s/Linux-Mandrake/Mandrake Linux/

9 files changed, 188 insertions, 188 deletions

diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm
index cf88e7cda..11bf3cba9 100644
--- a/perl-install/bootlook.pm
+++ b/perl-install/bootlook.pm
@@ -213,14 +213,14 @@ $global_vbox->pack_start ($x_main_frame, 1, 1, 0);
 
 #deush : hability to choose the runlevel.
 my $runl_hbox = new Gtk::HBox;
-my $runl_button5 = new Gtk::RadioButton _("5");
-my $runl_button1 = new Gtk::RadioButton _("1"), $runl_button5;
+my $runl_button5 = new Gtk::RadioButton ("5");
+my $runl_button1 = new Gtk::RadioButton ("1"), $runl_button5;
 $runl_hbox->pack_start($runl_button1, 0, 0, 0);
-my $runl_button2 = new Gtk::RadioButton _("2"), $runl_button5;
+my $runl_button2 = new Gtk::RadioButton ("2"), $runl_button5;
 $runl_hbox->pack_start($runl_button2, 0, 0, 0);
-my $runl_button3 = new Gtk::RadioButton _("3"), $runl_button5;
+my $runl_button3 = new Gtk::RadioButton ("3"), $runl_button5;
 $runl_hbox->pack_start($runl_button3, 0, 0, 0);
-my $runl_button4 = new Gtk::RadioButton _("4"), $runl_button5;
+my $runl_button4 = new Gtk::RadioButton ("4"), $runl_button5;
 $runl_hbox->pack_start($runl_button4, 0, 0, 0);
 
 $runl_hbox->pack_start($runl_button5, 0, 0, 0);
diff --git a/perl-install/help.pm b/perl-install/help.pm
index b1ad37b26..afff7e11e 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -27,15 +27,15 @@ beginning of installation) will be available after installation, please chose
 them in list above. If you want select all, you just need to select \"All\"."),
 
 selectInstallClass =>
