spell Mandrakelinux in one word

39 files changed, 392 insertions, 391 deletions

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 3aa4153be..14676c14f 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -630,7 +630,7 @@ sub selectLanguage {
 
         my $last_utf8 = $in->{locale}{utf8};
 	add2hash($common, { cancel => '',
-			    advanced_messages => formatAlaTeX(N("Mandrake Linux can support multiple languages. Select
+			    advanced_messages => formatAlaTeX(N("Mandrakelinux can support multiple languages. Select
 the languages you would like to install. They will be available
 when your installation is complete and you restart your system.")),
 			    callbacks => { advanced => sub { $langs->{$listval2val->($lang)} = 1 },
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 0c6b38e96..1ea7051c2 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -517,7 +517,7 @@ sub suggest {
 	{
 	 defaultos => "linux",
 	 entries => [],
-	 'init-message' => "Welcome to Mandrake Linux!",
+	 'init-message' => "Welcome to Mandrakelinux!",
 	 delay => 30,	#- OpenFirmware delay
 	 timeout => 50,
 	 enableofboot => 1,
diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index 3415fa43d..7cd0b2447 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -102,7 +102,7 @@ sub bestMirror {
     $possible[rand @possible];
 }
 
-#- hack to retrieve Mandrake Linux version...
+#- hack to retrieve Mandrakelinux version...
 sub version() {
     require pkgs;
     my $pkg = pkgs::packageByName($::o->{packages}, 'mandrake-release');
@@ -148,7 +148,7 @@ sub getPackages {
     #- extract hdlist of crypto, then depslist.
     require pkgs;
     my $update_medium = pkgs::psUsingHdlist($prefix, 'ftp', $packages, "hdlist-updates.cz", "1u", "RPMS",
-					    "Updates for Mandrake Linux " . version(), 1, $fhdlist, $pubkey);
+					    "Updates for Mandrakelinux " . version(), 1, $fhdlist, $pubkey);
     if ($update_medium) {
 	log::l("read updates hdlist");
 	#- keep in mind where is the URL prefix used according to mirror (for install_any::install_urpmi).
diff --git a/perl-install/help.pm b/perl-install/help.pm
index ecda19ff6..e1474b1f7 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -9,7 +9,7 @@ use common;
 #            you want it changed.
 sub acceptLicense() {
     N("Before continuing, you should carefully read the terms of the license. It
-covers the entire Mandrake Linux distribution. If you do agree with all the
+covers the entire Mandrakelinux distribution. If you do agree with all the
 terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button
 will reboot your computer.", N("Accept"), N("Quit"));
 }
@@ -83,18 +83,18 @@ With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means
 \"second lowest SCSI ID\", etc.");
 }
 sub chooseCd() {
-    N("The Mandrake Linux installation is distributed on several CD-ROMs. If a
+    N("The Mandrakelinux installation is distributed on several CD-ROMs. If a
 selected package is located on another CD-ROM, DrakX will eject the current
 CD and ask you to insert the correct CD as required.");
 }
 sub choosePackages() {
     N("It is now time to specify which programs you wish to install on your
-system. There are thousands of packages available for Mandrake Linux, and
+system. There are thousands of packages available for Mandrakelinux, and
 to make it simpler to manage the packages have been placed into groups of
 similar applications.
 
 Packages are sorted into groups corresponding to a particular use of your
-machine. Mandrake Linux sorts packages groups in four categories. You can
+machine. Mandrakelinux sorts packages groups in four categories. You can
 mix and match applications from the various categories, so a
 ``Workstation'' installation can still have applications from the
 ``Development'' category installed.
@@ -148,10 +148,10 @@ right to let you know the purpose of the package.
 !! If a server package has been selected, either because you specifically
 chose the individual package or because it was part of a group of packages,
 you will be asked to confirm that you really want those servers to be
-installed. By default Mandrake Linux will automatically start any installed
+installed. By default Mandrakelinux will automatically start any installed
 services at boot time. Even if they are safe and have no known issues at
 the time the distribution was shipped, it is entirely possible that that
-security holes were discovered after this version of Mandrake Linux was
+security holes were discovered after this version of Mandrakelinux was
 finalized. If you do not know what a particular service is supposed to do
 or why it is being installed, then click \"%s\". Clicking \"%s\" will
 install the listed services and they will be started automatically by
@@ -174,7 +174,7 @@ create such a floppy.", N("No"), N("Yes"), N("Automatic dependencies"));
 sub configureNetwork() {
     N("You will now set up your Internet/network connection. If you wish to
 connect your computer to the Internet or to a local network, click \"%s\".
-Mandrake Linux will attempt to auto-detect network devices and modems. If
+Mandrakelinux will attempt to auto-detect network devices and modems. If
 this detection fails, uncheck the \"%s\" box. You may also choose not to
 configure the network, or to do it later, in which case clicking the \"%s\"
 button will take you to the next step.
@@ -189,7 +189,7 @@ from your Internet Service Provider or system administrator.
 
 About Winmodem Connection. Winmodems are special integrated low-end modems
 that require additional software to work compared to Normal modems. Some of
-those modems actually work under Mandrake Linux, some others do not. You
+those modems actually work under Mandrakelinux, some others do not. You
 can consult the list of supported modems at LinModems.
 
 You can consult the ``Starter Guide'' chapter about Internet connections
@@ -248,7 +248,7 @@ best suits your needs.");
 sub configureX_chooser() {
     N("X (for X Window System) is the heart of the GNU/Linux graphical interface
 on which all the graphical environments (KDE, GNOME, AfterStep,
-WindowMaker, etc.) bundled with Mandrake Linux rely upon.
+WindowMaker, etc.) bundled with Mandrakelinux rely upon.
 
 You will be presented with a list of different parameters to change to get
 an optimal graphical display: Graphic Card
@@ -334,7 +334,7 @@ Linux operating system on your hard drive. If your hard drive is empty or
 if an existing operating system is using all the available space you will
 have to partition the drive. Basically, partitioning a hard drive consists
 of logically dividing it to create the space needed to install your new
-Mandrake Linux system.
+Mandrakelinux system.
 
 Because the process of partitioning a hard drive is usually irreversible
 and can lead to lost data if there is an existing operating system already
@@ -361,7 +361,7 @@ data (see ``Erase entire disk'' solution) or resize your Microsoft Windows
 FAT or NTFS partition. Resizing can be performed without the loss of any
 data, provided you have previously defragmented the Windows partition.
 Backing up your data is strongly recommended.. Using this option is
-recommended if you want to use both Mandrake Linux and Microsoft Windows on
+recommended if you want to use both Mandrakelinux and Microsoft Windows on
 the same computer.
 
    Before choosing this option, please understand that after this
@@ -370,7 +370,7 @@ then when you started. You will have less free space under Microsoft
 Windows to store your data or to install new software.
 
  * \"%s\": if you want to delete all data and all partitions present on
-your hard drive and replace them with your new Mandrake Linux system,
+your hard drive and replace them with your new Mandrakelinux system,
 choose this option. Be careful, because you will not be able to undo your
 choice after you confirm.
 
@@ -438,13 +438,13 @@ it.
 Click on \"%s\" when you are ready to format the partitions.
 
 Click on \"%s\" if you want to choose another partition for your new
-Mandrake Linux operating system installation.
+Mandrakelinux operating system installation.
 
 Click on \"%s\" if you wish to select partitions that will be checked for
 bad blocks on the disk.", N("Next"), N("Previous"), N("Advanced"));
 }
 sub installUpdates() {
-    N("At the time you are installing Mandrake Linux, it is likely that some
+    N("At the time you are installing Mandrakelinux, it is likely that some
 packages will have been updated since the initial release. Bugs may have
 been fixed, security issues resolved. To allow you to benefit from these
 updates, you are now able to download them from the Internet. Check \"%s\"
@@ -473,7 +473,7 @@ address.", N("Security Administrator"));
 }
 sub partition_with_diskdrake() {
     N("At this point, you need to choose which partition(s) will be used for the
-installation of your Mandrake Linux system. If partitions have already been
+installation of your Mandrakelinux system. If partitions have already been
 defined, either from a previous installation of GNU/Linux or by another
 partitioning tool, you can use existing partitions. Otherwise, hard drive
 partitions must be defined.
@@ -546,7 +546,7 @@ emergency boot situations.", N("Clear all"), N("Auto allocate"), N("More"), N("S
 sub resizeFATChoose() {
     N("More than one Microsoft partition has been detected on your hard drive.
 Please choose the one which you want to resize in order to install your new
-Mandrake Linux operating system.
+Mandrakelinux operating system.
 
 Each partition is listed as follows: \"Linux name\", \"Windows name\"
 \"Capacity\".
@@ -585,7 +585,7 @@ sub selectInstallClass() {
 found on your machine.
 
 DrakX now needs to know if you want to perform a new install or an upgrade
-of an existing Mandrake Linux system:
+of an existing Mandrakelinux system:
 
  * \"%s\": For the most part, this completely wipes out the old system. If
 you wish to change how your hard drives are partitioned, or change the file
@@ -593,13 +593,13 @@ system, you should use this option. However, depending on your partitioning
 scheme, you can prevent some of your existing data from being over-written.
 
  * \"%s\": this installation class allows you to update the packages
-currently installed on your Mandrake Linux system. Your current
+currently installed on your Mandrakelinux system. Your current
 partitioning scheme and user data is not altered. Most of other
 configuration steps remain available, similar to a standard installation.
 
-Using the ``Upgrade'' option should work fine on Mandrake Linux systems
+Using the ``Upgrade'' option should work fine on Mandrakelinux systems
 running version \"8.1\" or later. Performing an Upgrade on versions prior
-to Mandrake Linux version \"8.1\" is not recommended.", N("Install"), N("Upgrade"));
+to Mandrakelinux version \"8.1\" is not recommended.", N("Install"), N("Upgrade"));
 }
 sub selectKeyboard() {
     N("Depending on the language you chose in section , DrakX will automatically
@@ -633,7 +633,7 @@ language in the tree view and \"%s\" in the Advanced section.
 
 About UTF-8 (unicode) support: Unicode is a new character encoding meant to
 cover all existing languages. Though full support for it in GNU/Linux is
-still under development. For that reason, Mandrake Linux will be using it
+still under development. For that reason, Mandrakelinux will be using it
 or not depending on the user choices:
 
  * If you choose a languages with a strong legacy encoding (latin1
@@ -760,7 +760,7 @@ instabilities, machine freeze, ...) you should try disabling APIC by
 checking this box.
 
 !! Be aware that if you choose not to install a bootloader (by selecting
-\"%s\"), you must ensure that you have a way to boot your Mandrake Linux
+\"%s\"), you must ensure that you have a way to boot your Mandrakelinux
 system! Be sure you know what you are doing before changing any of the
 options. !!
 
@@ -801,7 +801,7 @@ won't install any bootloader. Use it only if you know what you are doing.", N("F
 }
 sub setupDefaultSpooler() {
     N("Now, it's time to select a printing system for your computer. Other OSs may
-offer you one, but Mandrake Linux offers two. Each of the printing systems
+offer you one, but Mandrakelinux offers two. Each of the printing systems
 is best suited to particular types of configuration.
 
  * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice
@@ -992,7 +992,7 @@ idea to review this setup.", N("Configure"), N("Keyboard"), N("Country / Region"
 }
 sub takeOverHdChoose() {
     N("Choose the hard drive you want to erase in order to install your new
-Mandrake Linux partition. Be careful, all data on this drive will be lost
+Mandrakelinux partition. Be careful, all data on this drive will be lost
 and will not be recoverable!");
 }
 sub takeOverHdConfirm() {
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index 154f1bde1..8919649d2 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -160,7 +160,7 @@ the following error occured: %s", formatError($@));
 		#- this save at least a cylinder (less than 8Mb).
 		$min_win += partition_table::raw::cylinder_size($hd);
 
-		$part->{size} > $min_linux + $min_swap + $min_freewin + $min_win or die \N("Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrake Linux installation.");
+		$part->{size} > $min_linux + $min_swap + $min_freewin + $min_win or die \N("Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrakelinux installation.");
 		$o->ask_okcancel('', formatAlaTeX(N("WARNING!
 
 DrakX will now resize your Windows partition. Be careful: this
diff --git a/perl-install/install_messages.pm b/perl-install/install_messages.pm
index 3ba7c9fc8..e668c0ff5 100644
--- a/perl-install/install_messages.pm
+++ b/perl-install/install_messages.pm
@@ -8,10 +8,10 @@ use common;
 sub main_license() {
 N("Introduction
 
-The operating system and the different components available in the Mandrake Linux distribution 
+The operating system and the different components available in the Mandrakelinux 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 Mandrake Linux distribution.
+system and the different components of the Mandrakelinux distribution.
 
 
 1. License Agreement
@@ -46,7 +46,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 Mandrake Linux sites  which are prohibited or restricted in some countries by local laws.
+from one of Mandrakelinux 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.
 
@@ -70,7 +70,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\", \"Mandrake Linux\" and associated logos are trademarks of MandrakeSoft S.A.  
+\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of MandrakeSoft S.A.  
 
 
 5. Governing Laws 
@@ -129,7 +129,7 @@ N("Congratulations, installation is complete.
 Remove the boot media and press return to reboot.
 
 
-For information on fixes which are available for this release of Mandrake Linux,
+For information on fixes which are available for this release of Mandrakelinux,
 consult the Errata available from:
 
 
@@ -137,7 +137,7 @@ consult the Errata available from:
 
 
 Information on configuring your system is available in the post
-install chapter of the Official Mandrake Linux User's Guide.",
+install chapter of the Official Mandrakelinux User's Guide.",
 N("http://www.mandrakelinux.com/en/100errata.php3"));
 }
 
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 2faaa16af..d94b50878 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -176,7 +176,7 @@ sub selectLanguage {
   
     $o->ask_warn('',
 formatAlaTeX(N("Your system is low on resources. You may have some problem installing
-Mandrake Linux. If that occurs, you can try a text install instead. For this,
+Mandrakelinux. 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() < 70; # 70MB
 
 }
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 5cc38719e..2efaf83e8 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -779,7 +779,7 @@ Do you want to install the updates ?")),
 	require crypto;
 	eval {
 	    my @mirrors = do {
-		my $_w = $o->wait_message('', N("Contacting Mandrake Linux web site to get the list of available mirrors..."));
+		my $_w = $o->wait_message('', N("Contacting Mandrakelinux web site to get the list of available mirrors..."));
 		crypto::mirrors($o->{distro_type});
 	    };
 	    #- if no mirror have been found, use current time zone and propose among available.
diff --git a/perl-install/install_steps_newt.pm b/perl-install/install_steps_newt.pm
index 2b01dc82c..ba8f7ba0c 100644
--- a/perl-install/install_steps_newt.pm
+++ b/perl-install/install_steps_newt.pm
@@ -17,7 +17,7 @@ use lang;
 use common;
 
 sub banner {
-    my $banner = translate(N_("Mandrake Linux Installation %s"));
+    my $banner = translate(N_("Mandrakelinux Installation %s"));
     my $l = first(Newt::GetScreenSize()) - length($banner) - length($_[0]) + 1;
     Newt::DrawRootText(0, 0, sprintf($banner, ' ' x $l . $_[0]));
     Newt::Refresh();
diff --git a/perl-install/network/drakfirewall.pm b/perl-install/network/drakfirewall.pm
index e65a92917..887aa3b1e 100644
--- a/perl-install/network/drakfirewall.pm
+++ b/perl-install/network/drakfirewall.pm
@@ -145,7 +145,7 @@ sub get_conf {
     } else {
 	$in->ask_okcancel('', N("drakfirewall configurator
 
-This configures a personal firewall for this Mandrake Linux machine.
+This configures a personal firewall for this Mandrakelinux machine.
 For a powerful and dedicated firewall solution, please look to the
 specialized MandrakeSecurity Firewall distribution."), 1) or return;
 
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index a41d9a8cf..ab2eb5cc8 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -452,6 +452,7 @@ Take a look at http://www.linmodems.org"),
                             /^Hcf:/ and $type = "hcfpcimodem";
                             /^Hsf:/ and $type = "hsflinmodem";
                             /^LT:/  and $type = "ltmodem";
+                            print "�$type� => �$relocations{$type}� [", $in->do_pkgs->what_provides($type), "]\n";
                             $relocations{$type} || $type && $in->do_pkgs->what_provides($type) or $type = undef;
                         }
                         
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index a52683b30..43aa36246 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -15,7 +15,7 @@ use printer::default;
 use printer::data;
 
 my $companyname = "MandrakeSoft";
-my $distroname = "Mandrake Linux";
+my $distroname = "Mandrakelinux";
 my $shortdistroname = "Mandrake";
 my $domainname = "mandrakesoft.com";
 
diff --git a/perl-install/share/advertising/dis-01.pl b/perl-install/share/advertising/dis-01.pl
index ab8cc8acc..522b9bf77 100644
--- a/perl-install/share/advertising/dis-01.pl
+++ b/perl-install/share/advertising/dis-01.pl
@@ -10,10 +10,10 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Congratulations for choosing Mandrake Linux!</b>"), center => 1 ],
+@text = ([ N("<b>Congratulations for choosing Mandrakelinux!</b>"), center => 1 ],
         ' ',
 	N("Welcome to the Open Source world!"),
 	' ',
-	N("Your new Mandrake Linux operating system and its many applications is the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world."),
+	N("Your new Mandrakelinux operating system and its many applications is the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world."),
 	' ',
 	N("We would like to thank everyone who participated in the development of this latest release.")); 
diff --git a/perl-install/share/advertising/dis-10.pl b/perl-install/share/advertising/dis-10.pl
index cc95a1aec..e0f574c6d 100644
--- a/perl-install/share/advertising/dis-10.pl
+++ b/perl-install/share/advertising/dis-10.pl
@@ -15,7 +15,7 @@ $border = 10;  #- for leftish text
 	N("Take advantage of valuable benefits, products and services by joining MandrakeClub, such as:"),
 	N("	- Full access to commercial applications"),
 	N("	- Special download mirror list exclusively for MandrakeClub Members"),
-	N("	- Voting for software to put in Mandrake Linux"),
+	N("	- Voting for software to put in Mandrakelinux"),
 	N("	- Special discounts for products and services at MandrakeStore"),
 	N("	- Plus much more"),
 	' ',
diff --git a/perl-install/share/advertising/dwd-01.pl b/perl-install/share/advertising/dwd-01.pl
index fec34899c..2ac84ba95 100644
--- a/perl-install/share/advertising/dwd-01.pl
+++ b/perl-install/share/advertising/dwd-01.pl
@@ -10,10 +10,10 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Congratulations for choosing Mandrake Linux!</b>"), center => 1 ],
+@text = ([ N("<b>Congratulations for choosing Mandrakelinux!</b>"), center => 1 ],
          ' ',
 		 N("Welcome to the Open Source world!"),
 		 ' ',
-         N("Mandrake Linux is committed to the Open Source Model and fully respects the General Public License. This new release is the result of collaboration between MandrakeSoft's team of developers and the worldwide community of Mandrake Linux contributors."),
+         N("Mandrakelinux is committed to the Open Source Model and fully respects the General Public License. This new release is the result of collaboration between MandrakeSoft's team of developers and the worldwide community of Mandrakelinux contributors."),
          ' ',
          N("We would like to thank everyone who participated in the development of this latest release."));
diff --git a/perl-install/share/advertising/dwd-02.pl b/perl-install/share/advertising/dwd-02.pl
index b60ccd5dd..adaf4dcb1 100644
--- a/perl-install/share/advertising/dwd-02.pl
+++ b/perl-install/share/advertising/dwd-02.pl
@@ -10,7 +10,7 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Join the Mandrake Linux community!</b>"), center => 1 ],
+@text = ([ N("<b>Join the Mandrakelinux community!</b>"), center => 1 ],
         ' ',
 	N("If you would like to get involved, please subscribe to the \"Cooker\" mailing list by visiting <b>mandrake-linux.com/cooker</b>"),
         ' ',
diff --git a/perl-install/share/advertising/dwd-03.pl b/perl-install/share/advertising/dwd-03.pl
index f21d5ffaf..d8fb45cfe 100644
--- a/perl-install/share/advertising/dwd-03.pl
+++ b/perl-install/share/advertising/dwd-03.pl
@@ -10,8 +10,8 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>What is Mandrake Linux?</b>"), center => 1 ],
+@text = ([ N("<b>What is Mandrakelinux?</b>"), center => 1 ],
         ' ',
-	N("Mandrake Linux is an Open Source distribution created with thousands of the choicest applications from the Free Software world. Mandrake Linux is one of the most widely used Linux distributions worldwide!"),
+	N("Mandrakelinux is an Open Source distribution created with thousands of the choicest applications from the Free Software world. Mandrakelinux is one of the most widely used Linux distributions worldwide!"),
         ' ',
-        N("Mandrake Linux includes the famous graphical desktops KDE and GNOME, plus the latest versions of the most popular Open Source applications.")); 
+        N("Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the latest versions of the most popular Open Source applications.")); 
diff --git a/perl-install/share/advertising/dwd-04.pl b/perl-install/share/advertising/dwd-04.pl
index 9dfee6679..002d36dd6 100644
--- a/perl-install/share/advertising/dwd-04.pl
+++ b/perl-install/share/advertising/dwd-04.pl
@@ -10,10 +10,10 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = (N("Mandrake Linux is widely known as the most user-friendly and the easiest to install and easy to use Linux distribution."),
+@text = (N("Mandrakelinux is widely known as the most user-friendly and the easiest to install and easy to use Linux distribution."),
          ' ',
          N("Find out about our <b>Personal Solutions</b>:"),
-	 N("	- Find out Mandrake Linux on a bootable CD with <b>MandrakeMove</b>"),
+	 N("	- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"),
 	 N("	- If you use Linux mostly for Office, Internet and Multimedia tasks, <b>Discovery</b> perfectly meets your needs"),
 	 N("	- If you appreciate the largest selection of software including powerful development tools, <b>PowerPack</b> is for you"),
 	 N("	- If you require a full-featured Linux solution customized for small to medium-sized networks, choose <b>PowerPack+</b>"));
diff --git a/perl-install/share/advertising/dwd-05.pl b/perl-install/share/advertising/dwd-05.pl
index 51c48ae15..8bc53c9df 100644
--- a/perl-install/share/advertising/dwd-05.pl
+++ b/perl-install/share/advertising/dwd-05.pl
@@ -16,4 +16,4 @@ $border = 10;  #- for leftish text
 	 ' ',
 	 N("<b>Multi Network Firewall</b>: based on Linux 2.4 \"kernel secure\" to provide multi-VPN as well as multi-DMZ functionalities. It is the perfect high performance security solution."),
 	 ' ',
-	 N("<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined with the stability and easy-of-use of the world-famous Mandrake Linux distribution. A unique blend for incomparable HPC performance.")); 
+	 N("<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined with the stability and easy-of-use of the world-famous Mandrakelinux distribution. A unique blend for incomparable HPC performance.")); 
diff --git a/perl-install/share/advertising/dwd-07.pl b/perl-install/share/advertising/dwd-07.pl
index eeb64de3f..561b61fce 100644
--- a/perl-install/share/advertising/dwd-07.pl
+++ b/perl-install/share/advertising/dwd-07.pl
@@ -15,7 +15,7 @@ $border = 10;  #- for leftish text
         N("Take advantage of valuable benefits, products and services by joining Mandrake Club, such as:"),
 	N("	- Full access to commercial applications"),
 	N("	- Special download mirror list exclusively for MandrakeClub Members"),
-	N("	- Voting for software to put in Mandrake Linux"),
+	N("	- Voting for software to put in Mandrakelinux"),
 	N("	- Special discounts for products and services at MandrakeStore"),
 	N("	- Plus much more"),
 	' ',
diff --git a/perl-install/share/advertising/dwd-09.pl b/perl-install/share/advertising/dwd-09.pl
index 648309f06..c5393e971 100644
--- a/perl-install/share/advertising/dwd-09.pl
+++ b/perl-install/share/advertising/dwd-09.pl
@@ -15,6 +15,6 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Note</b>"), center => 1 ],
         ' ',
-	N("This is the Mandrake Linux <b>Download version</b>."),
+	N("This is the Mandrakelinux <b>Download version</b>."),
 	' ',
 	N("The free download version does not include commercial software, and therefore may not work with certain modems (such as some ADSL and RTC) and video cards (such as ATI® and NVIDIA®).")); 
diff --git a/perl-install/share/advertising/ppp-01.pl b/perl-install/share/advertising/ppp-01.pl
index 71c7580f0..d7f4cef1f 100644
--- a/perl-install/share/advertising/ppp-01.pl
+++ b/perl-install/share/advertising/ppp-01.pl
@@ -10,10 +10,10 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Congratulations for choosing Mandrake Linux!</b>"), center => 1 ],
+@text = ([ N("<b>Congratulations for choosing Mandrakelinux!</b>"), center => 1 ],
         ' ',
         N("Welcome to the Open Source world!"),
         ' ',
-        N("Your new Mandrake Linux distribution and its many applications are the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world."),
+        N("Your new Mandrakelinux distribution and its many applications are the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world."),
 	' ',
 	N("We would like to thank everyone who participated in the development of this latest release.")); 
diff --git a/perl-install/share/advertising/ppp-02.pl b/perl-install/share/advertising/ppp-02.pl
index 6c9eb25d5..35cf8259b 100644
--- a/perl-install/share/advertising/ppp-02.pl
+++ b/perl-install/share/advertising/ppp-02.pl
@@ -14,4 +14,4 @@ $border = 10;  #- for leftish text
         ' ',
 	N("PowerPack+ is a full-featured Linux solution for small to medium-sized networks. PowerPack+ increases the value of the standard PowerPack by adding a comprehensive selection of world-class server applications."),
 	' ',
-	N("It is the only Mandrake Linux product that includes the groupware solution.")); 
+	N("It is the only Mandrakelinux product that includes the groupware solution.")); 
diff --git a/perl-install/share/advertising/ppp-03.pl b/perl-install/share/advertising/ppp-03.pl
index 5642d6120..8343e42d3 100644
--- a/perl-install/share/advertising/ppp-03.pl
+++ b/perl-install/share/advertising/ppp-03.pl
@@ -12,4 +12,4 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Choose your graphical Desktop environment!</b>"), center => 1 ],
         ' ',
-	N("When you log into your Mandrake Linux system for the first time, you can choose between several popular graphical desktops environments, including: KDE, GNOME, WindowMaker, IceWM, and others."));
+	N("When you log into your Mandrakelinux system for the first time, you can choose between several popular graphical desktops environments, including: KDE, GNOME, WindowMaker, IceWM, and others."));
diff --git a/perl-install/share/advertising/ppp-04.pl b/perl-install/share/advertising/ppp-04.pl
index 80b104cb5..911dc5fe9 100644
--- a/perl-install/share/advertising/ppp-04.pl
+++ b/perl-install/share/advertising/ppp-04.pl
@@ -10,7 +10,7 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = (N("In the Mandrake Linux menu you will find easy-to-use applications for all tasks:"),
+@text = (N("In the Mandrakelinux menu you will find easy-to-use applications for all tasks:"),
          ' ',
          N("	- Create, edit and share office documents with <b>OpenOffice.org</b>"),
 	 N("	- Take charge of your personal data with the integrated personal information suites: <b>Kontact</b> and <b>Evolution</b>"),
diff --git a/perl-install/share/advertising/ppp-10.pl b/perl-install/share/advertising/ppp-10.pl
index 2edbfaf61..1276fa8e7 100644
--- a/perl-install/share/advertising/ppp-10.pl
+++ b/perl-install/share/advertising/ppp-10.pl
@@ -16,7 +16,7 @@ $border = 10;  #- for leftish text
 	' ',
 	N("	- Full access to commercial applications"),
 	N("	- Special download mirror list exclusively for MandrakeClub Members"),
-	N("	- Voting for software to put in Mandrake Linux"),
+	N("	- Voting for software to put in Mandrakelinux"),
 	N("	- Special discounts for products and services at MandrakeStore"),
 	N("	- Plus much more"),
 	' ',
diff --git a/perl-install/share/advertising/pwp-01.pl b/perl-install/share/advertising/pwp-01.pl
index 94dd285cd..1b00b2f38 100644
--- a/perl-install/share/advertising/pwp-01.pl
+++ b/perl-install/share/advertising/pwp-01.pl
@@ -10,10 +10,10 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Congratulations for choosing Mandrake Linux!</b>"), center => 1 ],
+@text = ([ N("<b>Congratulations for choosing Mandrakelinux!</b>"), center => 1 ],
         ' ',
 	N("Welcome to the Open Source world!"),
         ' ',
-	N("Your new Mandrake Linux distribution is the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world."),
+	N("Your new Mandrakelinux distribution is the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world."),
 	' ',
 	N("We would like to thank everyone who participated in the development of our latest release.")); 
diff --git a/perl-install/share/advertising/pwp-03.pl b/perl-install/share/advertising/pwp-03.pl
index 5642d6120..8343e42d3 100644
--- a/perl-install/share/advertising/pwp-03.pl
+++ b/perl-install/share/advertising/pwp-03.pl
@@ -12,4 +12,4 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Choose your graphical Desktop environment!</b>"), center => 1 ],
         ' ',
-	N("When you log into your Mandrake Linux system for the first time, you can choose between several popular graphical desktops environments, including: KDE, GNOME, WindowMaker, IceWM, and others."));
+	N("When you log into your Mandrakelinux system for the first time, you can choose between several popular graphical desktops environments, including: KDE, GNOME, WindowMaker, IceWM, and others."));
diff --git a/perl-install/share/advertising/pwp-04.pl b/perl-install/share/advertising/pwp-04.pl
index 5620a9cad..a96ff2096 100644
--- a/perl-install/share/advertising/pwp-04.pl
+++ b/perl-install/share/advertising/pwp-04.pl
@@ -10,7 +10,7 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = (N("In the Mandrake Linux menu you will find easy-to-use applications for all of your tasks:"),
+@text = (N("In the Mandrakelinux menu you will find easy-to-use applications for all of your tasks:"),
          ' ',
          N("	- Create, edit and share office documents with <b>OpenOffice.org</b>"),
 	 N("	- Take charge of your personal data with the integrated personal information suites <b>Kontact</b> and <b>Evolution</b>"),
diff --git a/perl-install/share/advertising/pwp-09.pl b/perl-install/share/advertising/pwp-09.pl
index f65ad95fe..f16aaeeaa 100644
--- a/perl-install/share/advertising/pwp-09.pl
+++ b/perl-install/share/advertising/pwp-09.pl
@@ -15,7 +15,7 @@ $border = 10;  #- for leftish text
 	 N("Take advantage of valuable benefits, products and services by joining MandrakeClub, such as:"),
 	 N("	- Full access to commercial applications"),
 	 N("	- Special download mirror list exclusively for MandrakeClub Members"),
-	 N("	- Voting for software to put in Mandrake Linux"),
+	 N("	- Voting for software to put in Mandrakelinux"),
 	 N("	- Special discounts for products and services at MandrakeStore"),
 	 N("	- Plus much more"),
 	 ' ',
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 675ca655c..61bfd34d4 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -1049,7 +1049,7 @@ msgstr ""
 #: any.pm:633
 #, c-format
 msgid ""
-"Mandrake Linux can support multiple languages. Select\n"
+"Mandrakelinux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
 msgstr ""
@@ -2907,7 +2907,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrake Linux distribution. If you do agree with all the\n"
+"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
 "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
 "will reboot your computer."
 msgstr ""
@@ -3005,7 +3005,7 @@ msgstr ""
 #: help.pm:86
 #, c-format
 msgid ""
-"The Mandrake Linux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the correct CD as required."
 msgstr ""
@@ -3014,12 +3014,12 @@ msgstr ""
 #, c-format
 msgid ""
 "It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrake Linux, and\n"
+"system. There are thousands of packages available for Mandrakelinux, and\n"
 "to make it simpler to manage the packages have been placed into groups of\n"
 "similar applications.\n"
 "\n"
 "Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrake Linux sorts packages groups in four categories. You can\n"
+"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
 "mix and match applications from the various categories, so a\n"
 "``Workstation'' installation can still have applications from the\n"
 "``Development'' category installed.\n"
@@ -3116,10 +3116,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you will be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrake Linux will automatically start any installed\n"
+"installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that that\n"
-"security holes were discovered after this version of Mandrake Linux was\n"
+"security holes were discovered after this version of Mandrakelinux was\n"
 "finalized. If you do not know what a particular service is supposed to do\n"
 "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
 "install the listed services and they will be started automatically by\n"
@@ -3160,7 +3160,7 @@ msgstr ""
 msgid ""
 "You will now set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrake Linux will attempt to auto-detect network devices and modems. If\n"
+"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
 "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
 "configure the network, or to do it later, in which case clicking the \"%s\"\n"
 "button will take you to the next step.\n"
@@ -3175,7 +3175,7 @@ msgid ""
 "\n"
 "About Winmodem Connection. Winmodems are special integrated low-end modems\n"
 "that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrake Linux, some others do not. You\n"
+"those modems actually work under Mandrakelinux, some others do not. You\n"
 "can consult the list of supported modems at LinModems.\n"
 "\n"
 "You can consult the ``Starter Guide'' chapter about Internet connections\n"
@@ -3269,7 +3269,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
 "You will be presented with a list of different parameters to change to get\n"
 "an optimal graphical display: Graphic Card\n"
@@ -3370,7 +3370,7 @@ msgid ""
 "if an existing operating system is using all the available space you will\n"
 "have to partition the drive. Basically, partitioning a hard drive consists\n"
 "of logically dividing it to create the space needed to install your new\n"
-"Mandrake Linux system.\n"
+"Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to lost data if there is an existing operating system already\n"
@@ -3397,7 +3397,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you have previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended.. Using this option is\n"
-"recommended if you want to use both Mandrake Linux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -3406,7 +3406,7 @@ msgid ""
 "Windows to store your data or to install new software.\n"
 "\n"
 " * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrake Linux system,\n"
+"your hard drive and replace them with your new Mandrakelinux system,\n"
 "choose this option. Be careful, because you will not be able to undo your\n"
 "choice after you confirm.\n"
 "\n"
@@ -3530,7 +3530,7 @@ msgid ""
 "Click on \"%s\" when you are ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrake Linux operating system installation.\n"
+"Mandrakelinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions that will be checked for\n"
 "bad blocks on the disk."
@@ -3544,7 +3544,7 @@ msgstr ""
 #: help.pm:447
 #, c-format
 msgid ""
-"At the time you are installing Mandrake Linux, it is likely that some\n"
+"At the time you are installing Mandrakelinux, it is likely that some\n"
 "packages will have been updated since the initial release. Bugs may have\n"
 "been fixed, security issues resolved. To allow you to benefit from these\n"
 "updates, you are now able to download them from the Internet. Check \"%s\"\n"
@@ -3589,7 +3589,7 @@ msgstr ""
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrake Linux system. If partitions have already been\n"
+"installation of your Mandrakelinux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -3675,7 +3675,7 @@ msgstr ""
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrake Linux operating system.\n"
+"Mandrakelinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -3720,7 +3720,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrake Linux system:\n"
+"of an existing Mandrakelinux system:\n"
 "\n"
 " * \"%s\": For the most part, this completely wipes out the old system. If\n"
 "you wish to change how your hard drives are partitioned, or change the file\n"
@@ -3728,13 +3728,13 @@ msgid ""
 "scheme, you can prevent some of your existing data from being over-written.\n"
 "\n"
 " * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrake Linux system. Your current\n"
+"currently installed on your Mandrakelinux system. Your current\n"
 "partitioning scheme and user data is not altered. Most of other\n"
 "configuration steps remain available, similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrake Linux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
 "running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
-"to Mandrake Linux version \"8.1\" is not recommended."
+"to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:605
@@ -3774,7 +3774,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrake Linux will be using it\n"
+"still under development. For that reason, Mandrakelinux will be using it\n"
 "or not depending on the user choices:\n"
 "\n"
 " * If you choose a languages with a strong legacy encoding (latin1\n"
@@ -3934,7 +3934,7 @@ msgid ""
 "checking this box.\n"
 "\n"
 "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
+"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
 "system! Be sure you know what you are doing before changing any of the\n"
 "options. !!\n"
 "\n"
@@ -4029,7 +4029,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
+"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
 "is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -4303,7 +4303,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrake Linux partition. Be careful, all data on this drive will be lost\n"
+"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -4481,7 +4481,7 @@ msgstr ""
 
 #: install_interactive.pm:163
 #, c-format
-msgid "Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrake Linux installation."
+msgid "Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrakelinux installation."
 msgstr ""
 
 #: install_interactive.pm:164
@@ -4581,10 +4581,10 @@ msgstr ""
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Mandrake Linux distribution \n"
+"The operating system and the different components available in the Mandrakelinux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related to the operating \n"
-"system and the different components of the Mandrake Linux distribution.\n"
+"system and the different components of the Mandrakelinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4619,7 +4619,7 @@ msgid ""
 "limitation damages for loss of business, interruption of business, financial loss, legal fees \n"
 "and penalties resulting from a court judgment, or any other consequential loss) arising out \n"
 "of the possession and use of software components or arising out of  downloading software components \n"
-"from one of Mandrake Linux sites  which are prohibited or restricted in some countries by local laws.\n"
+"from one of Mandrakelinux sites  which are prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong cryptography components \n"
 "included in the Software Products.\n"
 "\n"
@@ -4643,7 +4643,7 @@ msgid ""
 "protected by intellectual property and copyright laws applicable to software programs.\n"
 "MandrakeSoft S.A. reserves its rights to modify or adapt the Software Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of MandrakeSoft S.A.  \n"
+"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of MandrakeSoft S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -4709,7 +4709,7 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of Mandrake Linux,\n"
+"For information on fixes which are available for this release of Mandrakelinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -4717,7 +4717,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrake Linux User's Guide."
+"install chapter of the Official Mandrakelinux User's Guide."
 msgstr ""
 
 #: install_messages.pm:141
@@ -4755,7 +4755,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrake Linux. If that occurs, you can try a text install instead. For this,\n"
+"Mandrakelinux. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
@@ -5234,7 +5234,7 @@ msgstr ""
 
 #: install_steps_interactive.pm:782
 #, c-format
-msgid "Contacting Mandrake Linux web site to get the list of available mirrors..."
+msgid "Contacting Mandrakelinux web site to get the list of available mirrors..."
 msgstr ""
 
 #: install_steps_interactive.pm:787
@@ -5481,7 +5481,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrake Linux Installation %s"
+msgid "Mandrakelinux Installation %s"
 msgstr ""
 
 #: install_steps_newt.pm:33
@@ -7743,7 +7743,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrake Linux machine.\n"
+"This configures a personal firewall for this Mandrakelinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12057,7 +12057,7 @@ msgstr ""
 
 #: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13 share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
 #, c-format
-msgid "<b>Congratulations for choosing Mandrake Linux!</b>"
+msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
 msgstr ""
 
 #: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15 share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
@@ -12067,7 +12067,7 @@ msgstr ""
 
 #: share/advertising/dis-01.pl:17
 #, c-format
-msgid "Your new Mandrake Linux operating system and its many applications is the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world."
+msgid "Your new Mandrakelinux operating system and its many applications is the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world."
 msgstr ""
 
 #: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19 share/advertising/ppp-01.pl:19
@@ -12242,7 +12242,7 @@ msgstr ""
 
 #: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18 share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
 #, c-format
-msgid "\t- Voting for software to put in Mandrake Linux"
+msgid "\t- Voting for software to put in Mandrakelinux"
 msgstr ""
 
 #: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19 share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
@@ -12277,12 +12277,12 @@ msgstr ""
 
 #: share/advertising/dwd-01.pl:17
 #, c-format
-msgid "Mandrake Linux is committed to the Open Source Model and fully respects the General Public License. This new release is the result of collaboration between MandrakeSoft's team of developers and the worldwide community of Mandrake Linux contributors."
+msgid "Mandrakelinux is committed to the Open Source Model and fully respects the General Public License. This new release is the result of collaboration between MandrakeSoft's team of developers and the worldwide community of Mandrakelinux contributors."
 msgstr ""
 
 #: share/advertising/dwd-02.pl:13
 #, c-format
-msgid "<b>Join the Mandrake Linux community!</b>"
+msgid "<b>Join the Mandrakelinux community!</b>"
 msgstr ""
 
 #: share/advertising/dwd-02.pl:15
@@ -12297,22 +12297,22 @@ msgstr ""
 
 #: share/advertising/dwd-03.pl:13
 #, c-format
-msgid "<b>What is Mandrake Linux?</b>"
+msgid "<b>What is Mandrakelinux?</b>"
 msgstr ""
 
 #: share/advertising/dwd-03.pl:15
 #, c-format
-msgid "Mandrake Linux is an Open Source distribution created with thousands of the choicest applications from the Free Software world. Mandrake Linux is one of the most widely used Linux distributions worldwide!"
+msgid "Mandrakelinux is an Open Source distribution created with thousands of the choicest applications from the Free Software world. Mandrakelinux is one of the most widely used Linux distributions worldwide!"
 msgstr ""
 
 #: share/advertising/dwd-03.pl:17
 #, c-format
-msgid "Mandrake Linux includes the famous graphical desktops KDE and GNOME, plus the latest versions of the most popular Open Source applications."
+msgid "Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the latest versions of the most popular Open Source applications."
 msgstr ""
 
 #: share/advertising/dwd-04.pl:13
 #, c-format
-msgid "Mandrake Linux is widely known as the most user-friendly and the easiest to install and easy to use Linux distribution."
+msgid "Mandrakelinux is widely known as the most user-friendly and the easiest to install and easy to use Linux distribution."
 msgstr ""
 
 #: share/advertising/dwd-04.pl:15
@@ -12322,7 +12322,7 @@ msgstr ""
 
 #: share/advertising/dwd-04.pl:16
 #, c-format
-msgid "\t- Find out Mandrake Linux on a bootable CD with <b>MandrakeMove</b>"
+msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
 msgstr ""
 
 #: share/advertising/dwd-04.pl:17
@@ -12357,7 +12357,7 @@ msgstr ""
 
 #: share/advertising/dwd-05.pl:19
 #, c-format
-msgid "<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined with the stability and easy-of-use of the world-famous Mandrake Linux distribution. A unique blend for incomparable HPC performance."
+msgid "<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined with the stability and easy-of-use of the world-famous Mandrakelinux distribution. A unique blend for incomparable HPC performance."
 msgstr ""
 
 #: share/advertising/dwd-06.pl:15
@@ -12392,7 +12392,7 @@ msgstr ""
 
 #: share/advertising/dwd-09.pl:18
 #, c-format
-msgid "This is the Mandrake Linux <b>Download version</b>."
+msgid "This is the Mandrakelinux <b>Download version</b>."
 msgstr ""
 
 #: share/advertising/dwd-09.pl:20
@@ -12402,7 +12402,7 @@ msgstr ""
 
 #: share/advertising/ppp-01.pl:17
 #, c-format
-msgid "Your new Mandrake Linux distribution and its many applications are the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world."
+msgid "Your new Mandrakelinux distribution and its many applications are the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world."
 msgstr ""
 
 #: share/advertising/ppp-02.pl:13
@@ -12417,7 +12417,7 @@ msgstr ""
 
 #: share/advertising/ppp-02.pl:17
 #, c-format
-msgid "It is the only Mandrake Linux product that includes the groupware solution."
+msgid "It is the only Mandrakelinux product that includes the groupware solution."
 msgstr ""
 
 #: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
@@ -12427,12 +12427,12 @@ msgstr ""
 
 #: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
 #, c-format
-msgid "When you log into your Mandrake Linux system for the first time, you can choose between several popular graphical desktops environments, including: KDE, GNOME, WindowMaker, IceWM, and others."
+msgid "When you log into your Mandrakelinux system for the first time, you can choose between several popular graphical desktops environments, including: KDE, GNOME, WindowMaker, IceWM, and others."
 msgstr ""
 
 #: share/advertising/ppp-04.pl:13
 #, c-format
-msgid "In the Mandrake Linux menu you will find easy-to-use applications for all tasks:"
+msgid "In the Mandrakelinux menu you will find easy-to-use applications for all tasks:"
 msgstr ""
 
 #: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
@@ -12562,7 +12562,7 @@ msgstr ""
 
 #: share/advertising/pwp-01.pl:17
 #, c-format
-msgid "Your new Mandrake Linux distribution is the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world."
+msgid "Your new Mandrakelinux distribution is the result of collaborative efforts between MandrakeSoft developers and Mandrakelinux contributors throughout the world."
 msgstr ""
 
 #: share/advertising/pwp-01.pl:19
@@ -12582,7 +12582,7 @@ msgstr ""
 
 #: share/advertising/pwp-04.pl:13
 #, c-format
-msgid "In the Mandrake Linux menu you will find easy-to-use applications for all of your tasks:"
+msgid "In the Mandrakelinux menu you will find easy-to-use applications for all of your tasks:"
 msgstr ""
 
 #: share/advertising/pwp-04.pl:16
diff --git a/perl-install/share/po/help-de.pot b/perl-install/share/po/help-de.pot
index 062ca8842..d76cc25b2 100644
--- a/perl-install/share/po/help-de.pot
+++ b/perl-install/share/po/help-de.pot
@@ -10,7 +10,7 @@ msgid ""
 "if an existing operating system is using all the available space you will\n"
 "have to partition the drive. Basically, partitioning a hard drive consists\n"
 "of logically dividing it to create the space needed to install your new\n"
-"Mandrake Linux system.\n"
+"Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to lost data if there is an existing operating system already\n"
@@ -37,7 +37,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you have previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended.. Using this option is\n"
-"recommended if you want to use both Mandrake Linux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -46,7 +46,7 @@ msgid ""
 "Windows to store your data or to install new software.\n"
 "\n"
 " * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrake Linux system,\n"
+"your hard drive and replace them with your new Mandrakelinux system,\n"
 "choose this option. Be careful, because you will not be able to undo your\n"
 "choice after you confirm.\n"
 "\n"
@@ -64,11 +64,11 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Sie müssen nun entscheiden, wo auf Ihrer/n Festplatte(n) Ihr Mandrake Linux\n"
+"Sie müssen nun entscheiden, wo auf Ihrer/n Festplatte(n) Ihr Mandrakelinux\n"
 "System installiert werden soll. Sofern alles leer ist bzw. ein\n"
 "Betriebssystem alles belegt, müssen die Platte(n) neu partitioniert werden.\n"
 "Prinzipiell besteht das Partitionieren der Platte(n) darin, den\n"
-"Plattenplatz so aufzuteilen, dass Ihr Mandrake Linux darauf installiert\n"
+"Plattenplatz so aufzuteilen, dass Ihr Mandrakelinux darauf installiert\n"
 "werden kann.\n"
 "\n"
 "Da dieser Schritt normalerweise irreversibel ist, kann das Partitionieren\n"
@@ -99,7 +99,7 @@ msgstr ""
 "defragmentiert. Dennoch sollten Sie vor diesem Schritt eine Sicherungskopie\n"
 "Ihrer Daten auf einem anderem Medium als der zu verändernden Festplatte\n"
 "vornehmen. Sie sollten diese Variante wählen, falls Sie beide\n"
-"Betriebssysteme (Microsoft Windows und Mandrake Linux) nebeneinander nutzen\n"
+"Betriebssysteme (Microsoft Windows und Mandrakelinux) nebeneinander nutzen\n"
 "wollen.\n"
 "\n"
 "   Bevor Sie sich für diese Variante entscheiden, sei hier noch einmal\n"
@@ -107,7 +107,7 @@ msgstr ""
 "als momentan.\n"
 "\n"
 " * „%s“: Falls Sie alle Daten Ihrer Platte verlieren, und sie durch Ihr\n"
-"neues Mandrake Linux System ersetzen wollen, wählen Sie diese Schaltfläche.\n"
+"neues Mandrakelinux System ersetzen wollen, wählen Sie diese Schaltfläche.\n"
 "Beachten Sie, dass dieser Schritt nicht rückgängig gemacht werden kann.\n"
 "\n"
 "   !! Wenn Sie diese Variante wählen, werden alle Ihre Daten auf der Platte\n"
@@ -304,7 +304,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrake Linux system:\n"
+"of an existing Mandrakelinux system:\n"
 "\n"
 " * \"%s\": For the most part, this completely wipes out the old system. If\n"
 "you wish to change how your hard drives are partitioned, or change the file\n"
@@ -312,13 +312,13 @@ msgid ""
 "scheme, you can prevent some of your existing data from being over-written.\n"
 "\n"
 " * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrake Linux system. Your current\n"
+"currently installed on your Mandrakelinux system. Your current\n"
 "partitioning scheme and user data is not altered. Most of other\n"
 "configuration steps remain available, similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrake Linux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
 "running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
-"to Mandrake Linux version \"8.1\" is not recommended."
+"to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 "Dieser Schritt wird nur aufgerufen, wenn mindestens eine GNU/Linux\n"
 "Partition auf Ihren Festplatten gefunden wird.\n"
@@ -327,24 +327,24 @@ msgstr ""
 "Wahl zwischen einer Aktualisierung einer bereits vorhandenen Mandrake\n"
 "Linux-Version oder einer kompletten Neuinstallation:\n"
 "\n"
-" * „%s“: Entfernt komplett ältere Versionen von Mandrake Linux, die noch\n"
+" * „%s“: Entfernt komplett ältere Versionen von Mandrakelinux, die noch\n"
 "installiert sind - um genau zu sein, können Sie je nach aktuellem Inhalt\n"
 "Ihrer Platte auch einige ältere Linux- oder anderweitige Partitionen\n"
 "unangetastet behalten.\n"
 "\n"
-" * „%s“: Mit dieser Variante können Sie eine existierende Mandrake Linux\n"
+" * „%s“: Mit dieser Variante können Sie eine existierende Mandrakelinux\n"
 "Version aktualisieren. Die Partitionstabellen sowie die persönlichen\n"
 "Verzeichnisse der Anwender bleiben erhalten. Alle anderen\n"
 "Installationsschritte werden wie bei einer Installation ausgeführt.\n"
 "\n"
-"Aktualisierungen von Mandrake Linux „8.1“ oder neueren Systemen sollten\n"
-"problemlos funktionieren. Ältere Versionen von Mandrake Linux sollten Sie\n"
+"Aktualisierungen von Mandrakelinux „8.1“ oder neueren Systemen sollten\n"
+"problemlos funktionieren. Ältere Versionen von Mandrakelinux sollten Sie\n"
 "nicht zu aktualisieren versuchen."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
-"At the time you are installing Mandrake Linux, it is likely that some\n"
+"At the time you are installing Mandrakelinux, it is likely that some\n"
 "packages will have been updated since the initial release. Bugs may have\n"
 "been fixed, security issues resolved. To allow you to benefit from these\n"
 "updates, you are now able to download them from the Internet. Check \"%s\"\n"
@@ -356,7 +356,7 @@ msgid ""
 "appear: review the selection, and press \"%s\" to retrieve and install the\n"
 "selected package(s), or \"%s\" to abort."
 msgstr ""
-"Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandrake Linux\n"
+"Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandrakelinux\n"
 "Installation bereits einige Pakete aktualisiert wurden, etwa da noch Fehler\n"
 "entdeckt und beseitigt wurden oder da in Paketen Sicherheitslücken entdeckt\n"
 "wurden, für die bereits Lösungen existieren. Um von diesen aktualisierten\n"
@@ -403,7 +403,7 @@ msgid ""
 "checking this box.\n"
 "\n"
 "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
+"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
 "system! Be sure you know what you are doing before changing any of the\n"
 "options. !!\n"
 "\n"
@@ -439,7 +439,7 @@ msgstr ""
 "versuchen, APIC zu deaktivieren, indem Sie diese Markierung löschen.\n"
 "\n"
 "!! Machen Sie sich klar, dass Sie sich selbst darum kümmern müssen,\n"
-"irgendwie Ihr Mandrake Linux-System zu starten, wenn Sie hier keinen\n"
+"irgendwie Ihr Mandrakelinux-System zu starten, wenn Sie hier keinen\n"
 "Betriebssystemstarter installieren (durch Auswahl von „%s“). Stellen Sie\n"
 "auch sicher, dass Sie wissen was Sie tun, wenn Sie hier Einstellungen\n"
 "verändern ... !!\n"
@@ -452,7 +452,7 @@ msgstr ""
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrake Linux operating system.\n"
+"Mandrakelinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -481,7 +481,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Es wurde mehr als eine Windows-Partition gefunden. Wählen Sie bitte, welche\n"
-"Sie verkleinern wollen, um Platz für Ihr neues Mandrake Linux zu schaffen.\n"
+"Sie verkleinern wollen, um Platz für Ihr neues Mandrakelinux zu schaffen.\n"
 "\n"
 "Die Partitionen werden folgendermaßen aufgelistet: „Linux-Name“,\n"
 "„Windows-Name“, „Kapazität“.\n"
@@ -514,7 +514,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
 "You will be presented with a list of different parameters to change to get\n"
 "an optimal graphical display: Graphic Card\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 "X (das X Window System) ist das Herz der grafischen Benutzeroberfläche von\n"
 "GNU/Linux. Es bildet die Grundlage für die Vielzahl grafischer\n"
-"Benutzerumgebungen, die Mandrake Linux Ihnen anbietet (wie etwa KDE, GNOME,\n"
+"Benutzerumgebungen, die Mandrakelinux Ihnen anbietet (wie etwa KDE, GNOME,\n"
 "AfterStep oder WindowMaker). Auch hier wird DrakX die Konfiguration soweit\n"
 "wie möglich selbstständig vollziehen.\n"
 "\n"
@@ -631,7 +631,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
 "Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
+"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
 "is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -656,7 +656,7 @@ msgid ""
 "Center and clicking the expert button."
 msgstr ""
 "Hier können Sie das Drucksystem für Ihren Rechner wählen. Andere\n"
-"Betriebssysteme bieten Ihnen nur eines, bei Mandrake Linux können Sie\n"
+"Betriebssysteme bieten Ihnen nur eines, bei Mandrakelinux können Sie\n"
 "zwischen zwei verschiedenen wählen.\n"
 "\n"
 " * „%s“ - Es steht für „print, don't queue“ (engl. für „Drucken ohne\n"
@@ -683,12 +683,12 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
 "It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrake Linux, and\n"
+"system. There are thousands of packages available for Mandrakelinux, and\n"
 "to make it simpler to manage the packages have been placed into groups of\n"
 "similar applications.\n"
 "\n"
 "Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrake Linux sorts packages groups in four categories. You can\n"
+"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
 "mix and match applications from the various categories, so a\n"
 "``Workstation'' installation can still have applications from the\n"
 "``Development'' category installed.\n"
@@ -731,7 +731,7 @@ msgid ""
 "updating an existing system."
 msgstr ""
 "Nun ist es Zeit sich zu entscheiden, welche Programme Sie auf Ihrem Rechner\n"
-"installieren wollen. Es gibt tausende von Paketen für Mandrake Linux, und\n"
+"installieren wollen. Es gibt tausende von Paketen für Mandrakelinux, und\n"
 "Sie müssen sie nicht alle auswendig kennen.\n"
 "\n"
 "Die Pakete sind nach ihrer Verwendung in vier Kategorien eingeteilt. Sie\n"
@@ -779,11 +779,11 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
-"The Mandrake Linux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the correct CD as required."
 msgstr ""
-"Da die Mandrake Linux-Distribution stetig wächst, wurde sie in mehrere\n"
+"Da die Mandrakelinux-Distribution stetig wächst, wurde sie in mehrere\n"
 "CD-ROMs unterteilt. Es kann daher vorkommen, dass DrakX Pakete von anderen,\n"
 "als der Installations-CD-ROM installieren will. In diesem Fall wird es die\n"
 "aktuelle CD auswerfen und nach einer anderen fragen."
@@ -828,7 +828,7 @@ msgid ""
 "will never be connected to the Internet and you absolutely trust everybody\n"
 "who uses your computer, you can choose to have \"%s\"."
 msgstr ""
-"Sie können nun das »root« Passwort für Ihr Mandrake Linux System eingeben.\n"
+"Sie können nun das »root« Passwort für Ihr Mandrakelinux System eingeben.\n"
 "\n"
 "»root« ist das Benutzerkennzeichen des Systemadministrators. Er ist der\n"
 "einzige der berechtigt ist, neue Software zu installieren, Systemdateien zu\n"
@@ -902,10 +902,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you will be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrake Linux will automatically start any installed\n"
+"installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that that\n"
-"security holes were discovered after this version of Mandrake Linux was\n"
+"security holes were discovered after this version of Mandrakelinux was\n"
 "finalized. If you do not know what a particular service is supposed to do\n"
 "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
 "install the listed services and they will be started automatically by\n"
@@ -940,7 +940,7 @@ msgstr ""
 "!! Es kommt vor, dass Server- und Dienst-Pakete angewählt wurden - entweder\n"
 "absichtlich, oder als Paket einer ganzen Gruppe; sollte das der Fall sein,\n"
 "werden Sie nun gefragt, ob Sie diese wirklich installiert haben wollen.\n"
-"Unter Mandrake Linux werden installierte Server und Dienste automatisch\n"
+"Unter Mandrakelinux werden installierte Server und Dienste automatisch\n"
 "beim Betriebssystemstart gestartet. Selbst wenn zum Zeitpunkt, als die\n"
 "Distribution zusammengestellt wurde, keine Sicherheitslücken oder Fehler in\n"
 "diesen Paketen bekannt waren, ist natürlich nicht auszuschließen, dass\n"
@@ -1152,7 +1152,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrake Linux will be using it\n"
+"still under development. For that reason, Mandrakelinux will be using it\n"
 "or not depending on the user choices:\n"
 "\n"
 " * If you choose a languages with a strong legacy encoding (latin1\n"
@@ -1191,7 +1191,7 @@ msgstr ""
 "Über UTF-8 (Unicode) Unterstützung: Unicode ist ein Zeichenkodierung, die\n"
 "die existierenden Kodierungen ablösen soll und die Zeichen aller\n"
 "existierender Sprachen beinhalten. Komplette Unterstützung in GNU/Linux ist\n"
-"leider immer noch nicht gegeben. Daher verwendet Mandrake Linux diese\n"
+"leider immer noch nicht gegeben. Daher verwendet Mandrakelinux diese\n"
 "Kodierung je nach Wahl des Anwenders:\n"
 "\n"
 " * Falls Sie eine Sprache nutzen, die eine gut unterstütztes Kodierung\n"
@@ -1269,11 +1269,11 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrake Linux partition. Be careful, all data on this drive will be lost\n"
+"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Bitte wählen Sie die Festplatte, die Sie löschen wollen, um Ihr neues\n"
-"Mandrake Linux zu installieren. Bedenken Sie dabei, dass alle Daten auf\n"
+"Mandrakelinux zu installieren. Bedenken Sie dabei, dass alle Daten auf\n"
 "dieser Platte nach diesem Schritt unwiederbringlich verloren sind!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1473,7 +1473,7 @@ msgstr ""
 "wählen Sie diese Schaltfläche. Es sei angemerkt, dass dieser Punkt sich an\n"
 "fortgeschrittenere Nutzer richtet.\n"
 "\n"
-" * Sie können hier die Dienste wählen, die ab dem Start von Mandrake Linux\n"
+" * Sie können hier die Dienste wählen, die ab dem Start von Mandrakelinux\n"
 "zur Verfügung gestellt werden sollen. Wollen Sie den Rechner als Server\n"
 "verwenden, sollten Sie unbedingt einen Blick auf diese Liste werfen."
 
@@ -1550,7 +1550,7 @@ msgstr ""
 msgid ""
 "You will now set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrake Linux will attempt to auto-detect network devices and modems. If\n"
+"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
 "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
 "configure the network, or to do it later, in which case clicking the \"%s\"\n"
 "button will take you to the next step.\n"
@@ -1565,7 +1565,7 @@ msgid ""
 "\n"
 "About Winmodem Connection. Winmodems are special integrated low-end modems\n"
 "that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrake Linux, some others do not. You\n"
+"those modems actually work under Mandrakelinux, some others do not. You\n"
 "can consult the list of supported modems at LinModems.\n"
 "\n"
 "You can consult the ``Starter Guide'' chapter about Internet connections\n"
@@ -1592,7 +1592,7 @@ msgstr ""
 "Verwendung von Winmodems Winmodems sind eigentlich keine Modems, die den\n"
 "Namen verdienen, da sie die CPU Ihres Rechners benötigen, um funktionieren\n"
 "zu können, was die Rechenleistung für anderen Prozesse vermindert. Einige\n"
-"dieser Modems können Sie mittlerweile unter Mandrake Linux zum\n"
+"dieser Modems können Sie mittlerweile unter Mandrakelinux zum\n"
 "Funktionieren bewegen, die Mehrzahl jedoch nicht. Unter LinModems finden\n"
 "Sie eine Liste.\n"
 "\n"
@@ -1628,12 +1628,12 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrake Linux distribution. If you do agree with all the\n"
+"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
 "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
 "will reboot your computer."
 msgstr ""
 "Lesen Sie bitte aufmerksam die Lizenz, bevor Sie fortfahren. Sie umfasst\n"
-"die gesamte Mandrake Linux Distribution. Sollten Sie nicht in allen Punkten\n"
+"die gesamte Mandrakelinux Distribution. Sollten Sie nicht in allen Punkten\n"
 "zustimmen, betätigen Sie bitte die Schaltfläche „%s“, um die Installation\n"
 "abzubrechen. Um mit der Installation fortzufahren, betätigen Sie die\n"
 "Schaltfläche „%s“."
@@ -1821,7 +1821,7 @@ msgid ""
 "Click on \"%s\" when you are ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrake Linux operating system installation.\n"
+"Mandrakelinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions that will be checked for\n"
 "bad blocks on the disk."
@@ -1957,7 +1957,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrake Linux system. If partitions have already been\n"
+"installation of your Mandrakelinux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
diff --git a/perl-install/share/po/help-es.pot b/perl-install/share/po/help-es.pot
index 8586fccda..30cbe6006 100644
--- a/perl-install/share/po/help-es.pot
+++ b/perl-install/share/po/help-es.pot
@@ -10,7 +10,7 @@ msgid ""
 "if an existing operating system is using all the available space you will\n"
 "have to partition the drive. Basically, partitioning a hard drive consists\n"
 "of logically dividing it to create the space needed to install your new\n"
-"Mandrake Linux system.\n"
+"Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to lost data if there is an existing operating system already\n"
@@ -37,7 +37,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you have previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended.. Using this option is\n"
-"recommended if you want to use both Mandrake Linux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -46,7 +46,7 @@ msgid ""
 "Windows to store your data or to install new software.\n"
 "\n"
 " * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrake Linux system,\n"
+"your hard drive and replace them with your new Mandrakelinux system,\n"
 "choose this option. Be careful, because you will not be able to undo your\n"
 "choice after you confirm.\n"
 "\n"
@@ -65,11 +65,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Ahora necesita elegir el lugar de su disco rígido donde se instalará su\n"
-"sistema operativo Mandrake Linux. Si su disco rígido está vacío o si un\n"
+"sistema operativo Mandrakelinux. Si su disco rígido está vacío o si un\n"
 "sistema operativo existente está utilizando todo el espacio disponible,\n"
 "necesitará particionar el disco. Básicamente, particionar un disco rígido\n"
 "consiste en dividirlo lógicamente para crear espacio para instalar su\n"
-"sistema Mandrake Linux nuevo.\n"
+"sistema Mandrakelinux nuevo.\n"
 "\n"
 "Debido a que el proceso de particionado de un disco rígido por lo general\n"
 "es irreversible y puede llevar a pérdida de datos si ya hay un sistema\n"
@@ -99,7 +99,7 @@ msgstr ""
 "realizar sin la pérdida de datos, siempre y cuando Usted haya\n"
 "desfragmentado con anterioridad la partición Windows. Es altamente\n"
 "recomendable hacer una copia de respaldo de sus datos. Se recomienda usar\n"
-"esta solución si desea utilizar tanto Mandrake Linux como Microsoft Windows\n"
+"esta solución si desea utilizar tanto Mandrakelinux como Microsoft Windows\n"
 "en la misma computadora.\n"
 "\n"
 "   Antes de elegir esta opción, por favor comprenda que después de este\n"
@@ -300,7 +300,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrake Linux system:\n"
+"of an existing Mandrakelinux system:\n"
 "\n"
 " * \"%s\": For the most part, this completely wipes out the old system. If\n"
 "you wish to change how your hard drives are partitioned, or change the file\n"
@@ -308,19 +308,19 @@ msgid ""
 "scheme, you can prevent some of your existing data from being over-written.\n"
 "\n"
 " * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrake Linux system. Your current\n"
+"currently installed on your Mandrakelinux system. Your current\n"
 "partitioning scheme and user data is not altered. Most of other\n"
 "configuration steps remain available, similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrake Linux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
 "running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
-"to Mandrake Linux version \"8.1\" is not recommended."
+"to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 "Este paso se activa sólo si se encontró una partición GNU/Linux antigua en\n"
 "su máquina.\n"
 "\n"
 "DrakX ahora necesita saber si desea realizar una instalación nueva o una\n"
-"actualización de un sistema Mandrake Linux existente:\n"
+"actualización de un sistema Mandrakelinux existente:\n"
 "\n"
 " * \"%s\": Esta opción borrará prácticamente por completo el sistema\n"
 "anterior. Si desea cambiar la forma en que se particionan sus discos, o\n"
@@ -329,21 +329,21 @@ msgstr ""
 "sobre-escriban algunos datos existentes.\n"
 "\n"
 " * \"%s\": Esta clase de instalación le permite actualizar los paquetes que\n"
-"en este momento están instalados en su sistema Mandrake Linux. No se\n"
+"en este momento están instalados en su sistema Mandrakelinux. No se\n"
 "alteran las particiones corrientes de sus discos ni los datos de los\n"
 "usuarios. La mayoría de los otros pasos de configuración permanecen\n"
 "disponibles, de manera similar a lo que ocurre con una instalación\n"
 "estándar.\n"
 "\n"
 "El uso de la opción \"Actualizar\" debería funcionar sin problemas para los\n"
-"sistemas Mandrake Linux que corren la versión \"8.1\" o una posterior. No\n"
+"sistemas Mandrakelinux que corren la versión \"8.1\" o una posterior. No\n"
 "se recomienda realizar una actualización sobre versiones anteriores a\n"
-"Mandrake Linux versión \"8.1\"."
+"Mandrakelinux versión \"8.1\"."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
-"At the time you are installing Mandrake Linux, it is likely that some\n"
+"At the time you are installing Mandrakelinux, it is likely that some\n"
 "packages will have been updated since the initial release. Bugs may have\n"
 "been fixed, security issues resolved. To allow you to benefit from these\n"
 "updates, you are now able to download them from the Internet. Check \"%s\"\n"
@@ -355,7 +355,7 @@ msgid ""
 "appear: review the selection, and press \"%s\" to retrieve and install the\n"
 "selected package(s), or \"%s\" to abort."
 msgstr ""
-"Es probable que cuando instale Mandrake Linux algunos paquetes se hayan\n"
+"Es probable que cuando instale Mandrakelinux algunos paquetes se hayan\n"
 "actualizado desde la publicación inicial. Se pueden haber corregido algunos\n"
 "errores y solucionado problemas de seguridad. Para permitir que Usted se\n"
 "beneficie de estas actualizaciones, ahora se le propone transferirlas desde\n"
@@ -398,7 +398,7 @@ msgid ""
 "checking this box.\n"
 "\n"
 "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
+"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
 "system! Be sure you know what you are doing before changing any of the\n"
 "options. !!\n"
 "\n"
@@ -433,7 +433,7 @@ msgstr ""
 "\n"
 "!! Tenga presente que si no elige instalar un cargador de arranque\n"
 "(seleccionando \"%s\"), ¡debe asegurarse que tiene una forma de arrancar a\n"
-"su sistema Mandrake Linux! También debe asegurarse que sabe lo que hace\n"
+"su sistema Mandrakelinux! También debe asegurarse que sabe lo que hace\n"
 "antes de cambiar cualquier opción. !!\n"
 "\n"
 "Haciendo clic sobre el botón \"%s\" en este diálogo se le ofrecerán\n"
@@ -444,7 +444,7 @@ msgstr ""
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrake Linux operating system.\n"
+"Mandrakelinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -474,7 +474,7 @@ msgid ""
 msgstr ""
 "Se ha detectado más de una partición Microsoft Windows en su disco rígido.\n"
 "Por favor, elija aquella a la cual desea cambiar el tamaño para poder\n"
-"instalar su sistema operativo Mandrake Linux nuevo.\n"
+"instalar su sistema operativo Mandrakelinux nuevo.\n"
 "\n"
 "Cada partición se lista como sigue: \"Nombre Linux\", \"Nombre Windows\",\n"
 "\"Capacidad\".\n"
@@ -511,7 +511,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
 "You will be presented with a list of different parameters to change to get\n"
 "an optimal graphical display: Graphic Card\n"
@@ -565,7 +565,7 @@ msgid ""
 msgstr ""
 "X (por \"X Window System\") es el corazón de la interfaz gráfica de\n"
 "GNU/Linux en el que se apoyan todos los entornos gráficos (KDE, GNOME,\n"
-"AfterStep, WindowMaker, etc.) que se incluyen con Mandrake Linux.\n"
+"AfterStep, WindowMaker, etc.) que se incluyen con Mandrakelinux.\n"
 "\n"
 "Se le presentará la lista de parámetros diferentes a cambiar para obtener\n"
 "una presentación gráfica óptima: Tarjeta gráfica\n"
@@ -622,7 +622,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
 "Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
+"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
 "is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -677,12 +677,12 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
 "It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrake Linux, and\n"
+"system. There are thousands of packages available for Mandrakelinux, and\n"
 "to make it simpler to manage the packages have been placed into groups of\n"
 "similar applications.\n"
 "\n"
 "Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrake Linux sorts packages groups in four categories. You can\n"
+"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
 "mix and match applications from the various categories, so a\n"
 "``Workstation'' installation can still have applications from the\n"
 "``Development'' category installed.\n"
@@ -725,12 +725,12 @@ msgid ""
 "updating an existing system."
 msgstr ""
 "Ahora es el momento de especificar los programas que desea instalar en su\n"
-"sistema. Hay miles de paquetes disponibles para Mandrake Linux, y para\n"
+"sistema. Hay miles de paquetes disponibles para Mandrakelinux, y para\n"
 "hacer más simple el manejo de los paquetes, los mismos se han puesto en\n"
 "grupos de aplicaciones similares.\n"
 "\n"
 "Los paquetes se clasifican en grupos que corresponden a un uso particular\n"
-"de su máquina. Mandrake Linux clasifica los grupos de paquetes en cuatro\n"
+"de su máquina. Mandrakelinux clasifica los grupos de paquetes en cuatro\n"
 "categorías. Puede mezclar y hacer coincidir aplicaciones de varias\n"
 "categorías, por lo que una instalación de \"Estación de trabajo\" puede\n"
 "tener instaladas aplicaciones de la categoría \"Desarrollo\".\n"
@@ -775,11 +775,11 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
-"The Mandrake Linux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the correct CD as required."
 msgstr ""
-"La instalación de Mandrake Linux se distribuye en varios CD-ROM. Si un\n"
+"La instalación de Mandrakelinux se distribuye en varios CD-ROM. Si un\n"
 "paquete seleccionado se encuentra en otro CD-ROM, DrakX expulsará el CD\n"
 "corriente y le pedirá que inserte el CD correcto según sea necesario."
 
@@ -897,10 +897,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you will be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrake Linux will automatically start any installed\n"
+"installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that that\n"
-"security holes were discovered after this version of Mandrake Linux was\n"
+"security holes were discovered after this version of Mandrakelinux was\n"
 "finalized. If you do not know what a particular service is supposed to do\n"
 "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
 "install the listed services and they will be started automatically by\n"
@@ -934,12 +934,12 @@ msgstr ""
 "!! Si ha sido seleccionado un paquete de servidor ya sea porque Usted\n"
 "seleccionó específicamente el paquete individual o porque el mismo era\n"
 "parte de un grupo de paquetes, se le pedirá que confirme que realmente\n"
-"desea que se instalen esos servidores. Bajo Mandrake Linux, cualquier\n"
+"desea que se instalen esos servidores. Bajo Mandrakelinux, cualquier\n"
 "servidor instalado se inicia de manera predeterminada al momento del\n"
 "arranque. Aunque estos son seguros y no tienen problemas conocidos al\n"
 "momento en que se publicó la distribución, es posible que se descubran\n"
 "vulnerabilidades en la seguridad luego que se terminó con esta versión de\n"
-"Mandrake Linux. En particular, si no sabe que es lo que se supone que hace\n"
+"Mandrakelinux. En particular, si no sabe que es lo que se supone que hace\n"
 "un servicio o la razón por la cual se está instalando, entonces haga clic\n"
 "sobre \"%s\". Si hace clic sobre \"%s\" se instalarán todos los servicios\n"
 "listados y de manera predeterminada los mismos arrancarán automáticamente.\n"
@@ -1146,7 +1146,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrake Linux will be using it\n"
+"still under development. For that reason, Mandrakelinux will be using it\n"
 "or not depending on the user choices:\n"
 "\n"
 " * If you choose a languages with a strong legacy encoding (latin1\n"
@@ -1188,7 +1188,7 @@ msgstr ""
 "Acerca del soporte UTF-8 (Unicode): Unicode es una codificación nueva de\n"
 "caracteres que pretende cubrir todos los idiomas existentes. Sin embargo,\n"
 "el soporte completo para Unicode bajo GNU/Linux todavía está en desarrollo.\n"
-"Por esta razón, Mandrake Linux lo usará o no dependiendo de las elecciones\n"
+"Por esta razón, Mandrakelinux lo usará o no dependiendo de las elecciones\n"
 "del usuario:\n"
 "\n"
 " * Si elige un idioma con codificación legada fuerte (idiomas latin1, ruso,\n"
@@ -1266,11 +1266,11 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrake Linux partition. Be careful, all data on this drive will be lost\n"
+"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Elija la unidad de disco que desea borrar para instalar su partición\n"
-"Mandrake Linux nueva. Tenga cuidado, ¡se perderán todos los datos presentes\n"
+"Mandrakelinux nueva. Tenga cuidado, ¡se perderán todos los datos presentes\n"
 "en dicha unidad de disco y no se podrán recuperar!."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1552,7 +1552,7 @@ msgstr ""
 msgid ""
 "You will now set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrake Linux will attempt to auto-detect network devices and modems. If\n"
+"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
 "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
 "configure the network, or to do it later, in which case clicking the \"%s\"\n"
 "button will take you to the next step.\n"
@@ -1567,7 +1567,7 @@ msgid ""
 "\n"
 "About Winmodem Connection. Winmodems are special integrated low-end modems\n"
 "that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrake Linux, some others do not. You\n"
+"those modems actually work under Mandrakelinux, some others do not. You\n"
 "can consult the list of supported modems at LinModems.\n"
 "\n"
 "You can consult the ``Starter Guide'' chapter about Internet connections\n"
@@ -1576,7 +1576,7 @@ msgid ""
 msgstr ""
 "Ahora configurará su conexión de red/Internet. Haga clic sobre \"%s\" si\n"
 "desea conectar su computadora a la Internet o a una red de área local.\n"
-"Mandrake Linux intentará detectar automáticamente los dispositivos de red y\n"
+"Mandrakelinux intentará detectar automáticamente los dispositivos de red y\n"
 "módems. Si esta detección falla, quite la marca de la casilla \"%s\".\n"
 "También puede elegir no configurar la red, o hacerlo más tarde, en cuyo\n"
 "caso hacer clic sobre el botón \"%s\" lo llevará al paso siguiente.\n"
@@ -1595,7 +1595,7 @@ msgstr ""
 "Acerca de la conexión con Winmodems. Los Winmodem son módems de gama baja,\n"
 "especiales e integrados, que necesitan un software adicional para funcionar\n"
 "a diferencia de los módem normales. En realidad, algunos de esos módem\n"
-"funcionan bajo Mandrake Linux y otros no. Puede consultar la lista de módem\n"
+"funcionan bajo Mandrakelinux y otros no. Puede consultar la lista de módem\n"
 "soportados en LinModems.\n"
 "\n"
 "Puede consultar el capítulo de \"Guía de Comienzo\" sobre las conexiones a\n"
@@ -1630,12 +1630,12 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrake Linux distribution. If you do agree with all the\n"
+"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
 "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
 "will reboot your computer."
 msgstr ""
 "Antes de continuar, debería leer cuidadosamente los términos de la\n"
-"licencia. La misma cubre a toda la distribución Mandrake Linux. Si está de\n"
+"licencia. La misma cubre a toda la distribución Mandrakelinux. Si está de\n"
 "acuerdo con todos los términos en la misma, marque la casilla \"%s\". Si\n"
 "no, simplemente apague su computadora."
 
@@ -1825,7 +1825,7 @@ msgid ""
 "Click on \"%s\" when you are ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrake Linux operating system installation.\n"
+"Mandrakelinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions that will be checked for\n"
 "bad blocks on the disk."
@@ -1850,7 +1850,7 @@ msgstr ""
 "Haga clic sobre \"%s\" cuando esté listo para formatear las particiones.\n"
 "\n"
 "Haga clic sobre \"%s\" si desea elegir otra partición para la instalación\n"
-"de su sistema operativo Mandrake Linux nuevo.\n"
+"de su sistema operativo Mandrakelinux nuevo.\n"
 "\n"
 "Haga clic sobre \"%s\" si desea seleccionar las particiones del disco en\n"
 "las que se buscarán bloques defectuosos."
@@ -1959,7 +1959,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrake Linux system. If partitions have already been\n"
+"installation of your Mandrakelinux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -2030,7 +2030,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Ahora necesita elegir qué particiones se utilizarán para la instalación de\n"
-"su sistema Mandrake Linux. Si ya se han definido particiones, ya sea por\n"
+"su sistema Mandrakelinux. Si ya se han definido particiones, ya sea por\n"
 "una instalación previa de GNU/Linux o con otra herramienta de particionado,\n"
 "puede utilizarlas. De lo contrario, se deben definir particiones en el\n"
 "disco rígido.\n"
diff --git a/perl-install/share/po/help-fr.pot b/perl-install/share/po/help-fr.pot
index 1c04acfc6..2fd5038bd 100644
--- a/perl-install/share/po/help-fr.pot
+++ b/perl-install/share/po/help-fr.pot
@@ -10,7 +10,7 @@ msgid ""
 "if an existing operating system is using all the available space you will\n"
 "have to partition the drive. Basically, partitioning a hard drive consists\n"
 "of logically dividing it to create the space needed to install your new\n"
-"Mandrake Linux system.\n"
+"Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to lost data if there is an existing operating system already\n"
@@ -37,7 +37,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you have previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended.. Using this option is\n"
-"recommended if you want to use both Mandrake Linux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -46,7 +46,7 @@ msgid ""
 "Windows to store your data or to install new software.\n"
 "\n"
 " * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrake Linux system,\n"
+"your hard drive and replace them with your new Mandrakelinux system,\n"
 "choose this option. Be careful, because you will not be able to undo your\n"
 "choice after you confirm.\n"
 "\n"
@@ -65,7 +65,7 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Cette étape vous permet de déterminer précisément l'emplacement de votre\n"
-"installation de Mandrake Linux. Si votre disque est vide ou utilisé par un\n"
+"installation de Mandrakelinux. Si votre disque est vide ou utilisé par un\n"
 "autre système d'exploitation, vous devrez repartitionner votre disque.\n"
 "Partitionner un disque désigne l'opération consistant à le diviser\n"
 "précisément afin de créer un espace pour votre installation.\n"
@@ -95,7 +95,7 @@ msgstr ""
 "Le redimensionnement peut être effectué sans pertes de données, à condition\n"
 "que vous ayez préalablement défragmenté la partition Windows. Une\n"
 "sauvegarde de vos données ne fera pas de mal non plus. Cette solution est\n"
-"recommandée pour faire cohabiter Mandrake Linux and Microsoft Windows sur\n"
+"recommandée pour faire cohabiter Mandrakelinux and Microsoft Windows sur\n"
 "le même ordinateur.\n"
 "\n"
 "   Avant de choisir cette option, il faut comprendre qu'après cette\n"
@@ -105,7 +105,7 @@ msgstr ""
 "\n"
 " * « %s »: si vous voulez effacer toutes les données et les applications\n"
 "installées sur votre système et les remplacer par votre nouveau système\n"
-"Mandrake Linux, choisissez cette option. Soyez prudent, car ce choix est\n"
+"Mandrakelinux, choisissez cette option. Soyez prudent, car ce choix est\n"
 "irréversible et permanent. Il vous sera impossible de retrouver vos données\n"
 "effacées.\n"
 "\n"
@@ -298,7 +298,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrake Linux system:\n"
+"of an existing Mandrakelinux system:\n"
 "\n"
 " * \"%s\": For the most part, this completely wipes out the old system. If\n"
 "you wish to change how your hard drives are partitioned, or change the file\n"
@@ -306,13 +306,13 @@ msgid ""
 "scheme, you can prevent some of your existing data from being over-written.\n"
 "\n"
 " * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrake Linux system. Your current\n"
+"currently installed on your Mandrakelinux system. Your current\n"
 "partitioning scheme and user data is not altered. Most of other\n"
 "configuration steps remain available, similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrake Linux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
 "running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
-"to Mandrake Linux version \"8.1\" is not recommended."
+"to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 "Cette étape ne s'affiche que si une partition GNU/Linux a été détectée sur\n"
 "votre disque dur.\n"
@@ -322,14 +322,14 @@ msgstr ""
 "qui limite le nombre de questions à l'utilisateur au minimum ou « %s » qui\n"
 "vous permet de sélectionner individuellement chacune des composantes à\n"
 "installer. Il vous est également proposé de faire une « %s » ou une « %s »\n"
-"d'un système Mandrake Linux déjà installé :\n"
+"d'un système Mandrakelinux déjà installé :\n"
 "\n"
 " * « %s » : Remplace l'ancien système. En fait, selon ce que votre machine\n"
 "comporte, vous pourrez garder intactes certaines des anciennes partitions\n"
 "(Linux ou autres) ;\n"
 "\n"
 " * « %s » : cette classe d'installation permet de mettre à jour seulement\n"
-"les paquetages qui composent votre système Mandrake Linux. Elle conserve\n"
+"les paquetages qui composent votre système Mandrakelinux. Elle conserve\n"
 "les partitions existantes, ainsi que la configuration des utilisateurs. La\n"
 "plupart des autres étapes d'une installation classique sont accessibles.\n"
 "\n"
@@ -342,7 +342,7 @@ msgstr ""
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrake Linux operating system.\n"
+"Mandrakelinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -372,7 +372,7 @@ msgid ""
 msgstr ""
 "Plus d'une partition Windows a été détectée sur votre disque dur. Veuillez\n"
 "choisir celle que vous choisissez pour votre nouvelle installation de\n"
-"Mandrake Linux.\n"
+"Mandrakelinux.\n"
 "\n"
 "Chaque partition est identifiée comme suit: \"Nom linux\", \"Nom Windows\",\n"
 "\"Capacité\".\n"
@@ -431,7 +431,7 @@ msgid ""
 "checking this box.\n"
 "\n"
 "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
+"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
 "system! Be sure you know what you are doing before changing any of the\n"
 "options. !!\n"
 "\n"
@@ -476,7 +476,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
-"At the time you are installing Mandrake Linux, it is likely that some\n"
+"At the time you are installing Mandrakelinux, it is likely that some\n"
 "packages will have been updated since the initial release. Bugs may have\n"
 "been fixed, security issues resolved. To allow you to benefit from these\n"
 "updates, you are now able to download them from the Internet. Check \"%s\"\n"
@@ -488,7 +488,7 @@ msgid ""
 "appear: review the selection, and press \"%s\" to retrieve and install the\n"
 "selected package(s), or \"%s\" to abort."
 msgstr ""
-"Au moment où vous êtes en train d'installer Mandrake Linux, il est possible\n"
+"Au moment où vous êtes en train d'installer Mandrakelinux, il est possible\n"
 "que certains paquetages aient été mis à jour depuis la sortie du produit.\n"
 "Des bogues ont pu être corrigés, et des problèmes de sécurité résolus. Pour\n"
 "vous permettre de bénéficier de ces mises à jour, il vous est maintenant\n"
@@ -507,7 +507,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
 "You will be presented with a list of different parameters to change to get\n"
 "an optimal graphical display: Graphic Card\n"
@@ -561,7 +561,7 @@ msgid ""
 msgstr ""
 "X (pour le système X Window) est le coeur de votre interface graphique sous\n"
 "GNU/Linux. Tous les environnements graphiques (KDE, GNOME, WindowMaker\n"
-"etc.) présents sur Mandrake Linux dépendent de X.\n"
+"etc.) présents sur Mandrakelinux dépendent de X.\n"
 "\n"
 "Il vous sera présenté une liste de divers paramètres à changer pour obtenir\n"
 "un affichage optimal : Carte graphique\n"
@@ -619,7 +619,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
 "Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
+"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
 "is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -644,7 +644,7 @@ msgid ""
 "Center and clicking the expert button."
 msgstr ""
 "Il faut choisir ici un système d'impression pour votre ordinateur. D'autres\n"
-"OSs en offrent un, Mandrake Linux en propose deux.\n"
+"OSs en offrent un, Mandrakelinux en propose deux.\n"
 "\n"
 " * « %s » - qui veut dire « print, don't queue », (ou, impression sans\n"
 "passer par la file d'attente) est un bon choix si votre imprimante est\n"
@@ -671,12 +671,12 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
 "It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrake Linux, and\n"
+"system. There are thousands of packages available for Mandrakelinux, and\n"
 "to make it simpler to manage the packages have been placed into groups of\n"
 "similar applications.\n"
 "\n"
 "Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrake Linux sorts packages groups in four categories. You can\n"
+"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
 "mix and match applications from the various categories, so a\n"
 "``Workstation'' installation can still have applications from the\n"
 "``Development'' category installed.\n"
@@ -719,12 +719,12 @@ msgid ""
 "updating an existing system."
 msgstr ""
 "C'est maintenant le moment de choisir les paquetages qui seront installés\n"
-"sur votre système. Sachez que Mandrake Linux contient plusieurs milliers de\n"
+"sur votre système. Sachez que Mandrakelinux contient plusieurs milliers de\n"
 "paquetages à installer, et qu'il n'est pas nécessaire de tous les connaître\n"
 "par coeur.\n"
 "\n"
 "Les paquetages sont regroupés en groupes chacun correspondant à une usage\n"
-"particulier de l'ordinateur. Mandrake Linux range ces groupes en quatre\n"
+"particulier de l'ordinateur. Mandrakelinux range ces groupes en quatre\n"
 "catégories. Vous pouvez mélanger des groupes de plusieurs catégories de\n"
 "sorte qu'une station de travail peut toujours proposer des applications\n"
 "pour le « %s ».\n"
@@ -771,11 +771,11 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
-"The Mandrake Linux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the correct CD as required."
 msgstr ""
-"Les paquetages requis à l'installation de Mandrake Linux sont distribués\n"
+"Les paquetages requis à l'installation de Mandrakelinux sont distribués\n"
 "sur plusieurs CD-ROM. Si un paquetage requis se trouve sur un autre CD-ROM,\n"
 "DrakX éjectera celui présent dans le lecteur et vous demandera d'insérer le\n"
 "CD-ROM approprié."
@@ -891,10 +891,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you will be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrake Linux will automatically start any installed\n"
+"installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that that\n"
-"security holes were discovered after this version of Mandrake Linux was\n"
+"security holes were discovered after this version of Mandrakelinux was\n"
 "finalized. If you do not know what a particular service is supposed to do\n"
 "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
 "install the listed services and they will be started automatically by\n"
@@ -1138,7 +1138,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrake Linux will be using it\n"
+"still under development. For that reason, Mandrakelinux will be using it\n"
 "or not depending on the user choices:\n"
 "\n"
 " * If you choose a languages with a strong legacy encoding (latin1\n"
@@ -1181,7 +1181,7 @@ msgstr ""
 "À propos de l'encodage UTF-8 (unicode): Unicode est un nouveau système\n"
 "d'encodage des caractères censé couvrir tous les langages existants.\n"
 "Cependant son intégration dans GNU/Linux est encore imparfaite. Pour cette\n"
-"raison, Mandrake Linux l'utilisera ou non selon les critères suivants :\n"
+"raison, Mandrakelinux l'utilisera ou non selon les critères suivants :\n"
 "\n"
 " * Si vous choisissez une langue avec un encodage ayant une longue histoire\n"
 "(langages associés à « latin1 », Russe, Japonais, Chinois, Coréen, Thaï,\n"
@@ -1255,7 +1255,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrake Linux partition. Be careful, all data on this drive will be lost\n"
+"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Choisissez le disque dur à effacer pour installer votre partition\n"
@@ -1523,13 +1523,13 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrake Linux distribution. If you do agree with all the\n"
+"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
 "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
 "will reboot your computer."
 msgstr ""
 "Avant d'aller plus loin, il est fortement recommandé de lire attentivement\n"
 "les termes et conditions d'utilisation de la licence. Celle-ci régit\n"
-"l'ensemble de la distribution Mandrake Linux. Si vous en acceptez tous les\n"
+"l'ensemble de la distribution Mandrakelinux. Si vous en acceptez tous les\n"
 "termes, cochez la case « %s », sinon, cliquez sur le bouton « %s » pour\n"
 "redémarrer votre ordinateur."
 
@@ -1561,7 +1561,7 @@ msgstr ""
 msgid ""
 "You will now set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrake Linux will attempt to auto-detect network devices and modems. If\n"
+"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
 "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
 "configure the network, or to do it later, in which case clicking the \"%s\"\n"
 "button will take you to the next step.\n"
@@ -1576,7 +1576,7 @@ msgid ""
 "\n"
 "About Winmodem Connection. Winmodems are special integrated low-end modems\n"
 "that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrake Linux, some others do not. You\n"
+"those modems actually work under Mandrakelinux, some others do not. You\n"
 "can consult the list of supported modems at LinModems.\n"
 "\n"
 "You can consult the ``Starter Guide'' chapter about Internet connections\n"
@@ -1600,7 +1600,7 @@ msgstr ""
 "À propos des Winmodems Les Winmodems sont des modems de bas de gamme\n"
 "généralement intégrés à la carte mère de l'ordinateur qui ont besoin d'un\n"
 "logiciel additionnel pour fonctionner par rapport aux modems standards.\n"
-"Certains de ces modems fonctionnent avec Mandrake Linux, d'autres non. Vous\n"
+"Certains de ces modems fonctionnent avec Mandrakelinux, d'autres non. Vous\n"
 "pouvez consulter la liste des modems pris en charge chez LinModems.\n"
 "\n"
 "Vous pouvez consulter le chapitre du « Guide de démarrage » concernant les\n"
@@ -1793,7 +1793,7 @@ msgid ""
 "Click on \"%s\" when you are ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrake Linux operating system installation.\n"
+"Mandrakelinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions that will be checked for\n"
 "bad blocks on the disk."
@@ -1890,7 +1890,7 @@ msgid ""
 "the installation. At the prompt, press the [F1] key and type >>linux\n"
 "defcfg=\"floppy\" <<."
 msgstr ""
-"Votre installation de Mandrake Linux est maintenant terminée et votre\n"
+"Votre installation de Mandrakelinux est maintenant terminée et votre\n"
 "système est prêt à être utilisé. Cliquez sur « %s » pour redémarrer votre\n"
 "système. N'oubliez pas de retirer la source d'installation(CD-ROM ou\n"
 "disquette). La première chose que vous verrez alors après que l'ordinateur\n"
@@ -1924,7 +1924,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrake Linux system. If partitions have already been\n"
+"installation of your Mandrakelinux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -1995,7 +1995,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "À cette étape, vous devez sélectionner quelle partition sera utilisée pour\n"
-"votre système Mandrake Linux. Si votre disque est déjà partitionné, soit\n"
+"votre système Mandrakelinux. Si votre disque est déjà partitionné, soit\n"
 "par une autre installation GNU/Linux ou par un autre outil de\n"
 "partitionnement, vous pourrez les utiliser. Sinon, les partitions devront\n"
 "être créées.\n"
diff --git a/perl-install/share/po/help-it.pot b/perl-install/share/po/help-it.pot
index 4da222d9f..d2d5247ce 100644
--- a/perl-install/share/po/help-it.pot
+++ b/perl-install/share/po/help-it.pot
@@ -10,7 +10,7 @@ msgid ""
 "if an existing operating system is using all the available space you will\n"
 "have to partition the drive. Basically, partitioning a hard drive consists\n"
 "of logically dividing it to create the space needed to install your new\n"
-"Mandrake Linux system.\n"
+"Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to lost data if there is an existing operating system already\n"
@@ -37,7 +37,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you have previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended.. Using this option is\n"
-"recommended if you want to use both Mandrake Linux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -46,7 +46,7 @@ msgid ""
 "Windows to store your data or to install new software.\n"
 "\n"
 " * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrake Linux system,\n"
+"your hard drive and replace them with your new Mandrakelinux system,\n"
 "choose this option. Be careful, because you will not be able to undo your\n"
 "choice after you confirm.\n"
 "\n"
@@ -65,12 +65,12 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "A questo punto dovete scegliere in quali punti del vostro disco rigido\n"
-"installare il sistema operativo Mandrake Linux. Se il disco è vuoto, o se\n"
+"installare il sistema operativo Mandrakelinux. Se il disco è vuoto, o se\n"
 "tutto lo spazio disponibile è occupato da un altro sistema operativo già\n"
 "installato, allora dovrete creare o modificare le partizioni. In breve,\n"
 "partizionare un disco rigido consiste nel suddividerlo logicamente in più\n"
 "zone in maniera da creare lo spazio necessario all'installazione di\n"
-"Mandrake Linux.\n"
+"Mandrakelinux.\n"
 "\n"
 "Dato che gli effetti del partizionamento sono di solito irreversibili, e\n"
 "possono causare la perdita di dati se sul disco rigido è già installato un\n"
@@ -102,7 +102,7 @@ msgstr ""
 "perdita di dati, a patto che prima di procedere la partizione sia stata\n"
 "deframmentata. Vi consigliamo caldamente di fare comunque una copia di\n"
 "sicurezza dei vostri dati. Questa è la soluzione consigliata se desiderate\n"
-"usare sia Mandrake Linux che Microsoft Windows sullo stesso computer.\n"
+"usare sia Mandrakelinux che Microsoft Windows sullo stesso computer.\n"
 "\n"
 "   Prima di scegliere questa opzione, tenete presente che le dimensioni\n"
 "della partizione su cui risiede Microsoft Windows saranno ridotte rispetto\n"
@@ -111,7 +111,7 @@ msgstr ""
 "\n"
 " * \"%s\": se desiderate cancellare tutti i dati e tutte le partizioni\n"
 "presenti sul vostro disco rigido e rimpiazzarli con il vostro nuovo sistema\n"
-"Mandrake Linux, potete selezionare questa opzione. Fate molta attenzione,\n"
+"Mandrakelinux, potete selezionare questa opzione. Fate molta attenzione,\n"
 "perché dopo aver dato conferma non potrete più tornare indietro.\n"
 "\n"
 "   !! Se scegliete questa opzione tutti i dati sul vostro disco saranno\n"
@@ -236,7 +236,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrake Linux system:\n"
+"of an existing Mandrakelinux system:\n"
 "\n"
 " * \"%s\": For the most part, this completely wipes out the old system. If\n"
 "you wish to change how your hard drives are partitioned, or change the file\n"
@@ -244,19 +244,19 @@ msgid ""
 "scheme, you can prevent some of your existing data from being over-written.\n"
 "\n"
 " * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrake Linux system. Your current\n"
+"currently installed on your Mandrakelinux system. Your current\n"
 "partitioning scheme and user data is not altered. Most of other\n"
 "configuration steps remain available, similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrake Linux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
 "running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
-"to Mandrake Linux version \"8.1\" is not recommended."
+"to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 "Questo passo viene eseguito soltanto se sulla vostra macchina viene trovata\n"
 "una partizione GNU/Linux preesistente.\n"
 "\n"
 "A questo punto DrakX ha bisogno di sapere se intendete effettuare una nuova\n"
-"installazione o un aggiornamento di un sistema Mandrake Linux esistente:\n"
+"installazione o un aggiornamento di un sistema Mandrakelinux esistente:\n"
 "\n"
 " * \"%s\": nella maggior parte dei casi cancella completamente il vecchio\n"
 "sistema. Dovrete usare questa opzione se volete modificare le partizioni\n"
@@ -266,20 +266,20 @@ msgstr ""
 "\n"
 " * \"%s\": questo tipo di installazione vi permette di effettuare un\n"
 "semplice aggiornamento dei pacchetti già installati sul vostro sistema\n"
-"Mandrake Linux. Tutte le partizioni attuali del disco rigido sono\n"
+"Mandrakelinux. Tutte le partizioni attuali del disco rigido sono\n"
 "conservate, come pure le configurazioni e i dati individuali degli utenti.\n"
 "La maggior parte degli altri passi relativi alla configurazione restano\n"
 "disponibili, come per una installazione normale.\n"
 "\n"
 "L'opzione ''Aggiornamento'' non dovrebbe comportare difficoltà per sistemi\n"
-"Mandrake Linux a partire dalla versione \"8.1\", mentre non è consigliabile\n"
-"utilizzarla per aggiornare versioni di Mandrake Linux precedenti la\n"
+"Mandrakelinux a partire dalla versione \"8.1\", mentre non è consigliabile\n"
+"utilizzarla per aggiornare versioni di Mandrakelinux precedenti la\n"
 "\"8.1\"."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
-"At the time you are installing Mandrake Linux, it is likely that some\n"
+"At the time you are installing Mandrakelinux, it is likely that some\n"
 "packages will have been updated since the initial release. Bugs may have\n"
 "been fixed, security issues resolved. To allow you to benefit from these\n"
 "updates, you are now able to download them from the Internet. Check \"%s\"\n"
@@ -291,7 +291,7 @@ msgid ""
 "appear: review the selection, and press \"%s\" to retrieve and install the\n"
 "selected package(s), or \"%s\" to abort."
 msgstr ""
-"È molto probabile che, al momento in cui installate Mandrake Linux, alcuni\n"
+"È molto probabile che, al momento in cui installate Mandrakelinux, alcuni\n"
 "pacchetti siano stati aggiornati rispetto alla versione iniziale;\n"
 "potrebbero essere stati corretti degli errori, o risolti eventuali problemi\n"
 "relativi alla sicurezza. Per permettervi di beneficiare di questi\n"
@@ -336,7 +336,7 @@ msgid ""
 "checking this box.\n"
 "\n"
 "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
+"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
 "system! Be sure you know what you are doing before changing any of the\n"
 "options. !!\n"
 "\n"
@@ -373,7 +373,7 @@ msgstr ""
 "\n"
 "!! Prestate particolare attenzione al fatto che, se scegliete di non\n"
 "installare un bootloader, dovete essere sicuri di poter avviare il vostro\n"
-"sistema Mandrake Linux in qualche modo! Accertatevi di sapere quello che\n"
+"sistema Mandrakelinux in qualche modo! Accertatevi di sapere quello che\n"
 "fate prima di modificare qualcuna delle opzioni. !!\n"
 "\n"
 "Cliccando sul pulsante \"%s\" di questa finestra avrete la possibilità di\n"
@@ -384,7 +384,7 @@ msgstr ""
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrake Linux operating system.\n"
+"Mandrakelinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -414,7 +414,7 @@ msgid ""
 msgstr ""
 "Sul vostro disco rigido è stata individuata più di una partizione\n"
 "Microsoft. Scegliete quella che deve essere ridimensionata in modo da poter\n"
-"installare il vostro nuovo sistema operativo Mandrake Linux.\n"
+"installare il vostro nuovo sistema operativo Mandrakelinux.\n"
 "\n"
 "Ogni partizione è elencata in questo modo: \"nome Linux\", \"nome Windows\"\n"
 "\"Dimensione\".\n"
@@ -447,7 +447,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
 "You will be presented with a list of different parameters to change to get\n"
 "an optimal graphical display: Graphic Card\n"
@@ -501,7 +501,7 @@ msgid ""
 msgstr ""
 "X (abbreviazione per ''X Window System'') è il cuore dell'interfaccia\n"
 "grafica di GNU/Linux, sul quale sono basati tutti gli ambienti grafici\n"
-"inclusi in Mandrake Linux (KDE, GNOME, AfterStep, WindowMaker, etc.).\n"
+"inclusi in Mandrakelinux (KDE, GNOME, AfterStep, WindowMaker, etc.).\n"
 "\n"
 "Vi verrà mostrata una lista dei parametri da configurare in modo da avere\n"
 "la miglior visualizzazione possibile: Scheda grafica\n"
@@ -560,7 +560,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
 "Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
+"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
 "is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -585,7 +585,7 @@ msgid ""
 "Center and clicking the expert button."
 msgstr ""
 "Qui potrete scegliere il sistema di stampa da usare con il vostro computer;\n"
-"altri sistemi operativi ve ne offrono uno, ma Mandrake Linux ve ne offre\n"
+"altri sistemi operativi ve ne offrono uno, ma Mandrakelinux ve ne offre\n"
 "ben due. Ciascuno di essi è adatto a un particolare tipo di configurazione.\n"
 "\n"
 " * \"%s\" -- che sta per ''''print, don't queue'''' (''stampa, non mettere\n"
@@ -615,12 +615,12 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
 "It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrake Linux, and\n"
+"system. There are thousands of packages available for Mandrakelinux, and\n"
 "to make it simpler to manage the packages have been placed into groups of\n"
 "similar applications.\n"
 "\n"
 "Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrake Linux sorts packages groups in four categories. You can\n"
+"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
 "mix and match applications from the various categories, so a\n"
 "``Workstation'' installation can still have applications from the\n"
 "``Development'' category installed.\n"
@@ -715,11 +715,11 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
-"The Mandrake Linux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the correct CD as required."
 msgstr ""
-"La distribuzione Mandrake Linux è suddivisa su più CD-ROM. Se uno dei\n"
+"La distribuzione Mandrakelinux è suddivisa su più CD-ROM. Se uno dei\n"
 "pacchetti selezionati si trova su un CD-ROM diverso da quello attualmente\n"
 "inserito nel lettore, DrakX provvederà, quando necessario, a espellerlo e a\n"
 "chiedervi di inserire quello corretto."
@@ -838,10 +838,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you will be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrake Linux will automatically start any installed\n"
+"installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that that\n"
-"security holes were discovered after this version of Mandrake Linux was\n"
+"security holes were discovered after this version of Mandrakelinux was\n"
 "finalized. If you do not know what a particular service is supposed to do\n"
 "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
 "install the listed services and they will be started automatically by\n"
@@ -873,7 +873,7 @@ msgstr ""
 "!! Se avete selezionato un pacchetto che offre un servizio come server\n"
 "(intenzionalmente, oppure perché faceva parte di un gruppo), vi verrà\n"
 "chiesta conferma per la sua effettiva installazione. Come opzione\n"
-"predefinita, in Mandrake Linux tutti i servizi installati vengono attivati\n"
+"predefinita, in Mandrakelinux tutti i servizi installati vengono attivati\n"
 "automaticamente all'avvio. Sebbene si tratti di servizi sicuri ed esenti da\n"
 "problemi noti al momento della pubblicazione, non è escluso che possano\n"
 "essere scoperte falle di sicurezza al loro interno solo in seguito a tale\n"
@@ -988,7 +988,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrake Linux will be using it\n"
+"still under development. For that reason, Mandrakelinux will be using it\n"
 "or not depending on the user choices:\n"
 "\n"
 " * If you choose a languages with a strong legacy encoding (latin1\n"
@@ -1030,7 +1030,7 @@ msgstr ""
 "Riguardo al supporto UTF-8 (Unicode): Unicode è un nuovo standard per la\n"
 "codifica dei caratteri, progettato per supportare tutte le lingue\n"
 "esistenti. Il suo supporto su GNU/Linux è ancora in fase di sviluppo, e per\n"
-"questo motivo la sua attivazione su Mandrake Linux dipenderà dalle scelte\n"
+"questo motivo la sua attivazione su Mandrakelinux dipenderà dalle scelte\n"
 "effettuate dall'utente:\n"
 "\n"
 " * se scegliete lingue fortemente legate alle vecchie codifiche (lingue del\n"
@@ -1111,11 +1111,11 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrake Linux partition. Be careful, all data on this drive will be lost\n"
+"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Scegliete il disco rigido che volete cancellare per poter creare la nuova\n"
-"partizione su cui installare Mandrake Linux. Attenzione, tutti i dati\n"
+"partizione su cui installare Mandrakelinux. Attenzione, tutti i dati\n"
 "presenti sul disco selezionato andranno perduti e non potranno più essere\n"
 "recuperati!"
 
@@ -1397,7 +1397,7 @@ msgstr ""
 msgid ""
 "You will now set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrake Linux will attempt to auto-detect network devices and modems. If\n"
+"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
 "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
 "configure the network, or to do it later, in which case clicking the \"%s\"\n"
 "button will take you to the next step.\n"
@@ -1412,7 +1412,7 @@ msgid ""
 "\n"
 "About Winmodem Connection. Winmodems are special integrated low-end modems\n"
 "that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrake Linux, some others do not. You\n"
+"those modems actually work under Mandrakelinux, some others do not. You\n"
 "can consult the list of supported modems at LinModems.\n"
 "\n"
 "You can consult the ``Starter Guide'' chapter about Internet connections\n"
@@ -1421,7 +1421,7 @@ msgid ""
 msgstr ""
 "A questo punto potete configurare la vostra connessione di rete. Se\n"
 "desiderate connettere il vostro computer a Internet o a una rete locale,\n"
-"cliccate su \"%s\". Mandrake Linux cercherà di individuare automaticamente\n"
+"cliccate su \"%s\". Mandrakelinux cercherà di individuare automaticamente\n"
 "dispositivi di rete e modem; se questa ricerca dovesse fallire, levate il\n"
 "segno di spunta dalla casella \"%s\". Potete anche decidere di non\n"
 "configurare la rete, o di farlo in seguito, nel qual caso potete cliccare\n"
@@ -1441,7 +1441,7 @@ msgstr ""
 "Riguardo alla connessione tramite Winmodem: i ''Winmodem'' sono particolari\n"
 "modem integrati di fascia bassa che, rispetto ai modem tradizionali, per\n"
 "funzionare necessitano di software aggiuntivo. Alcuni di questi modem\n"
-"funzionano bene con Mandrake Linux, ma altri no. Potete consultare l'elenco\n"
+"funzionano bene con Mandrakelinux, ma altri no. Potete consultare l'elenco\n"
 "dei modem supportati sul sito LinModems.\n"
 "\n"
 "Per maggiori dettagli riguardo la configurazione della connessione a\n"
@@ -1477,12 +1477,12 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrake Linux distribution. If you do agree with all the\n"
+"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
 "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
 "will reboot your computer."
 msgstr ""
 "Prima di proseguire dovreste leggere con attenzione le condizioni d'uso che\n"
-"riguardano l'intera distribuzione Mandrake Linux. Se siete d'accordo con\n"
+"riguardano l'intera distribuzione Mandrakelinux. Se siete d'accordo con\n"
 "tutti i termini della licenza cliccate sul pulsante \"%s\". In caso\n"
 "contrario, semplicemente spegnere il computer per interrompere\n"
 "l'installazione."
@@ -1677,7 +1677,7 @@ msgid ""
 "Click on \"%s\" when you are ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrake Linux operating system installation.\n"
+"Mandrakelinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions that will be checked for\n"
 "bad blocks on the disk."
@@ -1702,7 +1702,7 @@ msgstr ""
 "Cliccate su \"%s\" quando siete pronti ad avviare la formattazione.\n"
 "\n"
 "Cliccate su \"%s\" se volete cambiare la scelta delle partizioni su cui\n"
-"installare Mandrake Linux.\n"
+"installare Mandrakelinux.\n"
 "\n"
 "Cliccate su \"%s\" se desiderate selezionare alcune delle partizioni\n"
 "affinché venga controllata la presenza di eventuali blocchi danneggiati su\n"
@@ -1820,7 +1820,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrake Linux system. If partitions have already been\n"
+"installation of your Mandrakelinux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -1891,7 +1891,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "A questo punto, dovete decidere quali partizioni devono essere usate per\n"
-"l'installazione del vostro sistema Mandrake Linux. Se sono già state\n"
+"l'installazione del vostro sistema Mandrakelinux. Se sono già state\n"
 "definite delle partizioni, grazie a una precedente installazione di\n"
 "GNU/Linux o usando un altro programma di partizionamento, potete utilizzare\n"
 "quelle. In caso contrario, sarà necessario creare o modificare le\n"
diff --git a/perl-install/share/po/help-ru.pot b/perl-install/share/po/help-ru.pot
index 9b1ca10a1..a4a215b41 100644
--- a/perl-install/share/po/help-ru.pot
+++ b/perl-install/share/po/help-ru.pot
@@ -10,7 +10,7 @@ msgid ""
 "if an existing operating system is using all the available space you will\n"
 "have to partition the drive. Basically, partitioning a hard drive consists\n"
 "of logically dividing it to create the space needed to install your new\n"
-"Mandrake Linux system.\n"
+"Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to lost data if there is an existing operating system already\n"
@@ -37,7 +37,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you have previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended.. Using this option is\n"
-"recommended if you want to use both Mandrake Linux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -46,7 +46,7 @@ msgid ""
 "Windows to store your data or to install new software.\n"
 "\n"
 " * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrake Linux system,\n"
+"your hard drive and replace them with your new Mandrakelinux system,\n"
 "choose this option. Be careful, because you will not be able to undo your\n"
 "choice after you confirm.\n"
 "\n"
@@ -65,11 +65,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "На этом шаге вам прийдется решить, куда вы хотите установить операционную\n"
-"систему Mandrake Linux на вашем жестком диске. Если ваш жесткий диск пуст,\n"
+"систему Mandrakelinux на вашем жестком диске. Если ваш жесткий диск пуст,\n"
 "или существующая операционная система на нем занимает все дисковое\n"
 "пространство, вам прийдется диск переразбить (partition). Разделение диска\n"
 "в основном состоит в том, чтобы логически выделить на нем свободное\n"
-"пространство для установки вашей новой системы Mandrake Linux.\n"
+"пространство для установки вашей новой системы Mandrakelinux.\n"
 "\n"
 "Поскольку разделение диска - это обычно необратимый процесс и может\n"
 "привести к потере данных, если на диске уже есть установленная операционная\n"
@@ -96,7 +96,7 @@ msgstr ""
 "потери данных, особенно если вы предварительно провели дефрагментацию\n"
 "раздела Windows. Резервное копирование ваших данных настойчиво\n"
 "рекомендуется.. Рекомендуем выбрать эту опцию, если вы собираетесь\n"
-"использовать Mandrake Linux и Microsoft Windows на одном компьютере.\n"
+"использовать Mandrakelinux и Microsoft Windows на одном компьютере.\n"
 "\n"
 "   Перед тем, как выбрать эту опцию, вы должны осознать, что размер вашего\n"
 "раздела Microsoft Windows станет меньше, чем был. У вас будет меньше\n"
@@ -104,7 +104,7 @@ msgstr ""
 "новых программ.\n"
 "\n"
 " * \"%s\" выберите эту опцию, если вы хотите удалить все данные на всех\n"
-"разделах вашего жесткого диска и заменить их новой системой Mandrake Linux.\n"
+"разделах вашего жесткого диска и заменить их новой системой Mandrakelinux.\n"
 "Будьте осторожны в этом решении, потому что после подтверждения вы не\n"
 "сможете вернуть обратно все как было.\n"
 "\n"
@@ -292,7 +292,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrake Linux system:\n"
+"of an existing Mandrakelinux system:\n"
 "\n"
 " * \"%s\": For the most part, this completely wipes out the old system. If\n"
 "you wish to change how your hard drives are partitioned, or change the file\n"
@@ -300,19 +300,19 @@ msgid ""
 "scheme, you can prevent some of your existing data from being over-written.\n"
 "\n"
 " * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrake Linux system. Your current\n"
+"currently installed on your Mandrakelinux system. Your current\n"
 "partitioning scheme and user data is not altered. Most of other\n"
 "configuration steps remain available, similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrake Linux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
 "running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
-"to Mandrake Linux version \"8.1\" is not recommended."
+"to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 "Этот шаг появляется только в случае, если на вашей машине найден старый\n"
 "раздел GNU/Linux.\n"
 "\n"
 "DrakX теперь должен узнать, хотите ли вы провести новую установку или\n"
-"обновление существующей системы Mandrake Linux:\n"
+"обновление существующей системы Mandrakelinux:\n"
 "\n"
 " * \"%s\": в большинстве случаев этот вариант приведет к уничтожению старой\n"
 "системы. Если вы желаете изменить разделы вашего жесткого диска или\n"
@@ -321,18 +321,18 @@ msgstr ""
 "от перезаписи некоторые свои данные.\n"
 "\n"
 " * \"%s\": этот класс установки позволит вам обновить пакеты, установленные\n"
-"в вашей системе Mandrake Linux. Текущая схема разделов диска и\n"
+"в вашей системе Mandrakelinux. Текущая схема разделов диска и\n"
 "пользовательские данные останутся нетронутыми. Большинство других шагов\n"
 "будут доступны, как и при стандартной установке.\n"
 "\n"
-"``Обновление'' будет неплохо работать на системах Mandrake Linux начиная с\n"
-"\"8.1\" и выше. Проведение обновления на системах Mandrake Linux старше\n"
+"``Обновление'' будет неплохо работать на системах Mandrakelinux начиная с\n"
+"\"8.1\" и выше. Проведение обновления на системах Mandrakelinux старше\n"
 "\"8.1\" не рекомендуется."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
-"At the time you are installing Mandrake Linux, it is likely that some\n"
+"At the time you are installing Mandrakelinux, it is likely that some\n"
 "packages will have been updated since the initial release. Bugs may have\n"
 "been fixed, security issues resolved. To allow you to benefit from these\n"
 "updates, you are now able to download them from the Internet. Check \"%s\"\n"
@@ -344,7 +344,7 @@ msgid ""
 "appear: review the selection, and press \"%s\" to retrieve and install the\n"
 "selected package(s), or \"%s\" to abort."
 msgstr ""
-"В данный момент установки Mandrake Linux было бы неплохо обновить некоторые\n"
+"В данный момент установки Mandrakelinux было бы неплохо обновить некоторые\n"
 "пакеты из исходного релиза. Некоторые баги могут быть уже исправлены и\n"
 "решены проблемы безопасности. Чтобы получить пользу от этих обновлений,\n"
 "сейчас вы можете загрузить их из Интернет. Нажмите \"%s\", если у вас есть\n"
@@ -386,7 +386,7 @@ msgid ""
 "checking this box.\n"
 "\n"
 "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
+"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
 "system! Be sure you know what you are doing before changing any of the\n"
 "options. !!\n"
 "\n"
@@ -421,7 +421,7 @@ msgstr ""
 "\n"
 "!! Будьте осторожны при отмене установки начального загрузчика (нажатие\n"
 "здесь кнопки \"%s\" ведет к этому), потому что у вас должен остаться хотя\n"
-"бы один способ загрузить вашу систему Mandrake Linux! Также убедитесь в\n"
+"бы один способ загрузить вашу систему Mandrakelinux! Также убедитесь в\n"
 "том, что вы знаете что делаете, когда изменяете какой-либо параметр. !!\n"
 "\n"
 "При нажатии на кнопку \"%s\" появится диалог со множеством опций для\n"
@@ -432,7 +432,7 @@ msgstr ""
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrake Linux operating system.\n"
+"Mandrakelinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -462,7 +462,7 @@ msgid ""
 msgstr ""
 "На вашем жестом диске обнаружено несколько разделов Microsoft. Выберите\n"
 "необходимый раздел для изменения его размера с целью установки вашей новой\n"
-"операционной системы Mandrake Linux.\n"
+"операционной системы Mandrakelinux.\n"
 "\n"
 "Каждый раздел перечислен так: \"Linux имя\", \"Windows имя\" \"Размер\".\n"
 "\n"
@@ -494,7 +494,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
 "You will be presented with a list of different parameters to change to get\n"
 "an optimal graphical display: Graphic Card\n"
@@ -548,7 +548,7 @@ msgid ""
 msgstr ""
 "X (для системы X Window) это сердце графического интерфейса GNU/Linux, на\n"
 "базе которого работают все графические среды (KDE, GNOME, AfterStep,\n"
-"WindowMaker, и т.д..), входящие в Mandrake Linux.\n"
+"WindowMaker, и т.д..), входящие в Mandrakelinux.\n"
 "\n"
 "Вам будет представлен список различных параметров для получения\n"
 "оптимального графического отображения: Видеокарта\n"
@@ -606,7 +606,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
 "Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
+"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
 "is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -631,7 +631,7 @@ msgid ""
 "Center and clicking the expert button."
 msgstr ""
 "Теперь пришло время выбрать систему печати для вашего компьютера. Другие OS\n"
-"могут предложить вам одну, а Mandrake Linux предлагает две. Каждая из\n"
+"могут предложить вам одну, а Mandrakelinux предлагает две. Каждая из\n"
 "систем является лучшей для определенной конфигурации.\n"
 "\n"
 " * \"%s\" -- что означает ``печатать, не ставить в очередь'' (``print,\n"
@@ -660,12 +660,12 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
 "It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrake Linux, and\n"
+"system. There are thousands of packages available for Mandrakelinux, and\n"
 "to make it simpler to manage the packages have been placed into groups of\n"
 "similar applications.\n"
 "\n"
 "Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrake Linux sorts packages groups in four categories. You can\n"
+"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
 "mix and match applications from the various categories, so a\n"
 "``Workstation'' installation can still have applications from the\n"
 "``Development'' category installed.\n"
@@ -708,11 +708,11 @@ msgid ""
 "updating an existing system."
 msgstr ""
 "Теперь настало время определить, какие программы вы хотите установить в\n"
-"вашу систему. С Mandrake Linux поставляются тысячи пакетов и, для упрощения\n"
+"вашу систему. С Mandrakelinux поставляются тысячи пакетов и, для упрощения\n"
 "выбора, они разбиты на группы.\n"
 "\n"
 "Пакеты сортированы по группам, которые соответствуют специфике\n"
-"использования вашей машины. В Mandrake Linux пакеты сортируются по четырем\n"
+"использования вашей машины. В Mandrakelinux пакеты сортируются по четырем\n"
 "категориям. Вы можете смешивать и сочетать приложения из различных\n"
 "категорий, например, вариант установки ``Рабочая станция'' может иметь\n"
 "приложения из категории ``Разработка''.\n"
@@ -757,11 +757,11 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
-"The Mandrake Linux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the correct CD as required."
 msgstr ""
-"Инсталляция Mandrake Linux размещена на нескольких CD-ROMах. Если выбранный\n"
+"Инсталляция Mandrakelinux размещена на нескольких CD-ROMах. Если выбранный\n"
 "пакет находится на другом CD-ROM, DrakX будет отдавать текущий CD и просить\n"
 "вас вставить другой по мере надобности."
 
@@ -874,10 +874,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you will be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrake Linux will automatically start any installed\n"
+"installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that that\n"
-"security holes were discovered after this version of Mandrake Linux was\n"
+"security holes were discovered after this version of Mandrakelinux was\n"
 "finalized. If you do not know what a particular service is supposed to do\n"
 "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
 "install the listed services and they will be started automatically by\n"
@@ -907,10 +907,10 @@ msgstr ""
 "\n"
 "!! Если был выбран какой-либо серверный пакет, специально или он был частью\n"
 "какой-либо группы, вас попросят подтвердить, действительно ли вы желаете\n"
-"установить эти сервера. Под Mandrake Linux все установленные сервера\n"
+"установить эти сервера. Под Mandrakelinux все установленные сервера\n"
 "запускаются по умолчанию в процессе загрузки. Даже если они безопасны и не\n"
 "имеют известных проблем на момент выпуска дистрибутива, в них могут быть\n"
-"обнаружены дыры в безопасности после выпуска данной версии Mandrake Linux.\n"
+"обнаружены дыры в безопасности после выпуска данной версии Mandrakelinux.\n"
 "Если вы не знаете, зачем нужен данный сервис и что он делает, нажмите\n"
 "\"%s\". Если вы нажмете \"%s\", тогда все сервисы из списка будут\n"
 "установлены и автоматически запущены при загрузке системы. !!\n"
@@ -1108,7 +1108,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrake Linux will be using it\n"
+"still under development. For that reason, Mandrakelinux will be using it\n"
 "or not depending on the user choices:\n"
 "\n"
 " * If you choose a languages with a strong legacy encoding (latin1\n"
@@ -1146,7 +1146,7 @@ msgstr ""
 "\n"
 "О поддержке UTF-8 (unicode): Unicode это новая кодировка, которая включает\n"
 "в себя все существующие языки. Однако ее полная поддержка в GNU/Linux пока\n"
-"находится в стадии разработки. Поэтому Mandrake Linux будет определять\n"
+"находится в стадии разработки. Поэтому Mandrakelinux будет определять\n"
 "использовать ее или нет в зависимости от выбора пользователя:\n"
 "\n"
 " * Если вы выбираете языки, которые имеют свою традиционную устоявшуюся\n"
@@ -1223,11 +1223,11 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrake Linux partition. Be careful, all data on this drive will be lost\n"
+"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Выберите жесткий диск, который нужно очистить для инсталляции вашего нового\n"
-"раздела Mandrake Linux. Будьте осторожны, все данные на нем будут потеряны\n"
+"раздела Mandrakelinux. Будьте осторожны, все данные на нем будут потеряны\n"
 "и их нельзя будет восстановить!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1500,7 +1500,7 @@ msgstr ""
 msgid ""
 "You will now set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrake Linux will attempt to auto-detect network devices and modems. If\n"
+"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
 "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
 "configure the network, or to do it later, in which case clicking the \"%s\"\n"
 "button will take you to the next step.\n"
@@ -1515,7 +1515,7 @@ msgid ""
 "\n"
 "About Winmodem Connection. Winmodems are special integrated low-end modems\n"
 "that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrake Linux, some others do not. You\n"
+"those modems actually work under Mandrakelinux, some others do not. You\n"
 "can consult the list of supported modems at LinModems.\n"
 "\n"
 "You can consult the ``Starter Guide'' chapter about Internet connections\n"
@@ -1524,7 +1524,7 @@ msgid ""
 msgstr ""
 "Теперь у вас есть возможность настроить ваше соединение Интернет/Сеть. Если\n"
 "вы хотите подключить ваш компьютер к Интернет или локальной сети, нажмите\n"
-"\"%s\". Mandrake Linux попытается автоматически определить сетевые\n"
+"\"%s\". Mandrakelinux попытается автоматически определить сетевые\n"
 "устройства и модемы. Если автоопределение не пройдет, снимите выбор с опции\n"
 "\"%s\". Кроме того, вы можете не выбирать настройку сети или сделать это\n"
 "позже. В этом случае просто нажмите кнопку \"%s\", чтобы перейти к\n"
@@ -1542,7 +1542,7 @@ msgstr ""
 "По поводу Win-модемного соединения Win-модемы это специальные\n"
 "интегрированные дешевые модемы, которые требуют для работы, в отличии от\n"
 "обычных модемов, дополнительное программное обеспечение. Некоторые из таких\n"
-"модемов уже работают в Mandrake Linux, некоторые нет. Список поддерживаемых\n"
+"модемов уже работают в Mandrakelinux, некоторые нет. Список поддерживаемых\n"
 "модемов вы можете получить на LinModems.\n"
 "\n"
 "Вы можете ознакомиться с деталями настройки в главе о соединениях Интернет\n"
@@ -1577,12 +1577,12 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrake Linux distribution. If you do agree with all the\n"
+"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
 "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
 "will reboot your computer."
 msgstr ""
 "Прежде чем продолжить, вы должны внимательно прочитать условия лицензии.\n"
-"Лицензия распространяется на весь дистрибутив Mandrake Linux. Если вы\n"
+"Лицензия распространяется на весь дистрибутив Mandrakelinux. Если вы\n"
 "согласны со всеми условиями лицензии, отметьте пункт \"%s\". Если нет -\n"
 "просто выключите свой компьютер."
 
@@ -1767,7 +1767,7 @@ msgid ""
 "Click on \"%s\" when you are ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrake Linux operating system installation.\n"
+"Mandrakelinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions that will be checked for\n"
 "bad blocks on the disk."
@@ -1901,7 +1901,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrake Linux system. If partitions have already been\n"
+"installation of your Mandrakelinux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -1972,7 +1972,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Здесь вам предложат выбрать, какие разделы будут использоваться для\n"
-"установки вашей системы Mandrake Linux. Если разделы были уже определены\n"
+"установки вашей системы Mandrakelinux. Если разделы были уже определены\n"
 "ранее, например, предыдущей инсталляцией GNU/Linux или другой утилитой\n"
 "разбиения дисков, вы можете воспользоваться существующими разделами. В\n"
 "противном случае, разделы жесткого диска должны быть определены.\n"
diff --git a/perl-install/share/po/help-zh_CN.pot b/perl-install/share/po/help-zh_CN.pot
index c19a2cb28..4a525267a 100644
--- a/perl-install/share/po/help-zh_CN.pot
+++ b/perl-install/share/po/help-zh_CN.pot
@@ -10,7 +10,7 @@ msgid ""
 "if an existing operating system is using all the available space you will\n"
 "have to partition the drive. Basically, partitioning a hard drive consists\n"
 "of logically dividing it to create the space needed to install your new\n"
-"Mandrake Linux system.\n"
+"Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to lost data if there is an existing operating system already\n"
@@ -37,7 +37,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you have previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended.. Using this option is\n"
-"recommended if you want to use both Mandrake Linux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -46,7 +46,7 @@ msgid ""
 "Windows to store your data or to install new software.\n"
 "\n"
 " * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrake Linux system,\n"
+"your hard drive and replace them with your new Mandrakelinux system,\n"
 "choose this option. Be careful, because you will not be able to undo your\n"
 "choice after you confirm.\n"
 "\n"
@@ -64,9 +64,9 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"在这一步里，您需要决定您想要将 Mandrake Linux\n"
+"在这一步里，您需要决定您想要将 Mandrakelinux\n"
 "操作系统安装到硬盘的何处。如果您的硬盘完全是空的，或者已有操作系统使用了所有的空间，您就必须要对硬盘进行分区。粗略的说，对硬盘进行分区就是将其划分成几个逻辑上不同的部分，以便创建安装您新的\n"
-"Mandrake Linux 系统所需的空间。\n"
+"Mandrakelinux 系统所需的空间。\n"
 "\n"
 "\n"
 "对硬盘进行分区通常是不可恢复的。并且，如果在该硬盘上已经安装了操作系统的话，将可能最终导致数据丢失。所以，对于没有经验的用户来说，分区是十分危险的操作。所幸的是，DrakX\n"
@@ -82,13 +82,13 @@ msgstr ""
 " * \"%s\"：如果在您的硬盘上安装了 Microsoft Windows，而该操作系统占用了所有的空间，您就需要为 GNU/Linux\n"
 "创建剩余空间。要完成这一操作，您可以删除您的 Microsoft Windows 分区和数据(参看“删除整个磁盘”方案)，或者更改\n"
 "Microsoft Windows FAT 或 NTFS 分区的大小。更改分区大小通常不会造成任何数据丢失，但您必须事先对 Windows\n"
-"分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计算机上使用 Mandrake Linux 和 Microsoft\n"
+"分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计算机上使用 Mandrakelinux 和 Microsoft\n"
 "Windows，则推荐使用此选项。\n"
 "\n"
 "   注意，在执行这一过程之后，您原有的 Microsoft Windows 分区将会被先前小一些。而您在 Microsoft Windows\n"
 "下可用来存储数据或安装新软件的剩余空间也会变少。\n"
 "\n"
-" * \"%s\"：如果您想要删除硬盘上的全部数据和全部分区，并将其替换为全新的 Mandrake Linux\n"
+" * \"%s\"：如果您想要删除硬盘上的全部数据和全部分区，并将其替换为全新的 Mandrakelinux\n"
 "系统，请选择此选项。请额外小心，因为在您确认之后，此操作无法撤销。\n"
 "\n"
 "   !! 如果您选择了此选项，您硬盘上的全部数据都将被删除。 !!\n"
@@ -234,7 +234,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrake Linux system:\n"
+"of an existing Mandrakelinux system:\n"
 "\n"
 " * \"%s\": For the most part, this completely wipes out the old system. If\n"
 "you wish to change how your hard drives are partitioned, or change the file\n"
@@ -242,26 +242,26 @@ msgid ""
 "scheme, you can prevent some of your existing data from being over-written.\n"
 "\n"
 " * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrake Linux system. Your current\n"
+"currently installed on your Mandrakelinux system. Your current\n"
 "partitioning scheme and user data is not altered. Most of other\n"
 "configuration steps remain available, similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrake Linux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
 "running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
-"to Mandrake Linux version \"8.1\" is not recommended."
+"to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 "仅当在您的计算机上发现了已有的 GNU/Linux 分区，才会激活这一步骤。\n"
 "\n"
-"DrakX 现在需要知道您是想要执行全新安装，还是升级已有的 Mandrake Linux 系统：\n"
+"DrakX 现在需要知道您是想要执行全新安装，还是升级已有的 Mandrakelinux 系统：\n"
 "\n"
 " *\n"
 "\"%s\"：总体来说，这将完全销毁旧系统。如果您想要更改硬盘的分区方案，或者更该文件系统，您就应该使用此选项。但是，根据您选择的分区方案，您可以让现有的数据免于覆盖。\n"
 "\n"
-" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandrake Linux\n"
+" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandrakelinux\n"
 "系统上的软件包。您的分区方案和用户数据都不会被破坏。绝大多数配置步骤仍然可用，与标准安装类似。\n"
 "\n"
-"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrake Linux 系统上工作正常。不推荐在先于 \"8.1\" 版本的\n"
-"Mandrake Linux 系统上执行升级。"
+"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrakelinux 系统上工作正常。不推荐在先于 \"8.1\" 版本的\n"
+"Mandrakelinux 系统上执行升级。"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
@@ -293,7 +293,7 @@ msgid ""
 "checking this box.\n"
 "\n"
 "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
+"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
 "system! Be sure you know what you are doing before changing any of the\n"
 "options. !!\n"
 "\n"
@@ -319,7 +319,7 @@ msgstr ""
 "\n"
 " * \"%s\"：如果您在您的计算机上遇到了硬件问题(IRQ 冲突、不稳定、死机……)您可以选中此框来试着禁用 APIC。\n"
 "\n"
-"!! 注意：如果您在这里选择不安装开机引导程序(选择\"%s\")，您必须保证您可以通过其它方法引导您的 Mandrake Linux\n"
+"!! 注意：如果您在这里选择不安装开机引导程序(选择\"%s\")，您必须保证您可以通过其它方法引导您的 Mandrakelinux\n"
 "系统！不管修改任何选项，一定要清楚您在做什么！ !!\n"
 "\n"
 "单击此对话框中的\"%s\"按钮可为专家用户提供高级的选项。"
@@ -327,7 +327,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 msgid ""
-"At the time you are installing Mandrake Linux, it is likely that some\n"
+"At the time you are installing Mandrakelinux, it is likely that some\n"
 "packages will have been updated since the initial release. Bugs may have\n"
 "been fixed, security issues resolved. To allow you to benefit from these\n"
 "updates, you are now able to download them from the Internet. Check \"%s\"\n"
@@ -339,7 +339,7 @@ msgid ""
 "appear: review the selection, and press \"%s\" to retrieve and install the\n"
 "selected package(s), or \"%s\" to abort."
 msgstr ""
-"在您安装 Mandrake Linux\n"
+"在您安装 Mandrakelinux\n"
 "的这个时候，很可能有些软件包在发行之后已经更新。有些故障已经被修正，有些问题已经被解决。为了利用这些更新，您最好从 Internet\n"
 "上下载它们。如果您的 Internet 连接已经可以使用，请选择\"%s\"。如果您愿意以后再升级，请选择\"%s\"。\n"
 "\n"
@@ -351,7 +351,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
 "You will be presented with a list of different parameters to change to get\n"
 "an optimal graphical display: Graphic Card\n"
@@ -403,7 +403,7 @@ msgid ""
 "\"%s\" if your machine is to act as a server, or if you were not successful\n"
 "in getting the display configured."
 msgstr ""
-"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrake Linux\n"
+"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrakelinux\n"
 "附带的所有图形环境(KDE、GNOME、AfterStep、WindowMaker 等)都依赖于该系统。\n"
 "\n"
 "您将会看到不同的参数列表，以便进行图形显示选项的更改来达到最佳状态。其中包括： 显示卡\n"
@@ -444,7 +444,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 msgid ""
 "Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
+"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
 "is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -468,7 +468,7 @@ msgid ""
 "system you may change it by running PrinterDrake from the Mandrake Control\n"
 "Center and clicking the expert button."
 msgstr ""
-"现在，应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择，但 Mandrake Linux\n"
+"现在，应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择，但 Mandrakelinux\n"
 "提供了两种。每种打印系统都能够在不同的配置中大展身手。\n"
 "\n"
 " * \"%s\" --\n"
@@ -488,12 +488,12 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 msgid ""
 "It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrake Linux, and\n"
+"system. There are thousands of packages available for Mandrakelinux, and\n"
 "to make it simpler to manage the packages have been placed into groups of\n"
 "similar applications.\n"
 "\n"
 "Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrake Linux sorts packages groups in four categories. You can\n"
+"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
 "mix and match applications from the various categories, so a\n"
 "``Workstation'' installation can still have applications from the\n"
 "``Development'' category installed.\n"
@@ -535,10 +535,10 @@ msgid ""
 "to avoid installing any new package. This is useful for repairing or\n"
 "updating an existing system."
 msgstr ""
-"现在该指定要在您的系统中安装哪些程序了。Mandrake Linux\n"
+"现在该指定要在您的系统中安装哪些程序了。Mandrakelinux\n"
 "为您准备了数千个软件包。而为了使管理软件包更加容易，软件包已经按组重新进行了分配。\n"
 "\n"
-"软件包已经根据您计算机的不同用途被分成了不同的组。Mandrake Linux\n"
+"软件包已经根据您计算机的不同用途被分成了不同的组。Mandrakelinux\n"
 "将软件包组分成了四个类别。您可以从不同的类别混合选择应用程序。也就是说，``工作站''中也可以选择安装``开发''分类中的应用程序。\n"
 "\n"
 " * \"%s\"：如果您计划将您的计算机用作工作站，请选择工作站分类中的一个或多个组。\n"
@@ -565,11 +565,11 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 msgid ""
-"The Mandrake Linux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the correct CD as required."
 msgstr ""
-"Mandrake Linux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM，DrakX 将弹出当前\n"
+"Mandrakelinux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM，DrakX 将弹出当前\n"
 "CD，并要求您插入所需的正确 CD。"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -646,10 +646,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you will be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrake Linux will automatically start any installed\n"
+"installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that that\n"
-"security holes were discovered after this version of Mandrake Linux was\n"
+"security holes were discovered after this version of Mandrakelinux was\n"
 "finalized. If you do not know what a particular service is supposed to do\n"
 "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
 "install the listed services and they will be started automatically by\n"
@@ -675,7 +675,7 @@ msgstr ""
 "只要您在左侧的树中选择了软件包，右侧就会出现该软件包用途的描述。\n"
 "\n"
 "!! 如果选择了服务器软件包，不管是您特意选中的，还是因为该软件包是某组的成员，您都需要确认是否真的想要安装这些服务器。默认情况下，Mandrake\n"
-"Linux 会在启动时自动启动所有安装的服务。尽管在发行版送出时这些服务是安全的，但完全有可能在此版本 Mandrake Linux\n"
+"Linux 会在启动时自动启动所有安装的服务。尽管在发行版送出时这些服务是安全的，但完全有可能在此版本 Mandrakelinux\n"
 "完成后发现了相应软件的安全漏洞。如果您并不知道特定服务的用途，或者不知道为什么要安装这些服务，请单击\"%s\"。单击\"%s\"将安装列出的服务，并且在默认启动时这些服务会被自动启动。\n"
 "!!\n"
 "\n"
@@ -846,7 +846,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrake Linux will be using it\n"
+"still under development. For that reason, Mandrakelinux will be using it\n"
 "or not depending on the user choices:\n"
 "\n"
 " * If you choose a languages with a strong legacy encoding (latin1\n"
@@ -878,7 +878,7 @@ msgstr ""
 "单击\"%s\"按钮以后，您可以选择要在您的工作站上安装哪些额外的语言，即为系统文档和应用程序安装特定语言的文件。例如，如果您的计算机要为繁体中文的用户提供服务，请在树视图中选择简体中文作为默认语言，然后在高级选项中选择\"%s\"。\n"
 "\n"
 "关于 UTF-8 (Unicode) 支持：Unicode 是一种新的字符编码，该编码可支持所有现存的语言。但是，在 GNU/Linux 下完全支持\n"
-"Unicode，仍然在开发和完善中。由此原因，Mandrake Linux 会根据用户的选择是否使用 UTF-8：\n"
+"Unicode，仍然在开发和完善中。由此原因，Mandrakelinux 会根据用户的选择是否使用 UTF-8：\n"
 "\n"
 " * 如果您所选的语言自身有强制性的编码(latin1 语言、俄语、日语、中文、朝鲜语、泰语、希腊语、土耳其语及大多数 iso-8859-2\n"
 "语言)，则会默认使用强制编码；\n"
@@ -1104,11 +1104,11 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrake Linux distribution. If you do agree with all the\n"
+"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
 "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
 "will reboot your computer."
 msgstr ""
-"在继续之前，您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrake Linux\n"
+"在继续之前，您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrakelinux\n"
 "发行版。如果您同意其中的全部条款，请选中\"%s\"框。如果不同意，单击\"%s\"按钮将重新启动您的计算机。"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1135,7 +1135,7 @@ msgstr ""
 msgid ""
 "You will now set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrake Linux will attempt to auto-detect network devices and modems. If\n"
+"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
 "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
 "configure the network, or to do it later, in which case clicking the \"%s\"\n"
 "button will take you to the next step.\n"
@@ -1150,7 +1150,7 @@ msgid ""
 "\n"
 "About Winmodem Connection. Winmodems are special integrated low-end modems\n"
 "that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrake Linux, some others do not. You\n"
+"those modems actually work under Mandrakelinux, some others do not. You\n"
 "can consult the list of supported modems at LinModems.\n"
 "\n"
 "You can consult the ``Starter Guide'' chapter about Internet connections\n"
@@ -1327,7 +1327,7 @@ msgid ""
 "Click on \"%s\" when you are ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrake Linux operating system installation.\n"
+"Mandrakelinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions that will be checked for\n"
 "bad blocks on the disk."
@@ -1343,7 +1343,7 @@ msgstr ""
 "\n"
 "如果您准备好格式化分区了，请单击 \"%s\"。\n"
 "\n"
-"如果您想要选择其它分区用于安装 Mandrake Linux 操作系统，请单击\"%s\"。\n"
+"如果您想要选择其它分区用于安装 Mandrakelinux 操作系统，请单击\"%s\"。\n"
 "\n"
 "如果您想要选择要检测磁盘上的坏块，请单击单击\"%s\"。"
 
@@ -1430,7 +1430,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrake Linux system. If partitions have already been\n"
+"installation of your Mandrakelinux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -1500,7 +1500,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"在这一步中，您需要选择要使用哪个或哪些分区来安装您的 Mandrake Linux 系统。如果已经定义了分区，不管是先前安装的 GNU/Linux\n"
+"在这一步中，您需要选择要使用哪个或哪些分区来安装您的 Mandrakelinux 系统。如果已经定义了分区，不管是先前安装的 GNU/Linux\n"
 "还是由其它分区工具划分的，您都可以使用已有的分区。否则，必须对硬盘分区进行定义。\n"
 "\n"
 "要创建分区，您必须先选择硬盘。您可以单击 ``hda'' 选择第一个 IDE 硬盘进行分区，``hdb'' 选择第二个 IDE 硬盘，``sda''\n"
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index 5051df390..dfac02321 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -38,7 +38,7 @@ use modules;
 use c;
 
 my $companyname = "MandrakeSoft";
-my $distroname = "Mandrake Linux";
+my $distroname = "Mandrakelinux";
 my $domainname = "mandrakesoft.com";
 
 my $pixdir = '/usr/share/libDrakX/pixmaps/';
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index 3ddedfe14..aaaaa88d5 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -30,7 +30,7 @@ use handle_configs;
 use services;
 
 my $companyname = "MandrakeSoft";
-my $distroname = "Mandrake Linux";
+my $distroname = "Mandrakelinux";
 my $shortdistroname = "Mandrake";
 my $domainname = "mandrakesoft.com";