English proofreading (first pass)

10 files changed, 1030 insertions, 620 deletions

diff --git a/perl-install/share/advertising/01-thanks.pl b/perl-install/share/advertising/01-thanks.pl
index fdc228785..ddad568fe 100644
--- a/perl-install/share/advertising/01-thanks.pl
+++ b/perl-install/share/advertising/01-thanks.pl
@@ -6,7 +6,7 @@ $icon = 0;
 $icon_dx = 0;
 $icon_dy = 0;
 @data = (
-	 [ N("Thank you for choosing Mandrake Linux 9.0"), 0, 80, 400, 0, 1],
+	 [ N("Thank you for choosing Mandrake Linux 9.1"), 0, 80, 400, 0, 1],
 	 [ N("Welcome to the Open Source world"), 0, 110, 400, 0, 0],
 	 [ N("The success of MandrakeSoft is based upon the principle of Free Software. Your new operating system is the result of collaborative work on the part of the worldwide Linux Community"), 0, 140, 400, 0, 0],
 
diff --git a/perl-install/share/advertising/03-internet.pl b/perl-install/share/advertising/03-internet.pl
index 7311696d2..466610f78 100644
--- a/perl-install/share/advertising/03-internet.pl
+++ b/perl-install/share/advertising/03-internet.pl
@@ -7,6 +7,6 @@ $icon_dx = 0;
 $icon_dy = 0;
 @data = (
 	 [ N("Get the most from the Internet"), 0, 0, 400, 20, 1],
-	 [ N("Mandrake Linux 9.0 has selected the best software for you. Surf the Web and view animations with Mozilla and Konqueror, or read your mail and handle your personal information with Evolution and Kmail"), 0, 30, 400, 60, 0],
+	 [ N("Mandrake Linux 9.1 has selected the best software for you. Surf the Web and view animations with Mozilla and Konqueror, or read your mail and handle your personal information with Evolution and Kmail"), 0, 30, 400, 60, 0],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);
diff --git a/perl-install/share/advertising/04-multimedia.pl b/perl-install/share/advertising/04-multimedia.pl
index ff59ffdd9..674b536e8 100644
--- a/perl-install/share/advertising/04-multimedia.pl
+++ b/perl-install/share/advertising/04-multimedia.pl
@@ -8,6 +8,6 @@ $icon_dy = 0;
 @data = (
 	 [ N("Discover the most up-to-date graphical and multimedia tools!"), 0, 0, 400, 20, 1],
 	 [ N("Push multimedia to its limits!"), 0, 40, 400, 20, 0],
-	 [ N("Mandrake Linux 9.0 enables you to use the very latest software to play audio files, edit and handle your images or photos, and play videos"), 0, 60, 400, 20, 0],
+	 [ N("Mandrake Linux 9.1 enables you to use the very latest software to play audio files, edit and handle your images or photos, and play videos"), 0, 60, 400, 20, 0],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);
diff --git a/perl-install/share/advertising/05-games.pl b/perl-install/share/advertising/05-games.pl
index 3b8646fd4..5885e644b 100644
--- a/perl-install/share/advertising/05-games.pl
+++ b/perl-install/share/advertising/05-games.pl
@@ -7,6 +7,6 @@ $icon_dx = 0;
 $icon_dy = 0;
 @data = (
 	 [ N("Games"), 0, 0, 400, 20, 1],
-	 [ N("Mandrake Linux 9.0 provides the best Open Source games - arcade, action, strategy, ..."), 0, 30, 400, 0, 0],
+	 [ N("Mandrake Linux 9.1 provides the best Open Source games - arcade, action, strategy, ..."), 0, 30, 400, 0, 0],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);
diff --git a/perl-install/share/advertising/06-mcc.pl b/perl-install/share/advertising/06-mcc.pl
index e2af9575b..1d6e5de15 100644
--- a/perl-install/share/advertising/06-mcc.pl
+++ b/perl-install/share/advertising/06-mcc.pl
@@ -7,6 +7,6 @@ $icon_dx = 0;
 $icon_dy = 0;
 @data = (
 	 [ N("Mandrake Control Center"), 0, 0, 400, 20, 1],
-	 [ N("Mandrake Linux 9.0 provides a powerful tool to fully customize and configure your machine"), 0, 40, 400, 60, 0],
+	 [ N("Mandrake Linux 9.1 provides a powerful tool to fully customize and configure your machine"), 0, 40, 400, 60, 0],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);
diff --git a/perl-install/share/advertising/07-desktop.pl b/perl-install/share/advertising/07-desktop.pl
index 49bb96064..5abc1f81e 100644
--- a/perl-install/share/advertising/07-desktop.pl
+++ b/perl-install/share/advertising/07-desktop.pl
@@ -7,6 +7,6 @@ $icon_dx = 0;
 $icon_dy = 0;
 @data = (
 	 [ N("User interfaces"), 0, 0, 400, 0, 1],
-	 [ N("Mandrake Linux 9.0 provides you with 11 user interfaces that can be fully modified: KDE 3, Gnome 2, WindowMaker, ..."), 0, 40, 400, 0, 0],
+	 [ N("Mandrake Linux 9.1 provides you with 11 user interfaces that can be fully modified: KDE 3, Gnome 2, WindowMaker, ..."), 0, 40, 400, 0, 0],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);
diff --git a/perl-install/share/advertising/08-development.pl b/perl-install/share/advertising/08-development.pl
index 69f8c36b8..1eddb13d5 100644
--- a/perl-install/share/advertising/08-development.pl
+++ b/perl-install/share/advertising/08-development.pl
@@ -7,7 +7,7 @@ $icon_dx = 0;
 $icon_dy = 0;
 @data = (
 	 [ N("Development simplified"), 0, 0, 400, 0, 1],
-	 [ N("Mandrake Linux 9.0 is the ultimate development platform"), 0, 20, 400, 0, 0],
+	 [ N("Mandrake Linux 9.1 is the ultimate development platform"), 0, 20, 400, 0, 0],
 	 [ N("Use the full power of the GNU gcc 3 compiler as well as the best Open Source development environments"), 0, 50, 400, 0, 0],
 #	 [ 'text', $x, $y, $area_width, $area_height ],
 	);
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index c3ed15744..df8e5dd86 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -18,10 +18,10 @@ msgstr ""
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
-"You can use userdrake to add a user in this group."
+"You can use userdrake to add a user to this group."
 msgstr ""
 
-#: ../../any.pm:1 ../../bootlook.pm:1 ../../install_steps_gtk.pm:1 ../../install_steps_gtk.pm:1 ../../interactive.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1 ../../my_gtk.pm:1 ../../my_gtk.pm:1 ../../ugtk.pm:1 ../../ugtk2.pm:1 ../../ugtk2.pm:1 ../../ugtk2.pm:1 ../../ugtk2.pm:1 ../../Xconfig/resolution_and_depth.pm:1 ../../diskdrake/smbnfs_gtk.pm:1 ../../interactive/http.pm:1 ../../interactive/newt.pm:1 ../../interactive/stdio.pm:1 ../../interactive/stdio.pm:1 ../../network/netconnect.pm:1 ../../printer/printerdrake.pm:1 ../../standalone/drakautoinst:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakfloppy:1 ../../standalone/drakfont:1 ../../standalone/drakgw:1 ../../standalone/draksec:1 ../../standalone/logdrake:1 ../../standalone/net_monitor:1
+#: ../../any.pm:1 ../../bootlook.pm:1 ../../install_steps_gtk.pm:1 ../../install_steps_gtk.pm:1 ../../interactive.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1 ../../my_gtk.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1 ../../ugtk2.pm:1 ../../ugtk2.pm:1 ../../ugtk2.pm:1 ../../ugtk.pm:1 ../../Xconfig/resolution_and_depth.pm:1 ../../diskdrake/smbnfs_gtk.pm:1 ../../interactive/http.pm:1 ../../interactive/newt.pm:1 ../../interactive/stdio.pm:1 ../../interactive/stdio.pm:1 ../../network/netconnect.pm:1 ../../printer/printerdrake.pm:1 ../../standalone/drakautoinst:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakfloppy:1 ../../standalone/drakfont:1 ../../standalone/drakgw:1 ../../standalone/draksec:1 ../../standalone/logdrake:1 ../../standalone/net_monitor:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Cancel"
 msgstr ""
@@ -104,7 +104,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../../any.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1 ../../modules/interactive.pm:1 ../../standalone/drakgw:1 ../../standalone/drakgw:1 ../../standalone/drakgw:1 ../../standalone/drakgw:1
+#: ../../any.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1 ../../modules/interactive.pm:1 ../../standalone/drakgw:1 ../../standalone/drakgw:1 ../../standalone/drakgw:1 ../../standalone/drakgw:1 ../../standalone/drakpxe:1 ../../standalone/drakpxe:1 ../../standalone/drakpxe:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Yes"
 msgstr ""
@@ -175,7 +175,7 @@ msgstr ""
 
 #: ../../any.pm:1
 #, c-format
-msgid "This user name is already added"
+msgid "This user name has already been added"
 msgstr ""
 
 #: ../../any.pm:1
@@ -247,7 +247,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
-"You can add some more or change the existing ones."
+"You can create additional entries or change the existing ones."
 msgstr ""
 
 #: ../../any.pm:1
@@ -412,7 +412,7 @@ msgstr ""
 
 #: ../../any.pm:1
 #, c-format
-msgid "Enable multi profiles"
+msgid "Enable multiple profiles"
 msgstr ""
 
 #: ../../any.pm:1
@@ -567,13 +567,13 @@ msgstr ""
 msgid ""
 "Welcome to %s the operating system chooser!\n"
 "\n"
-"Choose an operating system in the list above or\n"
+"Choose an operating system from the list above or\n"
 "wait %d seconds for default boot.\n"
 "\n"
 ""
 msgstr ""
 
-#: ../../bootlook.pm:1 ../../ugtk.pm:1 ../../ugtk2.pm:1 ../../network/netconnect.pm:1 ../../standalone/drakTermServ:1 ../../standalone/drakTermServ:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakfont:1 ../../standalone/drakfont:1 ../../standalone/drakfont:1 ../../standalone/net_monitor:1
+#: ../../bootlook.pm:1 ../../ugtk2.pm:1 ../../ugtk.pm:1 ../../network/netconnect.pm:1 ../../standalone/drakTermServ:1 ../../standalone/drakTermServ:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakfont:1 ../../standalone/drakfont:1 ../../standalone/drakfont:1 ../../standalone/net_monitor:1
 #, c-format
 msgid "OK"
 msgstr ""
@@ -612,10 +612,10 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"Select theme for\n"
+"Select the theme for\n"
 "lilo and bootsplash,\n"
 "you can choose\n"
-"them separatly"
+"them separately"
 msgstr ""
 
 #: ../../bootlook.pm:1
@@ -628,7 +628,7 @@ msgstr ""
 msgid "Splash selection"
 msgstr ""
 
-#: ../../bootlook.pm:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakgw:1
+#: ../../bootlook.pm:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Configure"
 msgstr ""
@@ -655,7 +655,7 @@ msgstr ""
 msgid "Notice"
 msgstr ""
 
-#: ../../bootlook.pm:1 ../../bootlook.pm:1 ../../bootlook.pm:1 ../../bootlook.pm:1 ../../bootlook.pm:1 ../../bootlook.pm:1 ../../fsedit.pm:1 ../../install_steps.pm:1 ../../install_steps_interactive.pm:1 ../../diskdrake/dav.pm:1 ../../diskdrake/hd_gtk.pm:1 ../../diskdrake/interactive.pm:1 ../../diskdrake/interactive.pm:1 ../../diskdrake/interactive.pm:1 ../../diskdrake/interactive.pm:1 ../../diskdrake/interactive.pm:1 ../../diskdrake/interactive.pm:1 ../../diskdrake/smbnfs_gtk.pm:1 ../../interactive/http.pm:1 ../../interactive/http.pm:1 ../../standalone/draksplash:1
+#: ../../bootlook.pm:1 ../../bootlook.pm:1 ../../bootlook.pm:1 ../../bootlook.pm:1 ../../bootlook.pm:1 ../../bootlook.pm:1 ../../fsedit.pm:1 ../../install_steps_interactive.pm:1 ../../install_steps.pm:1 ../../diskdrake/dav.pm:1 ../../diskdrake/hd_gtk.pm:1 ../../diskdrake/interactive.pm:1 ../../diskdrake/interactive.pm:1 ../../diskdrake/interactive.pm:1 ../../diskdrake/interactive.pm:1 ../../diskdrake/interactive.pm:1 ../../diskdrake/interactive.pm:1 ../../diskdrake/smbnfs_gtk.pm:1 ../../interactive/http.pm:1 ../../interactive/http.pm:1 ../../standalone/draksplash:1
 #, c-format
 msgid "Error"
 msgstr ""
@@ -891,26 +891,6 @@ msgstr ""
 msgid "Costa Rica"
 msgstr ""
 
-#: ../../fs.pm:1 ../../partition_table.pm:1
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr ""
-
-#: ../../fs.pm:1 ../../fs.pm:1
-#, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr ""
-
-#: ../../fs.pm:1
-#, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr ""
-
-#: ../../fs.pm:1 ../../fs.pm:1 ../../fs.pm:1 ../../fs.pm:1 ../../fs.pm:1 ../../fs.pm:1
-#, c-format
-msgid "%s formatting of %s failed"
-msgstr ""
-
 #: ../../fsedit.pm:1
 #, c-format
 msgid "Error opening %s for writing: %s"
@@ -997,6 +977,26 @@ msgstr ""
 msgid "simple"
 msgstr ""
 
+#: ../../fs.pm:1 ../../partition_table.pm:1
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr ""
+
+#: ../../fs.pm:1 ../../fs.pm:1
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr ""
+
+#: ../../fs.pm:1
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr ""
+
+#: ../../fs.pm:1 ../../fs.pm:1 ../../fs.pm:1 ../../fs.pm:1 ../../fs.pm:1 ../../fs.pm:1
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr ""
+
 #: ../../help.pm:1
 #, c-format
 msgid ""
@@ -2056,14 +2056,24 @@ msgid ""
 "\n"
 "\n"
 "These servers are activated by default. They don't have any known security\n"
-"issues, but some new could be found. In that case, you must make sure to upgrade\n"
-"as soon as possible.\n"
+"issues, but some new ones could be found. In that case, you must make sure\n"
+"to upgrade as soon as possible.\n"
 "\n"
 "\n"
 "Do you really want to install these servers?\n"
 ""
 msgstr ""
 
+#: ../../install_gtk.pm:1
+#, c-format
+msgid "System configuration"
+msgstr ""
+
+#: ../../install_gtk.pm:1
+#, c-format
+msgid "System installation"
+msgstr ""
+
 #: ../../install_gtk.pm:1 ../../install_steps_gtk.pm:1 ../../interactive.pm:1 ../../interactive.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1 ../../my_gtk.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1 ../../ugtk2.pm:1 ../../ugtk2.pm:1 ../../Xconfig/main.pm:1 ../../Xconfig/resolution_and_depth.pm:1 ../../interactive/http.pm:1 ../../interactive/newt.pm:1 ../../interactive/newt.pm:1 ../../interactive/stdio.pm:1 ../../interactive/stdio.pm:1 ../../interactive/stdio.pm:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/draksec:1
 #, c-format
 msgid "Ok"
@@ -2413,37 +2423,6 @@ msgid ""
 ""
 msgstr ""
 
-#: ../../install_steps.pm:1 ../../install_steps.pm:1
-#, c-format
-msgid "No floppy drive available"
-msgstr ""
-
-#: ../../install_steps.pm:1
-#, c-format
-msgid "Welcome to %s"
-msgstr ""
-
-#: ../../install_steps.pm:1
-#, c-format
-msgid ""
-"Some important packages didn't get installed properly.\n"
-"Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
-""
-msgstr ""
-
-#: ../../install_steps.pm:1
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr ""
-
-#: ../../install_steps.pm:1
-#, c-format
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-
 #: ../../install_steps_auto_install.pm:1 ../../install_steps_stdio.pm:1
 #, c-format
 msgid ""
@@ -2741,7 +2720,7 @@ msgid ""
 "You appear to have an OldWorld or Unknown\n"
 " machine, the yaboot bootloader will not work for you.\n"
 "The install will continue, but you'll\n"
-" need to use BootX to boot your machine"
+" need to use BootX or some other means to boot your machine"
 msgstr ""
 
 #: ../../install_steps_interactive.pm:1
@@ -3034,7 +3013,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
-"have been released after the distribution was released. They may\n"
+"have been updated after the distribution was released. They may\n"
 "contain security or bug fixes.\n"
 "\n"
 "To download these packages, you will need to have a working Internet \n"
@@ -3269,7 +3248,7 @@ msgstr ""
 
 #: ../../install_steps_interactive.pm:1 ../../standalone/mousedrake:1
 #, c-format
-msgid "Please choose on which serial port your mouse is connected to."
+msgid "Please choose which serial port your mouse is connected to."
 msgstr ""
 
 #: ../../install_steps_interactive.pm:1 ../../standalone/mousedrake:1
@@ -3279,7 +3258,7 @@ msgstr ""
 
 #: ../../install_steps_interactive.pm:1
 #, c-format
-msgid "Please choose the type of your mouse."
+msgid "Please choose your type of mouse."
 msgstr ""
 
 #: ../../install_steps_interactive.pm:1
@@ -3289,7 +3268,7 @@ msgstr ""
 
 #: ../../install_steps_interactive.pm:1
 #, c-format
-msgid "Upgrade partition %s"
+msgid "Upgrade %s"
 msgstr ""
 
 #: ../../install_steps_interactive.pm:1
@@ -3347,6 +3326,37 @@ msgstr ""
 msgid "Mandrake Linux Installation %s"
 msgstr ""
 
+#: ../../install_steps.pm:1 ../../install_steps.pm:1
+#, c-format
+msgid "No floppy drive available"
+msgstr ""
+
+#: ../../install_steps.pm:1
+#, c-format
+msgid "Welcome to %s"
+msgstr ""
+
+#: ../../install_steps.pm:1
+#, c-format
+msgid ""
+"Some important packages didn't get installed properly.\n"
+"Either your cdrom drive or your cdrom is defective.\n"
+"Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
+""
+msgstr ""
+
+#: ../../install_steps.pm:1
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr ""
+
+#: ../../install_steps.pm:1
+#, c-format
+msgid ""
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+msgstr ""
+
 #: ../../interactive.pm:1 ../../harddrake/sound.pm:1 ../../standalone/drakxtv:1 ../../standalone/harddrake2:1 ../../standalone/service_harddrake:1
 #, c-format
 msgid "Please wait"
@@ -3497,12 +3507,12 @@ msgstr ""
 
 #: ../../keyboard.pm:1
 #, c-format
-msgid "Tamil (TSCII)"
+msgid "Tamil (Typewriter-layout)"
 msgstr ""
 
 #: ../../keyboard.pm:1
 #, c-format
-msgid "Tamil (Unicode)"
+msgid "Tamil (ISCII-layout)"
 msgstr ""
 
 #: ../../keyboard.pm:1
@@ -4472,13 +4482,13 @@ msgstr ""
 #: ../../services.pm:1
 #, c-format
 msgid ""
-"apmd is used for monitoring batery status and logging it via syslog.\n"
+"apmd is used for monitoring battery status and logging it via syslog.\n"
 "It can also be used for shutting down the machine when the battery is low."
 msgstr ""
 
 #: ../../services.pm:1
 #, c-format
-msgid "Anacron a periodic command scheduler."
+msgid "Anacron is a periodic command scheduler."
 msgstr ""
 
 #: ../../services.pm:1
@@ -4493,11 +4503,6 @@ msgstr ""
 
 #: ../../standalone.pm:1
 #, c-format
-msgid "No browser is installed on your system, Please install one if you want to browse the help system"
-msgstr ""
-
-#: ../../standalone.pm:1
-#, c-format
 msgid ""
 "\n"
 "Usage: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] [-v|--version] "
@@ -4689,7 +4694,7 @@ msgstr ""
 
 #: ../../steps.pm:1
 #, c-format
-msgid "Setup filesystems"
+msgid "Partitioning"
 msgstr ""
 
 #: ../../steps.pm:1
@@ -4719,22 +4724,27 @@ msgstr ""
 
 #: ../../steps.pm:1
 #, c-format
+msgid "License"
+msgstr ""
+
+#: ../../steps.pm:1
+#, c-format
 msgid "Choose your language"
 msgstr ""
 
-#: ../../ugtk.pm:1
+#: ../../ugtk2.pm:1
 #, c-format
-msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgid "utopia 25"
 msgstr ""
 
-#: ../../ugtk.pm:1 ../../ugtk2.pm:1 ../../standalone/logdrake:1
+#: ../../ugtk2.pm:1 ../../ugtk.pm:1 ../../standalone/logdrake:1
 #, c-format
 msgid "logdrake"
 msgstr ""
 
-#: ../../ugtk2.pm:1
+#: ../../ugtk.pm:1
 #, c-format
-msgid "utopia 25"
+msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr ""
 
 #: ../../Xconfig/card.pm:1
@@ -4944,7 +4954,7 @@ msgstr ""
 
 #: ../../Xconfig/monitor.pm:1
 #, c-format
-msgid "Plug'n Play probing failed. Please choose a precise monitor"
+msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr ""
 
 #: ../../Xconfig/monitor.pm:1 ../../standalone/harddrake2:1 ../../standalone/harddrake2:1
@@ -5408,7 +5418,7 @@ msgstr ""
 msgid ""
 "\n"
 "Chances are, this partition is\n"
-"a Driver partition, you should\n"
+"a Driver partition. You should\n"
 "probably leave it alone.\n"
 ""
 msgstr ""
@@ -5586,7 +5596,7 @@ msgstr ""
 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"
+"Please be sure to add a /boot partition"
 msgstr ""
 
 #: ../../diskdrake/interactive.pm:1
@@ -5651,7 +5661,7 @@ msgstr ""
 
 #: ../../diskdrake/interactive.pm:1
 #, c-format
-msgid "File already used by another loopback, choose another one"
+msgid "File is already used by another loopback, choose another one"
 msgstr ""
 
 #: ../../diskdrake/interactive.pm:1
@@ -5788,7 +5798,7 @@ msgstr ""
 
 #: ../../diskdrake/interactive.pm:1
 #, c-format
-msgid "Where do you want to mount loopback file %s?"
+msgid "Where do you want to mount the loopback file %s?"
 msgstr ""
 
 #: ../../diskdrake/interactive.pm:1
@@ -6123,7 +6133,7 @@ msgstr ""
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
 "\n"
-"It has been reported to oopses the kernel on unloading.\n"
+"It has been reported to oops the kernel on unloading.\n"
 "\n"
 "The new \"%s\" driver'll only be used on next bootstrap."
 msgstr ""
@@ -6232,7 +6242,7 @@ msgstr ""
 #, c-format
 msgid ""
 "For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-detect the rights parameters.\n"
-"If your card is misdetected, you can force the right tuner and card types here. Just select your tv card parameters if needed"
+"If your card is misdetected, you can force the right tuner and card types here. Just select your tv card parameters if needed."
 msgstr ""
 
 #: ../../harddrake/v4l.pm:1 ../../harddrake/v4l.pm:1
@@ -6352,7 +6362,7 @@ msgstr ""
 #, 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"
+"properly, although it normally works fine without them. Would you like to specify\n"
 "extra options for it or allow the driver to probe your machine for the\n"
 "information it needs? Occasionally, probing will hang a computer, but it should\n"
 "not cause any damage."
@@ -6380,7 +6390,7 @@ msgstr ""
 #: ../../modules/interactive.pm:1
 #, c-format
 msgid ""
-"You may now provide its options to module %s.\n"
+"You may now provide options to module %s.\n"
 "Note that any address should be entered with the prefix 0x like '0x123'"
 msgstr ""
 
@@ -6464,7 +6474,7 @@ msgstr ""
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few ones use dhcp.\n"
+"Some connections use pptp, a few use dhcp.\n"
 "If you don't know, choose 'use pppoe'"
 msgstr ""
 
@@ -6544,7 +6554,7 @@ msgid ""
 "drakfirewall configurator\n"
 "\n"
 "This configures a personal firewall for this Mandrake Linux machine.\n"
-"For a powerful dedicated firewall solution, please look to the\n"
+"For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 
@@ -6599,10 +6609,10 @@ msgstr ""
 
 #: ../../network/ethernet.pm:1
 #, c-format
-msgid "Please choose which network adapter you want to use to connect to Internet"
+msgid "Please choose which network adapter you want to use to connect to Internet."
 msgstr ""
 
-#: ../../network/ethernet.pm:1 ../../standalone/drakgw:1
+#: ../../network/ethernet.pm:1 ../../standalone/drakgw:1 ../../standalone/drakpxe:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Choose the network interface"
 msgstr ""
@@ -6618,7 +6628,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Which dhcp client do you want to use?\n"
-"Default is dhcp-client"
+"Default is dhcp-client."
 msgstr ""
 
 #: ../../network/isdn.pm:1
@@ -6633,7 +6643,7 @@ msgstr ""
 
 #: ../../network/isdn.pm:1
 #, c-format
-msgid "Which is your ISDN card?"
+msgid "Which of the following is your ISDN card?"
 msgstr ""
 
 #: ../../network/isdn.pm:1 ../../network/isdn.pm:1 ../../network/isdn.pm:1 ../../network/isdn.pm:1 ../../network/isdn.pm:1 ../../network/isdn.pm:1
@@ -6710,7 +6720,7 @@ msgstr ""
 
 #: ../../network/isdn.pm:1
 #, c-format
-msgid "Europe protocol (EDSS1)"
+msgid "European protocol (EDSS1)"
 msgstr ""
 
 #: ../../network/isdn.pm:1
@@ -7061,12 +7071,12 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"You can connect to Internet or reconfigure your connection."
+"You can connect to the Internet or reconfigure your connection."
 msgstr ""
 
 #: ../../network/netconnect.pm:1
 #, c-format
-msgid "You are not currently connected to Internet."
+msgid "You are not currently connected to the Internet."
 msgstr ""
 
 #: ../../network/netconnect.pm:1
@@ -7078,12 +7088,12 @@ msgstr ""
 
 #: ../../network/netconnect.pm:1
 #, c-format
-msgid "You are currently connected to internet."
+msgid "You are currently connected to the Internet."
 msgstr ""
 
 #: ../../network/network.pm:1
 #, c-format
-msgid "Url should begin with 'ftp:' or 'http:'"
+msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr ""
 
 #: ../../network/network.pm:1
@@ -7142,17 +7152,17 @@ 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"
+"You may also enter the IP address of the gateway if you have one."
 msgstr ""
 
 #: ../../network/network.pm:1
 #, c-format
-msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0'."
+msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."
 msgstr ""
 
 #: ../../network/network.pm:1
 #, c-format
-msgid "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz frequency), or add enough '0'."
+msgid "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz frequency), or add enough '0' (zeroes)."
 msgstr ""
 
 #: ../../network/network.pm:1 ../../printer/printerdrake.pm:1
@@ -7162,20 +7172,35 @@ msgstr ""
 
 #: ../../network/network.pm:1
 #, c-format
+msgid "For an Automatic IP you have to select at least one protocol : dhcp or zeroconf"
+msgstr ""
+
+#: ../../network/network.pm:1
+#, c-format
 msgid "Start at boot"
 msgstr ""
 
 #: ../../network/network.pm:1
 #, c-format
-msgid "(bootp/dhcp)"
+msgid "zeroconf"
 msgstr ""
 
 #: ../../network/network.pm:1
 #, c-format
+msgid "bootp/dhcp"
+msgstr ""
+
+#: ../../network/network.pm:1 ../../network/network.pm:1
+#, c-format
 msgid "Automatic IP"
 msgstr ""
 
-#: ../../network/network.pm:1 ../../standalone/drakconnect:1 ../../standalone/drakgw:1
+#: ../../network/network.pm:1
+#, c-format
+msgid "(bootp/dhcp/zeroconf)"
+msgstr ""
+
+#: ../../network/network.pm:1 ../../standalone/drakconnect:1 ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Netmask"
 msgstr ""
@@ -7213,7 +7238,7 @@ msgstr ""
 
 #: ../../network/shorewall.pm:1
 #, c-format
-msgid "Warning! An existing firewalling configuration has been detected. You may need some manual fix after installation."
+msgid "Warning! An existing firewalling configuration has been detected. You may need some manual fixes after installation."
 msgstr ""
 
 #: ../../network/shorewall.pm:1
@@ -7319,18 +7344,18 @@ msgstr ""
 #: ../../network/tools.pm:1
 #, c-format
 msgid ""
-"The system doesn't seem to be connected to internet.\n"
+"The system doesn't seem to be connected to the Internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
 
 #: ../../network/tools.pm:1
 #, c-format
-msgid "For security reason, it will be disconnected now."
+msgid "For security reasons, it will be disconnected now."
 msgstr ""
 
 #: ../../network/tools.pm:1
 #, c-format
-msgid "The system is now connected to Internet."
+msgid "The system is now connected to the Internet."
 msgstr ""
 
 #: ../../network/tools.pm:1 ../../standalone/drakconnect:1
@@ -7353,7 +7378,7 @@ msgstr ""
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
-"It means writing anything on the disk will end up with random trash"
+"It means writing anything on the disk will end up with random, corrupted data."
 msgstr ""
 
 #: ../../printer/cups.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1
@@ -7596,7 +7621,7 @@ msgstr ""
 msgid "Remove printer"
 msgstr ""
 
-#: ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid "Know how to use this printer"
 msgstr ""
@@ -7691,6 +7716,11 @@ msgstr ""
 msgid "Printer connection type"
 msgstr ""
 
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Learn how to use this printer"
+msgstr ""
+
 #: ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1
 #, c-format
 msgid "Raw printer"
@@ -7870,7 +7900,7 @@ msgstr ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "The network configuration done during the installation cannot be started now. Please check whether the network gets accessable after booting your system and correct the configuration using the Mandrake Control Center, section \"Network & Internet\"/\"Connection\", and afterwards set up the printer, also using the Mandrake Control Center, section \"Hardware\"/\"Printer\""
+msgid "The network configuration done during the installation cannot be started now. Please check whether the network is accessable after booting your system and correct the configuration using the Mandrake Control Center, section \"Network & Internet\"/\"Connection\", and afterwards set up the printer, also using the Mandrake Control Center, section \"Hardware\"/\"Printer\""
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1
@@ -8281,7 +8311,7 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"Please check whether Printerdrake did the auto-detection of your printer model correctly. Search the correct model in the list when the cursor is standing on a wrong model or on \"Raw printer\"."
+"Please check whether Printerdrake did the auto-detection of your printer model correctly. Find the correct model in the list when a wrong model or \"Raw printer\" is highlighted."
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
@@ -8461,7 +8491,7 @@ msgstr ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Choose one of the auto-detected printers from the list or enter the hostname or IP and the optional port number (default is 9100) into the input fields."
+msgid "Choose one of the auto-detected printers from the list or enter the hostname or IP and the optional port number (default is 9100) in the input fields."
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
@@ -8661,12 +8691,12 @@ msgstr ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Please choose the port where your printer is connected to."
+msgid "Please choose the port that your printer is connected to."
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Please choose the port where your printer is connected to or enter a device name/file name in the input line"
+msgid "Please choose the port that your printer is connected to or enter a device name/file name in the input line"
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
@@ -8785,7 +8815,7 @@ msgid ""
 "\n"
 "If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected.\n"
 "\n"
-" Click on \"Next\" when you are ready, and on \"Cancel\" when you do not want to set up your printer(s) now."
+" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now."
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
@@ -8800,7 +8830,7 @@ msgid ""
 "\n"
 "Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network printers when you don't need it.\n"
 "\n"
-" Click on \"Next\" when you are ready, and on \"Cancel\" when you do not want to set up your printer(s) now."
+" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now."
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
@@ -8811,11 +8841,11 @@ msgid ""
 "\n"
 "This wizard will help you to install your printer(s) connected to this computer, connected directly to the network or to a remote Windows machine.\n"
 "\n"
-"If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected. Also your network printer(s) and you Windows machines must be connected and turned on.\n"
+"If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected. Also your network printer(s) and your Windows machines must be connected and turned on.\n"
 "\n"
 "Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network and/or Windows-hosted printers when you don't need it.\n"
 "\n"
-" Click on \"Next\" when you are ready, and on \"Cancel\" when you do not want to set up your printer(s) now."
+" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now."
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
@@ -9024,7 +9054,7 @@ msgstr ""
 #: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"When this option is turned on, on every startup of CUPS is automatically made sure that\n"
+"When this option is turned on, on every startup of CUPS it is automatically made sure that\n"
 "\n"
 "- if LPD/LPRng is installed, /etc/printcap will not be overwritten by CUPS\n"
 "\n"
@@ -9089,7 +9119,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"Printers on remote CUPS servers you do not have to configure here; these printers will be automatically detected."
+"Printers on remote CUPS servers do not need to be configured here; these printers will be automatically detected."
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
@@ -9157,14 +9187,14 @@ msgstr ""
 
 #: ../../security/level.pm:1
 #, c-format
-msgid "Password are now enabled, but use as a networked computer is still not recommended."
+msgid "Passwords are now enabled, but use as a networked computer is still not recommended."
 msgstr ""
 
 #: ../../security/level.pm:1
 #, c-format
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
-"but very sensitive: it must not be used for a machine connected to others\n"
+"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 ""
 
@@ -9205,7 +9235,7 @@ msgstr ""
 
 #: ../../share/advertising/01-thanks.pl:1
 #, c-format
-msgid "Thank you for choosing Mandrake Linux 9.0"
+msgid "Thank you for choosing Mandrake Linux 9.1"
 msgstr ""
 
 #: ../../share/advertising/02-community.pl:1
@@ -9225,7 +9255,7 @@ msgstr ""
 
 #: ../../share/advertising/03-internet.pl:1
 #, c-format
-msgid "Mandrake Linux 9.0 has selected the best software for you. Surf the Web and view animations with Mozilla and Konqueror, or read your mail and handle your personal information with Evolution and Kmail"
+msgid "Mandrake Linux 9.1 has selected the best software for you. Surf the Web and view animations with Mozilla and Konqueror, or read your mail and handle your personal information with Evolution and Kmail"
 msgstr ""
 
 #: ../../share/advertising/03-internet.pl:1
@@ -9235,7 +9265,7 @@ msgstr ""
 
 #: ../../share/advertising/04-multimedia.pl:1
 #, c-format
-msgid "Mandrake Linux 9.0 enables you to use the very latest software to play audio files, edit and handle your images or photos, and play videos"
+msgid "Mandrake Linux 9.1 enables you to use the very latest software to play audio files, edit and handle your images or photos, and play videos"
 msgstr ""
 
 #: ../../share/advertising/04-multimedia.pl:1
@@ -9250,7 +9280,7 @@ msgstr ""
 
 #: ../../share/advertising/05-games.pl:1
 #, c-format
-msgid "Mandrake Linux 9.0 provides the best Open Source games - arcade, action, strategy, ..."
+msgid "Mandrake Linux 9.1 provides the best Open Source games - arcade, action, strategy, ..."
 msgstr ""
 
 #: ../../share/advertising/05-games.pl:1
@@ -9260,7 +9290,7 @@ msgstr ""
 
 #: ../../share/advertising/06-mcc.pl:1
 #, c-format
-msgid "Mandrake Linux 9.0 provides a powerful tool to fully customize and configure your machine"
+msgid "Mandrake Linux 9.1 provides a powerful tool to fully customize and configure your machine"
 msgstr ""
 
 #: ../../share/advertising/06-mcc.pl:1 ../../standalone/drakbug:1
@@ -9270,7 +9300,7 @@ msgstr ""
 
 #: ../../share/advertising/07-desktop.pl:1
 #, c-format
-msgid "Mandrake Linux 9.0 provides you with 11 user interfaces that can be fully modified: KDE 3, Gnome 2, WindowMaker, ..."
+msgid "Mandrake Linux 9.1 provides you with 11 user interfaces that can be fully modified: KDE 3, Gnome 2, WindowMaker, ..."
 msgstr ""
 
 #: ../../share/advertising/07-desktop.pl:1
@@ -9285,7 +9315,7 @@ msgstr ""
 
 #: ../../share/advertising/08-development.pl:1
 #, c-format
-msgid "Mandrake Linux 9.0 is the ultimate development platform"
+msgid "Mandrake Linux 9.1 is the ultimate development platform"
 msgstr ""
 
 #: ../../share/advertising/08-development.pl:1
@@ -9608,7 +9638,7 @@ msgstr ""
 
 #: ../../standalone/drakTermServ:1
 #, c-format
-msgid "No nic selected!"
+msgid "No NIC selected!"
 msgstr ""
 
 #: ../../standalone/drakTermServ:1
@@ -9829,7 +9859,7 @@ msgid ""
 "You may now replay your installation."
 msgstr ""
 
-#: ../../standalone/drakautoinst:1 ../../standalone/drakgw:1 ../../standalone/scannerdrake:1
+#: ../../standalone/drakautoinst:1 ../../standalone/drakgw:1 ../../standalone/scannerdrake:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Congratulations!"
 msgstr ""
@@ -10059,7 +10089,7 @@ msgid ""
 msgstr ""
 
 #: ../../standalone/drakbackup:1
-#, no-c-format
+#, c-format
 msgid ""
 "options description:\n"
 "\n"
@@ -11801,7 +11831,7 @@ msgstr ""
 
 #: ../../standalone/drakfont:1 ../../standalone/drakfont:1
 #, c-format
-msgid "Initials tests"
+msgid "Initial tests"
 msgstr ""
 
 #: ../../standalone/drakfont:1
@@ -12111,7 +12141,7 @@ msgstr ""
 msgid "Search installed fonts"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -12121,101 +12151,101 @@ msgid ""
 "Click on Configure to launch the setup wizard."
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Internet connection sharing configuration"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The setup has already been done, and it's currently enabled."
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The setup has already been done, but it's currently disabled."
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local Area Network, using automatic network configuration (DHCP)."
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Problems installing package %s"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Configuring..."
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "Potential LAN address conflict found in current config of %s!\n"
 ""
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The DHCP end range"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The DHCP start range"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The internal domain name"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The DNS Server IP"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -12226,12 +12256,12 @@ msgid ""
 ""
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Local Network adress"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP server; in that case please verify I correctly read the Network that you use for your local network; I will not reconfigure it and I will not touch your DHCP server configuration.\n"
@@ -12243,7 +12273,7 @@ msgid ""
 ""
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -12254,27 +12284,27 @@ msgid ""
 "Driver: %s"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Current interface configuration"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Show current interface configuration"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "No (experts only)"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -12284,17 +12314,17 @@ msgid ""
 "You can do it manually but you need to know what you're doing."
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Network interface already configured"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Please choose what network adapter will be connected to your Local Area Network."
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -12304,27 +12334,27 @@ msgid ""
 "I am about to setup your Local Area Network with that adapter."
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Network interface"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "No ethernet network adapter has been detected on your system. Please run the hardware configuration tool."
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "No network adapter on your system!"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Interface %s"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr ""
@@ -12622,7 +12652,7 @@ msgstr ""
 
 #: ../../standalone/draksec:1
 #, c-format
-msgid " (default value: %s)"
+msgid "(default value: %s)"
 msgstr ""
 
 #: ../../standalone/draksec:1
@@ -13915,6 +13945,93 @@ msgid ""
 ""
 msgstr ""
 
+#: ../../standalone/drakhelp:1
+#, c-format
+msgid "No browser is installed on your system, Please install one if you want to browse the help system"
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "Location of auto_install.cfg file"
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"Please indicate where the auto_install.cfg file is located.\n"
+"\n"
+"Leave it blank if you do not want to set up automatic installation mode.\n"
+"\n"
+""
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "No CD or DVD image found, please copy the installation program and rpm files."
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "No image found"
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "Installation image directory"
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"Please indicate where the installation image will be available.\n"
+"\n"
+"If you do not have an existing directory, please copy the CD or DVD contents.\n"
+"\n"
+""
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"The DHCP server will allow other computer to boot using PXE in the given range of address.\n"
+"\n"
+"If you give an inexistant directory, you will be asked to insert Installation CD or DVD to copy the installation program and rpm files.\n"
+"\n"
+""
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "Interface %s (on network %s)"
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "Please choose which network interface will be used for the dhcp server."
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"You are about to configure your computer to install a PXE server as a DHCP server\n"
+"and a TFTP server to build an installation server.\n"
+"With that feature, other computers on your local network will be installable using from this computer.\n"
+"\n"
+"Make sure you have configured your Network/Internet access using drakconnect before going any further.\n"
+"\n"
+"Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN)."
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "Installation Server Configuration"
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "PXE Server Configuration"
+msgstr ""
+
 
 #: ../../share/compssUsers:999
 msgid "Office Workstation"
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index b3a499049..0e5e332c9 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -20,13 +20,13 @@ msgstr ""
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
-"You can use userdrake to add a user in this group."
+"You can use userdrake to add a user to this group."
 msgstr ""
 "per-user deling bruker gruppen \"fileshare\". \n"
 "Du kan bruke userdrake til х legge til en bruker i denne gruppen."
 
 #: ../../any.pm:1 ../../bootlook.pm:1 ../../install_steps_gtk.pm:1
-#: ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk.pm:1 ../../ugtk2.pm:1
+#: ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1 ../../ugtk.pm:1
 #: ../../Xconfig/resolution_and_depth.pm:1 ../../diskdrake/smbnfs_gtk.pm:1
 #: ../../interactive/http.pm:1 ../../interactive/newt.pm:1
 #: ../../interactive/stdio.pm:1 ../../network/netconnect.pm:1
@@ -35,6 +35,7 @@ msgstr ""
 #: ../../standalone/drakfloppy:1 ../../standalone/drakfont:1
 #: ../../standalone/drakgw:1 ../../standalone/draksec:1
 #: ../../standalone/logdrake:1 ../../standalone/net_monitor:1
+#: ../../standalone/drakpxe:1
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
@@ -122,6 +123,7 @@ msgstr "Nei"
 
 #: ../../any.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1
 #: ../../modules/interactive.pm:1 ../../standalone/drakgw:1
+#: ../../standalone/drakpxe:1
 #, c-format
 msgid "Yes"
 msgstr "Ja"
@@ -203,7 +205,7 @@ msgstr "Legg til bruker"
 
 #: ../../any.pm:1
 #, c-format
-msgid "This user name is already added"
+msgid "This user name has already been added"
 msgstr "Denne brukeren er allerede lagt til"
 
 #: ../../any.pm:1
@@ -277,7 +279,7 @@ msgstr "tilgang til X-programmer"
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
-"You can add some more or change the existing ones."
+"You can create additional entries or change the existing ones."
 msgstr ""
 "Her er de forskjellige oppfјringene.\n"
 "Du kan legge til flere eller endre de eksisterende."
@@ -446,7 +448,7 @@ msgstr "Oppgi ram-stјrrelsen i MB"
 
 #: ../../any.pm:1
 #, c-format
-msgid "Enable multi profiles"
+msgid "Enable multiple profiles"
 msgstr "Slх pх multiprofiler"
 
 #: ../../any.pm:1
@@ -605,7 +607,7 @@ msgstr "SILO"
 msgid ""
 "Welcome to %s the operating system chooser!\n"
 "\n"
-"Choose an operating system in the list above or\n"
+"Choose an operating system from the list above or\n"
 "wait %d seconds for default boot.\n"
 "\n"
 msgstr ""
@@ -615,7 +617,7 @@ msgstr ""
 "vent %d sekunder for standard oppstart.\n"
 "\n"
 
-#: ../../bootlook.pm:1 ../../ugtk.pm:1 ../../ugtk2.pm:1
+#: ../../bootlook.pm:1 ../../ugtk2.pm:1 ../../ugtk.pm:1
 #: ../../network/netconnect.pm:1 ../../standalone/drakTermServ:1
 #: ../../standalone/drakbackup:1 ../../standalone/drakconnect:1
 #: ../../standalone/drakfont:1 ../../standalone/net_monitor:1
@@ -657,10 +659,10 @@ msgstr "Lilo skjerm"
 #, c-format
 msgid ""
 "\n"
-"Select theme for\n"
+"Select the theme for\n"
 "lilo and bootsplash,\n"
 "you can choose\n"
-"them separatly"
+"them separately"
 msgstr ""
 "\n"
 "Velg tema for\n"
@@ -679,6 +681,7 @@ msgid "Splash selection"
 msgstr "Splash valg"
 
 #: ../../bootlook.pm:1 ../../standalone/drakbackup:1 ../../standalone/drakgw:1
+#: ../../standalone/drakpxe:1
 #, c-format
 msgid "Configure"
 msgstr "Konfigurer"
@@ -707,8 +710,8 @@ msgstr "Tema installasjon mislykket!"
 msgid "Notice"
 msgstr "Notis"
 
-#: ../../bootlook.pm:1 ../../fsedit.pm:1 ../../install_steps.pm:1
-#: ../../install_steps_interactive.pm:1 ../../diskdrake/dav.pm:1
+#: ../../bootlook.pm:1 ../../fsedit.pm:1 ../../install_steps_interactive.pm:1
+#: ../../install_steps.pm:1 ../../diskdrake/dav.pm:1
 #: ../../diskdrake/hd_gtk.pm:1 ../../diskdrake/interactive.pm:1
 #: ../../diskdrake/smbnfs_gtk.pm:1 ../../interactive/http.pm:1
 #: ../../standalone/draksplash:1
@@ -957,26 +960,6 @@ msgstr "Frankrike"
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../../fs.pm:1 ../../partition_table.pm:1
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr "feil ved demontering av %s: %s"
-
-#: ../../fs.pm:1
-#, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "montere partisjon %s i katalog %s gikk ikke"
-
-#: ../../fs.pm:1
-#, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "Jeg vet ikke hvordan formatere %s i type %s"
-
-#: ../../fs.pm:1
-#, c-format
-msgid "%s formatting of %s failed"
-msgstr "%s formatering av %s mislykket"
-
 #: ../../fsedit.pm:1
 #, c-format
 msgid "Error opening %s for writing: %s"
@@ -1068,6 +1051,26 @@ msgstr "med /usr"
 msgid "simple"
 msgstr "enkel"
 
+#: ../../fs.pm:1 ../../partition_table.pm:1
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "feil ved demontering av %s: %s"
+
+#: ../../fs.pm:1
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "montere partisjon %s i katalog %s gikk ikke"
+
+#: ../../fs.pm:1
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "Jeg vet ikke hvordan formatere %s i type %s"
+
+#: ../../fs.pm:1
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "%s formatering av %s mislykket"
+
 #: ../../help.pm:1
 #, c-format
 msgid ""
@@ -2573,15 +2576,14 @@ msgid ""
 msgstr ""
 
 #: ../../install_any.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
 "\n"
 "\n"
 "These servers are activated by default. They don't have any known security\n"
-"issues, but some new could be found. In that case, you must make sure to "
-"upgrade\n"
-"as soon as possible.\n"
+"issues, but some new ones could be found. In that case, you must make sure\n"
+"to upgrade as soon as possible.\n"
 "\n"
 "\n"
 "Do you really want to install these servers?\n"
@@ -2596,6 +2598,16 @@ msgstr ""
 "\n"
 "иnsker du virkelig х installere disse tjenerene?\n"
 
+#: ../../install_gtk.pm:1
+#, fuzzy, c-format
+msgid "System configuration"
+msgstr "Internett-konfigurasjon"
+
+#: ../../install_gtk.pm:1
+#, fuzzy, c-format
+msgid "System installation"
+msgstr "SILO-installasjon"
+
 #: ../../install_gtk.pm:1 ../../install_steps_gtk.pm:1 ../../interactive.pm:1
 #: ../../my_gtk.pm:1 ../../ugtk2.pm:1 ../../Xconfig/main.pm:1
 #: ../../Xconfig/resolution_and_depth.pm:1 ../../interactive/http.pm:1
@@ -3176,44 +3188,6 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 
-#: ../../install_steps.pm:1
-#, c-format
-msgid "No floppy drive available"
-msgstr "Ingen diskettstasjon tilgjengelig"
-
-#: ../../install_steps.pm:1
-#, c-format
-msgid "Welcome to %s"
-msgstr "Velkommen til %s"
-
-#: ../../install_steps.pm:1
-#, c-format
-msgid ""
-"Some important packages didn't get installed properly.\n"
-"Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm"
-"\"\n"
-msgstr ""
-"Noen viktige pakker ble ikke installert ordentlig.\n"
-"Det er noe galt enten med CD-rom'en eller CD-platen.\n"
-"Sjekk cd-platen pх en installert maskin med \"rpm -qpl Mandrake/RPMS/*.rpm"
-"\"\n"
-
-#: ../../install_steps.pm:1
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Dupliser monteringspunkt %s"
-
-#: ../../install_steps.pm:1
-#, c-format
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"En feil oppsto, men jeg vet ikke hvordan jeg skal hхndtere dette pх en\n"
-"pen mхte.\n"
-"Fortsett pх eget ansvar."
-
 #: ../../install_steps_auto_install.pm:1 ../../install_steps_stdio.pm:1
 #, c-format
 msgid "Entering step `%s'\n"
@@ -3531,12 +3505,12 @@ msgid "Do you want to use aboot?"
 msgstr "иnsker du х bruke aboot?"
 
 #: ../../install_steps_interactive.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
 " machine, the yaboot bootloader will not work for you.\n"
 "The install will continue, but you'll\n"
-" need to use BootX to boot your machine"
+" need to use BootX or some other means to boot your machine"
 msgstr ""
 "Det virker som du har en OldWorld eller ukjent\n"
 "maskin, yaboot oppstartslasteren vil ikke virke for deg.\n"
@@ -3883,7 +3857,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
-"have been released after the distribution was released. They may\n"
+"have been updated after the distribution was released. They may\n"
 "contain security or bug fixes.\n"
 "\n"
 "To download these packages, you will need to have a working Internet \n"
@@ -4146,7 +4120,7 @@ msgstr "Emulering knapper"
 
 #: ../../install_steps_interactive.pm:1 ../../standalone/mousedrake:1
 #, c-format
-msgid "Please choose on which serial port your mouse is connected to."
+msgid "Please choose which serial port your mouse is connected to."
 msgstr "Vennligst velg hvilken serieport musen din koblet til."
 
 #: ../../install_steps_interactive.pm:1 ../../standalone/mousedrake:1
@@ -4156,7 +4130,7 @@ msgstr "Port mus"
 
 #: ../../install_steps_interactive.pm:1
 #, c-format
-msgid "Please choose the type of your mouse."
+msgid "Please choose your type of mouse."
 msgstr "Vennligst velg din musetype."
 
 #: ../../install_steps_interactive.pm:1
@@ -4166,8 +4140,8 @@ msgstr "Oppgrader"
 
 #: ../../install_steps_interactive.pm:1
 #, fuzzy, c-format
-msgid "Upgrade partition %s"
-msgstr "partisjon %s"
+msgid "Upgrade %s"
+msgstr "Oppgrader"
 
 #: ../../install_steps_interactive.pm:1
 #, fuzzy, c-format
@@ -4226,6 +4200,44 @@ msgstr ""
 msgid "Mandrake Linux Installation %s"
 msgstr "Mandrake Linux installasjon %s"
 
+#: ../../install_steps.pm:1
+#, c-format
+msgid "No floppy drive available"
+msgstr "Ingen diskettstasjon tilgjengelig"
+
+#: ../../install_steps.pm:1
+#, c-format
+msgid "Welcome to %s"
+msgstr "Velkommen til %s"
+
+#: ../../install_steps.pm:1
+#, c-format
+msgid ""
+"Some important packages didn't get installed properly.\n"
+"Either your cdrom drive or your cdrom is defective.\n"
+"Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm"
+"\"\n"
+msgstr ""
+"Noen viktige pakker ble ikke installert ordentlig.\n"
+"Det er noe galt enten med CD-rom'en eller CD-platen.\n"
+"Sjekk cd-platen pх en installert maskin med \"rpm -qpl Mandrake/RPMS/*.rpm"
+"\"\n"
+
+#: ../../install_steps.pm:1
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Dupliser monteringspunkt %s"
+
+#: ../../install_steps.pm:1
+#, c-format
+msgid ""
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+msgstr ""
+"En feil oppsto, men jeg vet ikke hvordan jeg skal hхndtere dette pх en\n"
+"pen mхte.\n"
+"Fortsett pх eget ansvar."
+
 #: ../../interactive.pm:1 ../../harddrake/sound.pm:1
 #: ../../standalone/drakxtv:1 ../../standalone/harddrake2:1
 #: ../../standalone/service_harddrake:1
@@ -4378,14 +4390,14 @@ msgid "Thai keyboard"
 msgstr "Thai-tastatur"
 
 #: ../../keyboard.pm:1
-#, c-format
-msgid "Tamil (TSCII)"
-msgstr "Tamilsk (TSCII)"
+#, fuzzy, c-format
+msgid "Tamil (Typewriter-layout)"
+msgstr "Armensk (skrivemaskin)"
 
 #: ../../keyboard.pm:1
-#, c-format
-msgid "Tamil (Unicode)"
-msgstr "Tamilsk (Unicode)"
+#, fuzzy, c-format
+msgid "Tamil (ISCII-layout)"
+msgstr "Tamilsk (TSCII)"
 
 #: ../../keyboard.pm:1
 #, c-format
@@ -5442,7 +5454,7 @@ msgstr ""
 #: ../../services.pm:1
 #, c-format
 msgid ""
-"apmd is used for monitoring batery status and logging it via syslog.\n"
+"apmd is used for monitoring battery status and logging it via syslog.\n"
 "It can also be used for shutting down the machine when the battery is low."
 msgstr ""
 "apmd blir brukt til overvхkning av batteristatus og logging av dette via "
@@ -5451,7 +5463,7 @@ msgstr ""
 
 #: ../../services.pm:1
 #, c-format
-msgid "Anacron a periodic command scheduler."
+msgid "Anacron is a periodic command scheduler."
 msgstr "Anacron en periodisk kommandoplanlegger."
 
 #: ../../services.pm:1
@@ -5467,13 +5479,6 @@ msgstr "Installerer pakke..."
 #: ../../standalone.pm:1
 #, c-format
 msgid ""
-"No browser is installed on your system, Please install one if you want to "
-"browse the help system"
-msgstr ""
-
-#: ../../standalone.pm:1
-#, c-format
-msgid ""
 "\n"
 "Usage: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
 "testing] [-v|--version] "
@@ -5671,9 +5676,9 @@ msgid "Format partitions"
 msgstr "Formater partisjoner"
 
 #: ../../steps.pm:1
-#, c-format
-msgid "Setup filesystems"
-msgstr "Oppsett filsystemer"
+#, fuzzy, c-format
+msgid "Partitioning"
+msgstr "Skriver ut"
 
 #: ../../steps.pm:1
 #, c-format
@@ -5702,23 +5707,28 @@ msgstr "Konfigurer mus"
 
 #: ../../steps.pm:1
 #, c-format
+msgid "License"
+msgstr ""
+
+#: ../../steps.pm:1
+#, c-format
 msgid "Choose your language"
 msgstr "Velg sprхk"
 
-#: ../../ugtk.pm:1
+#: ../../ugtk2.pm:1
 #, c-format
-msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
-msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgid "utopia 25"
+msgstr ""
 
-#: ../../ugtk.pm:1 ../../ugtk2.pm:1 ../../standalone/logdrake:1
+#: ../../ugtk2.pm:1 ../../ugtk.pm:1 ../../standalone/logdrake:1
 #, c-format
 msgid "logdrake"
 msgstr "logdrake"
 
-#: ../../ugtk2.pm:1
+#: ../../ugtk.pm:1
 #, c-format
-msgid "utopia 25"
-msgstr ""
+msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
 
 #: ../../Xconfig/card.pm:1
 #, c-format
@@ -5959,7 +5969,7 @@ msgstr ""
 
 #: ../../Xconfig/monitor.pm:1
 #, c-format
-msgid "Plug'n Play probing failed. Please choose a precise monitor"
+msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr "Plug'n Play sјking mislykket. Vennligst velg en monitor"
 
 #: ../../Xconfig/monitor.pm:1 ../../standalone/harddrake2:1
@@ -6412,11 +6422,11 @@ msgstr ""
 "dual-boote ditt system.\n"
 
 #: ../../diskdrake/interactive.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Chances are, this partition is\n"
-"a Driver partition, you should\n"
+"a Driver partition. You should\n"
 "probably leave it alone.\n"
 msgstr ""
 "\n"
@@ -6580,11 +6590,11 @@ msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Partisjonstabellen pх disk %s blir nх skrevet til disk!"
 
 #: ../../diskdrake/interactive.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
-"So be careful to add a /boot partition"
+"Please be sure to add a /boot partition"
 msgstr ""
 "Du har valgt en programvare RAID partisjon som root (/).\n"
 "Ingen oppstartslaster kan hхndtere dette uten en /boot partisjon.\n"
@@ -6663,8 +6673,8 @@ msgid "File already exists. Use it?"
 msgstr "Filen eksisterer allerede. Bruke denne?"
 
 #: ../../diskdrake/interactive.pm:1
-#, c-format
-msgid "File already used by another loopback, choose another one"
+#, fuzzy, c-format
+msgid "File is already used by another loopback, choose another one"
 msgstr "Filen blir allerede brukt av en annen loopback, velg en annen"
 
 #: ../../diskdrake/interactive.pm:1
@@ -6804,8 +6814,8 @@ msgid "Where do you want to mount device %s?"
 msgstr "Hvor vil du montere %s enheten?"
 
 #: ../../diskdrake/interactive.pm:1
-#, c-format
-msgid "Where do you want to mount loopback file %s?"
+#, fuzzy, c-format
+msgid "Where do you want to mount the loopback file %s?"
 msgstr "Hvor vil du montere loopback-filen %s?"
 
 #: ../../diskdrake/interactive.pm:1
@@ -7154,7 +7164,7 @@ msgstr "Vennligst vent . . . Setter konfigurasjonen pх plass"
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
 "\n"
-"It has been reported to oopses the kernel on unloading.\n"
+"It has been reported to oops the kernel on unloading.\n"
 "\n"
 "The new \"%s\" driver'll only be used on next bootstrap."
 msgstr ""
@@ -7288,7 +7298,7 @@ msgid ""
 "For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-"
 "detect the rights parameters.\n"
 "If your card is misdetected, you can force the right tuner and card types "
-"here. Just select your tv card parameters if needed"
+"here. Just select your tv card parameters if needed."
 msgstr ""
 
 #: ../../harddrake/v4l.pm:1
@@ -7413,7 +7423,7 @@ msgstr "Automatisk sondering"
 #, 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 "
+"properly, although it normally works fine without them. Would you like to "
 "specify\n"
 "extra options for it or allow the driver to probe your machine for the\n"
 "information it needs? Occasionally, probing will hang a computer, but it "
@@ -7453,7 +7463,7 @@ msgstr ""
 #: ../../modules/interactive.pm:1
 #, fuzzy, c-format
 msgid ""
-"You may now provide its options to module %s.\n"
+"You may now provide options to module %s.\n"
 "Note that any address should be entered with the prefix 0x like '0x123'"
 msgstr ""
 "Du kan nх gi modul %s de opsjoner du fјler for.\n"
@@ -7539,7 +7549,7 @@ msgstr ""
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few ones use dhcp.\n"
+"Some connections use pptp, a few use dhcp.\n"
 "If you don't know, choose 'use pppoe'"
 msgstr ""
 "Den mest vanlige mхten х koble opp med adsl er pppoe.\n"
@@ -7622,7 +7632,7 @@ msgid ""
 "drakfirewall configurator\n"
 "\n"
 "This configures a personal firewall for this Mandrake Linux machine.\n"
-"For a powerful dedicated firewall solution, please look to the\n"
+"For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "tinyfirewall konfigurering\n"
@@ -7687,12 +7697,13 @@ msgstr "ingen nettverkskort funnet"
 #: ../../network/ethernet.pm:1
 #, c-format
 msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
+"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"
 
 #: ../../network/ethernet.pm:1 ../../standalone/drakgw:1
+#: ../../standalone/drakpxe:1
 #, c-format
 msgid "Choose the network interface"
 msgstr "Velg nettverksgrensesnitt"
@@ -7710,7 +7721,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Which dhcp client do you want to use?\n"
-"Default is dhcp-client"
+"Default is dhcp-client."
 msgstr ""
 "Hvilken dhcp klient јnsker du х bruke?\n"
 "Standard er dhcp-client"
@@ -7730,8 +7741,8 @@ msgstr ""
 "velg et PCI-kort i neste skjermbilde."
 
 #: ../../network/isdn.pm:1
-#, c-format
-msgid "Which is your ISDN card?"
+#, fuzzy, c-format
+msgid "Which of the following is your ISDN card?"
 msgstr "Hvilket er ditt ISDN-kort?"
 
 #: ../../network/isdn.pm:1
@@ -7808,13 +7819,13 @@ msgstr ""
 " ingen D-kanal (leid linje)"
 
 #: ../../network/isdn.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid "Europe protocol"
 msgstr "Europaprotokollen"
 
 #: ../../network/isdn.pm:1
 #, c-format
-msgid "Europe protocol (EDSS1)"
+msgid "European protocol (EDSS1)"
 msgstr "Europaprotokollen (EDSS1)"
 
 #: ../../network/isdn.pm:1
@@ -8212,14 +8223,14 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"You can connect to Internet or reconfigure your connection."
+"You can connect to the Internet or reconfigure your connection."
 msgstr ""
 "\n"
 "Du kan koble opp mot Internett eller rekonfigurere tilkoblingen din."
 
 #: ../../network/netconnect.pm:1
 #, c-format
-msgid "You are not currently connected to Internet."
+msgid "You are not currently connected to the Internet."
 msgstr "Du er for јyeblikket ikke koblet opp mot Internett."
 
 #: ../../network/netconnect.pm:1
@@ -8233,12 +8244,12 @@ msgstr ""
 
 #: ../../network/netconnect.pm:1
 #, c-format
-msgid "You are currently connected to internet."
+msgid "You are currently connected to the Internet."
 msgstr "Du er for јyeblikket koblet opp mot Internett"
 
 #: ../../network/network.pm:1
 #, fuzzy, c-format
-msgid "Url should begin with 'ftp:' or 'http:'"
+msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URLen bјr begynne med \"http:\""
 
 #: ../../network/network.pm:1
@@ -8297,7 +8308,7 @@ 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"
+"You may also enter the IP address of the gateway if you have one."
 msgstr ""
 "Vennligst entre vertsnavnet ditt.\n"
 "Vertsnavnet ditt bјr vцre et full-kvalifisert vertsnavn,\n"
@@ -8308,14 +8319,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
-"enough '0'."
+"enough '0' (zeroes)."
 msgstr ""
 
 #: ../../network/network.pm:1
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
-"frequency), or add enough '0'."
+"frequency), or add enough '0' (zeroes)."
 msgstr ""
 
 #: ../../network/network.pm:1 ../../printer/printerdrake.pm:1
@@ -8324,13 +8335,25 @@ msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-adresse bјr vцre i format 1.2.3.4"
 
 #: ../../network/network.pm:1
+#, c-format
+msgid ""
+"For an Automatic IP you have to select at least one protocol : dhcp or "
+"zeroconf"
+msgstr ""
+
+#: ../../network/network.pm:1
 #, fuzzy, c-format
 msgid "Start at boot"
 msgstr "Startet ved oppstart"
 
 #: ../../network/network.pm:1
 #, c-format
-msgid "(bootp/dhcp)"
+msgid "zeroconf"
+msgstr ""
+
+#: ../../network/network.pm:1
+#, fuzzy, c-format
+msgid "bootp/dhcp"
 msgstr "(bootp/dhcp)"
 
 #: ../../network/network.pm:1
@@ -8338,8 +8361,13 @@ msgstr "(bootp/dhcp)"
 msgid "Automatic IP"
 msgstr "Automatisk IP"
 
+#: ../../network/network.pm:1
+#, fuzzy, c-format
+msgid "(bootp/dhcp/zeroconf)"
+msgstr "(bootp/dhcp)"
+
 #: ../../network/network.pm:1 ../../standalone/drakconnect:1
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Netmask"
 msgstr "Nettmaske"
@@ -8387,7 +8415,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
-"need some manual fix after installation."
+"need some manual fixes after installation."
 msgstr ""
 "Advarsel! En eksisterende brannmurkonfigurasjon har blitt oppdaget. Du "
 "trenger muligens х konfigurere noe manuelt etter installasjon."
@@ -8493,22 +8521,22 @@ msgid "Connection Configuration"
 msgstr "Konfigurasjon tilknytning."
 
 #: ../../network/tools.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The system doesn't seem to be connected to internet.\n"
+"The system doesn't seem to be connected to the Internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
 "Det ser ikke ut til at systemet er koblet til Internett.\n"
 "Prјv х rekonfigurere tilkoblingen din."
 
 #: ../../network/tools.pm:1
-#, c-format
-msgid "For security reason, it will be disconnected now."
+#, fuzzy, c-format
+msgid "For security reasons, it will be disconnected now."
 msgstr "Av sikkerhetsgrunner vil den bli frakoblet nх."
 
 #: ../../network/tools.pm:1
-#, c-format
-msgid "The system is now connected to Internet."
+#, fuzzy, c-format
+msgid "The system is now connected to the Internet."
 msgstr "Systemet er nх koblet opp mot Internett."
 
 #: ../../network/tools.pm:1 ../../standalone/drakconnect:1
@@ -8527,11 +8555,12 @@ msgid "Internet configuration"
 msgstr "Internett-konfigurasjon"
 
 #: ../../partition_table/raw.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
-"It means writing anything on the disk will end up with random trash"
+"It means writing anything on the disk will end up with random, corrupted "
+"data."
 msgstr ""
 "Noe som ikke er bra skjer med disken din. \n"
 "En test for х sjekke dataintegritet var mislykket. \n"
@@ -8878,6 +8907,11 @@ msgid "Printer connection type"
 msgstr "Skrivertilkoblingstype"
 
 #: ../../printer/printerdrake.pm:1
+#, fuzzy, c-format
+msgid "Learn how to use this printer"
+msgstr "Vet hvordan man skal bruke denne skriveren"
+
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid "Raw printer"
 msgstr "Rх skriver"
@@ -9085,7 +9119,7 @@ msgstr ""
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
-"now. Please check whether the network gets accessable after booting your "
+"now. Please check whether the network is accessable after booting your "
 "system and correct the configuration using the Mandrake Control Center, "
 "section \"Network & Internet\"/\"Connection\", and afterwards set up the "
 "printer, also using the Mandrake Control Center, section \"Hardware\"/"
@@ -9627,13 +9661,13 @@ msgstr ""
 "skrivermanualen) eller en lignende."
 
 #: ../../printer/printerdrake.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "\n"
 "Please check whether Printerdrake did the auto-detection of your printer "
-"model correctly. Search the correct model in the list when the cursor is "
-"standing on a wrong model or on \"Raw printer\"."
+"model correctly. Find the correct model in the list when a wrong model or "
+"\"Raw printer\" is highlighted."
 msgstr ""
 "\n"
 "\n"
@@ -9858,7 +9892,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
-"or IP and the optional port number (default is 9100) into the input fields."
+"or IP and the optional port number (default is 9100) in the input fields."
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
@@ -10096,13 +10130,13 @@ msgstr ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Please choose the port where your printer is connected to."
+msgid "Please choose the port that your printer is connected to."
 msgstr "Vennligst velg porten hvor skriveren din er koblet til."
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"Please choose the port where your printer is connected to or enter a device "
+"Please choose the port that your printer is connected to or enter a device "
 "name/file name in the input line"
 msgstr ""
 "Vennligst velg en port hvor skriveren din er tilkoblet eller entre en enhet "
@@ -10259,8 +10293,8 @@ msgid ""
 "If you have printer(s) connected to this machine, Please plug it/them in on "
 "this computer and turn it/them on so that it/they can be auto-detected.\n"
 "\n"
-" Click on \"Next\" when you are ready, and on \"Cancel\" when you do not "
-"want to set up your printer(s) now."
+" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
+"to set up your printer(s) now."
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
@@ -10280,8 +10314,8 @@ msgid ""
 "detection of only the printers connected to this machine. So turn off the "
 "auto-detection of network printers when you don't need it.\n"
 "\n"
-" Click on \"Next\" when you are ready, and on \"Cancel\" when you do not "
-"want to set up your printer(s) now."
+" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
+"to set up your printer(s) now."
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
@@ -10295,7 +10329,7 @@ msgid ""
 "\n"
 "If you have printer(s) connected to this machine, Please plug it/them in on "
 "this computer and turn it/them on so that it/they can be auto-detected. Also "
-"your network printer(s) and you Windows machines must be connected and "
+"your network printer(s) and your Windows machines must be connected and "
 "turned on.\n"
 "\n"
 "Note that auto-detecting printers on the network takes longer than the auto-"
@@ -10303,8 +10337,8 @@ msgid ""
 "auto-detection of network and/or Windows-hosted printers when you don't need "
 "it.\n"
 "\n"
-" Click on \"Next\" when you are ready, and on \"Cancel\" when you do not "
-"want to set up your printer(s) now."
+" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
+"to set up your printer(s) now."
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
@@ -10510,7 +10544,7 @@ msgstr ""
 #: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"When this option is turned on, on every startup of CUPS is automatically "
+"When this option is turned on, on every startup of CUPS it is automatically "
 "made sure that\n"
 "\n"
 "- if LPD/LPRng is installed, /etc/printcap will not be overwritten by CUPS\n"
@@ -10579,10 +10613,10 @@ msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Printers on remote CUPS servers you do not have to configure here; these "
+"Printers on remote CUPS servers do not need to be configured here; these "
 "printers will be automatically detected."
 msgstr ""
 "\n"
@@ -10676,7 +10710,7 @@ msgstr ""
 #: ../../security/level.pm:1
 #, c-format
 msgid ""
-"Password are now enabled, but use as a networked computer is still not "
+"Passwords are now enabled, but use as a networked computer is still not "
 "recommended."
 msgstr ""
 "Passord er nх aktivert, men bruk som nettverksmaskin er fortsatt ikke "
@@ -10686,7 +10720,7 @@ msgstr ""
 #, c-format
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
-"but very sensitive: it must not be used for a machine connected to others\n"
+"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 ""
 "Dette nivхet bјr brukes med forsiktighet. Det gjјr systemet ditt lettere х\n"
@@ -10733,8 +10767,8 @@ msgstr "Velkommen til хpen kilde verdenen"
 
 #: ../../share/advertising/01-thanks.pl:1
 #, c-format
-msgid "Thank you for choosing Mandrake Linux 9.0"
-msgstr "Takk for at du valgte Mandrake Linux 9.0"
+msgid "Thank you for choosing Mandrake Linux 9.1"
+msgstr "Takk for at du valgte Mandrake Linux 9.1"
 
 #: ../../share/advertising/02-community.pl:1
 #, c-format
@@ -10756,7 +10790,7 @@ msgstr "Protokoll for resten av verden"
 #: ../../share/advertising/03-internet.pl:1
 #, c-format
 msgid ""
-"Mandrake Linux 9.0 has selected the best software for you. Surf the Web and "
+"Mandrake Linux 9.1 has selected the best software for you. Surf the Web and "
 "view animations with Mozilla and Konqueror, or read your mail and handle "
 "your personal information with Evolution and Kmail"
 msgstr ""
@@ -10769,7 +10803,7 @@ msgstr "Koble opp mot Internett"
 #: ../../share/advertising/04-multimedia.pl:1
 #, c-format
 msgid ""
-"Mandrake Linux 9.0 enables you to use the very latest software to play audio "
+"Mandrake Linux 9.1 enables you to use the very latest software to play audio "
 "files, edit and handle your images or photos, and play videos"
 msgstr ""
 
@@ -10786,7 +10820,7 @@ msgstr ""
 #: ../../share/advertising/05-games.pl:1
 #, c-format
 msgid ""
-"Mandrake Linux 9.0 provides the best Open Source games - arcade, action, "
+"Mandrake Linux 9.1 provides the best Open Source games - arcade, action, "
 "strategy, ..."
 msgstr ""
 
@@ -10798,7 +10832,7 @@ msgstr "Spill"
 #: ../../share/advertising/06-mcc.pl:1
 #, c-format
 msgid ""
-"Mandrake Linux 9.0 provides a powerful tool to fully customize and configure "
+"Mandrake Linux 9.1 provides a powerful tool to fully customize and configure "
 "your machine"
 msgstr ""
 
@@ -10810,7 +10844,7 @@ msgstr "Mandrake kontrollpanel"
 #: ../../share/advertising/07-desktop.pl:1
 #, c-format
 msgid ""
-"Mandrake Linux 9.0 provides you with 11 user interfaces that can be fully "
+"Mandrake Linux 9.1 provides you with 11 user interfaces that can be fully "
 "modified: KDE 3, Gnome 2, WindowMaker, ..."
 msgstr ""
 
@@ -10828,7 +10862,7 @@ msgstr ""
 
 #: ../../share/advertising/08-development.pl:1
 #, c-format
-msgid "Mandrake Linux 9.0 is the ultimate development platform"
+msgid "Mandrake Linux 9.1 is the ultimate development platform"
 msgstr ""
 
 #: ../../share/advertising/08-development.pl:1
@@ -11180,7 +11214,7 @@ msgstr ""
 
 #: ../../standalone/drakTermServ:1
 #, fuzzy, c-format
-msgid "No nic selected!"
+msgid "No NIC selected!"
 msgstr "Ikke tilkoblet"
 
 #: ../../standalone/drakTermServ:1
@@ -11435,7 +11469,7 @@ msgstr ""
 "Du kan nх gjennomfјre installasjonen pх nytt."
 
 #: ../../standalone/drakautoinst:1 ../../standalone/drakgw:1
-#: ../../standalone/scannerdrake:1
+#: ../../standalone/scannerdrake:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Congratulations!"
 msgstr "Gratulerer!"
@@ -13389,7 +13423,7 @@ msgstr "Ikke noe nettverksadapter i systemet ditt!"
 
 #: ../../standalone/drakfont:1
 #, fuzzy, c-format
-msgid "Initials tests"
+msgid "Initial tests"
 msgstr "Initmelding"
 
 #: ../../standalone/drakfont:1
@@ -13702,7 +13736,7 @@ msgstr ""
 msgid "Search installed fonts"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -13717,27 +13751,27 @@ msgstr ""
 "\n"
 "Klikk pх Konfigurer for х starte oppsett-hjelperen."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Internet connection sharing configuration"
 msgstr "Internett deling av tilkobling konfigurasjon"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Deling av Internett tilkobling har aldri blitt konfigurert."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The setup has already been done, and it's currently enabled."
 msgstr "Oppsett har allerede blitt gjort, og er for јyeblikket slхtt pх."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The setup has already been done, but it's currently disabled."
 msgstr "Oppsett har allerede blitt gjort, men er for јyeblikket slхtt av."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -13748,72 +13782,72 @@ msgstr ""
 "Du kan nх dele Internett-tilkobling med andre maskiner pх ditt lokale "
 "nettverk ved х bruke automatisk nettverkskonfigurasjon (DHCP)."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Problems installing package %s"
 msgstr "Problemer ved installering av pakke %s"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Konfigurerer script, installerer programvare, starter tjenere..."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Configuring..."
 msgstr "Konfigurerer..."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "Mulig LAN-adresse konflikt funnet i konfigurasjonen til %s!\n"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The DHCP end range"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The DHCP start range"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, fuzzy, c-format
 msgid "The internal domain name"
 msgstr "Nytt skrivernavn"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, fuzzy, c-format
 msgid "The DNS Server IP"
 msgstr "CUPS tjener IP"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, fuzzy, c-format
 msgid "(This) DHCP Server IP"
 msgstr "CUPS tjener IP"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -13823,12 +13857,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, fuzzy, c-format
 msgid "Local Network adress"
 msgstr "ingen nettverkskort funnet"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -13844,7 +13878,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -13855,27 +13889,27 @@ msgid ""
 "Driver: %s"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, fuzzy, c-format
 msgid "Current interface configuration"
 msgstr "Modifiser skriverkonfigurasjon"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, fuzzy, c-format
 msgid "Show current interface configuration"
 msgstr "Modifiser skriverkonfigurasjon"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "No (experts only)"
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, fuzzy, c-format
 msgid "Automatic reconfiguration"
 msgstr "Konfigurasjon av automatiske skritt"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -13885,12 +13919,12 @@ msgid ""
 "You can do it manually but you need to know what you're doing."
 msgstr ""
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, fuzzy, c-format
 msgid "Network interface already configured"
 msgstr "Monitor er ikke konfigurert"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
@@ -13899,7 +13933,7 @@ msgstr ""
 "Vennligst velg hvilket nettverksadapter som skal kobles til ditt lokale "
 "nettverk (LAN)."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -13914,12 +13948,12 @@ msgstr ""
 "\n"
 "Jeg er i ferd med х sette opp ditt lokale nettverk (LAN) med dette adapteret."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Network interface"
 msgstr "Nettverksgrensesnitt"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -13928,17 +13962,17 @@ msgstr ""
 "Ikke noe ethernet nettverksadapter har blitt oppdaget i systemet ditt. "
 "Vennligst kjјr verktјyet for maskinvarekonfigurasjon."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "Ikke noe nettverksadapter i systemet ditt!"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Interface %s"
 msgstr "Grensesnitt %s"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Grensesnitt %s (bruker modul %s)"
@@ -14254,7 +14288,7 @@ msgstr "Sikkerhetsnivх"
 
 #: ../../standalone/draksec:1
 #, fuzzy, c-format
-msgid " (default value: %s)"
+msgid "(default value: %s)"
 msgstr " (Standard)"
 
 #: ../../standalone/draksec:1
@@ -15586,6 +15620,109 @@ msgstr ""
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr ""
 
+#: ../../standalone/drakhelp:1
+#, c-format
+msgid ""
+"No browser is installed on your system, Please install one if you want to "
+"browse the help system"
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, fuzzy, c-format
+msgid "Location of auto_install.cfg file"
+msgstr "Oppretter diskett for autoinstallasjon"
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"Please indicate where the auto_install.cfg file is located.\n"
+"\n"
+"Leave it blank if you do not want to set up automatic installation mode.\n"
+"\n"
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"No CD or DVD image found, please copy the installation program and rpm files."
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, fuzzy, c-format
+msgid "No image found"
+msgstr "Ingen lokal skriver funnet!\n"
+
+#: ../../standalone/drakpxe:1
+#, fuzzy, c-format
+msgid "Installation image directory"
+msgstr "Xpmac (installasjons skjermdriver)"
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"Please indicate where the installation image will be available.\n"
+"\n"
+"If you do not have an existing directory, please copy the CD or DVD "
+"contents.\n"
+"\n"
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"The DHCP server will allow other computer to boot using PXE in the given "
+"range of address.\n"
+"\n"
+"If you give an inexistant directory, you will be asked to insert "
+"Installation CD or DVD to copy the installation program and rpm files.\n"
+"\n"
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, fuzzy, c-format
+msgid "Interface %s (on network %s)"
+msgstr "Grensesnitt %s (bruker modul %s)"
+
+#: ../../standalone/drakpxe:1
+#, fuzzy, c-format
+msgid "Please choose which network interface will be used for the dhcp server."
+msgstr ""
+"Vennligst velg hvilket nettverksadapter du јnsker х bruke til х koble opp\n"
+"mot Internett"
+
+#: ../../standalone/drakpxe:1
+#, fuzzy, c-format
+msgid ""
+"You are about to configure your computer to install a PXE server as a DHCP "
+"server\n"
+"and a TFTP server to build an installation server.\n"
+"With that feature, other computers on your local network will be installable "
+"using from this computer.\n"
+"\n"
+"Make sure you have configured your Network/Internet access using drakconnect "
+"before going any further.\n"
+"\n"
+"Note: you need a dedicated Network Adapter to set up a Local Area Network "
+"(LAN)."
+msgstr ""
+"Du er i ferd med х konfigurere maskinen din til х dele Internett-"
+"tilkobling.\n"
+"Andre maskiner i nettverket ditt vil da kunne bruke denne maskinens "
+"Internett tilkobling.\n"
+"\n"
+"Merk: du trenger et dedikert nettverksadapter for х sette opp et lokalt "
+"nettverk (LAN)."
+
+#: ../../standalone/drakpxe:1
+#, fuzzy, c-format
+msgid "Installation Server Configuration"
+msgstr "LAN-konfigurasjon"
+
+#: ../../standalone/drakpxe:1
+#, fuzzy, c-format
+msgid "PXE Server Configuration"
+msgstr "LAN-konfigurasjon"
+
 #: ../../share/compssUsers:999
 msgid "Office Workstation"
 msgstr "Kontor og arbeidsmaskin"
@@ -15829,6 +15966,16 @@ msgstr "Personlig finans"
 msgid "Programs to manage your finance, such as gnucash"
 msgstr "Programmer for х hхndtere dine finanser, sх som gnucash"
 
+#, fuzzy
+#~ msgid "Upgrade partition %s"
+#~ msgstr "partisjon %s"
+
+#~ msgid "Tamil (Unicode)"
+#~ msgstr "Tamilsk (Unicode)"
+
+#~ msgid "Setup filesystems"
+#~ msgstr "Oppsett filsystemer"
+
 #~ msgid "Boot from DOS/Windows (loadlin)"
 #~ msgstr "Start fra DOS/Windows (loadlin)"
 
@@ -16059,7 +16206,7 @@ msgstr "Programmer for х hхndtere dine finanser, sх som gnucash"
 #~ msgid "port"
 #~ msgstr "port"
 
-#~ msgid "Url should begin with 'http:'"
+#~ msgid "URL should begin with 'http:'"
 #~ msgstr "URLen bјr begynne med \"http:\""
 
 #~ msgid "The port part should be numeric"
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index ba3bcbea1..d9e5e1633 100644
--- a/perl-install/share/po/sp.po
+++ b/perl-install/share/po/sp.po
@@ -19,13 +19,13 @@ msgstr ""
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
-"You can use userdrake to add a user in this group."
+"You can use userdrake to add a user to this group."
 msgstr ""
 "per-user дељење ресурса користи групу \"fileshare\". \n"
 "Ви помоћу userdrake-а можете додати корисника у ову групу."
 
 #: ../../any.pm:1 ../../bootlook.pm:1 ../../install_steps_gtk.pm:1
-#: ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk.pm:1 ../../ugtk2.pm:1
+#: ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1 ../../ugtk.pm:1
 #: ../../Xconfig/resolution_and_depth.pm:1 ../../diskdrake/smbnfs_gtk.pm:1
 #: ../../interactive/http.pm:1 ../../interactive/newt.pm:1
 #: ../../interactive/stdio.pm:1 ../../network/netconnect.pm:1
@@ -34,6 +34,7 @@ msgstr ""
 #: ../../standalone/drakfloppy:1 ../../standalone/drakfont:1
 #: ../../standalone/drakgw:1 ../../standalone/draksec:1
 #: ../../standalone/logdrake:1 ../../standalone/net_monitor:1
+#: ../../standalone/drakpxe:1
 #, c-format
 msgid "Cancel"
 msgstr "Поништи"
@@ -127,6 +128,7 @@ msgstr "Не"
 
 #: ../../any.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1
 #: ../../modules/interactive.pm:1 ../../standalone/drakgw:1
+#: ../../standalone/drakpxe:1
 #, c-format
 msgid "Yes"
 msgstr "Да"
@@ -207,7 +209,7 @@ msgstr "Додај корисника"
 
 #: ../../any.pm:1
 #, c-format
-msgid "This user name is already added"
+msgid "This user name has already been added"
 msgstr "Ово корисничко име већ постоји"
 
 #: ../../any.pm:1
@@ -281,7 +283,7 @@ msgstr "приступ X програмима"
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
-"You can add some more or change the existing ones."
+"You can create additional entries or change the existing ones."
 msgstr ""
 "Ово су постављне опције.\n"
 "Можете додати нове или изменити старе."
@@ -450,7 +452,7 @@ msgstr "Прикажи величину RAM-а у Mb"
 
 #: ../../any.pm:1
 #, c-format
-msgid "Enable multi profiles"
+msgid "Enable multiple profiles"
 msgstr "Омогући мулти-профиле"
 
 #: ../../any.pm:1
@@ -649,7 +651,7 @@ msgstr "SILO"
 msgid ""
 "Welcome to %s the operating system chooser!\n"
 "\n"
-"Choose an operating system in the list above or\n"
+"Choose an operating system from the list above or\n"
 "wait %d seconds for default boot.\n"
 "\n"
 msgstr ""
@@ -658,7 +660,7 @@ msgstr ""
 "Izaberite operativni sistem, ili\n"
 "sacekate %d sekundi za startanje pretpostavljenog OS.\n"
 
-#: ../../bootlook.pm:1 ../../ugtk.pm:1 ../../ugtk2.pm:1
+#: ../../bootlook.pm:1 ../../ugtk2.pm:1 ../../ugtk.pm:1
 #: ../../network/netconnect.pm:1 ../../standalone/drakTermServ:1
 #: ../../standalone/drakbackup:1 ../../standalone/drakconnect:1
 #: ../../standalone/drakfont:1 ../../standalone/net_monitor:1
@@ -700,10 +702,10 @@ msgstr "Lilo екран"
 #, c-format
 msgid ""
 "\n"
-"Select theme for\n"
+"Select the theme for\n"
 "lilo and bootsplash,\n"
 "you can choose\n"
-"them separatly"
+"them separately"
 msgstr ""
 "\n"
 "Изаберите тему за\n"
@@ -722,6 +724,7 @@ msgid "Splash selection"
 msgstr "Splash селекција"
 
 #: ../../bootlook.pm:1 ../../standalone/drakbackup:1 ../../standalone/drakgw:1
+#: ../../standalone/drakpxe:1
 #, c-format
 msgid "Configure"
 msgstr "Подеси"
@@ -750,8 +753,8 @@ msgstr "Инсталација теме није успела!"
 msgid "Notice"
 msgstr "Напомена"
 
-#: ../../bootlook.pm:1 ../../fsedit.pm:1 ../../install_steps.pm:1
-#: ../../install_steps_interactive.pm:1 ../../diskdrake/dav.pm:1
+#: ../../bootlook.pm:1 ../../fsedit.pm:1 ../../install_steps_interactive.pm:1
+#: ../../install_steps.pm:1 ../../diskdrake/dav.pm:1
 #: ../../diskdrake/hd_gtk.pm:1 ../../diskdrake/interactive.pm:1
 #: ../../diskdrake/smbnfs_gtk.pm:1 ../../interactive/http.pm:1
 #: ../../standalone/draksplash:1
@@ -1000,26 +1003,6 @@ msgstr "Францускa"
 msgid "Costa Rica"
 msgstr "Костарика"
 
-#: ../../fs.pm:1 ../../partition_table.pm:1
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr "Грешка при демонтирању %s: %s"
-
-#: ../../fs.pm:1
-#, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "монтирање партиције %s у директоријум %s није успело"
-
-#: ../../fs.pm:1
-#, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "не знам како да форматирам %s у типу %s"
-
-#: ../../fs.pm:1
-#, c-format
-msgid "%s formatting of %s failed"
-msgstr "%s Форматирање  %s није успело"
-
 #: ../../fsedit.pm:1
 #, c-format
 msgid "Error opening %s for writing: %s"
@@ -1113,6 +1096,26 @@ msgstr "са /usr"
 msgid "simple"
 msgstr "jедноставно"
 
+#: ../../fs.pm:1 ../../partition_table.pm:1
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "Грешка при демонтирању %s: %s"
+
+#: ../../fs.pm:1
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "монтирање партиције %s у директоријум %s није успело"
+
+#: ../../fs.pm:1
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "не знам како да форматирам %s у типу %s"
+
+#: ../../fs.pm:1
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "%s Форматирање  %s није успело"
+
 #: ../../help.pm:1
 #, c-format
 msgid ""
@@ -3155,15 +3158,14 @@ msgstr ""
 "Да ли заиста желите да уклоните ове пакете?\n"
 
 #: ../../install_any.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
 "\n"
 "\n"
 "These servers are activated by default. They don't have any known security\n"
-"issues, but some new could be found. In that case, you must make sure to "
-"upgrade\n"
-"as soon as possible.\n"
+"issues, but some new ones could be found. In that case, you must make sure\n"
+"to upgrade as soon as possible.\n"
 "\n"
 "\n"
 "Do you really want to install these servers?\n"
@@ -3180,6 +3182,16 @@ msgstr ""
 "\n"
 "Да ли заиста желите да инсталирате ове сервисе?\n"
 
+#: ../../install_gtk.pm:1
+#, fuzzy, c-format
+msgid "System configuration"
+msgstr "Custom конфигурација"
+
+#: ../../install_gtk.pm:1
+#, fuzzy, c-format
+msgid "System installation"
+msgstr "SILO инсталација"
+
 #: ../../install_gtk.pm:1 ../../install_steps_gtk.pm:1 ../../interactive.pm:1
 #: ../../my_gtk.pm:1 ../../ugtk2.pm:1 ../../Xconfig/main.pm:1
 #: ../../Xconfig/resolution_and_depth.pm:1 ../../interactive/http.pm:1
@@ -3763,43 +3775,6 @@ msgstr ""
 "За било коjе питaње коjе jе везано за оваj документ, контактираjте  "
 "MandrakeSoft S.A.  \n"
 
-#: ../../install_steps.pm:1
-#, c-format
-msgid "No floppy drive available"
-msgstr "Неприступачан дискетни уређај"
-
-#: ../../install_steps.pm:1
-#, c-format
-msgid "Welcome to %s"
-msgstr "Доброшли у  %s"
-
-#: ../../install_steps.pm:1
-#, c-format
-msgid ""
-"Some important packages didn't get installed properly.\n"
-"Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm"
-"\"\n"
-msgstr ""
-"Неки вaжни пакети нису добро инсталирани.\n"
-"Вaш cdrom урeђаj или cd су неисправни.\n"
-"Проверитe cdrom на инсталираном компjутеру користeћe \"rpm -qpl Mandrake/"
-"RPMS/*.rpm\"\n"
-
-#: ../../install_steps.pm:1
-#, c-format
-msgid "Duplicate mount point %s"
-msgstr "Дуплиранa тачка монтирања %s"
-
-#: ../../install_steps.pm:1
-#, c-format
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"Грешка, али незнам како да је разрешим.\n"
-"Наставите на ваш ризик!"
-
 #: ../../install_steps_auto_install.pm:1 ../../install_steps_stdio.pm:1
 #, c-format
 msgid "Entering step `%s'\n"
@@ -4116,12 +4091,12 @@ msgid "Do you want to use aboot?"
 msgstr "Да ли желите да користите aboot ?"
 
 #: ../../install_steps_interactive.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
 " machine, the yaboot bootloader will not work for you.\n"
 "The install will continue, but you'll\n"
-" need to use BootX to boot your machine"
+" need to use BootX or some other means to boot your machine"
 msgstr ""
 "Пошто изгледа да имате старомодну или непознату \n"
 " машину, yaboot стартер неђе радити код вас.\n"
@@ -4468,10 +4443,10 @@ msgstr ""
 "КОнтактирајте Mandrake Linux web сајт да би добили листу доступних mirror-а"
 
 #: ../../install_steps_interactive.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
-"have been released after the distribution was released. They may\n"
+"have been updated after the distribution was released. They may\n"
 "contain security or bug fixes.\n"
 "\n"
 "To download these packages, you will need to have a working Internet \n"
@@ -4733,7 +4708,7 @@ msgstr "Емулациjа тастерa"
 
 #: ../../install_steps_interactive.pm:1 ../../standalone/mousedrake:1
 #, c-format
-msgid "Please choose on which serial port your mouse is connected to."
+msgid "Please choose which serial port your mouse is connected to."
 msgstr "Изаберите на који серијски порт је ваш миш прикључен."
 
 #: ../../install_steps_interactive.pm:1 ../../standalone/mousedrake:1
@@ -4743,7 +4718,7 @@ msgstr "Порт за миша"
 
 #: ../../install_steps_interactive.pm:1
 #, c-format
-msgid "Please choose the type of your mouse."
+msgid "Please choose your type of mouse."
 msgstr "Изаберитe тип миша."
 
 #: ../../install_steps_interactive.pm:1
@@ -4752,9 +4727,9 @@ msgid "Upgrade"
 msgstr "Ажурирање"
 
 #: ../../install_steps_interactive.pm:1
-#, c-format
-msgid "Upgrade partition %s"
-msgstr "Ажурирање партиције %s"
+#, fuzzy, c-format
+msgid "Upgrade %s"
+msgstr "Ажурирање"
 
 #: ../../install_steps_interactive.pm:1
 #, c-format
@@ -4813,6 +4788,43 @@ msgstr ""
 msgid "Mandrake Linux Installation %s"
 msgstr "Mandrake Linux Инсталација %s"
 
+#: ../../install_steps.pm:1
+#, c-format
+msgid "No floppy drive available"
+msgstr "Неприступачан дискетни уређај"
+
+#: ../../install_steps.pm:1
+#, c-format
+msgid "Welcome to %s"
+msgstr "Доброшли у  %s"
+
+#: ../../install_steps.pm:1
+#, c-format
+msgid ""
+"Some important packages didn't get installed properly.\n"
+"Either your cdrom drive or your cdrom is defective.\n"
+"Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm"
+"\"\n"
+msgstr ""
+"Неки вaжни пакети нису добро инсталирани.\n"
+"Вaш cdrom урeђаj или cd су неисправни.\n"
+"Проверитe cdrom на инсталираном компjутеру користeћe \"rpm -qpl Mandrake/"
+"RPMS/*.rpm\"\n"
+
+#: ../../install_steps.pm:1
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Дуплиранa тачка монтирања %s"
+
+#: ../../install_steps.pm:1
+#, c-format
+msgid ""
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
+msgstr ""
+"Грешка, али незнам како да је разрешим.\n"
+"Наставите на ваш ризик!"
+
 #: ../../interactive.pm:1 ../../harddrake/sound.pm:1
 #: ../../standalone/drakxtv:1 ../../standalone/harddrake2:1
 #: ../../standalone/service_harddrake:1
@@ -4968,14 +4980,14 @@ msgid "Thai keyboard"
 msgstr " Thai тастатура"
 
 #: ../../keyboard.pm:1
-#, c-format
-msgid "Tamil (TSCII)"
-msgstr "Тамилски (TSCII)"
+#, fuzzy, c-format
+msgid "Tamil (Typewriter-layout)"
+msgstr "Јерменски (typewriter)"
 
 #: ../../keyboard.pm:1
-#, c-format
-msgid "Tamil (Unicode)"
-msgstr "Тамилски (Unicode)"
+#, fuzzy, c-format
+msgid "Tamil (ISCII-layout)"
+msgstr "Тамилски (TSCII)"
 
 #: ../../keyboard.pm:1
 #, c-format
@@ -6022,7 +6034,7 @@ msgstr ""
 #: ../../services.pm:1
 #, c-format
 msgid ""
-"apmd is used for monitoring batery status and logging it via syslog.\n"
+"apmd is used for monitoring battery status and logging it via syslog.\n"
 "It can also be used for shutting down the machine when the battery is low."
 msgstr ""
 "apmd се користи за прaћeње статуса батериje и логовaње преко syslog.\n"
@@ -6031,7 +6043,7 @@ msgstr ""
 
 #: ../../services.pm:1
 #, c-format
-msgid "Anacron a periodic command scheduler."
+msgid "Anacron is a periodic command scheduler."
 msgstr "Anacron -  подесите период.командe"
 
 #: ../../services.pm:1
@@ -6047,15 +6059,6 @@ msgstr "Инсталирам пакете..."
 #: ../../standalone.pm:1
 #, c-format
 msgid ""
-"No browser is installed on your system, Please install one if you want to "
-"browse the help system"
-msgstr ""
-"Ниједан претраживач није инсталиран. Молим Вас да инсталирате један да би "
-"могли да користите ситем ѕа помоћ"
-
-#: ../../standalone.pm:1
-#, c-format
-msgid ""
 "\n"
 "Usage: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
 "testing] [-v|--version] "
@@ -6337,9 +6340,9 @@ msgid "Format partitions"
 msgstr "Форматираj партициje"
 
 #: ../../steps.pm:1
-#, c-format
-msgid "Setup filesystems"
-msgstr "Подеси датотeчне системе"
+#, fuzzy, c-format
+msgid "Partitioning"
+msgstr "Штампање"
 
 #: ../../steps.pm:1
 #, c-format
@@ -6368,23 +6371,28 @@ msgstr "Подешавање миша"
 
 #: ../../steps.pm:1
 #, c-format
+msgid "License"
+msgstr ""
+
+#: ../../steps.pm:1
+#, c-format
 msgid "Choose your language"
 msgstr "Изаберите језик"
 
-#: ../../ugtk.pm:1
+#: ../../ugtk2.pm:1
 #, c-format
-msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
-msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgid "utopia 25"
+msgstr "utopia 25"
 
-#: ../../ugtk.pm:1 ../../ugtk2.pm:1 ../../standalone/logdrake:1
+#: ../../ugtk2.pm:1 ../../ugtk.pm:1 ../../standalone/logdrake:1
 #, c-format
 msgid "logdrake"
 msgstr "logdrake"
 
-#: ../../ugtk2.pm:1
+#: ../../ugtk.pm:1
 #, c-format
-msgid "utopia 25"
-msgstr "utopia 25"
+msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
 
 #: ../../Xconfig/card.pm:1
 #, c-format
@@ -6621,7 +6629,7 @@ msgstr ""
 
 #: ../../Xconfig/monitor.pm:1
 #, c-format
-msgid "Plug'n Play probing failed. Please choose a precise monitor"
+msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr "Plug'n Play тестирање није успело. Изаберите тачан модел монитора"
 
 #: ../../Xconfig/monitor.pm:1 ../../standalone/harddrake2:1
@@ -7083,11 +7091,11 @@ msgstr ""
 "dual-booting вaшег системa.\n"
 
 #: ../../diskdrake/interactive.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Chances are, this partition is\n"
-"a Driver partition, you should\n"
+"a Driver partition. You should\n"
 "probably leave it alone.\n"
 msgstr ""
 "\n"
@@ -7249,11 +7257,11 @@ msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Табела партиција за уређај %s ће бити записана на диск!"
 
 #: ../../diskdrake/interactive.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
-"So be careful to add a /boot partition"
+"Please be sure to add a /boot partition"
 msgstr ""
 "Изабрали сте софтверску RAID партициjу као root (/).\n"
 "Ниjедан стартер не може да ради са тим без /boot партициje.\n"
@@ -7329,8 +7337,8 @@ msgid "File already exists. Use it?"
 msgstr "Датотекa већ постоји.Да ли да га користим ?"
 
 #: ../../diskdrake/interactive.pm:1
-#, c-format
-msgid "File already used by another loopback, choose another one"
+#, fuzzy, c-format
+msgid "File is already used by another loopback, choose another one"
 msgstr "Фаjл се већ користи од стране другог loopback-а,изаберите други"
 
 #: ../../diskdrake/interactive.pm:1
@@ -7468,8 +7476,8 @@ msgid "Where do you want to mount device %s?"
 msgstr "Где бисте да монтирате %s уређај ?"
 
 #: ../../diskdrake/interactive.pm:1
-#, c-format
-msgid "Where do you want to mount loopback file %s?"
+#, fuzzy, c-format
+msgid "Where do you want to mount the loopback file %s?"
 msgstr "Где бисте да монтирате loopback датотеку  %s?"
 
 #: ../../diskdrake/interactive.pm:1
@@ -7843,7 +7851,7 @@ msgstr "Само моменат... примена конфигурације"
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
 "\n"
-"It has been reported to oopses the kernel on unloading.\n"
+"It has been reported to oops the kernel on unloading.\n"
 "\n"
 "The new \"%s\" driver'll only be used on next bootstrap."
 msgstr ""
@@ -7991,7 +7999,7 @@ msgid ""
 "For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-"
 "detect the rights parameters.\n"
 "If your card is misdetected, you can force the right tuner and card types "
-"here. Just select your tv card parameters if needed"
+"here. Just select your tv card parameters if needed."
 msgstr ""
 "За већину модерних TV картица, bttv модул GNU/Linux кернела једноставно ауто-"
 "детектује праве параметре.\n"
@@ -8121,7 +8129,7 @@ msgstr "Аутоматска проба"
 #, 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 "
+"properly, although it normally works fine without them. Would you like to "
 "specify\n"
 "extra options for it or allow the driver to probe your machine for the\n"
 "information it needs? Occasionally, probing will hang a computer, but it "
@@ -8158,7 +8166,7 @@ msgstr ""
 #: ../../modules/interactive.pm:1
 #, c-format
 msgid ""
-"You may now provide its options to module %s.\n"
+"You may now provide options to module %s.\n"
 "Note that any address should be entered with the prefix 0x like '0x123'"
 msgstr ""
 "Сада можете да убаците његове опције у модул %s.\n"
@@ -8248,7 +8256,7 @@ msgstr ""
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few ones use dhcp.\n"
+"Some connections use pptp, a few use dhcp.\n"
 "If you don't know, choose 'use pppoe'"
 msgstr ""
 "Наjчeшћи нaчин за конекциjу сa adsl je pppoe.\n"
@@ -8341,7 +8349,7 @@ msgid ""
 "drakfirewall configurator\n"
 "\n"
 "This configures a personal firewall for this Mandrake Linux machine.\n"
-"For a powerful dedicated firewall solution, please look to the\n"
+"For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall конфигуратор\n"
@@ -8406,11 +8414,12 @@ msgstr "Није пронађена мрежна картица"
 #: ../../network/ethernet.pm:1
 #, c-format
 msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
+"Please choose which network adapter you want to use to connect to Internet."
 msgstr ""
 "Изаберите мрeжни адаптер коjи желите да користите за конекциjу на интернет"
 
 #: ../../network/ethernet.pm:1 ../../standalone/drakgw:1
+#: ../../standalone/drakpxe:1
 #, c-format
 msgid "Choose the network interface"
 msgstr "Изаберите мрeжни интерфejс"
@@ -8428,7 +8437,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Which dhcp client do you want to use?\n"
-"Default is dhcp-client"
+"Default is dhcp-client."
 msgstr "Ког dhcp клиjента желите да користитe ?Постављени jе dhcp-client"
 
 #: ../../network/isdn.pm:1
@@ -8446,8 +8455,8 @@ msgstr ""
 "картицу на следeћем екрану."
 
 #: ../../network/isdn.pm:1
-#, c-format
-msgid "Which is your ISDN card?"
+#, fuzzy, c-format
+msgid "Which of the following is your ISDN card?"
 msgstr "Која је ваша ISDN картицa ?"
 
 #: ../../network/isdn.pm:1
@@ -8525,13 +8534,13 @@ msgstr ""
 " без Д-канала (закупљене линиjе)"
 
 #: ../../network/isdn.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid "Europe protocol"
 msgstr "Европски протокол"
 
 #: ../../network/isdn.pm:1
 #, c-format
-msgid "Europe protocol (EDSS1)"
+msgid "European protocol (EDSS1)"
 msgstr "Европски протокол (EDSS1)"
 
 #: ../../network/isdn.pm:1
@@ -8930,14 +8939,14 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"You can connect to Internet or reconfigure your connection."
+"You can connect to the Internet or reconfigure your connection."
 msgstr ""
 "\n"
 "Сада се можете конектовати на Интернет или реконфигурисати конекциjу"
 
 #: ../../network/netconnect.pm:1
 #, c-format
-msgid "You are not currently connected to Internet."
+msgid "You are not currently connected to the Internet."
 msgstr "Тренутно нисте конектовани на Интернет"
 
 #: ../../network/netconnect.pm:1
@@ -8951,12 +8960,12 @@ msgstr ""
 
 #: ../../network/netconnect.pm:1
 #, c-format
-msgid "You are currently connected to internet."
+msgid "You are currently connected to the Internet."
 msgstr "Тренутно сте конектовани на Интернет"
 
 #: ../../network/network.pm:1
 #, c-format
-msgid "Url should begin with 'ftp:' or 'http:'"
+msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "Url треба да почиње 'ftp:' или 'http:'"
 
 #: ../../network/network.pm:1
@@ -9015,7 +9024,7 @@ 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"
+"You may also enter the IP address of the gateway if you have one."
 msgstr ""
 "Молим унесите име вашег домена, име хоста, као IP адресе додатних\n"
 "'nameserver'-а. Име вашег хоста треба да буде пуно квалификовано име хоста,\n"
@@ -9023,19 +9032,19 @@ msgstr ""
 "Ако немате додатних 'nameserver'-а, оставите та поља празна."
 
 #: ../../network/network.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
-"enough '0'."
+"enough '0' (zeroes)."
 msgstr ""
 "Распон треба да има предзнак k, M или G (на пример, \"11M\" за 11M), или "
 "додајте довољно '0'."
 
 #: ../../network/network.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
-"frequency), or add enough '0'."
+"frequency), or add enough '0' (zeroes)."
 msgstr ""
 "Фреквенција треба да има предзнак k, M или G (на пример, \"2.46G\" за 2.46 "
 "GHz фреквенцију), или додајте довољно '0'."
@@ -9047,12 +9056,24 @@ msgstr "IP адреса треба да буде у формату 1.2.3.4"
 
 #: ../../network/network.pm:1
 #, c-format
+msgid ""
+"For an Automatic IP you have to select at least one protocol : dhcp or "
+"zeroconf"
+msgstr ""
+
+#: ../../network/network.pm:1
+#, c-format
 msgid "Start at boot"
 msgstr "Покрени при стартaњу"
 
 #: ../../network/network.pm:1
 #, c-format
-msgid "(bootp/dhcp)"
+msgid "zeroconf"
+msgstr ""
+
+#: ../../network/network.pm:1
+#, fuzzy, c-format
+msgid "bootp/dhcp"
 msgstr "(bootp/dhcp)"
 
 #: ../../network/network.pm:1
@@ -9060,8 +9081,13 @@ msgstr "(bootp/dhcp)"
 msgid "Automatic IP"
 msgstr "Аутоматски IP"
 
+#: ../../network/network.pm:1
+#, fuzzy, c-format
+msgid "(bootp/dhcp/zeroconf)"
+msgstr "(bootp/dhcp)"
+
 #: ../../network/network.pm:1 ../../standalone/drakconnect:1
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Netmask"
 msgstr "Мрежна маска"
@@ -9109,7 +9135,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
-"need some manual fix after installation."
+"need some manual fixes after installation."
 msgstr ""
 "Упозорeњe ! Постоjeћa firewalling конфигурациja je детектованa. Мождaће бити "
 "потребно ручно подeшавaње након инсталациje."
@@ -9215,22 +9241,22 @@ msgid "Connection Configuration"
 msgstr "Конфигурација Интернет конекциje"
 
 #: ../../network/tools.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The system doesn't seem to be connected to internet.\n"
+"The system doesn't seem to be connected to the Internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
 "Изгледа да систем ниjе конектован на Интернет.\n"
 "Пробаjте да промените конфигурациjу."
 
 #: ../../network/tools.pm:1
-#, c-format
-msgid "For security reason, it will be disconnected now."
+#, fuzzy, c-format
+msgid "For security reasons, it will be disconnected now."
 msgstr "Из сигурносних разлога, он ће сада бити дисконектован."
 
 #: ../../network/tools.pm:1
-#, c-format
-msgid "The system is now connected to Internet."
+#, fuzzy, c-format
+msgid "The system is now connected to the Internet."
 msgstr "Систем jе тренутно конектован на Интернет"
 
 #: ../../network/tools.pm:1 ../../standalone/drakconnect:1
@@ -9249,11 +9275,12 @@ msgid "Internet configuration"
 msgstr "Конфигурација интернетa"
 
 #: ../../partition_table/raw.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
-"It means writing anything on the disk will end up with random trash"
+"It means writing anything on the disk will end up with random, corrupted "
+"data."
 msgstr ""
 "Нeшто лоше се дeшава са вaшим хард диском. \n"
 "Тест интегритета података ниjе прошао. \n"
@@ -9600,6 +9627,11 @@ msgid "Printer connection type"
 msgstr "Тип конекције штампача"
 
 #: ../../printer/printerdrake.pm:1
+#, fuzzy, c-format
+msgid "Learn how to use this printer"
+msgstr "Да ли знате како да користите овај штампач"
+
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid "Raw printer"
 msgstr "Raw штампач"
@@ -9829,7 +9861,7 @@ msgstr ""
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
-"now. Please check whether the network gets accessable after booting your "
+"now. Please check whether the network is accessable after booting your "
 "system and correct the configuration using the Mandrake Control Center, "
 "section \"Network & Internet\"/\"Connection\", and afterwards set up the "
 "printer, also using the Mandrake Control Center, section \"Hardware\"/"
@@ -10449,13 +10481,13 @@ msgstr ""
 "(погледајте упуство за штампач) или  сличан њему."
 
 #: ../../printer/printerdrake.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "\n"
 "Please check whether Printerdrake did the auto-detection of your printer "
-"model correctly. Search the correct model in the list when the cursor is "
-"standing on a wrong model or on \"Raw printer\"."
+"model correctly. Find the correct model in the list when a wrong model or "
+"\"Raw printer\" is highlighted."
 msgstr ""
 "\n"
 "\n"
@@ -10685,7 +10717,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
-"or IP and the optional port number (default is 9100) into the input fields."
+"or IP and the optional port number (default is 9100) in the input fields."
 msgstr ""
 "Изаберите један од ауто-детектованих штампача са листе и унесите име хоста "
 "или IP и опционални број порта (default је 9100) у поље за унос."
@@ -10955,13 +10987,13 @@ msgstr ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Please choose the port where your printer is connected to."
+msgid "Please choose the port that your printer is connected to."
 msgstr "Изаберите порт на који је ваш рачунар повезан."
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"Please choose the port where your printer is connected to or enter a device "
+"Please choose the port that your printer is connected to or enter a device "
 "name/file name in the input line"
 msgstr ""
 "Изаберите порт на који је ваш штампач повезан или унесите име/име фајла "
@@ -11120,7 +11152,7 @@ msgid "Auto-detect printers connected to this machine"
 msgstr "Ауто-детекција штампача повезаних са овом машином"
 
 #: ../../printer/printerdrake.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -11131,8 +11163,8 @@ msgid ""
 "If you have printer(s) connected to this machine, Please plug it/them in on "
 "this computer and turn it/them on so that it/they can be auto-detected.\n"
 "\n"
-" Click on \"Next\" when you are ready, and on \"Cancel\" when you do not "
-"want to set up your printer(s) now."
+" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
+"to set up your printer(s) now."
 msgstr ""
 "\n"
 "Добродошли у Чаробњак за подешавање штампача\n"
@@ -11148,7 +11180,7 @@ msgstr ""
 "подешавате ваш штампач(е)."
 
 #: ../../printer/printerdrake.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -11164,8 +11196,8 @@ msgid ""
 "detection of only the printers connected to this machine. So turn off the "
 "auto-detection of network printers when you don't need it.\n"
 "\n"
-" Click on \"Next\" when you are ready, and on \"Cancel\" when you do not "
-"want to set up your printer(s) now."
+" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
+"to set up your printer(s) now."
 msgstr ""
 "\n"
 "Добродошли у Чаробњак за подешавање штампача\n"
@@ -11185,7 +11217,7 @@ msgstr ""
 "подешавате ваш штампач(е)."
 
 #: ../../printer/printerdrake.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -11195,7 +11227,7 @@ msgid ""
 "\n"
 "If you have printer(s) connected to this machine, Please plug it/them in on "
 "this computer and turn it/them on so that it/they can be auto-detected. Also "
-"your network printer(s) and you Windows machines must be connected and "
+"your network printer(s) and your Windows machines must be connected and "
 "turned on.\n"
 "\n"
 "Note that auto-detecting printers on the network takes longer than the auto-"
@@ -11203,8 +11235,8 @@ msgid ""
 "auto-detection of network and/or Windows-hosted printers when you don't need "
 "it.\n"
 "\n"
-" Click on \"Next\" when you are ready, and on \"Cancel\" when you do not "
-"want to set up your printer(s) now."
+" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
+"to set up your printer(s) now."
 msgstr ""
 "\n"
 "Добродошли у Чаробњак за подешавање штампача\n"
@@ -11445,9 +11477,9 @@ msgstr ""
 "требали бити доступни:"
 
 #: ../../printer/printerdrake.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"When this option is turned on, on every startup of CUPS is automatically "
+"When this option is turned on, on every startup of CUPS it is automatically "
 "made sure that\n"
 "\n"
 "- if LPD/LPRng is installed, /etc/printcap will not be overwritten by CUPS\n"
@@ -11532,10 +11564,10 @@ msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
 msgstr "Ауто-детекција штампача (Локални, TCP/Socket, и SMB штампачи)"
 
 #: ../../printer/printerdrake.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Printers on remote CUPS servers you do not have to configure here; these "
+"Printers on remote CUPS servers do not need to be configured here; these "
 "printers will be automatically detected."
 msgstr ""
 "\n"
@@ -11630,7 +11662,7 @@ msgstr ""
 #: ../../security/level.pm:1
 #, c-format
 msgid ""
-"Password are now enabled, but use as a networked computer is still not "
+"Passwords are now enabled, but use as a networked computer is still not "
 "recommended."
 msgstr ""
 "Лозинке су сада омогућене, али сe и даље не препоручује да се користи\n"
@@ -11640,7 +11672,7 @@ msgstr ""
 #, c-format
 msgid ""
 "This level is to be used with care. It makes your system more easy to use,\n"
-"but very sensitive: it must not be used for a machine connected to others\n"
+"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 ""
 "На овом нивоу треба обратити пажњу. Он прави ваш систем лакшим\n"
@@ -11691,8 +11723,8 @@ msgstr "Добродошли у Свет Open Source-а"
 
 #: ../../share/advertising/01-thanks.pl:1
 #, c-format
-msgid "Thank you for choosing Mandrake Linux 9.0"
-msgstr "Хвала вам што сте изабрали Mandrake Linux 9.0"
+msgid "Thank you for choosing Mandrake Linux 9.1"
+msgstr "Хвала вам што сте изабрали Mandrake Linux 9.1"
 
 #: ../../share/advertising/02-community.pl:1
 #, c-format
@@ -11717,7 +11749,7 @@ msgstr "Прикључите се свету Беспатног Софтвера"
 #: ../../share/advertising/03-internet.pl:1
 #, c-format
 msgid ""
-"Mandrake Linux 9.0 has selected the best software for you. Surf the Web and "
+"Mandrake Linux 9.1 has selected the best software for you. Surf the Web and "
 "view animations with Mozilla and Konqueror, or read your mail and handle "
 "your personal information with Evolution and Kmail"
 msgstr ""
@@ -11734,10 +11766,10 @@ msgstr "Конектуjте се на Интернет"
 #: ../../share/advertising/04-multimedia.pl:1
 #, c-format
 msgid ""
-"Mandrake Linux 9.0 enables you to use the very latest software to play audio "
+"Mandrake Linux 9.1 enables you to use the very latest software to play audio "
 "files, edit and handle your images or photos, and play videos"
 msgstr ""
-"Mandrake Linux 9.0 вам омогућава да доведете свој мултимедијални рачунар до "
+"Mandrake Linux 9.1 вам омогућава да доведете свој мултимедијални рачунар до "
 "крајних граница! Користећи најновији софтвер за слушање музичких и аудио "
 "фајлова, едитовање и организовање ваших слика и фотографија, гледање TV-а и "
 "видеа, и још много тога"
@@ -11755,7 +11787,7 @@ msgstr "Откријте већину најновијих графичких и мултимедијалних алата!"
 #: ../../share/advertising/05-games.pl:1
 #, c-format
 msgid ""
-"Mandrake Linux 9.0 provides the best Open Source games - arcade, action, "
+"Mandrake Linux 9.1 provides the best Open Source games - arcade, action, "
 "strategy, ..."
 msgstr ""
 "Mandrake Linux 9.1 вам нуди најбоље Open Source игре - аркаде, акције, "
@@ -11769,7 +11801,7 @@ msgstr "Игрe"
 #: ../../share/advertising/06-mcc.pl:1
 #, c-format
 msgid ""
-"Mandrake Linux 9.0 provides a powerful tool to fully customize and configure "
+"Mandrake Linux 9.1 provides a powerful tool to fully customize and configure "
 "your machine"
 msgstr ""
 "Mandrake Linux 9.1 Контролни Центар је локација за потупуно  и комплетно "
@@ -11783,7 +11815,7 @@ msgstr "Mandrake Контролни Центар"
 #: ../../share/advertising/07-desktop.pl:1
 #, c-format
 msgid ""
-"Mandrake Linux 9.0 provides you with 11 user interfaces that can be fully "
+"Mandrake Linux 9.1 provides you with 11 user interfaces that can be fully "
 "modified: KDE 3, Gnome 2, WindowMaker, ..."
 msgstr ""
 "Mandrake Linux 9.1 вам доноси 11 различитих грфичких десктоп окружења и "
@@ -11806,7 +11838,7 @@ msgstr ""
 
 #: ../../share/advertising/08-development.pl:1
 #, c-format
-msgid "Mandrake Linux 9.0 is the ultimate development platform"
+msgid "Mandrake Linux 9.1 is the ultimate development platform"
 msgstr "Mandrake Linux 9.1 ултимативна развојна платформа"
 
 #: ../../share/advertising/08-development.pl:1
@@ -12197,8 +12229,8 @@ msgid "Build All Kernels -->"
 msgstr "Компајлирај Све Кернеле -->"
 
 #: ../../standalone/drakTermServ:1
-#, c-format
-msgid "No nic selected!"
+#, fuzzy, c-format
+msgid "No NIC selected!"
 msgstr "Ниједан nic није изабран!"
 
 #: ../../standalone/drakTermServ:1
@@ -12463,7 +12495,7 @@ msgstr ""
 "Сада можете поновити вашу инсталацију."
 
 #: ../../standalone/drakautoinst:1 ../../standalone/drakgw:1
-#: ../../standalone/scannerdrake:1
+#: ../../standalone/scannerdrake:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Congratulations!"
 msgstr "Честитамо !"
@@ -14695,7 +14727,7 @@ msgstr "Уклони фонтове из система"
 
 #: ../../standalone/drakfont:1
 #, c-format
-msgid "Initials tests"
+msgid "Initial tests"
 msgstr "Тестови иницијала"
 
 #: ../../standalone/drakfont:1
@@ -15044,7 +15076,7 @@ msgstr "Деселектовани фонтови инсталирани"
 msgid "Search installed fonts"
 msgstr "Тражи инсталиране фонтове"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -15058,30 +15090,30 @@ msgstr ""
 "\n"
 "Кликните на Подеси (Configure) да би покренули подeшавaње."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Internet connection sharing configuration"
 msgstr "Конфигурациjа Дeљeња Интернет конекциje"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "До сада Дeљeње интернет конекциjе ниjе подeшавано."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The setup has already been done, and it's currently enabled."
 msgstr ""
 "Подeшавaњe дeљeњa интернет конекциjе jе вeћ завршено и тренутно jе омогућено."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The setup has already been done, but it's currently disabled."
 msgstr ""
 "Подeшавaњe дeљeњa интернет конекциjе jе вeћ завршено али jе тренутно "
 "онeмогућено."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -15092,72 +15124,72 @@ msgstr ""
 "Сада можете делити Интернет конекциjу са другим компjутерима на вaшоj "
 "локалноj мрeжи  (LAN), користећи аутоматску мрeжну конфигурациjу (DHCP)."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Problems installing package %s"
 msgstr "Проблеми при инсталациjи %s пакетa"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Конфигурисaње скрипти,инсталациjа софтвера, стартaње сервиса..."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Configuring..."
 msgstr "Kонфигурациjа у току..."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "Потенциjални конфликт LAN адресe у тренутном конфиг. %s!\n"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr "Локална Мрежа није завршила са`.0', bailing out."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Реконфигуриши интерфејс и DHCP сервер"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "Максимално пуштање (у секундама)"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "default пуштање (у секундама)"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCP крај распона"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCP почетак распона"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The internal domain name"
 msgstr "Интерно име домена"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "The DNS Server IP"
 msgstr "DNS сервер IP"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "(Овај) DHCP сервер IP"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -15172,12 +15204,12 @@ msgstr ""
 "Уколико не знате значење неке опције, једноставно је немојте мењати.\n"
 "\n"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Local Network adress"
 msgstr "Адреса Локалне Мреже"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -15204,7 +15236,7 @@ msgstr ""
 "сервер за вас.\n"
 "\n"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -15221,27 +15253,27 @@ msgstr ""
 "IP атрибути: %s\n"
 "Драјвер: %s"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Current interface configuration"
 msgstr "Тренутна конфигурација интерфејса"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Прикажи тренутну конфигурацију"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "No (experts only)"
 msgstr "Не (само експерти)"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Аутоматска реконфигурација"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -15256,19 +15288,19 @@ msgstr ""
 "\n"
 "Можете то учинити ручно али морате да знате шта радите."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Network interface already configured"
 msgstr "Мрежни интерфејс је већ подешшен"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "Изаберите коjи ће мрeжни адаптер бити кориштен зa LANмрeжу."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -15283,12 +15315,12 @@ msgstr ""
 "\n"
 "Сада подеавам вaшу локалну мрeжу са овим адаптером."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Network interface"
 msgstr "Мрeжни интерфejс"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -15297,17 +15329,17 @@ msgstr ""
 "Ниjе детектована ниjедна мрeжна картицa. Покренитe алат за конфигурисaње "
 "хардверa."
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "Нема мрeжног адаптера у вaшем систему !"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Interface %s"
 msgstr "Интерфеjс %s"
 
-#: ../../standalone/drakgw:1
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Интерфеjс %s (користeћи модул %s)"
@@ -15631,8 +15663,8 @@ msgid "Security Alerts:"
 msgstr "Сигурносни аларми:"
 
 #: ../../standalone/draksec:1
-#, c-format
-msgid " (default value: %s)"
+#, fuzzy, c-format
+msgid "(default value: %s)"
 msgstr " (подразумевана вредност: %s)"
 
 #: ../../standalone/draksec:1
@@ -17056,6 +17088,111 @@ msgstr "Неки уређаји су додани:\n"
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "Неки уређаји у \"%s\" класи хардвера су уклоњени:\n"
 
+#: ../../standalone/drakhelp:1
+#, c-format
+msgid ""
+"No browser is installed on your system, Please install one if you want to "
+"browse the help system"
+msgstr ""
+"Ниједан претраживач није инсталиран. Молим Вас да инсталирате један да би "
+"могли да користите ситем ѕа помоћ"
+
+#: ../../standalone/drakpxe:1
+#, fuzzy, c-format
+msgid "Location of auto_install.cfg file"
+msgstr "Креирам ауто инсталациону дискету"
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"Please indicate where the auto_install.cfg file is located.\n"
+"\n"
+"Leave it blank if you do not want to set up automatic installation mode.\n"
+"\n"
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"No CD or DVD image found, please copy the installation program and rpm files."
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, fuzzy, c-format
+msgid "No image found"
+msgstr "Није пронађен штампач!"
+
+#: ../../standalone/drakpxe:1
+#, fuzzy, c-format
+msgid "Installation image directory"
+msgstr "Xpmac (Инсталациja дисплеj драjвер)"
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"Please indicate where the installation image will be available.\n"
+"\n"
+"If you do not have an existing directory, please copy the CD or DVD "
+"contents.\n"
+"\n"
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"The DHCP server will allow other computer to boot using PXE in the given "
+"range of address.\n"
+"\n"
+"If you give an inexistant directory, you will be asked to insert "
+"Installation CD or DVD to copy the installation program and rpm files.\n"
+"\n"
+msgstr ""
+
+#: ../../standalone/drakpxe:1
+#, fuzzy, c-format
+msgid "Interface %s (on network %s)"
+msgstr "Интерфеjс %s (користeћи модул %s)"
+
+#: ../../standalone/drakpxe:1
+#, fuzzy, c-format
+msgid "Please choose which network interface will be used for the dhcp server."
+msgstr ""
+"Изаберите мрeжни адаптер коjи желите да користите за конекциjу на интернет"
+
+#: ../../standalone/drakpxe:1
+#, fuzzy, c-format
+msgid ""
+"You are about to configure your computer to install a PXE server as a DHCP "
+"server\n"
+"and a TFTP server to build an installation server.\n"
+"With that feature, other computers on your local network will be installable "
+"using from this computer.\n"
+"\n"
+"Make sure you have configured your Network/Internet access using drakconnect "
+"before going any further.\n"
+"\n"
+"Note: you need a dedicated Network Adapter to set up a Local Area Network "
+"(LAN)."
+msgstr ""
+"Вaш рачунар можете подесити за дeљeње његове Интернет конекциje.\n"
+"са овом опциjом, други компjутери на вaшоj локалноj мрeжи ће моћи да "
+"користeИнтернет конекциjу са овог рачунара.\n"
+"\n"
+"Проверите да ли је подешена ваша Мрежни/Интернет приступ преко drakconnect "
+"пре него што наставимо.\n"
+"\n"
+"Напоменa: потребанa вам jе мрeжна картица да би подесили локалну мрeжу(LAN)."
+
+#: ../../standalone/drakpxe:1
+#, fuzzy, c-format
+msgid "Installation Server Configuration"
+msgstr "dhcpd Сервер конфигурација"
+
+#: ../../standalone/drakpxe:1
+#, fuzzy, c-format
+msgid "PXE Server Configuration"
+msgstr "dhcpd Сервер конфигурација"
+
 #: ../../share/compssUsers:999
 msgid "Office Workstation"
 msgstr "Радна(Office) станицa"
@@ -17299,6 +17436,15 @@ msgstr "Личне финансиje"
 msgid "Programs to manage your finance, such as gnucash"
 msgstr "Програми за управљaње вaшим финансиjамa, као што jе gnucash"
 
+#~ msgid "Upgrade partition %s"
+#~ msgstr "Ажурирање партиције %s"
+
+#~ msgid "Tamil (Unicode)"
+#~ msgstr "Тамилски (Unicode)"
+
+#~ msgid "Setup filesystems"
+#~ msgstr "Подеси датотeчне системе"
+
 #~ msgid "Boot from DOS/Windows (loadlin)"
 #~ msgstr "Стартaње из DOS/Windows-a (loadlin)"
 
@@ -17476,7 +17622,7 @@ msgstr "Програми за управљaње вaшим финансиjамa, као што jе gnucash"
 #~ msgid "port"
 #~ msgstr "Порт"
 
-#~ msgid "Url should begin with 'http:'"
+#~ msgid "URL should begin with 'http:'"
 #~ msgstr "Url треба да почиње са http://..."
 
 #~ msgid "The port part should be numeric"