- __("Please choose \"Install\" if there are no previous version of Linux-Mandrake
+ __("Please choose \"Install\" if there are no previous version of Mandrake Linux
 installed or if you wish to use several operating systems.
 
 
-Please choose \"Update\" if you wish to update an already installed version of Linux-Mandrake.
+Please choose \"Update\" if you wish to update an already installed version of Mandrake Linux.
 
 
 Depend of your knowledge in GNU/Linux, you can choose one of the following levels to install or update your
-Linux-Mandrake operating system:
+Mandrake Linux operating system:
 
 	* Recommended: if you have never installed a GNU/Linux operating system choose this. Installation will be
 	  be very easy and you will be asked only on few questions.
@@ -106,10 +106,10 @@ manufacturer's Web site (if you have Internet access) or from Microsoft Windows
 
 doPartitionDisks => 
  __("At this point, you need to choose where to install your
-Linux-Mandrake operating system on your hard drive. If it is empty or if an
+Mandrake Linux operating system on your hard drive. If it is empty or if an
 existing operating system uses all the space available on it, you need to
 partition it. Basically, partitioning a hard drive consists of logically
-dividing it to create space to install your new Linux-Mandrake system.
+dividing it to create space to install your new Mandrake Linux system.
 
 
 Because the effects of the partitioning process are usually irreversible,
@@ -136,7 +136,7 @@ configuration, several solutions can be available:
 
 
 	* Erase entire disk: if you want delete all data and all partitions present on your hard drive and replace them by
-	  your new Linux-Mandrake system, you can choose this option. Be careful with this solution, you will not be
+	  your new Mandrake Linux system, you can choose this option. Be careful with this solution, you will not be
 	  able to revert your choice after confirmation.
 
 
@@ -144,7 +144,7 @@ configuration, several solutions can be available:
 	  all space available on it, you have to create free space for Linux data. To do that you can delete your
 	  Microsoft Windows partition and data (see \"Erase entire disk\" or \"Expert mode\" solutions) or resize your
 	  Microsoft Windows partition. Resizing can be performed without loss of any data. This solution is
-	  recommended if you want use both Linux-Mandrake and Microsoft Windows on same computer.
+	  recommended if you want use both Mandrake Linux and Microsoft Windows on same computer.
 
 
 	  Before choosing this solution, please understand that the size of your Microsoft
@@ -158,7 +158,7 @@ configuration, several solutions can be available:
 
 partition_with_diskdrake => 
  __("At this point, you need to choose what
-partition(s) to use to install your new Linux-Mandrake system. If partitions
+partition(s) to use to install your new Mandrake Linux system. If partitions
 have been already defined (from a previous installation of GNU/Linux or from
 another partitioning tool), you can use existing partitions. In other cases,
 hard drive partitions must be defined.
@@ -256,7 +256,7 @@ With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means \"sec
 
 takeOverHdChoose => 
  __("Choose the hard drive you want to erase to install your
-new Linux-Mandrake partition. Be careful, all data present on it will be lost
+new Mandrake Linux partition. Be careful, all data present on it will be lost
 and will not be recoverable."),
 
 takeOverHdConfirm => 
@@ -272,7 +272,7 @@ partitions present on this hard drive."),
 resizeFATChoose => 
  __("More than one Microsoft Windows partition have been
 detected on your hard drive. Please choose the one you want resize to install
-your new Linux-Mandrake operating system.
+your new Mandrake Linux operating system.
 
 
 For information, each partition is listed as follow; \"Linux name\", \"Windows
@@ -329,7 +329,7 @@ Click on \"OK\" when you are ready to format partitions.
 
 
 Click on \"Cancel\" if you want to choose other partitions to install your new
-Linux-Mandrake operating system."),
+Mandrake Linux operating system."),
 
 choosePackages => 
  __("You may now select the group of packages you wish to
@@ -366,7 +366,7 @@ none of those CDs, click Cancel. If only some CDs are missing, unselect them,
 then click Ok."),
 
 installPackages => 
- __("Your new Linux-Mandrake operating system is currently being
+ __("Your new Mandrake Linux operating system is currently being
 installed. This operation should take a few minutes (it depends on size you
 choose to install and the speed of your computer).
 
@@ -499,10 +499,10 @@ CUPS and LPR.
 
 CUPS is a new, powerful and flexible printing system for Unix systems (CUPS
 means \"Common Unix Printing System\"). It is the default printing system in
-Linux-Mandrake.
+Mandrake Linux.
 
 
-LPR is the old printing system used in previous Linux-Mandrake distributions.
+LPR is the old printing system used in previous Mandrake Linux distributions.
 
 
 If you don't have printer, click on \"None\"."),
@@ -588,7 +588,7 @@ Please see its documentation if you don't know what choose here.
 You will be able to test your configuration in next step and you will be able to modify it if it doesn't work as you want."),
 
 setRootPassword => 
- __("You can now enter the root password for your Linux-Mandrake system.
+ __("You can now enter the root password for your Mandrake Linux system.
 The password must be entered twice to verify that both password entries are identical.
 
 
@@ -843,7 +843,7 @@ miscellaneous =>
 exitInstall =>
  __("Your system is going to reboot.
 
-After rebooting, your new Linux Mandrake system will load automatically.
+After rebooting, your new Mandrake Linux system will load automatically.
 If you want to boot into another existing operating system, please read
 the additional instructions."),
 );
@@ -906,7 +906,7 @@ the additional instructions."),
 #-
 #-partitionDisks =>
 #- __("In this stage, you may choose what partition(s) use to install your
-#-Linux-Mandrake system."),
+#-Mandrake Linux system."),
 #-
 #-#At this point, hard drive partitions must be defined. (Unless you
 #-#are overwriting a previous install of GNU/Linux and have already defined
@@ -984,7 +984,7 @@ the additional instructions."),
 #-panel.
 #-
 #-
-#-If you install a Linux-Mandrake system on a machine which is part
+#-If you install a Mandrake Linux system on a machine which is part
 #-of an already existing network, the network administrator will
 #-have given you all necessary information (IP address, network
 #-submask or netmask for short, and hostname). If you're setting
@@ -1021,7 +1021,7 @@ the additional instructions."),
 #-for a NetWare printer, except that you need no workgroup information."),
 #-
 #-setRootPassword =>
-#- __("You must now enter the root password for your Linux-Mandrake
+#- __("You must now enter the root password for your Mandrake Linux
 #-system. The password must be entered twice to verify that both
 #-password entries are identical.
 #-
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 539d2f1e5..da7133d96 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -140,7 +140,7 @@ sub selectLanguage {
   
     $o->ask_warn('',
 _("Your system is low on resource. You may have some problem installing
-Linux-Mandrake. If that occurs, you can try a text install instead. For this,
+Mandrake Linux. If that occurs, you can try a text install instead. For this,
 press `F1' when booting on CDROM, then enter `text'.")) if $first_time && availableRamMB() < 60; # 60MB
 
 }
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 15b0a50cd..2967b273c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -86,10 +86,10 @@ sub selectLanguage {
 	$o->{useless_thing_accepted} = $o->ask_from_list_(_("License agreement"), formatAlaTeX(
 _("Introduction
 
-The operating system and the different components available in the Linux-Mandrake distribution 
+The operating system and the different components available in the Mandrake Linux distribution 
 shall be called the \"Software Products\" hereafter. The Software Products include, but are not 
 restricted to, the set of programs, methods, rules and documentation related to the operating 
-system and the different components of the Linux-Mandrake distribution.
+system and the different components of the Mandrake Linux distribution.
 
 
 1. License Agreement
@@ -124,7 +124,7 @@ liable for any special, incidental, direct or indirect damages whatsoever (inclu
 limitation damages for loss of business, interruption of business, financial loss, legal fees 
 and penalties resulting from a court judgment, or any other consequential loss) arising out 
 of the possession and use of software components or arising out of  downloading software components 
-from one of Linux-Mandrake sites  which are prohibited or restricted in some countries by local laws.
+from one of Mandrake Linux sites  which are prohibited or restricted in some countries by local laws.
 This limited liability applies to, but is not restricted to, the strong cryptography components 
 included in the Software Products.
 
@@ -148,7 +148,7 @@ All rights to the components of the Software Products belong to their respective
 protected by intellectual property and copyright laws applicable to software programs.
 MandrakeSoft S.A. reserves its rights to modify or adapt the Software Products, as a whole or in 
 parts, by all means and for all purposes.
-\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of MandrakeSoft S.A.  
+\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of MandrakeSoft S.A.  
 
 
 5. Governing Laws 
@@ -1167,11 +1167,11 @@ Do you really want to quit now?"), 0);
 _("Congratulations, installation is complete.
 Remove the boot media and press return to reboot.
 
-For information on fixes which are available for this release of Linux-Mandrake,
-consult the Errata available from http://www.linux-mandrake.com/.
+For information on fixes which are available for this release of Mandrake Linux,
+consult the Errata available from http://www.mandrakelinux.com/.
 
 Information on configuring your system is available in the post
-install chapter of the Official Linux-Mandrake User's Guide."),
+install chapter of the Official Mandrake Linux User's Guide."),
 	 cancel => '',
 	},      
 	[
diff --git a/perl-install/install_steps_newt.pm b/perl-install/install_steps_newt.pm
index 7fd1cab1f..20e0293e6 100644
--- a/perl-install/install_steps_newt.pm
+++ b/perl-install/install_steps_newt.pm
@@ -19,7 +19,7 @@ use common qw(:common);
 my $banner = __();
 
 sub banner {
-    my $banner = translate(__("Linux-Mandrake Installation %s"));
+    my $banner = translate(__("Mandrake Linux Installation %s"));
     my $l = first(Newt::GetScreenSize) - length($banner) - length($_[0]) + 1;
     Newt::DrawRootText(0, 0, sprintf($banner, ' ' x $l . $_[0]));
 }
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 35206b229..ed85994e4 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-06-18 19:04+0200\n"
+"POT-Creation-Date: 2001-06-21 23:35+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1803,18 +1803,18 @@ msgstr ""
 
 #: ../../help.pm_.c:30
 msgid ""
-"Please choose \"Install\" if there are no previous version of Linux-"
-"Mandrake\n"
+"Please choose \"Install\" if there are no previous version of Mandrake "
+"Linux\n"
 "installed or if you wish to use several operating systems.\n"
 "\n"
 "\n"
 "Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
+"of Mandrake Linux.\n"
 "\n"
 "\n"
 "Depend of your knowledge in GNU/Linux, you can choose one of the following "
 "levels to install or update your\n"
-"Linux-Mandrake operating system:\n"
+"Mandrake Linux operating system:\n"
 "\n"
 "\t* Recommended: if you have never installed a GNU/Linux operating system "
 "choose this. Installation will be\n"
@@ -1917,10 +1917,10 @@ msgstr ""
 #: ../../help.pm_.c:108
 msgid ""
 "At this point, you need to choose where to install your\n"
-"Linux-Mandrake operating system on your hard drive. If it is empty or if an\n"
+"Mandrake Linux operating system on your hard drive. If it is empty or if an\n"
 "existing operating system uses all the space available on it, you need to\n"
 "partition it. Basically, partitioning a hard drive consists of logically\n"
-"dividing it to create space to install your new Linux-Mandrake system.\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
 "\n"
 "Because the effects of the partitioning process are usually irreversible,\n"
@@ -1954,7 +1954,7 @@ msgid ""
 "\n"
 "\t* Erase entire disk: if you want delete all data and all partitions "
 "present on your hard drive and replace them by\n"
-"\t  your new Linux-Mandrake system, you can choose this option. Be careful "
+"\t  your new Mandrake Linux system, you can choose this option. Be careful "
 "with this solution, you will not be\n"
 "\t  able to revert your choice after confirmation.\n"
 "\n"
@@ -1967,7 +1967,7 @@ msgid ""
 "\"Expert mode\" solutions) or resize your\n"
 "\t  Microsoft Windows partition. Resizing can be performed without loss of "
 "any data. This solution is\n"
-"\t  recommended if you want use both Linux-Mandrake and Microsoft Windows on "
+"\t  recommended if you want use both Mandrake Linux and Microsoft Windows on "
 "same computer.\n"
 "\n"
 "\n"
@@ -1988,7 +1988,7 @@ msgstr ""
 #: ../../help.pm_.c:160
 msgid ""
 "At this point, you need to choose what\n"
-"partition(s) to use to install your new Linux-Mandrake system. If "
+"partition(s) to use to install your new Mandrake Linux system. If "
 "partitions\n"
 "have been already defined (from a previous installation of GNU/Linux or "
 "from\n"
@@ -2115,7 +2115,7 @@ msgstr ""
 #: ../../help.pm_.c:258
 msgid ""
 "Choose the hard drive you want to erase to install your\n"
-"new Linux-Mandrake partition. Be careful, all data present on it will be "
+"new Mandrake Linux partition. Be careful, all data present on it will be "
 "lost\n"
 "and will not be recoverable."
 msgstr ""
@@ -2139,7 +2139,7 @@ msgid ""
 "More than one Microsoft Windows partition have been\n"
 "detected on your hard drive. Please choose the one you want resize to "
 "install\n"
-"your new Linux-Mandrake operating system.\n"
+"your new Mandrake Linux operating system.\n"
 "\n"
 "\n"
 "For information, each partition is listed as follow; \"Linux name\", "
@@ -2211,7 +2211,7 @@ msgid ""
 "\n"
 "Click on \"Cancel\" if you want to choose other partitions to install your "
 "new\n"
-"Linux-Mandrake operating system."
+"Mandrake Linux operating system."
 msgstr ""
 
 #: ../../help.pm_.c:335
@@ -2262,7 +2262,7 @@ msgstr ""
 
 #: ../../help.pm_.c:369
 msgid ""
-"Your new Linux-Mandrake operating system is currently being\n"
+"Your new Mandrake Linux operating system is currently being\n"
 "installed. This operation should take a few minutes (it depends on size you\n"
 "choose to install and the speed of your computer).\n"
 "\n"
@@ -2451,10 +2451,10 @@ msgid ""
 "CUPS is a new, powerful and flexible printing system for Unix systems (CUPS\n"
 "means \"Common Unix Printing System\"). It is the default printing system "
 "in\n"
-"Linux-Mandrake.\n"
+"Mandrake Linux.\n"
 "\n"
 "\n"
-"LPR is the old printing system used in previous Linux-Mandrake "
+"LPR is the old printing system used in previous Mandrake Linux "
 "distributions.\n"
 "\n"
 "\n"
@@ -2568,7 +2568,7 @@ msgstr ""
 
 #: ../../help.pm_.c:591
 msgid ""
-"You can now enter the root password for your Linux-Mandrake system.\n"
+"You can now enter the root password for your Mandrake Linux system.\n"
 "The password must be entered twice to verify that both password entries are "
 "identical.\n"
 "\n"
@@ -2892,7 +2892,7 @@ msgstr ""
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
-"After rebooting, your new Linux Mandrake system will load automatically.\n"
+"After rebooting, your new Mandrake Linux system will load automatically.\n"
 "If you want to boot into another existing operating system, please read\n"
 "the additional instructions."
 msgstr ""
@@ -3304,7 +3304,7 @@ msgstr ""
 #: ../../install_steps_gtk.pm_.c:142
 msgid ""
 "Your system is low on resource. You may have some problem installing\n"
-"Linux-Mandrake. If that occurs, you can try a text install instead. For "
+"Mandrake Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -3518,13 +3518,13 @@ msgstr ""
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Linux-"
-"Mandrake distribution \n"
+"The operating system and the different components available in the Mandrake "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Linux-Mandrake distribution.\n"
+"system and the different components of the Mandrake Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -3578,7 +3578,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Linux-Mandrake sites  which are prohibited or restricted in some "
+"from one of Mandrake Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -3615,7 +3615,7 @@ msgid ""
 "MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
 "Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -4097,12 +4097,12 @@ msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
-"For information on fixes which are available for this release of Linux-"
-"Mandrake,\n"
-"consult the Errata available from http://www.linux-mandrake.com/.\n"
+"For information on fixes which are available for this release of Mandrake "
+"Linux,\n"
+"consult the Errata available from http://www.mandrakelinux.com/.\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Linux-Mandrake User's Guide."
+"install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
 
 #: ../../install_steps_interactive.pm_.c:1179
@@ -4132,7 +4132,7 @@ msgstr ""
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
+msgid "Mandrake Linux Installation %s"
 msgstr ""
 
 #: ../../install_steps_newt.pm_.c:33
@@ -6442,7 +6442,7 @@ msgstr ""
 msgid ""
 "tinyfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Linux Mandrake machine.\n"
+"This configures a personal firewall for this Mandrake Linux machine.\n"
 "For a powerful dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 5103a2862..b4a5b5aac 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-18 19:04+0200\n"
+"POT-Creation-Date: 2001-06-21 23:35+0200\n"
 "PO-Revision-Date: 2001-03-13 13:19CET\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: Norsk\n"
@@ -1972,18 +1972,18 @@ msgstr ""
 
 #: ../../help.pm_.c:30
 msgid ""
-"Please choose \"Install\" if there are no previous version of Linux-"
-"Mandrake\n"
+"Please choose \"Install\" if there are no previous version of Mandrake "
+"Linux\n"
 "installed or if you wish to use several operating systems.\n"
 "\n"
 "\n"
 "Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
+"of Mandrake Linux.\n"
 "\n"
 "\n"
 "Depend of your knowledge in GNU/Linux, you can choose one of the following "
 "levels to install or update your\n"
-"Linux-Mandrake operating system:\n"
+"Mandrake Linux operating system:\n"
 "\n"
 "\t* Recommended: if you have never installed a GNU/Linux operating system "
 "choose this. Installation will be\n"
@@ -2008,18 +2008,18 @@ msgid ""
 "knowledge in GNU/Linux. So, don't choose\n"
 "\t  this installation class unless you know what you are doing."
 msgstr ""
-"Velg \"Installer\" hvis det ikke er noen tidligere versjoner av Linux-"
-"Mandrake\n"
+"Velg \"Installer\" hvis det ikke er noen tidligere versjoner av Mandrake "
+"Linux\n"
 "installert eller hvis du јnsker х bruke flere operativsystem.\n"
 "\n"
 "\n"
 "Velg \"Oppdater\" hvis du јnsker х oppdatere en allerede installert versjon "
-"av Linux-Mandrake.\n"
+"av Mandrake Linux.\n"
 "\n"
 "\n"
 "Avhengig av din kunnskap i GNU/Linux, kan du velge en av fјlgende nivхer til "
 "х installere eller oppdatere\n"
-"Linux-Mandrake operativsystemet ditt:\n"
+"Mandrake Linux operativsystemet ditt:\n"
 "\n"
 "\t* Anbefalt: hvis du aldri har installert et GNU/Linux operativsystem velg "
 "denne. Installasjonen vil vцre\n"
@@ -2179,10 +2179,10 @@ msgstr ""
 #: ../../help.pm_.c:108
 msgid ""
 "At this point, you need to choose where to install your\n"
-"Linux-Mandrake operating system on your hard drive. If it is empty or if an\n"
+"Mandrake Linux operating system on your hard drive. If it is empty or if an\n"
 "existing operating system uses all the space available on it, you need to\n"
 "partition it. Basically, partitioning a hard drive consists of logically\n"
-"dividing it to create space to install your new Linux-Mandrake system.\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
 "\n"
 "Because the effects of the partitioning process are usually irreversible,\n"
@@ -2216,7 +2216,7 @@ msgid ""
 "\n"
 "\t* Erase entire disk: if you want delete all data and all partitions "
 "present on your hard drive and replace them by\n"
-"\t  your new Linux-Mandrake system, you can choose this option. Be careful "
+"\t  your new Mandrake Linux system, you can choose this option. Be careful "
 "with this solution, you will not be\n"
 "\t  able to revert your choice after confirmation.\n"
 "\n"
@@ -2229,7 +2229,7 @@ msgid ""
 "\"Expert mode\" solutions) or resize your\n"
 "\t  Microsoft Windows partition. Resizing can be performed without loss of "
 "any data. This solution is\n"
-"\t  recommended if you want use both Linux-Mandrake and Microsoft Windows on "
+"\t  recommended if you want use both Mandrake Linux and Microsoft Windows on "
 "same computer.\n"
 "\n"
 "\n"
@@ -2247,12 +2247,12 @@ msgid ""
 "\t  don't choose this solution unless you know what you are doing."
 msgstr ""
 "Pх dette punktet mх du velge hvor du skal installere ditt\n"
-"Linux-Mandrake operativsystem pх harddisken din. Hvis den er tom eller hvis "
+"Mandrake Linux operativsystem pх harddisken din. Hvis den er tom eller hvis "
 "et\n"
 "eksisterende operativsystem bruker all tilgjengelig plass mх du\n"
 "partisjonere denne. I basis bestхr partisjonering av en harddisk av х "
 "logisk\n"
-"dele denne for х opprette plass til installere ditt nye Linux-Mandrake "
+"dele denne for х opprette plass til installere ditt nye Mandrake Linux "
 "system.\n"
 "\n"
 "\n"
@@ -2287,7 +2287,7 @@ msgstr ""
 "\n"
 "\t* Slett hele disken: hvis du јnsker х slette alle data og alle partisjoner "
 "pх harddisken din og erstatte disse med\n"
-"\t  ditt nye Linux-Mandrake system, kan du velge dette valget. Vцr forsiktig "
+"\t  ditt nye Mandrake Linux system, kan du velge dette valget. Vцr forsiktig "
 "med denne lјsningen, du vil ikke kunne\n"
 "\t  gjјre om valget ditt etter bekreftelse.\n"
 "\n"
@@ -2300,7 +2300,7 @@ msgstr ""
 "\"Ekspert modus\" lјsninger) eller endre stјrrelsen pх din\n"
 "\t  Microsoft Windows partisjon. Endring av stјrrelse kan utfјres uten tap "
 "av noen data. Denne lјsningen \n"
-"\t  anbefales hvis du јnsker х bruke bхde Linux-Mandrake og Microsoft "
+"\t  anbefales hvis du јnsker х bruke bхde Mandrake Linux og Microsoft "
 "Windows pх samme maskin.\n"
 "\n"
 "\n"
@@ -2321,7 +2321,7 @@ msgstr ""
 #: ../../help.pm_.c:160
 msgid ""
 "At this point, you need to choose what\n"
-"partition(s) to use to install your new Linux-Mandrake system. If "
+"partition(s) to use to install your new Mandrake Linux system. If "
 "partitions\n"
 "have been already defined (from a previous installation of GNU/Linux or "
 "from\n"
@@ -2401,7 +2401,7 @@ msgid ""
 "a spare kernel and ramdisk image for emergency boot situations."
 msgstr ""
 "Pх dette punktet mх du velge hvilken\n"
-"partisjon(er) som skal brukes til х installere ditt nye Linux-Mandrake "
+"partisjon(er) som skal brukes til х installere ditt nye Mandrake Linux "
 "system. Hvis partisjoner\n"
 "allerede har blitt definert (fra en tidligere installasjon av GNU/Linux "
 "eller fra\n"
@@ -2564,12 +2564,12 @@ msgstr ""
 #: ../../help.pm_.c:258
 msgid ""
 "Choose the hard drive you want to erase to install your\n"
-"new Linux-Mandrake partition. Be careful, all data present on it will be "
+"new Mandrake Linux partition. Be careful, all data present on it will be "
 "lost\n"
 "and will not be recoverable."
 msgstr ""
 "Velg den harddisken du јnsker х slette for х installere din\n"
-"nye Linux-Mandrake partisjon. Vцr forsiktig, alle data pх denne vil gх tapt\n"
+"nye Mandrake Linux partisjon. Vцr forsiktig, alle data pх denne vil gх tapt\n"
 "og kan ikke bli gjenopprettet."
 
 #: ../../help.pm_.c:263
@@ -2600,7 +2600,7 @@ msgid ""
 "More than one Microsoft Windows partition have been\n"
 "detected on your hard drive. Please choose the one you want resize to "
 "install\n"
-"your new Linux-Mandrake operating system.\n"
+"your new Mandrake Linux operating system.\n"
 "\n"
 "\n"
 "For information, each partition is listed as follow; \"Linux name\", "
@@ -2639,7 +2639,7 @@ msgstr ""
 "Mer enn en Microsoft Windows partisjon har blitt\n"
 "oppdaget pх harddisken din. Vennligst velg den du јnsker х endre stјrrelsen "
 "pх for х\n"
-"installere ditt nye Linux-Mandrake operativsystem.\n"
+"installere ditt nye Mandrake Linux operativsystem.\n"
 "\n"
 "\n"
 "For informasjon, hver partisjon er listet som fјlger: \"Linux navn\", "
@@ -2708,7 +2708,7 @@ msgid ""
 "\n"
 "Click on \"Cancel\" if you want to choose other partitions to install your "
 "new\n"
-"Linux-Mandrake operating system."
+"Mandrake Linux operating system."
 msgstr ""
 "Partisjoner som nylig har blitt definert mх\n"
 "formateres for bruk (formatering betyr х opprette et filsystem).\n"
@@ -2739,7 +2739,7 @@ msgstr ""
 "\n"
 "Klikk pх \"Avbryt\" hvis du јnsker х velge andre partisjoner х installere "
 "ditt nye\n"
-"Linux-Mandrake operating system pх."
+"Mandrake Linux operating system pх."
 
 #: ../../help.pm_.c:335
 msgid ""
@@ -2822,14 +2822,14 @@ msgstr ""
 
 #: ../../help.pm_.c:369
 msgid ""
-"Your new Linux-Mandrake operating system is currently being\n"
+"Your new Mandrake Linux operating system is currently being\n"
 "installed. This operation should take a few minutes (it depends on size you\n"
 "choose to install and the speed of your computer).\n"
 "\n"
 "\n"
 "Please be patient."
 msgstr ""
-"Ditt nye Linux-Mandrake operativsystem blir nх\n"
+"Ditt nye Mandrake Linux operativsystem blir nх\n"
 "installert. Denne operasjonen burde ta noen minutter (avhengig av stјrrelsen "
 "du\n"
 "valgte х installere og hastigheten pх maskinen din).\n"
@@ -3113,10 +3113,10 @@ msgid ""
 "CUPS is a new, powerful and flexible printing system for Unix systems (CUPS\n"
 "means \"Common Unix Printing System\"). It is the default printing system "
 "in\n"
-"Linux-Mandrake.\n"
+"Mandrake Linux.\n"
 "\n"
 "\n"
-"LPR is the old printing system used in previous Linux-Mandrake "
+"LPR is the old printing system used in previous Mandrake Linux "
 "distributions.\n"
 "\n"
 "\n"
@@ -3130,10 +3130,10 @@ msgstr ""
 "CUPS er et nytt, kraftig og fleksibelt utskriftsystem for Unix systemer "
 "(CUPS\n"
 "betyr \"Common Unix Printing System\"). Det er standard utskriftsystem i\n"
-"Linux-Mandrake.\n"
+"Mandrake Linux.\n"
 "\n"
 "\n"
-"LPR er det gamle utskriftsystemet brukt i tidligere Linux-Mandrake "
+"LPR er det gamle utskriftsystemet brukt i tidligere Mandrake Linux "
 "distribusjoner.\n"
 "\n"
 "\n"
@@ -3327,7 +3327,7 @@ msgstr ""
 
 #: ../../help.pm_.c:591
 msgid ""
-"You can now enter the root password for your Linux-Mandrake system.\n"
+"You can now enter the root password for your Mandrake Linux system.\n"
 "The password must be entered twice to verify that both password entries are "
 "identical.\n"
 "\n"
@@ -3348,7 +3348,7 @@ msgid ""
 "to\n"
 "remember it without too much effort."
 msgstr ""
-"Du kan nх entre root-passordet for Linux-Mandrake systemet ditt.\n"
+"Du kan nх entre root-passordet for Mandrake Linux systemet ditt.\n"
 "Passordet mх entres to ganger for х verifisere at begge passordinntastingene "
 "er identiske.\n"
 "\n"
@@ -3898,13 +3898,13 @@ msgstr ""
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
-"After rebooting, your new Linux Mandrake system will load automatically.\n"
+"After rebooting, your new Mandrake Linux system will load automatically.\n"
 "If you want to boot into another existing operating system, please read\n"
 "the additional instructions."
 msgstr ""
 "Systemet ditt vil bli startet pх nytt.\n"
 "\n"
-"Etter omstart vil ditt nye Linux Mandrake system bli automatisk lastet.\n"
+"Etter omstart vil ditt nye Mandrake Linux system bli automatisk lastet.\n"
 "Hvis du јnsker х starte et annet eksisterende operativsystem, vennligst\n"
 "les ytterligere instruksjoner."
 
@@ -4357,12 +4357,12 @@ msgstr "Bruke eksisterende konfigurasjon for X11?"
 #: ../../install_steps_gtk.pm_.c:142
 msgid ""
 "Your system is low on resource. You may have some problem installing\n"
-"Linux-Mandrake. If that occurs, you can try a text install instead. For "
+"Mandrake Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Systemet ditt har lite ressurser. Du kan muligens oppleve noen problemer\n"
-"ved installering av Linux-Mandrake. Hvis dette skjer kan du prјve tekst- "
+"ved installering av Mandrake Linux. Hvis dette skjer kan du prјve tekst- "
 "installering\n"
 "i stedet. Trykk `F1' ved oppstart av CD-ROM, skriv sх `text'."
 
@@ -4623,13 +4623,13 @@ msgstr "License agreement"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Linux-"
-"Mandrake distribution \n"
+"The operating system and the different components available in the Mandrake "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Linux-Mandrake distribution.\n"
+"system and the different components of the Mandrake Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4683,7 +4683,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Linux-Mandrake sites  which are prohibited or restricted in some "
+"from one of Mandrake Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -4720,7 +4720,7 @@ msgid ""
 "MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
 "Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -4741,13 +4741,13 @@ msgid ""
 msgstr ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Linux-"
-"Mandrake distribution \n"
+"The operating system and the different components available in the Mandrake "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Linux-Mandrake distribution.\n"
+"system and the different components of the Mandrake Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4801,7 +4801,7 @@ msgstr ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Linux-Mandrake sites  which are prohibited or restricted in some "
+"from one of Mandrake Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -4838,7 +4838,7 @@ msgstr ""
 "MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
 "Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -5407,22 +5407,22 @@ msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
-"For information on fixes which are available for this release of Linux-"
-"Mandrake,\n"
-"consult the Errata available from http://www.linux-mandrake.com/.\n"
+"For information on fixes which are available for this release of Mandrake "
+"Linux,\n"
+"consult the Errata available from http://www.mandrakelinux.com/.\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Linux-Mandrake User's Guide."
+"install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
 "Gratulerer, installasjonen er fullfјrt.\n"
 "Fjern oppstartsmediet og trykk return for х starte pх nytt.\n"
 "\n"
-"For informasjon om endringer som er tilgjengelige for denne utgaven av Linux-"
-"Mandrake,\n"
-"sjekk errataen tilgjengelig fra http://www.linux-mandrake.com/.\n"
+"For informasjon om endringer som er tilgjengelige for denne utgaven av "
+"Mandrake Linux,\n"
+"sjekk errataen tilgjengelig fra http://www.mandrakelinux.com/.\n"
 "\n"
 "Informasjon om konfigurering av systemet ditt finnes i post\n"
-"install-kapittelet i Official Linux Mandrake User's Guide."
+"install-kapittelet i Official Mandrake Linux User's Guide."
 
 #: ../../install_steps_interactive.pm_.c:1179
 msgid "Generate auto install floppy"
@@ -5456,8 +5456,8 @@ msgstr "Lagre pakkevalg"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Linux-Mandrake installasjon %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Mandrake Linux installasjon %s"
 
 #: ../../install_steps_newt.pm_.c:33
 msgid ""
@@ -8039,13 +8039,13 @@ msgstr ""
 msgid ""
 "tinyfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Linux Mandrake machine.\n"
+"This configures a personal firewall for this Mandrake Linux machine.\n"
 "For a powerful dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "tinyfirewall konfigurering\n"
 "\n"
-"Dette konfigurerer en personlig brannmur for denne Linux Mandrake maskinen.\n"
+"Dette konfigurerer en personlig brannmur for denne Mandrake Linux maskinen.\n"
 "For en kraftig dedikert brannmurlјsning ta en kikk pх den\n"
 "spesialiserte MandrakeSecurity Firewall distribusjonen."
 
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index 91146b8a0..51a9f51b4 100644
--- a/perl-install/share/po/sp.po
+++ b/perl-install/share/po/sp.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-06-18 19:04+0200\n"
+"POT-Creation-Date: 2001-06-21 23:35+0200\n"
 "PO-Revision-Date: 2001-03-20 07:46+0200\n"
 "Last-Translator: Jankovic Tomislav <tomaja@net.yu>\n"
 "Language-Team: Serbian (cyrillic)\n"
@@ -1953,18 +1953,18 @@ msgstr ""
 
 #: ../../help.pm_.c:30
 msgid ""
-"Please choose \"Install\" if there are no previous version of Linux-"
-"Mandrake\n"
+"Please choose \"Install\" if there are no previous version of Mandrake "
+"Linux\n"
 "installed or if you wish to use several operating systems.\n"
 "\n"
 "\n"
 "Please choose \"Update\" if you wish to update an already installed version "
-"of Linux-Mandrake.\n"
+"of Mandrake Linux.\n"
 "\n"
 "\n"
 "Depend of your knowledge in GNU/Linux, you can choose one of the following "
 "levels to install or update your\n"
-"Linux-Mandrake operating system:\n"
+"Mandrake Linux operating system:\n"
 "\n"
 "\t* Recommended: if you have never installed a GNU/Linux operating system "
 "choose this. Installation will be\n"
@@ -1989,17 +1989,17 @@ msgid ""
 "knowledge in GNU/Linux. So, don't choose\n"
 "\t  this installation class unless you know what you are doing."
 msgstr ""
-"Изаберите  \"Инсталациja\" уколико нема претходне верзиjеLinux-Mandrake\n"
+"Изаберите  \"Инсталациja\" уколико нема претходне верзиjеMandrake Linux\n"
 "коjа jе инсталирана или хоћете да користите више оперативних системa.\n"
 "\n"
 "\n"
-"Изаберитe \"Aжурирaњe\" уколико желите да aжурирaте постоjeћу верзиjу Linux-"
-"Mandrake-a.\n"
+"Изаберитe \"Aжурирaњe\" уколико желите да aжурирaте постоjeћу верзиjу "
+"Mandrake Linux-a.\n"
 "\n"
 "\n"
 "У зависности од вaшег познавaња GNU/Linux-a, можете изабрати jедну од "
 "следeћих нивоа за инсталациjу или aжурирaње\n"
-"Linux-Mandrake оперативног системa:\n"
+"Mandrake Linux оперативног системa:\n"
 "\n"
 "\t* Препоручено: уколико ниакада нисте инсталирали  GNU/Linux оперативни "
 "систем изаберите ово. Инсталациjа ће бити\n"
@@ -2092,7 +2092,7 @@ msgstr ""
 "изворног кодa, или за креирaње софтверскоих пакетa.\n"
 "\n"
 "\n"
-"  - Сервер: изаберите ово уколико имате намеру да Linux-Mandrake\n"
+"  - Сервер: изаберите ово уколико имате намеру да Mandrake Linux\n"
 "користите као сервер. Или као фаjл сервер (NFS или  SMB),\n"
 "или сервер протокол за штампу(Unix' lp (Line Printer или  Windows  SMB\n"
 "штампaњe) или  аутентични сервер (NIS), или као сервер за базу  податакa "
@@ -2158,10 +2158,10 @@ msgstr ""
 #: ../../help.pm_.c:108
 msgid ""
 "At this point, you need to choose where to install your\n"
-"Linux-Mandrake operating system on your hard drive. If it is empty or if an\n"
+"Mandrake Linux operating system on your hard drive. If it is empty or if an\n"
 "existing operating system uses all the space available on it, you need to\n"
 "partition it. Basically, partitioning a hard drive consists of logically\n"
-"dividing it to create space to install your new Linux-Mandrake system.\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
 "\n"
 "Because the effects of the partitioning process are usually irreversible,\n"
@@ -2195,7 +2195,7 @@ msgid ""
 "\n"
 "\t* Erase entire disk: if you want delete all data and all partitions "
 "present on your hard drive and replace them by\n"
-"\t  your new Linux-Mandrake system, you can choose this option. Be careful "
+"\t  your new Mandrake Linux system, you can choose this option. Be careful "
 "with this solution, you will not be\n"
 "\t  able to revert your choice after confirmation.\n"
 "\n"
@@ -2208,7 +2208,7 @@ msgid ""
 "\"Expert mode\" solutions) or resize your\n"
 "\t  Microsoft Windows partition. Resizing can be performed without loss of "
 "any data. This solution is\n"
-"\t  recommended if you want use both Linux-Mandrake and Microsoft Windows on "
+"\t  recommended if you want use both Mandrake Linux and Microsoft Windows on "
 "same computer.\n"
 "\n"
 "\n"
@@ -2226,11 +2226,11 @@ msgid ""
 "\t  don't choose this solution unless you know what you are doing."
 msgstr ""
 "У овом тренутку, морате да изаберете где ћете инсталирати\n"
-"Linux-Mandrake оперативни систем на вaш хард диск. Уколико jе празан или\n"
+"Mandrake Linux оперативни систем на вaш хард диск. Уколико jе празан или\n"
 "постоjeћи оперативни систем користи сав постоjeћи простор на диску, треба дa "
 "га\n"
 "партициониратe. У основи, партиционирaње хард дискa се састоjи логичког\n"
-"дeљeња да би обезбедили простор за инсталациjу вaш нови Linux-Mandrake "
+"дeљeња да би обезбедили простор за инсталациjу вaш нови Mandrake Linux "
 "систем.\n"
 "\n"
 "\n"
@@ -2263,7 +2263,7 @@ msgstr ""
 "\n"
 "\t* Брисaње целог дискa: уколико желите да избришете све податке и све "
 "партициje коjи постоjе на вaшем хард диску и замените их вaшим\n"
-"\t  новим Linux-Mandrake системом, можете да изаберете ову оциjу. Будите "
+"\t  новим Mandrake Linux системом, можете да изаберете ову оциjу. Будите "
 "пaжљивиса овом опциjом, jер нeћете бити у могућности\n"
 "\t  да повратите старо стaњe након потврдe.\n"
 "\n"
@@ -2276,7 +2276,7 @@ msgstr ""
 "или \"Eкспертни мод\" рeшeњa) или да промените вeличину\n"
 "\t  Microsoft Windows партициje. Таj поступак се можe извести без "
 "губљeњаподатакa. Ово рeшeње се препоручуje\n"
-"\t  уколико желите да користите Linux-Mandrake и Microsoft Windows нaистом "
+"\t  уколико желите да користите Mandrake Linux и Microsoft Windows нaистом "
 "компjутеру.\n"
 "\n"
 "\n"
@@ -2295,7 +2295,7 @@ msgstr ""
 #: ../../help.pm_.c:160
 msgid ""
 "At this point, you need to choose what\n"
-"partition(s) to use to install your new Linux-Mandrake system. If "
+"partition(s) to use to install your new Mandrake Linux system. If "
 "partitions\n"
 "have been already defined (from a previous installation of GNU/Linux or "
 "from\n"
@@ -2375,7 +2375,7 @@ msgid ""
 "a spare kernel and ramdisk image for emergency boot situations."
 msgstr ""
 "На овоj тaчки, морате избрати коjу\n"
-"партициjу(e) желите да користите за инсталациjу новог Linux-Mandrake "
+"партициjу(e) желите да користите за инсталациjу новог Mandrake Linux "
 "системa. Уколико су партициje\n"
 "вeћ дефинисане (од предходне инсталациjе или од странe\n"
 "другог алата за партициje), можете да користите постоjeће партициje. У "
@@ -2537,12 +2537,12 @@ msgstr ""
 #: ../../help.pm_.c:258
 msgid ""
 "Choose the hard drive you want to erase to install your\n"
-"new Linux-Mandrake partition. Be careful, all data present on it will be "
+"new Mandrake Linux partition. Be careful, all data present on it will be "
 "lost\n"
 "and will not be recoverable."
 msgstr ""
 "Изаберите хард диск коjи желите да избришетe да би инсталирали \n"
-"нову Linux-Mandrake партициjу. Будите пaжљиви, сви подаци на њему ће бити "
+"нову Mandrake Linux партициjу. Будите пaжљиви, сви подаци на њему ће бити "
 "изгубљени\n"
 "и нeће се моћи повратити."
 
@@ -2573,7 +2573,7 @@ msgid ""
 "More than one Microsoft Windows partition have been\n"
 "detected on your hard drive. Please choose the one you want resize to "
 "install\n"
-"your new Linux-Mandrake operating system.\n"
+"your new Mandrake Linux operating system.\n"
 "\n"
 "\n"
 "For information, each partition is listed as follow; \"Linux name\", "
@@ -2611,7 +2611,7 @@ msgid ""
 msgstr ""
 "Jедна или више Мicrosoft Windows партициjа jе детектовано \n"
 "на хард диску. Изаберите коjу од њих желите да смaњите да би инсталирали\n"
-"нови Linux-Mandrake оперативни систем.\n"
+"нови Mandrake Linux оперативни систем.\n"
 "\n"
 "\n"
 "Информациja: свака партициjа jе исписана на следeћи нaчин: \"Име Linux-a\", "
@@ -2681,7 +2681,7 @@ msgid ""
 "\n"
 "Click on \"Cancel\" if you want to choose other partitions to install your "
 "new\n"
-"Linux-Mandrake operating system."
+"Mandrake Linux operating system."
 msgstr ""
 "Свака партициjа коjа jе новодефинисана морa бити\n"
 "форматирана за уптребу (форматирaње значи креирaње датотeчног(фаjл) "
@@ -2710,7 +2710,7 @@ msgstr ""
 "\n"
 "Кликните на  \"Поништи\" уколико желите да изабереете друге партициjе за "
 "инсталациjу новог\n"
-"Linux-Mandrake оперативног системa."
+"Mandrake Linux оперативног системa."
 
 #: ../../help.pm_.c:335
 msgid ""
@@ -2795,14 +2795,14 @@ msgstr ""
 
 #: ../../help.pm_.c:369
 msgid ""
-"Your new Linux-Mandrake operating system is currently being\n"
+"Your new Mandrake Linux operating system is currently being\n"
 "installed. This operation should take a few minutes (it depends on size you\n"
 "choose to install and the speed of your computer).\n"
 "\n"
 "\n"
 "Please be patient."
 msgstr ""
-"Вaш нови Linux-Mandrake оперативни систем се тренутно\n"
+"Вaш нови Mandrake Linux оперативни систем се тренутно\n"
 "инсталирa. Ова операциjа би требала да потраjе неколико минутa (у зависности "
 "од величинe\n"
 "пакета коjи се инсталираjу и брзине вaшег компjутерa).\n"
@@ -3084,10 +3084,10 @@ msgid ""
 "CUPS is a new, powerful and flexible printing system for Unix systems (CUPS\n"
 "means \"Common Unix Printing System\"). It is the default printing system "
 "in\n"
-"Linux-Mandrake.\n"
+"Mandrake Linux.\n"
 "\n"
 "\n"
-"LPR is the old printing system used in previous Linux-Mandrake "
+"LPR is the old printing system used in previous Mandrake Linux "
 "distributions.\n"
 "\n"
 "\n"
@@ -3101,10 +3101,10 @@ msgstr ""
 "CUPS jе нови, моћни и флексибилни систем за штампaње за Unix системe (CUPS\n"
 "jе скрaћеница за \"Common Unix Printing System\"). Он jе постављен за "
 "default систем за штампaње у\n"
-"Linux-Mandrake-у.\n"
+"Mandrake Linux-у.\n"
 "\n"
 "\n"
-"LPR jе стари систем за штампaње коjи се користио у претходним Linux-Mandrake "
+"LPR jе стари систем за штампaње коjи се користио у претходним Mandrake Linux "
 "дистрибуциjамa.\n"
 "\n"
 "\n"
@@ -3304,7 +3304,7 @@ msgstr ""
 
 #: ../../help.pm_.c:591
 msgid ""
-"You can now enter the root password for your Linux-Mandrake system.\n"
+"You can now enter the root password for your Mandrake Linux system.\n"
 "The password must be entered twice to verify that both password entries are "
 "identical.\n"
 "\n"
@@ -3325,7 +3325,7 @@ msgid ""
 "to\n"
 "remember it without too much effort."
 msgstr ""
-"Садa, можетe унети  root лозинку за вaш Linux-Mandrake систем.\n"
+"Садa, можетe унети  root лозинку за вaш Mandrake Linux систем.\n"
 "Лозинка мора бити унета два пута ради верификациjе да су оба уноса\n"
 "лозинки истa.\n"
 "\n"
@@ -3873,13 +3873,13 @@ msgstr ""
 msgid ""
 "Your system is going to reboot.\n"
 "\n"
-"After rebooting, your new Linux Mandrake system will load automatically.\n"
+"After rebooting, your new Mandrake Linux system will load automatically.\n"
 "If you want to boot into another existing operating system, please read\n"
 "the additional instructions."
 msgstr ""
 "Систем ће се ресетовати.\n"
 "\n"
-"После ресетовања, ваш нови Linux-Mandrake систем ће се подићи аутоматски.\n"
+"После ресетовања, ваш нови Mandrake Linux систем ће се подићи аутоматски.\n"
 "Уколико желите да подигнете неки други инсталирани оперативни систем,\n"
 "прочитате упуство или посетите неки од Linux chat канала."
 
@@ -4324,13 +4324,13 @@ msgstr "Да ли да користим постојећу конфигурацију за X11 ?"
 #: ../../install_steps_gtk.pm_.c:142
 msgid ""
 "Your system is low on resource. You may have some problem installing\n"
-"Linux-Mandrake. If that occurs, you can try a text install instead. For "
+"Mandrake Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Вaш систем има мaњак снаге. Услед тога можете имaти проблема при "
 "инсталациjи\n"
-"Linux-Mandrake. Уколико се они поjавe, можете пробати текстуалну "
+"Mandrake Linux. Уколико се они поjавe, можете пробати текстуалну "
 "инсталациjу. Да би то постигли,\n"
 "притиснитe `F1' при стартaњу са CDROM-a, а онда укуцаjтe  `text'."
 
@@ -4593,13 +4593,13 @@ msgstr "ЛИценцирани уговор"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Linux-"
-"Mandrake distribution \n"
+"The operating system and the different components available in the Mandrake "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Linux-Mandrake distribution.\n"
+"system and the different components of the Mandrake Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4653,7 +4653,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Linux-Mandrake sites  which are prohibited or restricted in some "
+"from one of Mandrake Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -4690,7 +4690,7 @@ msgid ""
 "MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
 "Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -4711,13 +4711,13 @@ msgid ""
 msgstr ""
 "Упознавaњe\n"
 "\n"
-"Оперативни систем и друге компоненте доступне у Linux-Mandrake "
+"Оперативни систем и друге компоненте доступне у Mandrake Linux "
 "дистрибуциjи \n"
 "на дaљe ће бити зване \"Софтверски Производи\" . Софтверски производи "
 "уkључуjу, али нису и \n"
 "ограничени нa, скуп програмa, методa, правила и документациjу коjа je "
 "везанaза оперативни \n"
-"систем и друге компоненте Linux-Mandrake дистрибуциje.\n"
+"систем и друге компоненте Mandrake Linux дистрибуциje.\n"
 "\n"
 "\n"
 "1. Лиценцни уговор\n"
@@ -4769,7 +4769,7 @@ msgstr ""
 "произилазe \n"
 "из употребe или немогућности коришћeња Софтверских Компоненти или коje "
 "произилазe download-ованих софтверских компоненти \n"
-"било ког Linux-Mandrake саjта коjи су забрaњени или ограничени у неким "
+"било ког Mandrake Linux саjта коjи су забрaњени или ограничени у неким "
 "земљама по локалним законимa.\n"
 "Ова ограничена права се примeњуjу, али нису и ограничена нa,криптографске "
 "компонентe \n"
@@ -4805,7 +4805,7 @@ msgstr ""
 "MandrakeSoft S.A. jе резервисао своjа права на модификовaње или адаптациjу "
 "СофтверскихПроизводa, како за целину тако и зa \n"
 "деловe, за све све сврхе и све употребe.\n"
-"\"Mandrake\", \"Linux-Mandrake\" и придружени логотипи и ознакe MandrakeSoft "
+"\"Mandrake\", \"Mandrake Linux\" и придружени логотипи и ознакe MandrakeSoft "
 "S.A.  \n"
 "\n"
 "\n"
@@ -5204,7 +5204,7 @@ msgstr ""
 "од нормалног стартерa. Ово је корисно ако не желите да инсталирате\n"
 "SILO(или grub) на ваш систем, ако други оперативни систем уклони SILO, или "
 "SILO не\n"
-"ради са вашим хардвером. Стартни диск можете користити са Linux Mandrake\n"
+"ради са вашим хардвером. Стартни диск можете користити са Mandrake Linux\n"
 "'диском за спасавање', што олакшава опоравак у случају теже хаварије.\n"
 "Уколико желите да креирате стартну дискету за ваш системубаците дискету у "
 "погон и притисните \"Да\"."
@@ -5238,7 +5238,7 @@ msgstr ""
 "од нормалног стартерa. Ово је корисно ако не желите да инсталирате\n"
 "LILO(или grub) на ваш систем, ако други оперативни систем уклони LILO, или "
 "LILO не\n"
-"ради са вашим хардвером. Стартни диск можете користити са Linux Mandrake\n"
+"ради са вашим хардвером. Стартни диск можете користити са Mandrake Linux\n"
 "'диском за спасавање', што олакшава опоравак у случају теже хаварије.\n"
 "Да ли бисте да креирате стартну дискету за ваш систем?"
 
@@ -5342,22 +5342,22 @@ msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
-"For information on fixes which are available for this release of Linux-"
-"Mandrake,\n"
-"consult the Errata available from http://www.linux-mandrake.com/.\n"
+"For information on fixes which are available for this release of Mandrake "
+"Linux,\n"
+"consult the Errata available from http://www.mandrakelinux.com/.\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Linux-Mandrake User's Guide."
+"install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
 "Честитамо, инсталација је завршена.\n"
 "Извадите дискету из драјва и притисните <Enter> да се рачунар ресетује.\n"
 "\n"
 "За информације о поправкама које су на располагању за ово издање\n"
-"Linux Mandrake Линукса, прочитајте део 'Errata' који можете наћи на\n"
-"http://www.linux-mandrake.com/.\n"
+"Mandrake Linux Линукса, прочитајте део 'Errata' који можете наћи на\n"
+"http://www.mandrakelinux.com/.\n"
 "\n"
 "Информације о конфигурисању вашег система можете наћи у пост-инсталационом\n"
-"поглављу званичног Linux Mandrake 'Водича за кориснике'."
+"поглављу званичног Mandrake Linux 'Водича за кориснике'."
 
 #: ../../install_steps_interactive.pm_.c:1179
 msgid "Generate auto install floppy"
@@ -5391,8 +5391,8 @@ msgstr "Сaчуваj селекциjу пакетa"
 
 #: ../../install_steps_newt.pm_.c:22
 #, c-format
-msgid "Linux-Mandrake Installation %s"
-msgstr "Linux-Mandrake Инсталација %s"
+msgid "Mandrake Linux Installation %s"
+msgstr "Mandrake Linux Инсталација %s"
 
 #: ../../install_steps_newt.pm_.c:33
 msgid ""
@@ -7950,13 +7950,13 @@ msgstr ""
 msgid ""
 "tinyfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Linux Mandrake machine.\n"
+"This configures a personal firewall for this Mandrake Linux machine.\n"
 "For a powerful dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Мали firewall конфигуратор\n"
 "\n"
-"Он конфигурише лични firewall за ову Linux Mandrake мaшину.\n"
+"Он конфигурише лични firewall за ову Mandrake Linux мaшину.\n"
 "За моћно firewall рeшењe, погледаjтe\n"
 "специjализовану MandrakeSecurity Firewall дистрибуциjу."
 
@@ -9052,7 +9052,7 @@ msgstr "Сет алата за ел.пошту, вести, web, трансфер датотекa, или chat"
 #~ "Choose \"Install\" if there are no previous versions of GNU/Linux\n"
 #~ "installed, or if you wish to use multiple distributions or versions.\n"
 #~ "\n"
-#~ "Choose \"Rescue\" if you wish to rescue a version of Linux-Mandrake "
+#~ "Choose \"Rescue\" if you wish to rescue a version of Mandrake Linux "
 #~ "already installed.\n"
 #~ "\n"
 #~ "\n"
@@ -9101,7 +9101,7 @@ msgstr "Сет алата за ел.пошту, вести, web, трансфер датотекa, или chat"
 
 #~ msgid ""
 #~ "At this point, you may choose what partition(s) to use to install\n"
-#~ "your Linux-Mandrake system if they have been already defined (from a\n"
+#~ "your Mandrake Linux system if they have been already defined (from a\n"
 #~ "previous install of GNU/Linux or from another partitioning tool). In "
 #~ "other\n"
 #~ "cases, hard drive partitions must be defined. This operation consists of\n"
@@ -9142,7 +9142,7 @@ msgstr "Сет алата за ел.пошту, вести, web, трансфер датотекa, или chat"
 #~ "- Ctrl-m  to set the mount point\n"
 #~ msgstr ""
 #~ "Сада, можете изабрати на коју партицију(е) желите инсталирати\n"
-#~ "ваш Linux-Mandrake систем уколико је(су) она унапред одређена(е)\n"
+#~ "ваш Mandrake Linux систем уколико је(су) она унапред одређена(е)\n"
 #~ "(постојећом Линукс инсталацијом или неким програмом за партицирање "
 #~ "диска).\n"
 #~ "У другим случајевима партиције на хард диску морају бити дефинисане.\n"
@@ -9248,7 +9248,7 @@ msgstr "Сет алата за ел.пошту, вести, web, трансфер датотекa, или chat"
 #~ "hardware.\n"
 #~ "\n"
 #~ "\n"
-#~ "If you install a Linux-Mandrake system on a machine which is part\n"
+#~ "If you install a Mandrake Linux system on a machine which is part\n"
 #~ "of an already existing network, the network administrator will\n"
 #~ "have given you all necessary information (IP address, network\n"
 #~ "submask or netmask for short, and hostname). If you're setting\n"
@@ -9275,7 +9275,7 @@ msgstr "Сет алата за ел.пошту, вести, web, трансфер датотекa, или chat"
 #~ "хардвера.\n"
 #~ "\n"
 #~ "\n"
-#~ "Уколико инсталирате Linux-Mandrake систем на машину коя је део постојеће\n"
+#~ "Уколико инсталирате Mandrake Linux систем на машину коя је део постојеће\n"
 #~ "мреже, мрежни администратор ће вам дати све потребне информације\n"
 #~ "(IP адресу, име машине и др.) Уколико подешавате приватну мрежу\n"
 #~ "у кући, сами бирате адресе.\n"
diff --git a/perl-install/tinyfirewall.pm b/perl-install/tinyfirewall.pm
index e3c2effcd..37c6e8d5a 100644
--- a/perl-install/tinyfirewall.pm
+++ b/perl-install/tinyfirewall.pm
@@ -9,7 +9,7 @@ use network;
 use POSIX qw(tmpnam);
 my @messages = (_("tinyfirewall configurator
 
-This configures a personal firewall for this Linux Mandrake machine.
+This configures a personal firewall for this Mandrake Linux machine.
 For a powerful dedicated firewall solution, please look to the
 specialized MandrakeSecurity Firewall distribution."),
 _("We'll now ask you questions about which services you'd like to allow