s/Linux-Mandrake/Mandrake Linux/

author: Pablo Saratxaga <pablo@mandriva.com> 2001-06-22 00:35:55 +0000
committer: Pablo Saratxaga <pablo@mandriva.com> 2001-06-22 00:35:55 +0000
commit: 2997f48accd7036f6d105f18cf218c8c2f7288cc (patch)
tree: 874f92ecdc07dbb4c81f84577c070f40be96cbfb /perl-install
parent: 014a1102307fdf7a894aff048dd8858e74260296 (diff)
download: drakx-2997f48accd7036f6d105f18cf218c8c2f7288cc.tar
drakx-2997f48accd7036f6d105f18cf218c8c2f7288cc.tar.gz
drakx-2997f48accd7036f6d105f18cf218c8c2f7288cc.tar.bz2
drakx-2997f48accd7036f6d105f18cf218c8c2f7288cc.tar.xz
drakx-2997f48accd7036f6d105f18cf218c8c2f7288cc.zip
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
author	Pablo Saratxaga <pablo@mandriva.com>	2001-06-22 00:35:55 +0000
committer	Pablo Saratxaga <pablo@mandriva.com>	2001-06-22 00:35:55 +0000
commit	2997f48accd7036f6d105f18cf218c8c2f7288cc (patch)
tree	874f92ecdc07dbb4c81f84577c070f40be96cbfb /perl-install
parent	014a1102307fdf7a894aff048dd8858e74260296 (diff)
download	drakx-2997f48accd7036f6d105f18cf218c8c2f7288cc.tar drakx-2997f48accd7036f6d105f18cf218c8c2f7288cc.tar.gz drakx-2997f48accd7036f6d105f18cf218c8c2f7288cc.tar.bz2 drakx-2997f48accd7036f6d105f18cf218c8c2f7288cc.tar.xz drakx-2997f48accd7036f6d105f18cf218c8c2f7288cc.zip