125 files changed, 14577 insertions, 14577 deletions

diff --git a/move/move.pm b/move/move.pm
index ed6a19d04..1ca46710f 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -1,6 +1,6 @@
 package move; # $Id$ $
 
-#- Copyright (c) 2003-2004 Mandrakesoft
+#- Copyright (c) 2003-2004 Mandriva
 #-
 #- This program is free software; you can redistribute it and/or modify
 #- it under the terms of the GNU General Public License as published by
@@ -464,7 +464,7 @@ unplug it now.
 
 
 Click the button to reboot the machine, unplug it, remove write protection,
-plug the key again, and launch Mandrake Move again.")),
+plug the key again, and launch Mandriva Move again.")),
 				ok => N("Reboot") });
 	    reboot();
 	}
@@ -478,10 +478,10 @@ Windows partition instead.
 
 
 You may also proceed without an USB key - you'll still be
-able to use Mandrake Move as a normal live Mandrake
+able to use Mandriva Move as a normal live Mandriva
 Operating System.") :
 N("We did not detect any USB key on your system. If you
-plug in an USB key now, Mandrake Move will have the ability
+plug in an USB key now, Mandriva Move will have the ability
 to transparently save the data in your home directory and
 system wide configuration, for next boot on this computer
 or another one. Note: if you plug in a key now, wait several
@@ -489,7 +489,7 @@ seconds before detecting again.
 
 
 You may also proceed without an USB key - you'll still be
-able to use Mandrake Move as a normal live Mandrake
+able to use Mandriva Move as a normal live Mandriva
 Operating System.");
 	$o->ask_okcancel_({ title => N("Need a key to save your data"), 
 			    messages => formatAlaTeX($message),
@@ -670,7 +670,7 @@ N("An error occurred:
 
 This may come from corrupted system configuration files
 on the USB key, in this case removing them and then
-rebooting Mandrake Move would fix the problem. To do
+rebooting Mandriva Move would fix the problem. To do
 so, click on the corresponding button.
 
 
diff --git a/perl-install/Xconfig/resolution_and_depth.pm b/perl-install/Xconfig/resolution_and_depth.pm
index 21289bd39..7179186ec 100644
--- a/perl-install/Xconfig/resolution_and_depth.pm
+++ b/perl-install/Xconfig/resolution_and_depth.pm
@@ -238,7 +238,7 @@ sub set_default_background {
       sort {
 	  $a->[1] <=> $b->[1] || $b->[2] <=> $a->[2] || $a->[1] <=> $b->[1];
       } map {
-	  if (my ($X, $Y) = /^Mandrakelinux-(\d+)x(\d+).png$/) {
+	  if (my ($X, $Y) = /^Mandrivalinux-(\d+)x(\d+).png$/) {
 	      [
 		  $_, 
 		  int(abs($ratio - $X / $Y) * 100), #- we want the nearest ratio (precision .01)
diff --git a/perl-install/any.pm b/perl-install/any.pm
index f2fb51027..2009373aa 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -730,7 +730,7 @@ sub selectLanguage {
 
         my $last_utf8 = $in->{locale}{utf8};
 	add2hash($common, { cancel => '',
-			    advanced_messages => formatAlaTeX(N("Mandrakelinux can support multiple languages. Select
+			    advanced_messages => formatAlaTeX(N("Mandrivalinux 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.")),
 			    advanced_state => 1,
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index d64d6d118..b984708a4 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -724,7 +724,7 @@ sub suggest {
 	{
 	 defaultos => "linux",
 	 entries => [],
-	 'init-message' => "Welcome to Mandrakelinux!",
+	 'init-message' => "Welcome to Mandrivalinux!",
 	 delay => 30,	#- OpenFirmware delay
 	 timeout => 50,
 	 enableofboot => 1,
diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index aaedc3783..c07556f9f 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -146,7 +146,7 @@ sub bestMirror {
     $possible[rand @possible];
 }
 
-#- hack to retrieve Mandrakelinux version...
+#- hack to retrieve Mandrivaalinux version...
 sub version() {
     require pkgs;
     my $pkg = pkgs::packageByName($::o->{packages}, 'mandrakelinux-release');
diff --git a/perl-install/help.pm b/perl-install/help.pm
index 991b0b5e3..61b886be1 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 Mandrakelinux distribution. If you agree with all the
+covers the entire Mandrivalinux distribution. If you agree with all the
 terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"
 button will reboot your computer.", N("Accept"), N("Quit"));
 }
@@ -82,7 +82,7 @@ With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means
 \"second lowest SCSI ID\", etc.");
 }
 sub chooseCd() {
-    N("The Mandrakelinux installation is distributed on several CD-ROMs. If a
+    N("The Mandrivalinux 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 required one. If you do not have the requested
 CD at hand, just click on \"%s\", the corresponding packages will not be
@@ -90,11 +90,11 @@ installed.", N("Cancel"));
 }
 sub choosePackages() {
     N("It's now time to specify which programs you wish to install on your system.
-There are thousands of packages available for Mandrakelinux, and to make it
+There are thousands of packages available for Mandrivalinux, and to make it
 simpler to manage, they have been placed into groups of similar
 applications.
 
-Mandrakelinux sorts package groups in four categories. You can mix and
+Mandrivalinux sorts package groups in four categories. You can mix and
 match applications from the various categories, so a ``Workstation''
 installation can still have applications from the ``Server'' category
 installed.
@@ -157,10 +157,10 @@ right to let you know the purpose of that 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'll be asked to confirm that you really want those servers to be
-installed. By default Mandrakelinux will automatically start any installed
+installed. By default Mandrivalinux 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
-security holes were discovered after this version of Mandrakelinux was
+security holes were discovered after this version of Mandrivalinux was
 finalized. If you do not know what a particular service is supposed to do or
 why it's being installed, then click \"%s\". Clicking \"%s\" will install
 the listed services and they will be started automatically at boot time. !!
@@ -230,7 +230,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 Mandrakelinux rely upon.
+WindowMaker, etc.) bundled with Mandrivalinux rely upon.
 
 You'll see a list of different parameters to change to get an optimal
 graphical display.
@@ -313,12 +313,12 @@ want to check \"%s\" if your machine is to act as a server, or if you were
 not successful in getting the display configured.", N("No"));
 }
 sub doPartitionDisks() {
-    N("You now need to decide where you want to install the Mandrakelinux
+    N("You now need to decide where you want to install the Mandrivalinux
 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 means to
 logically divide it to create the space needed to install your new
-Mandrakelinux system.
+Mandrivalinux system.
 
 Because the process of partitioning a hard drive is usually irreversible
 and can lead to data losses, partitioning can be intimidating and stressful
@@ -345,7 +345,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've previously defragmented the Windows partition.
 Backing up your data is strongly recommended. Using this option is
-recommended if you want to use both Mandrakelinux and Microsoft Windows on
+recommended if you want to use both Mandrivalinux and Microsoft Windows on
 the same computer.
 
    Before choosing this option, please understand that after this
@@ -354,7 +354,7 @@ than when you started. You'll 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 Mandrakelinux system, choose
+your hard drive and replace them with your new Mandrivalinux system, choose
 this option. Be careful, because you will not be able to undo this operation
 after you confirm.
 
@@ -425,13 +425,13 @@ will not be able to recover it.
 Click on \"%s\" when you're ready to format the partitions.
 
 Click on \"%s\" if you want to choose another partition for your new
-Mandrakelinux operating system installation.
+Mandrivalinux operating system installation.
 
 Click on \"%s\" if you wish to select partitions which will be checked for
 bad blocks on the disk.", N("Next"), N("Previous"), N("Advanced"));
 }
 sub installUpdates() {
-    N("By the time you install Mandrakelinux, it's likely that some packages will
+    N("By the time you install Mandrivalinux, it's 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're now able to download them from the Internet. Check \"%s\" if you
@@ -451,7 +451,7 @@ exposed to the Internet. The trade-off that a higher security level is
 generally obtained at the expense of ease of use.
 
 If you do not know what to choose, keep the default option. You'll be able
-to change it later with the draksec tool, which is part of Mandrakelinux
+to change it later with the draksec tool, which is part of Mandrivalinux
 Control Center.
 
 Fill the \"%s\" field with the e-mail address of the person responsible for
@@ -459,7 +459,7 @@ security. Security messages will be sent to that address.", N("Security Administ
 }
 sub partition_with_diskdrake() {
     N("At this point, you need to choose which partition(s) will be used for the
-installation of your Mandrakelinux system. If partitions have already been
+installation of your Mandrivalinux 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.
@@ -532,7 +532,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
-Mandrakelinux operating system.
+Mandrivalinux operating system.
 
 Each partition is listed as follows: \"Linux name\", \"Windows name\"
 \"Capacity\".
@@ -570,7 +570,7 @@ sub selectInstallClass() {
 found on your machine.
 
 DrakX now needs to know if you want to perform a new installation or an
-upgrade of an existing Mandrakelinux system:
+upgrade of an existing Mandrivalinux system:
 
  * \"%s\". For the most part, this completely wipes out the old system.
 However, depending on your partitioning scheme, you can prevent some of
@@ -579,13 +579,13 @@ If you wish to change how your hard drives are partitioned, or to change
 the file system, you should use this option.
 
  * \"%s\". This installation class allows you to update the packages
-currently installed on your Mandrakelinux system. Your current partitioning
+currently installed on your Mandrivalinux system. Your current partitioning
 scheme and user data will not be altered. Most of the other configuration
 steps remain available and are similar to a standard installation.
 
-Using the ``Upgrade'' option should work fine on Mandrakelinux systems
+Using the ``Upgrade'' option should work fine on Mandrivalinux systems
 running version \"8.1\" or later. Performing an upgrade on versions prior
-to Mandrakelinux version \"8.1\" is not recommended.", N("Install"), N("Upgrade"));
+to Mandrivalinux version \"8.1\" is not recommended.", N("Install"), N("Upgrade"));
 }
 sub selectKeyboard() {
     N("Depending on the language you chose (), DrakX will automatically select a
@@ -620,7 +620,7 @@ 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. However full support for it in GNU/Linux is
-still under development. For that reason, Mandrakelinux's use of UTF-8 will
+still under development. For that reason, Mandrivalinux's use of UTF-8 will
 depend on the user's choices:
 
  * If you choose a language with a strong legacy encoding (latin1
@@ -740,7 +740,7 @@ know what you're doing.", N("First sector of drive (MBR)"), N("Skip"));
 }
 sub setupDefaultSpooler() {
     N("Now, it's time to select a printing system for your computer. Other
-operating systems may offer you one, but Mandrakelinux offers two. Each of
+operating systems may offer you one, but Mandrivalinux offers two. Each of
 the printing systems is best suited to particular types of configuration.
 
  * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice
@@ -761,7 +761,7 @@ emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon.
 options and for managing the printer.
 
 If you make a choice now, and later find that you do not like your printing
-system you may change it by running PrinterDrake from the Mandrakelinux
+system you may change it by running PrinterDrake from the Mandrivalinux
 Control Center and clicking on the \"%s\" button.", N("pdq"), N("pdq"), N("CUPS"), N("CUPS"), N("Expert"));
 }
 sub setupSCSI() {
@@ -831,7 +831,7 @@ the card if you feel the configuration is wrong.
 
  * \"%s\": if you wish to configure your Internet or local network access,
 you can do so now. Refer to the printed documentation or use the
-Mandrakelinux Control Center after the installation has finished to benefit
+Mandrivalinux Control Center after the installation has finished to benefit
 from full in-line help.
 
  * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine
@@ -848,7 +848,7 @@ firewall settings.
  * \"%s\": if you wish to change your bootloader configuration, click this
 button. This should be reserved to advanced users. Refer to the printed
 documentation or the in-line help about bootloader configuration in the
-Mandrakelinux Control Center.
+Mandrivalinux Control Center.
 
  * \"%s\": through this entry you can fine tune which services will be run
 on your machine. If you plan to use this machine as a server it's a good
@@ -856,7 +856,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
-Mandrakelinux partition. Be careful, all data on this drive will be lost
+Mandrivalinux 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 4f1ce5064..6fd56a736 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -160,7 +160,7 @@ the following error occurred: %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 Mandrakelinux 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 Mandrivalinux installation.");
 		$o->ask_okcancel('', formatAlaTeX(
                                             #-PO: keep the double empty lines between sections, this is formatted a la LaTeX
                                             N("WARNING!
diff --git a/perl-install/install_messages.pm b/perl-install/install_messages.pm
index d804ab1fa..746b94e7d 100644
--- a/perl-install/install_messages.pm
+++ b/perl-install/install_messages.pm
@@ -9,16 +9,16 @@ sub main_license() {
 #-PO: keep the double empty lines between sections, this is formatted a la LaTeX
 N("Introduction
 
-The operating system and the different components available in the Mandrakelinux distribution 
+The operating system and the different components available in the Mandrivalinux 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 Mandrakelinux distribution.
+system and the different components of the Mandrivalinux distribution.
 
 
 1. License Agreement
 
 Please read this document carefully. This document is a license agreement between you and  
-Mandrakesoft S.A. which applies to the Software Products.
+Mandriva S.A. which applies to the Software Products.
 By installing, duplicating or using the Software Products in any manner, you explicitly 
 accept and fully agree to conform to the terms and conditions of this License. 
 If you disagree with any portion of the License, you are not allowed to install, duplicate or use 
@@ -33,21 +33,21 @@ Software Products.
 
 The Software Products and attached documentation are provided \"as is\", with no warranty, to the 
 extent permitted by law.
-Mandrakesoft S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,
+Mandriva S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,
 incidental, direct or indirect damages whatsoever (including without 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 use or inability to use the Software 
-Products, even if Mandrakesoft S.A. has been advised of the possibility or occurrence of such 
+Products, even if Mandriva S.A. has been advised of the possibility or occurrence of such 
 damages.
 
 LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES
 
-To the extent permitted by law, Mandrakesoft S.A. or its distributors will, in no circumstances, be 
+To the extent permitted by law, Mandriva S.A. or its distributors will, in no circumstances, be 
 liable for any special, incidental, direct or indirect damages whatsoever (including without 
 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 Mandrakelinux sites  which are prohibited or restricted in some countries by local laws.
+from one of Mandrivalinux 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.
 
@@ -59,9 +59,9 @@ of these components are governed under the terms and conditions of the GNU Gener
 Licence, hereafter called \"GPL\", or of similar licenses. Most of these licenses allow you to use, 
 duplicate, adapt or redistribute the components which they cover. Please read carefully the terms 
 and conditions of the license agreement for each component before using any component. Any question 
-on a component license should be addressed to the component author and not to Mandrakesoft.
-The programs developed by Mandrakesoft S.A. are governed by the GPL License. Documentation written 
-by Mandrakesoft S.A. is governed by a specific license. Please refer to the documentation for 
+on a component license should be addressed to the component author and not to Mandriva.
+The programs developed by Mandriva S.A. are governed by the GPL License. Documentation written 
+by Mandriva S.A. is governed by a specific license. Please refer to the documentation for 
 further details.
 
 
@@ -69,9 +69,9 @@ further details.
 
 All rights to the components of the Software Products belong to their respective authors and are 
 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 
+Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of Mandrakesoft S.A.  
+\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of Mandriva S.A.  
 
 
 5. Governing Laws 
@@ -82,7 +82,7 @@ agreement.
 The terms and conditions of this License are governed by the Laws of France.
 All disputes on the terms of this license will preferably be settled out of court. As a last 
 resort, the dispute will be referred to the appropriate Courts of Law of Paris - France.
-For any question on this document, please contact Mandrakesoft S.A.  
+For any question on this document, please contact Mandriva S.A.  
 ");
 }
 
@@ -132,7 +132,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 Mandrakelinux,
+For information on fixes which are available for this release of Mandrivalinux,
 consult the Errata available from:
 
 
@@ -140,7 +140,7 @@ consult the Errata available from:
 
 
 Information on configuring your system is available in the post
-install chapter of the Official Mandrakelinux User's Guide.",
+install chapter of the Official Mandrivalinux User's Guide.",
 N("http://www.mandrakelinux.com/en/errata.php3"));
 }
 
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index a57e96631..5d136fbfb 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -962,7 +962,7 @@ sub exitInstall {
     eval { output "$o->{prefix}/root/drakx/README", "This directory contains several installation-related files,
 mostly log files (very useful if you ever report a bug!).
 
-Beware that some Mandrakelinux tools rely on the contents of some
+Beware that some Mandrivalinux tools rely on the contents of some
 of these files... so remove any file from here at your own
 risk!
 " };
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 16fe7bef4..af020ee64 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -174,7 +174,7 @@ sub selectLanguage {
   
     $o->ask_warn('',
 formatAlaTeX(N("Your system is low on resources. You may have some problem installing
-Mandrakelinux. If that occurs, you can try a text install instead. For this,
+Mandrivalinux. 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
 
 }
@@ -668,7 +668,7 @@ sub deselectFoundMedia {
     }
     if ($ask_copy_rpms_on_disk) {
 	#- don't be afraid, cleanup old RPMs if upgrade
-	eval { rm_rf("$::prefix/var/ftp/pub/Mandrakelinux", "$::prefix/var/ftp/pub/Mandrivalinux") if $o->{isUpgrade} };
+	eval { rm_rf("$::prefix/var/ftp/pub/Mandrivalinux", "$::prefix/var/ftp/pub/Mandrivalinux") if $o->{isUpgrade} };
 	my $w = ugtk2->new("");
 	$i = -1;
 	$w->sync;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 49a8b026e..a16716110 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -818,7 +818,7 @@ Do you want to install the updates?")),
 	require crypto;
 	eval {
 	    my @mirrors = do {
-		my $_w = $o->wait_message('', N("Contacting Mandrakelinux web site to get the list of available mirrors..."));
+		my $_w = $o->wait_message('', N("Contacting Mandrivalinux 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 9266bae61..62a1db141 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_("Mandrakelinux Installation %s"));
+    my $banner = translate(N_("Mandrivalinux 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/adsl.pm b/perl-install/network/adsl.pm
index e521443b9..fc7d7d95e 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -379,7 +379,7 @@ METRIC=$metric
         $modules_conf->set_alias($_->[0], $_->[1]) foreach @{$modems{$adsl_device}{aliases}};
         $::isStandalone and $modules_conf->write;
     }
-    #- remove the "speedtch off" alias that was written by Mandrakelinux 10.0
+    #- remove the "speedtch off" alias that was written by Mandrivalinux 10.0
     $adsl_device eq 'speedtouch' and $modules_conf->remove_alias('speedtch');
 
     if ($adsl_type eq "capi") {
diff --git a/perl-install/network/drakfirewall.pm b/perl-install/network/drakfirewall.pm
index 7b36d4de0..6f5ec9183 100644
--- a/perl-install/network/drakfirewall.pm
+++ b/perl-install/network/drakfirewall.pm
@@ -157,7 +157,7 @@ sub get_conf {
     } else {
 	$in->ask_okcancel('', N("drakfirewall configurator
 
-This configures a personal firewall for this Mandrakelinux machine.
+This configures a personal firewall for this Mandrivalinux 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 0d353fd7d..a37db2e8a 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -1371,7 +1371,7 @@ It is not necessary on most networks."),
 
                    multiple_internet_cnx =>
                    {
-                    name => N("You have configured multiple ways to connect to the Internet.\nChoose the one you want to use.\n\n") . if_(!$::isStandalone, "You may want to configure some profiles after the installation, in the Mandrake Control Center"),
+                    name => N("You have configured multiple ways to connect to the Internet.\nChoose the one you want to use.\n\n") . if_(!$::isStandalone, "You may want to configure some profiles after the installation, in the Mandriva Control Center"),
                     data => sub {
                         [ { label => N("Internet connection"), val => \$netc->{internet_cnx_choice},
                             list => [ keys %{$netc->{internet_cnx}} ] } ];
diff --git a/perl-install/network/test.pm b/perl-install/network/test.pm
index cc043b19c..e442d61cb 100644
--- a/perl-install/network/test.pm
+++ b/perl-install/network/test.pm
@@ -111,7 +111,7 @@ sub update_status {
 
 =head2 Test synchronously
 
-#- resolve and get ping to hostname from command line if given, else to Mandrakesoft
+#- resolve and get ping to hostname from command line if given, else to Mandriva
 use lib qw(/usr/lib/libDrakX);
 use network::test;
 
@@ -131,7 +131,7 @@ ping to host: $ping
 
 =head2 Test asynchronously
 
-#- resolve and get ping to hostname from command line if given, else to Mandrakesoft
+#- resolve and get ping to hostname from command line if given, else to Mandriva
 #- prints a "." every 10 miliseconds during connection test
 use lib qw(/usr/lib/libDrakX);
 use network::test;
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 9e8d55dc6..28edf501e 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -3926,7 +3926,7 @@ sub hplip_help {
     
     if ($hplipentry->{scan}) {
 	$text .= N("The scanner in your printer can be used with the usual SANE software, for example Kooka or XSane (Both in the Multimedia/Graphics menu). ");
-	$text .= N("Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share your scanner on the network.\n\n");
+	$text .= N("Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share your scanner on the network.\n\n");
     }
 
     if (($hplipentry->{card} == 2) && ($deviceuri =~ m!/usb/!i)) {
diff --git a/perl-install/share/advertising/01.pl b/perl-install/share/advertising/01.pl
index 3c5fb7ec6..21dba375d 100644
--- a/perl-install/share/advertising/01.pl
+++ b/perl-install/share/advertising/01.pl
@@ -10,10 +10,10 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>What is Mandrakelinux?</b>"), center => 1 ],
+@text = ([ N("<b>What is Mandrivalinux?</b>"), center => 1 ],
          ' ',
-	 N("Welcome to <b>Mandrakelinux</b>!"),
+	 N("Welcome to <b>Mandrivalinux</b>!"),
 		 ' ',
-         N("Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the system, called the <b>operating system</b> (based on the Linux kernel) together with <b>a lot of applications</b> meeting every need you could even think of."),
+         N("Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the system, called the <b>operating system</b> (based on the Linux kernel) together with <b>a lot of applications</b> meeting every need you could even think of."),
          ' ',
-         N("Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It is also one of the <b>most widely used</b> Linux distributions worldwide!"));
\ No newline at end of file
+         N("Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It is also one of the <b>most widely used</b> Linux distributions worldwide!"));
\ No newline at end of file
diff --git a/perl-install/share/advertising/02.pl b/perl-install/share/advertising/02.pl
index 5747bea5f..bd137f43b 100644
--- a/perl-install/share/advertising/02.pl
+++ b/perl-install/share/advertising/02.pl
@@ -14,6 +14,6 @@ $border = 10;  #- for leftish text
          ' ',
 	 N("Welcome to the <b>world of open source</b>!"),
 		 ' ',
-         N("Mandrakelinux is committed to the open source model. This means that this new release is the result of <b>collaboration</b> between <b>Mandrakesoft's team of developers</b> and the <b>worldwide community</b> of Mandrakelinux contributors."),
+         N("Mandrivalinux is committed to the open source model. This means that this new release is the result of <b>collaboration</b> between <b>Mandriva's team of developers</b> and the <b>worldwide community</b> of Mandrivalinux contributors."),
          ' ',
          N("We would like to <b>thank</b> everyone who participated in the development of this latest release."));
\ No newline at end of file
diff --git a/perl-install/share/advertising/03.pl b/perl-install/share/advertising/03.pl
index aa6ab140c..4dc4e887d 100644
--- a/perl-install/share/advertising/03.pl
+++ b/perl-install/share/advertising/03.pl
@@ -12,7 +12,7 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>The GPL</b>"), center => 1 ],
          ' ',
-	 N("Most of the software included in the distribution and all of the Mandrakelinux tools are licensed under the <b>General Public License</b>."),
+	 N("Most of the software included in the distribution and all of the Mandrivalinux tools are licensed under the <b>General Public License</b>."),
 		 ' ',
          N("The GPL is at the heart of the open source model; it grants everyone the <b>freedom</b> to use, study, distribute and improve the software any way they want, provided they make the results available."),
          ' ',
diff --git a/perl-install/share/advertising/04.pl b/perl-install/share/advertising/04.pl
index 59d3aa078..619b56784 100644
--- a/perl-install/share/advertising/04.pl
+++ b/perl-install/share/advertising/04.pl
@@ -12,6 +12,6 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Join the Community</b>"), center => 1 ],
          ' ',
-	 N("Mandrakelinux has one of the <b>biggest communities</b> of users and developers. The role of such a community is very wide, ranging from bug reporting to the development of new applications. The community plays a <b>key role</b> in the Mandrakelinux world."),
+	 N("Mandrivalinux has one of the <b>biggest communities</b> of users and developers. The role of such a community is very wide, ranging from bug reporting to the development of new applications. The community plays a <b>key role</b> in the Mandrivalinux world."),
 		 ' ',
          N("To <b>learn more</b> about our dynamic community, please visit <b>www.mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel.php3</b> if you would like to get <b>involved</b> in the development."));
\ No newline at end of file
diff --git a/perl-install/share/advertising/05.pl b/perl-install/share/advertising/05.pl
index e2017969d..e00ee15a5 100644
--- a/perl-install/share/advertising/05.pl
+++ b/perl-install/share/advertising/05.pl
@@ -14,10 +14,10 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Download Version</b>"), center => 1 ],
          ' ',
-	 N("You are now installing <b>Mandrakelinux Download</b>. This is the free version that Mandrakesoft wants to keep <b>available to everyone</b>."),
+	 N("You are now installing <b>Mandrivalinux Download</b>. This is the free version that Mandriva wants to keep <b>available to everyone</b>."),
 		 ' ',
          N("The Download version <b>cannot include</b> all the software that is not open source. Therefore, you will not find in the Download version:"),
 	 N("	* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."),
 	 N("	* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, Flash™, etc.)."),
 	 ' ',
-	 N("You will not have access to the <b>services included</b> in the other Mandrakesoft products either."));
+	 N("You will not have access to the <b>services included</b> in the other Mandriva products either."));
diff --git a/perl-install/share/advertising/06.pl b/perl-install/share/advertising/06.pl
index 4a232d0c9..a08f66b6c 100644
--- a/perl-install/share/advertising/06.pl
+++ b/perl-install/share/advertising/06.pl
@@ -12,6 +12,6 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Discovery, Your First Linux Desktop</b>"), center => 1 ],
          ' ',
-	 N("You are now installing <b>Mandrakelinux Discovery</b>."),
+	 N("You are now installing <b>Mandrivalinux Discovery</b>."),
 		 ' ',
          N("Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux distribution. It includes a hand-picked selection of <b>premium software</b> for office, multimedia and Internet activities. Its menu is task-oriented, with a single application per task."));
\ No newline at end of file
diff --git a/perl-install/share/advertising/07.pl b/perl-install/share/advertising/07.pl
index 27a0aa468..aa32ac02a 100644
--- a/perl-install/share/advertising/07.pl
+++ b/perl-install/share/advertising/07.pl
@@ -12,6 +12,6 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>PowerPack, The Ultimate Linux Desktop</b>"), center => 1 ],
 	' ',
-	N("You are now installing <b>Mandrakelinux PowerPack</b>."),
+	N("You are now installing <b>Mandrivalinux PowerPack</b>."),
 	' ',
-	N("PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack includes <b>thousands of applications</b> - everything from the most popular to the most advanced."));
\ No newline at end of file
+	N("PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack includes <b>thousands of applications</b> - everything from the most popular to the most advanced."));
\ No newline at end of file
diff --git a/perl-install/share/advertising/08.pl b/perl-install/share/advertising/08.pl
index 071baacf3..a006eaeb9 100644
--- a/perl-install/share/advertising/08.pl
+++ b/perl-install/share/advertising/08.pl
@@ -12,6 +12,6 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"), center => 1 ],
 	' ',
-	N("You are now installing <b>Mandrakelinux PowerPack+</b>."),
+	N("You are now installing <b>Mandrivalinux PowerPack+</b>."),
 	' ',
 	N("PowerPack+ is a <b>full-featured Linux solution</b> for small to medium-sized <b>networks</b>. PowerPack+ includes thousands of <b>desktop applications</b> and a comprehensive selection of world-class <b>server applications</b>."));
\ No newline at end of file
diff --git a/perl-install/share/advertising/09.pl b/perl-install/share/advertising/09.pl
index 12cfb449c..bc51ed0c5 100644
--- a/perl-install/share/advertising/09.pl
+++ b/perl-install/share/advertising/09.pl
@@ -10,12 +10,12 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrakesoft Products</b>"), center => 1 ],
+@text = ([ N("<b>Mandriva Products</b>"), center => 1 ],
 	' ',
-	N("<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> products."),
+	N("<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."),
 	' ',
-	N("The Mandrakelinux products are:"),
+	N("The Mandrivalinux products are:"),
 	N("	* <b>Discovery</b>, Your First Linux Desktop."),
 	N("	* <b>PowerPack</b>, The Ultimate Linux Desktop."),
 	N("	* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."),
-	N("	* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making the most of your 64-bit processor."));
+	N("	* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making the most of your 64-bit processor."));
diff --git a/perl-install/share/advertising/10.pl b/perl-install/share/advertising/10.pl
index a59f1d206..91088e020 100644
--- a/perl-install/share/advertising/10.pl
+++ b/perl-install/share/advertising/10.pl
@@ -12,8 +12,8 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrakesoft Products (Nomad Products)</b>"), center => 1 ],
+@text = ([ N("<b>Mandriva Products (Nomad Products)</b>"), center => 1 ],
 	' ',
-	N("Mandrakesoft has developed two products that allow you to use Mandrakelinux <b>on any computer</b> and without any need to actually install it:"),
-	N("	* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a bootable CD-ROM."),
-	N("	* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the ultra-compact “LaCie Mobile Hard Drive”."));
+	N("Mandriva has developed two products that allow you to use Mandrivalinux <b>on any computer</b> and without any need to actually install it:"),
+	N("	* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a bootable CD-ROM."),
+	N("	* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the ultra-compact “LaCie Mobile Hard Drive”."));
diff --git a/perl-install/share/advertising/11.pl b/perl-install/share/advertising/11.pl
index 286e48e42..ed0eefa34 100644
--- a/perl-install/share/advertising/11.pl
+++ b/perl-install/share/advertising/11.pl
@@ -10,9 +10,9 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrakesoft Products (Professional Solutions)</b>"), center => 1 ],
+@text = ([ N("<b>Mandriva Products (Professional Solutions)</b>"), center => 1 ],
 	' ',
-	N("Below are the Mandrakesoft products designed to meet the <b>professional needs</b>:"),
-	N("	* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."),
-	N("	* <b>Corporate Server</b>, The Mandrakelinux Server Solution."),
-	N("	* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."));
\ No newline at end of file
+	N("Below are the Mandriva products designed to meet the <b>professional needs</b>:"),
+	N("	* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."),
+	N("	* <b>Corporate Server</b>, The Mandrivalinux Server Solution."),
+	N("	* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."));
\ No newline at end of file
diff --git a/perl-install/share/advertising/13-a.pl b/perl-install/share/advertising/13-a.pl
index a8a81ec8e..a863cec0e 100644
--- a/perl-install/share/advertising/13-a.pl
+++ b/perl-install/share/advertising/13-a.pl
@@ -12,7 +12,7 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Choose your Favorite Desktop Environment</b>"), center => 1 ],
 	' ',
-	N("With PowerPack, you will have the choice of the <b>graphical desktop environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."),
+	N("With PowerPack, you will have the choice of the <b>graphical desktop environment</b>. Mandriva has chosen <b>KDE</b> as the default one."),
 	' ',
 	N("KDE is one of the <b>most advanced</b> and <b>user-friendly</b> graphical desktop environment available. It includes a lot of integrated applications."),
 	' ',
diff --git a/perl-install/share/advertising/13-b.pl b/perl-install/share/advertising/13-b.pl
index 5914d8b68..72e42206d 100644
--- a/perl-install/share/advertising/13-b.pl
+++ b/perl-install/share/advertising/13-b.pl
@@ -12,7 +12,7 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Choose your Favorite Desktop Environment</b>"), center => 1 ],
 	' ',
-	N("With PowerPack+, you will have the choice of the <b>graphical desktop environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."),
+	N("With PowerPack+, you will have the choice of the <b>graphical desktop environment</b>. Mandriva has chosen <b>KDE</b> as the default one."),
 	' ',
 	N("KDE is one of the <b>most advanced</b> and <b>user-friendly</b> graphical desktop environment available. It includes a lot of integrated applications."),
 	' ',
diff --git a/perl-install/share/advertising/18.pl b/perl-install/share/advertising/18.pl
index c1a5e2860..0ff5f7ce0 100644
--- a/perl-install/share/advertising/18.pl
+++ b/perl-install/share/advertising/18.pl
@@ -12,7 +12,7 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Enjoy the Wide Range of Applications</b>"), center => 1 ],
 	' ',
-	N("In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for <b>all of your tasks</b>:"),
+	N("In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for <b>all of your tasks</b>:"),
 	N("	* Create, edit and share office documents with <b>OpenOffice.org</b>."),
 	N("	* Manage your personal data with the integrated personal information suites <b>Kontact</b> and <b>Evolution</b>."),
 	N("	* Browse the web with <b>Mozilla</b> and <b>Konqueror</b>."),
diff --git a/perl-install/share/advertising/25.pl b/perl-install/share/advertising/25.pl
index 93975500d..69cd49cc3 100644
--- a/perl-install/share/advertising/25.pl
+++ b/perl-install/share/advertising/25.pl
@@ -10,8 +10,8 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrakelinux Control Center</b>"), center => 1 ],
+@text = ([ N("<b>Mandrivalinux Control Center</b>"), center => 1 ],
 	' ',
-	N("The <b>Mandrakelinux Control Center</b> is an essential collection of Mandrakelinux-specific utilities designed to simplify the configuration of your computer."),
+	N("The <b>Mandrivalinux Control Center</b> is an essential collection of Mandrivalinux-specific utilities designed to simplify the configuration of your computer."),
 	' ',
 	N("You will immediately appreciate this collection of <b>more than 60</b> handy utilities for <b>easily configuring your system</b>: hardware devices, mount points, network and Internet, security level of your computer, etc."));
\ No newline at end of file
diff --git a/perl-install/share/advertising/26.pl b/perl-install/share/advertising/26.pl
index 89df6f915..c43d69e89 100644
--- a/perl-install/share/advertising/26.pl
+++ b/perl-install/share/advertising/26.pl
@@ -12,4 +12,4 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>The Open Source Model</b>"), center => 1 ],
 	' ',
-	N("Like all computer programming, open source software <b>requires time and people</b> for development. In order to respect the open source philosophy, Mandrakesoft sells added value products and services to <b>keep improving Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> and the development of Mandrakelinux, <b>please</b> consider buying one of our products or services!"));
\ No newline at end of file
+	N("Like all computer programming, open source software <b>requires time and people</b> for development. In order to respect the open source philosophy, Mandriva sells added value products and services to <b>keep improving Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> and the development of Mandrivalinux, <b>please</b> consider buying one of our products or services!"));
\ No newline at end of file
diff --git a/perl-install/share/advertising/27.pl b/perl-install/share/advertising/27.pl
index faac46418..359e8e54b 100644
--- a/perl-install/share/advertising/27.pl
+++ b/perl-install/share/advertising/27.pl
@@ -12,7 +12,7 @@ $border = 10;  #- for leftish text
 
 @text = ([ N("<b>Online Store</b>"), center => 1 ],
 	' ',
-	N("To learn more about Mandrakesoft products and services, you can visit our <b>e-commerce platform</b>."),
+	N("To learn more about Mandriva products and services, you can visit our <b>e-commerce platform</b>."),
 	' ',
 	N("There you can find all our products, services and third-party products."),
 	' ',
diff --git a/perl-install/share/advertising/28.pl b/perl-install/share/advertising/28.pl
index cce312594..a1108c3d8 100644
--- a/perl-install/share/advertising/28.pl
+++ b/perl-install/share/advertising/28.pl
@@ -12,13 +12,13 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrakeclub</b>"), center => 1 ],
+@text = ([ N("<b>Mandriva Club</b>"), center => 1 ],
 	' ',
-	N("<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux product.."),
+	N("<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux product.."),
 	' ',
-	N("Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"),
+	N("Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"),
 	N("	* <b>Special discounts</b> on products and services of our online store <b>store.mandrakesoft.com</b>."),
 	N("	* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ drivers)."),
-	N("	* Participation in Mandrakelinux <b>user forums</b>."),
-	N("	* <b>Early and privileged access</b>, before public release, to Mandrakelinux <b>ISO images</b>."),
+	N("	* Participation in Mandrivalinux <b>user forums</b>."),
+	N("	* <b>Early and privileged access</b>, before public release, to Mandrivalinux <b>ISO images</b>."),
 	N("	* And many more."));
diff --git a/perl-install/share/advertising/29.pl b/perl-install/share/advertising/29.pl
index 719c82338..ad997d59e 100644
--- a/perl-install/share/advertising/29.pl
+++ b/perl-install/share/advertising/29.pl
@@ -10,12 +10,12 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrakeonline</b>"), center => 1 ],
+@text = ([ N("<b>Mandriva Online</b>"), center => 1 ],
 	' ',
-	N("<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to offer its customers!"),
+	N("<b>Mandriva Online</b> is a new premium service that Mandriva is proud to offer its customers!"),
 	' ',
-	N("Mandrakeonline provides a wide range of valuable services for <b>easily updating</b> your Mandrakelinux systems:"),
+	N("Mandriva Online provides a wide range of valuable services for <b>easily updating</b> your Mandrivalinux systems:"),
 	N("	* <b>Perfect</b> system security (automated software updates)."),
 	N("	* <b>Notification</b> of updates (by e-mail or by an applet on the desktop)."),
 	N("	* Flexible <b>scheduled</b> updates."),
-	N("	* Management of <b>all your Mandrakelinux systems</b> with one account."));
\ No newline at end of file
+	N("	* Management of <b>all your Mandrivalinux systems</b> with one account."));
\ No newline at end of file
diff --git a/perl-install/share/advertising/30.pl b/perl-install/share/advertising/30.pl
index b76729750..650c04833 100644
--- a/perl-install/share/advertising/30.pl
+++ b/perl-install/share/advertising/30.pl
@@ -10,10 +10,10 @@ $border = 10;  #- for leftish text
 
 # @text = ([ N("text to display"), center => 1 ],
 
-@text = ([ N("<b>Mandrakeexpert</b>"), center => 1 ],
+@text = ([ N("<b>Mandriva Expert</b>"), center => 1 ],
 	' ',
-	N("Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on <b>our technical support platform</b> www.mandrakeexpert.com."),
+	N("Do you require <b>assistance?</b> Meet Mandriva's technical experts on <b>our technical support platform</b> www.mandrakeexpert.com."),
 	' ',
-	N("Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save a lot of time."),
+	N("Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save a lot of time."),
 	' ',
-	N("For any question related to Mandrakelinux, you have the possibility to purchase support incidents at <b>store.mandrakesoft.com</b>."));
\ No newline at end of file
+	N("For any question related to Mandrivalinux, you have the possibility to purchase support incidents at <b>store.mandrakesoft.com</b>."));
\ No newline at end of file
diff --git a/perl-install/share/compssUsers.pl b/perl-install/share/compssUsers.pl
index 5ebae7582..64e5373ca 100644
--- a/perl-install/share/compssUsers.pl
+++ b/perl-install/share/compssUsers.pl
@@ -193,7 +193,7 @@ N_("Utilities") =>
     flags => [ qw(MONITORING NETWORKING_FILE) ],
     default_selected => 1,
   },
-  { label => N_("Mandrakesoft Wizards"),
+  { label => N_("Mandriva Wizards"),
     descr => N_("Wizards to configure server"),
     flags => [ qw(WIZARDS) ],
     default_selected => 1,
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 8baa1f292..cc164c9c8 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -57,7 +57,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -76,7 +76,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -92,7 +92,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -158,7 +158,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1088,7 +1088,7 @@ msgstr ""
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3252,7 +3252,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3354,7 +3354,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3365,11 +3365,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3475,10 +3475,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
 "the listed services and they will be started automatically at boot time. !!\n"
@@ -3583,7 +3583,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -3681,12 +3681,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -3713,7 +3713,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -3722,7 +3722,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this operation\n"
 "after you confirm.\n"
 "\n"
@@ -3849,7 +3849,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -3863,7 +3863,7 @@ msgstr ""
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -3891,7 +3891,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -3907,7 +3907,7 @@ msgstr ""
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -3993,7 +3993,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4037,7 +4037,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4046,13 +4046,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4093,7 +4093,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4248,7 +4248,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4269,7 +4269,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4368,7 +4368,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4385,7 +4385,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4446,7 +4446,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -4743,7 +4743,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 Mandrakelinux installation."
+msgid "Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrivalinux installation."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -4845,16 +4845,16 @@ msgstr ""
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Mandrakelinux distribution \n"
+"The operating system and the different components available in the Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this License. \n"
 "If you disagree with any portion of the License, you are not allowed to install, duplicate or use \n"
@@ -4869,21 +4869,21 @@ msgid ""
 "\n"
 "The Software Products and attached documentation are provided \"as is\", with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,\n"
+"Mandriva S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without limitation damages for loss of \n"
 "business, interruption of business, financial loss, legal fees and penalties resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or occurrence of such \n"
+"Products, even if Mandriva S.A. has been advised of the possibility or occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, in no circumstances, be \n"
+"To the extent permitted by law, Mandriva S.A. or its distributors will, in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever (including without \n"
 "limitation damages for loss of business, interruption of business, financial loss, legal fees \n"
 "and penalties resulting from a court judgment, or any other consequential loss) arising out \n"
 "of the possession and use of software components or arising out of  downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some countries by local laws.\n"
+"from one of Mandrivalinux 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"
@@ -4895,9 +4895,9 @@ msgid ""
 "Licence, hereafter called \"GPL\", or of similar licenses. Most of these licenses allow you to use, \n"
 "duplicate, adapt or redistribute the components which they cover. Please read carefully the terms \n"
 "and conditions of the license agreement for each component before using any component. Any question \n"
-"on a component license should be addressed to the component author and not to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the documentation for \n"
+"on a component license should be addressed to the component author and not to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. Documentation written \n"
+"by Mandriva S.A. is governed by a specific license. Please refer to the documentation for \n"
 "further details.\n"
 "\n"
 "\n"
@@ -4905,9 +4905,9 @@ msgid ""
 "\n"
 "All rights to the components of the Software Products belong to their respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software Products, as a whole or in \n"
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -4918,7 +4918,7 @@ msgid ""
 "The terms and conditions of this License are governed by the Laws of France.\n"
 "All disputes on the terms of this license will preferably be settled out of court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 ""
 msgstr ""
 
@@ -4974,7 +4974,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 Mandrakelinux,\n"
+"For information on fixes which are available for this release of Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -4982,7 +4982,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5016,7 +5016,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For this,\n"
+"Mandrivalinux. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
@@ -5500,7 +5500,7 @@ msgstr ""
 
 #: install_steps_interactive.pm:821
 #, c-format
-msgid "Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgid "Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
 
 #: install_steps_interactive.pm:840
@@ -5692,7 +5692,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
 msgstr ""
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -8236,7 +8236,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -11471,7 +11471,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share your scanner on the network.\n"
 "\n"
 ""
 msgstr ""
@@ -13035,22 +13035,22 @@ msgstr ""
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
 msgstr ""
 
 #: share/advertising/01.pl:17
 #, c-format
-msgid "Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the system, called the <b>operating system</b> (based on the Linux kernel) together with <b>a lot of applications</b> meeting every need you could even think of."
+msgid "Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the system, called the <b>operating system</b> (based on the Linux kernel) together with <b>a lot of applications</b> meeting every need you could even think of."
 msgstr ""
 
 #: share/advertising/01.pl:19
 #, c-format
-msgid "Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It is also one of the <b>most widely used</b> Linux distributions worldwide!"
+msgid "Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
 #: share/advertising/02.pl:13
@@ -13065,7 +13065,7 @@ msgstr ""
 
 #: share/advertising/02.pl:17
 #, c-format
-msgid "Mandrakelinux is committed to the open source model. This means that this new release is the result of <b>collaboration</b> between <b>Mandrakesoft's team of developers</b> and the <b>worldwide community</b> of Mandrakelinux contributors."
+msgid "Mandrivalinux is committed to the open source model. This means that this new release is the result of <b>collaboration</b> between <b>Mandriva's team of developers</b> and the <b>worldwide community</b> of Mandrivalinux contributors."
 msgstr ""
 
 #: share/advertising/02.pl:19
@@ -13080,7 +13080,7 @@ msgstr ""
 
 #: share/advertising/03.pl:15
 #, c-format
-msgid "Most of the software included in the distribution and all of the Mandrakelinux tools are licensed under the <b>General Public License</b>."
+msgid "Most of the software included in the distribution and all of the Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -13100,7 +13100,7 @@ msgstr ""
 
 #: share/advertising/04.pl:15
 #, c-format
-msgid "Mandrakelinux has one of the <b>biggest communities</b> of users and developers. The role of such a community is very wide, ranging from bug reporting to the development of new applications. The community plays a <b>key role</b> in the Mandrakelinux world."
+msgid "Mandrivalinux has one of the <b>biggest communities</b> of users and developers. The role of such a community is very wide, ranging from bug reporting to the development of new applications. The community plays a <b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -13115,7 +13115,7 @@ msgstr ""
 
 #: share/advertising/05.pl:17
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Download</b>. This is the free version that Mandrakesoft wants to keep <b>available to everyone</b>."
+msgid "You are now installing <b>Mandrivalinux Download</b>. This is the free version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -13135,7 +13135,7 @@ msgstr ""
 
 #: share/advertising/05.pl:23
 #, c-format
-msgid "You will not have access to the <b>services included</b> in the other Mandrakesoft products either."
+msgid "You will not have access to the <b>services included</b> in the other Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -13145,7 +13145,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -13160,12 +13160,12 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
-msgid "PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack includes <b>thousands of applications</b> - everything from the most popular to the most advanced."
+msgid "PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack includes <b>thousands of applications</b> - everything from the most popular to the most advanced."
 msgstr ""
 
 #: share/advertising/08.pl:13
@@ -13175,7 +13175,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -13185,17 +13185,17 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr ""
 
 #: share/advertising/09.pl:15
 #, c-format
-msgid "<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> products."
+msgid "<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -13215,52 +13215,52 @@ msgstr ""
 
 #: share/advertising/09.pl:21
 #, c-format
-msgid "\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making the most of your 64-bit processor."
+msgid "\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
-msgid "Mandrakesoft has developed two products that allow you to use Mandrakelinux <b>on any computer</b> and without any need to actually install it:"
+msgid "Mandriva has developed two products that allow you to use Mandrivalinux <b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
-msgid "\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a bootable CD-ROM."
+msgid "\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
-msgid "\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the ultra-compact “LaCie Mobile Hard Drive”."
+msgid "\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
-msgid "Below are the Mandrakesoft products designed to meet the <b>professional needs</b>:"
+msgid "Below are the Mandriva products designed to meet the <b>professional needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -13290,7 +13290,7 @@ msgstr ""
 
 #: share/advertising/13-a.pl:15
 #, c-format
-msgid "With PowerPack, you will have the choice of the <b>graphical desktop environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+msgid "With PowerPack, you will have the choice of the <b>graphical desktop environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -13305,7 +13305,7 @@ msgstr ""
 
 #: share/advertising/13-b.pl:15
 #, c-format
-msgid "With PowerPack+, you will have the choice of the <b>graphical desktop environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+msgid "With PowerPack+, you will have the choice of the <b>graphical desktop environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -13410,7 +13410,7 @@ msgstr ""
 
 #: share/advertising/18.pl:15
 #, c-format
-msgid "In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for <b>all of your tasks</b>:"
+msgid "In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for <b>all of your tasks</b>:"
 msgstr ""
 
 #: share/advertising/18.pl:16
@@ -13615,12 +13615,12 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr ""
 
 #: share/advertising/25.pl:15
 #, c-format
-msgid "The <b>Mandrakelinux Control Center</b> is an essential collection of Mandrakelinux-specific utilities designed to simplify the configuration of your computer."
+msgid "The <b>Mandrivalinux Control Center</b> is an essential collection of Mandrivalinux-specific utilities designed to simplify the configuration of your computer."
 msgstr ""
 
 #: share/advertising/25.pl:17
@@ -13635,7 +13635,7 @@ msgstr ""
 
 #: share/advertising/26.pl:15
 #, c-format
-msgid "Like all computer programming, open source software <b>requires time and people</b> for development. In order to respect the open source philosophy, Mandrakesoft sells added value products and services to <b>keep improving Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> and the development of Mandrakelinux, <b>please</b> consider buying one of our products or services!"
+msgid "Like all computer programming, open source software <b>requires time and people</b> for development. In order to respect the open source philosophy, Mandriva sells added value products and services to <b>keep improving Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> and the development of Mandrivalinux, <b>please</b> consider buying one of our products or services!"
 msgstr ""
 
 #: share/advertising/27.pl:13
@@ -13645,7 +13645,7 @@ msgstr ""
 
 #: share/advertising/27.pl:15
 #, c-format
-msgid "To learn more about Mandrakesoft products and services, you can visit our <b>e-commerce platform</b>."
+msgid "To learn more about Mandriva products and services, you can visit our <b>e-commerce platform</b>."
 msgstr ""
 
 #: share/advertising/27.pl:17
@@ -13665,17 +13665,17 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
 msgstr ""
 
 #: share/advertising/28.pl:17
 #, c-format
-msgid "<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux product.."
+msgid "<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
-msgid "Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+msgid "Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -13690,27 +13690,27 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
-msgid "\t* <b>Early and privileged access</b>, before public release, to Mandrakelinux <b>ISO images</b>."
+msgid "\t* <b>Early and privileged access</b>, before public release, to Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr ""
 
 #: share/advertising/29.pl:15
 #, c-format
-msgid "<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to offer its customers!"
+msgid "<b>Mandriva Online</b> is a new premium service that Mandriva is proud to offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
-msgid "Mandrakeonline provides a wide range of valuable services for <b>easily updating</b> your Mandrakelinux systems:"
+msgid "Mandriva Online provides a wide range of valuable services for <b>easily updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -13730,27 +13730,27 @@ msgstr ""
 
 #: share/advertising/29.pl:21
 #, c-format
-msgid "\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+msgid "\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
 msgstr ""
 
 #: share/advertising/30.pl:15
 #, c-format
-msgid "Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on <b>our technical support platform</b> www.mandrakeexpert.com."
+msgid "Do you require <b>assistance?</b> Meet Mandriva's technical experts on <b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
-msgid "Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save a lot of time."
+msgid "Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
-msgid "For any question related to Mandrakelinux, you have the possibility to purchase support incidents at <b>store.mandrakesoft.com</b>."
+msgid "For any question related to Mandrivalinux, you have the possibility to purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
 #: share/compssUsers.pl:25
@@ -14030,7 +14030,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr ""
 
 #: share/compssUsers.pl:197
@@ -14127,7 +14127,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -14171,7 +14171,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      do not ask first confirmation question in MandrakeUpdate mode\n"
+"  --no-confirmation      do not ask first confirmation question in Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
@@ -16609,12 +16609,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr ""
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakbug:48
@@ -16634,7 +16634,7 @@ msgstr ""
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr ""
 
 #: standalone/drakbug:52
@@ -16679,7 +16679,7 @@ msgstr ""
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -17072,14 +17072,14 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -17130,7 +17130,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -17413,7 +17413,7 @@ msgstr ""
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -17860,7 +17860,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU GPL.\n"
 "\n"
 "Usage: \n"
@@ -17890,7 +17890,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr ""
 
 #: standalone/drakhelp:36
@@ -20833,7 +20833,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr ""
 
 #: standalone/logdrake:51
@@ -21336,7 +21336,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po
index a79cb4300..817826e30 100644
--- a/perl-install/share/po/af.po
+++ b/perl-install/share/po/af.po
@@ -66,7 +66,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Dit blyk dat die USB-stafie lees alleen is, ons kan dit nie huidiglik met\n"
 "veiligheid uitprop nie.\n"
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "Klik op die herlaai knoppie om die rekenaar te herlaai, prop dit uit,\n"
 "verwyder die skryf-beskerming, prop dit weer in, en loods\n"
-"dan weer Mandrake Move."
+"dan weer Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -92,7 +92,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "U USB-stafie het nie enige geldige Windows (FAT) partisies nie.\n"
@@ -108,7 +108,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -116,11 +116,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Ons kon nie enige USB-stafies opspoor nie. U het nou\n"
-"die geleentheid op een in te prop. Mandrake Move het die\n"
+"die geleentheid op een in te prop. Mandriva Move het die\n"
 "vermoë op u data in u tuisgids, asook die konfigurasie van die\n"
 "rekenaar daarop te stoor. Dis vind alles deursigtig plaas.\n"
 "Aandag: Indien u nou 'n USB-stafie inprop, wag asseblief paar\n"
@@ -255,7 +255,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1303,7 +1303,7 @@ msgstr "selfdoen"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 "U kan ander tale selekteer wat na installasie beskikbaar sal wees."
@@ -3707,12 +3707,12 @@ msgstr "laat radio ondersteuning toe"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Voordat u voortgaan, lees asb die lisensieterme noukeurig deur. Dit dek\n"
-"die hele Mandrakelinux distribusie. Indien u saamstem met al die\n"
+"die hele Mandrivalinux distribusie. Indien u saamstem met al die\n"
 "voorwaardes daarin, merk die \"%s\" boksie. Indien nie, kan u op die\n"
 "\"%s\" knoppie druk om teherlaai."
 
@@ -3898,13 +3898,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Die Mandrakelinux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"
+"Die Mandrivalinux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"
 "weet wanneer 'n gekose pakket op 'n ander CD-ROM is. DrakX sal in so\n"
 "geval die huidige CD uitskop en aandui watter een benodig word."
 
@@ -3912,11 +3912,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3968,12 +3968,12 @@ msgid ""
 "megabytes."
 msgstr ""
 "Nou moet u spesifiseer watter programme u op die rekenaar wil\n"
-"installeer. Daar is duisende pakkette beskikbaar vir Mandrakelinux, en\n"
+"installeer. Daar is duisende pakkette beskikbaar vir Mandrivalinux, en\n"
 "om alles meer eenvoudig te maak, is die pakkette gegroepeer onder\n"
 "groepe van selfde tipe programme.\n"
 "\n"
 "Die groepe is so saamgestel dat dit saamval met die tipe gebruik van u\n"
-"rekenaar. Mandrakelinux het vier vooraf gespesifseerde installasies\n"
+"rekenaar. Mandrivalinux het vier vooraf gespesifseerde installasies\n"
 "beskikbaar. Dink aan hierdie tipes as houers met verskillende pakkette.\n"
 "U kan wel uit die verskillende houers, verskillende pakkette kies.\n"
 "Dus kan u \"Werkstasie\" ook programme uit die \"Ontwikkeling\"\n"
@@ -4066,10 +4066,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4099,7 +4099,7 @@ msgstr ""
 "\n"
 "Indien u 'n diensprogram kies, of dit nou deel is van 'n groepe pakkette of\n"
 "'n enkel een, sal u gevra word om die installasie daarvan te bevestig.\n"
-"Mandrakelinux sal by verstek alle bediener-programme afskop nadat u die\n"
+"Mandrivalinux sal by verstek alle bediener-programme afskop nadat u die\n"
 "rekenaar aangeskakel het. Hierdie bediener-programme is verpak sonder\n"
 "enige probleme bekend. Dit kon intussen verander het, nadat sekuriteits-"
 "gate\n"
@@ -4242,7 +4242,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4410,12 +4410,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4442,7 +4442,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4451,7 +4451,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4471,11 +4471,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 ""
-"Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandrakelinux\n"
+"Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandrivalinux\n"
 "wil installeer. Indien u 'n leë hardeskyf het, of indien 'n bestaande\n"
 "bedryfstelsel al die beskikbare spasie gebruik, sal u partisies moet\n"
 "skep. Om 'n partisie te skep veroorsaak dat u die hardeskyf logies\n"
-"verdeel, om spasie te skep vir u nuwe Mandrakelinux bedryfstelsel.\n"
+"verdeel, om spasie te skep vir u nuwe Mandrivalinux bedryfstelsel.\n"
 "\n"
 "Indien u 'n onervare gebruiker is, kan die skep van partisies vreemd en\n"
 "intimiderend wees.\n"
@@ -4505,14 +4505,14 @@ msgstr ""
 "geskied\n"
 "sonner verlies van data, mits u die partisie gedefragmenteer het.Ons beveel "
 "ten sterkste aan dat u 'n rugsteun maak van u data. Hierdie is\n"
-"die beste metode indien u beide Mandrakelinux en Microsoft Windows op die\n"
+"die beste metode indien u beide Mandrivalinux en Microsoft Windows op die\n"
 "rekenaar wil gebruik.\n"
 "\n"
 "Neem tog kennis dat dit die beskikbare oop spasie in Microsoft Windows sal\n"
 "verminder, aangesien ons plek moet maak vir Linux op die hardeskyf.\n"
 "\n"
 " * \"%s\": Indien u alle data op alle partisies op u hardeskyf wil uitwis,\n"
-"en dit dan vervang met Mandrakelinux, kan u hierdie opsie kies.\n"
+"en dit dan vervang met Mandrivalinux, kan u hierdie opsie kies.\n"
 "Wees versigtig die opsie is onomkeerbaar!\n"
 "\n"
 "   !! Net weer waarsku: alle data op die skyf sal vernietig word. !! \n"
@@ -4664,7 +4664,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4704,7 +4704,7 @@ msgstr "Vorige"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4716,7 +4716,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Teen die tyd wat u Mandrakelinux installeer, is dit hoogs waarskynlik\n"
+"Teen die tyd wat u Mandrivalinux installeer, is dit hoogs waarskynlik\n"
 "dat van die pakkette intussen opgedateer is. Foute kom reggestel wees,\n"
 "of sekuriteits probleme is dalk opgelos. Om voordeel hieruit te put, kan\n"
 "u hulle nou van die Internet aflaai. Merk \"%s\" indien u 'n werkende\n"
@@ -4743,7 +4743,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4756,7 +4756,7 @@ msgstr ""
 "dit algemene gebruik op die rekenaar moeiliker maak.\n"
 "\n"
 "Indien u onseker is oor wat om te kies, bly by die verstek opsie. U\n"
-"kan altyd later die vlak verander deur draksec in die Mandrakelinux Control\n"
+"kan altyd later die vlak verander deur draksec in die Mandrivalinux Control\n"
 "Center te grbruik.\n"
 "\n"
 "Die \"%s\" veld kan boodskappe stuur na 'n gekose persoon wat\n"
@@ -4772,7 +4772,7 @@ msgstr "Sekuriteits-admin:"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4843,7 +4843,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Nou moet u asseblief besluit watter partisie(s) u gaan gebruik vir die\n"
-"installasie van u Mandrakelinux rekenaar.Indien die partisies reeds\n"
+"installasie van u Mandrivalinux rekenaar.Indien die partisies reeds\n"
 "geskep is gedurende 'n vorige GNU/Linux installasie of deur 'n ander\n"
 "partisie-program, kan u hulle gebruik.Indien nie, moet u eerstens\n"
 "partisies skep.\n"
@@ -4927,7 +4927,7 @@ msgstr "Skakel tussen normale/kenner modus"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4957,7 +4957,7 @@ msgid ""
 msgstr ""
 "Ons het meer as een Microsoft-partisie op u hardeskyf gevind.\n"
 "Kies dan nou die een wie se grootte u wil verander, om plek te maak\n"
-"vir u nuwe Mandrakelinux bedryfstelsel.\n"
+"vir u nuwe Mandrivalinux bedryfstelsel.\n"
 "\n"
 "Elke partisie is as volg gelys: \"Linux-naam\", \"Windows-naam\"\n"
 "\"Kapasiteit\".\n"
@@ -5006,7 +5006,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5015,19 +5015,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Hierdie stap word slegs gedoen indien ou GNU/Linux partisies op die\n"
 "rekenaar gevind is.\n"
 "\n"
 "DrakX moet nou weet of u 'n nuwe installasie of 'n opgradering van 'n\n"
-"bestaande Mandrakelinux wil doen:\n"
+"bestaande Mandrivalinux wil doen:\n"
 "\n"
 " * \"%s\": Hierdie deel word grootliks gebruik vir 'n hele nuwe "
 "installasie.\n"
@@ -5036,7 +5036,7 @@ msgstr ""
 "van u partisies se data wil behou.\n"
 "\n"
 " * \"%s\": hierdie tipe installasie laat u toe om pakkette op te dateer\n"
-"wat deel uitmaak van u huidige Mandrakelinux installasie. Die partisies\n"
+"wat deel uitmaak van u huidige Mandrivalinux installasie. Die partisies\n"
 "en gebruiker se data bly onveranderd. Ander stappe is baie dieselfde as\n"
 "'n normale installasie.\n"
 "\n"
@@ -5095,7 +5095,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5349,7 +5349,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5370,11 +5370,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Dit is nou tyd om u drukkerstelsel te kies. Ander bedryfstelsels sal\n"
-"seker net een aan u bied, maar Mandrakelinux gee twee. Elk van hulle\n"
+"seker net een aan u bied, maar Mandrivalinux gee twee. Elk van hulle\n"
 "is beter as die ander in sekere gevalle.\n"
 "\n"
 " * \"%s\" -- wat vir \"print, do not queue\" staan. Kies dit indien u\n"
@@ -5393,7 +5393,7 @@ msgstr ""
 "opsies te keis en drukkers te bestuur.\n"
 "\n"
 "Sou u die keuse nou, later wil verander, gaan gerus na 'PrinterDrake'\n"
-"in die 'Mandrakelinux Control Center' en klik op die \"Kenner\" knoppie."
+"in die 'Mandrivalinux Control Center' en klik op die \"Kenner\" knoppie."
 
 #: help.pm:765
 #, c-format
@@ -5511,7 +5511,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5528,7 +5528,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5640,10 +5640,10 @@ msgstr "Dienste"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Kies die hardeskyf wat u wil wis, om u nuwe Mandrakelinux\n"
+"Kies die hardeskyf wat u wil wis, om u nuwe Mandrivalinux\n"
 "te kan installeer. Wees tog versigtig, alle huidige data op daardie\n"
 "partisie sal vernietig word!"
 
@@ -5990,7 +5990,7 @@ msgstr "Bereken die grootte van die Windowspartisie"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr "U Windows-partisie is te gefragmenteer. Loop eers 'defrag' asb."
 
@@ -6105,19 +6105,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6139,7 +6139,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6147,14 +6147,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6164,7 +6164,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6184,10 +6184,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6198,11 +6198,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6218,7 +6218,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -6310,7 +6310,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6318,13 +6318,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Geluk, installasie is afgehandel.\n"
 "Verwyder die herlaaimedium en druk 'enter' om te herlaai.\n"
 "\n"
 "\n"
-"Vir inligting oor hierdie vrystelling van Mandrakelinux,\n"
+"Vir inligting oor hierdie vrystelling van Mandrivalinux,\n"
 "bekyk die errata beskikbaar op\n"
 "\n"
 "\n"
@@ -6332,7 +6332,7 @@ msgstr ""
 "\n"
 "\n"
 "Inligting oor stelskonfigurasie is beskikbaar in die postinstallasie-\n"
-"hoofstuk in die Offisiële Mandrakelinux Gebruikersgids."
+"hoofstuk in die Offisiële Mandrivalinux Gebruikersgids."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6367,13 +6367,13 @@ msgstr "Gaan stap '%s' binne\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "U stelsel het min hulpbronne beskikbaar. U mag dalk probleme\n"
 "ondervind met die installering\n"
-"van Mandrakelinux. In so 'n geval probeer eerder die teksinstallasie.\n"
+"van Mandrivalinux. In so 'n geval probeer eerder die teksinstallasie.\n"
 "Daarvoor moet u\n"
 "'F1' druk wanneer u vanaf die CDROM herlaai en dan 'text' op die\n"
 "instruksielyn intik."
@@ -6912,8 +6912,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "Kontak Mandrakelinux se webwerf vir 'n lys van spieëlwebplekke...."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
+msgstr "Kontak Mandrivalinux se webwerf vir 'n lys van spieëlwebplekke...."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7135,8 +7135,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux Installasie %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux Installasie %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9727,13 +9727,13 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall konfigurasie\n"
 "\n"
-"Hiermee stel u 'n persoonlike vuurmuur op vir die Mandrakelinux\n"
+"Hiermee stel u 'n persoonlike vuurmuur op vir die Mandrivalinux\n"
 "rekenaar. Indien u 'n kragtige en toegewyde vuurmuur verlang, kyk\n"
 "dan gerus na die 'MandrakeSecurity Firewall'."
 
@@ -13773,7 +13773,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14046,7 +14046,7 @@ msgid ""
 msgstr ""
 "Die netwerk, soos opgestel gedurende die installasie, kom nie aan die gang "
 "nie. Maak tog seker die netwerk is tot u beskikking, en gaan u konfigurasie "
-"na deur die 'Mandrakelinux Control Center' te gebruik. "
+"na deur die 'Mandrivalinux Control Center' te gebruik. "
 
 #: printer/printerdrake.pm:4196
 #, c-format
@@ -15674,18 +15674,18 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Wat is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Wat is Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Welkom by <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Welkom by <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -15694,11 +15694,11 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, fuzzy, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux is 'n Oopbron bedryfstelsel wat duisende van die keurigste "
-"programme beskikbaar in die Oopbron wêreld bevat. Mandrakelinux is een van "
+"Mandrivalinux is 'n Oopbron bedryfstelsel wat duisende van die keurigste "
+"programme beskikbaar in die Oopbron wêreld bevat. Mandrivalinux is een van "
 "die gewildste in die wereld!"
 
 #: share/advertising/02.pl:13
@@ -15714,13 +15714,13 @@ msgstr "Welkom by die wêreld van Oopbron sagteware!"
 #: share/advertising/02.pl:17
 #, fuzzy, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux is toegewyd aan die Oopbron manier van dinge doen. Hierdie "
-"vrystelling is die reslutaat van samewerking tussen Mandrakesoft se span "
+"Mandrivalinux is toegewyd aan die Oopbron manier van dinge doen. Hierdie "
+"vrystelling is die reslutaat van samewerking tussen Mandriva se span "
 "ontwikkelaars en 'n wereldwye gemeenskap wan mense wat bydraes lewer."
 
 #: share/advertising/02.pl:19
@@ -15741,7 +15741,7 @@ msgstr "<b>Neem Kennis</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -15762,15 +15762,15 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, fuzzy, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Sluit aan by die Mandrakelinux gemeenskap!</b>"
+msgstr "<b>Sluit aan by die Mandrivalinux gemeenskap!</b>"
 
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -15784,13 +15784,13 @@ msgstr ""
 #: share/advertising/05.pl:15
 #, fuzzy, c-format
 msgid "<b>Download Version</b>"
-msgstr "Hierdie is die Mandrakelinux <b>Download weergawe</b>."
+msgstr "Hierdie is die Mandrivalinux <b>Download weergawe</b>."
 
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -15817,7 +15817,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -15827,7 +15827,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15849,17 +15849,17 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, fuzzy, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack is Mandrakesoft se uitblinker werkstasie-produk. Buiten dat dit "
+"PowerPack is Mandriva se uitblinker werkstasie-produk. Buiten dat dit "
 "die maklikste is om te ken gebruik, sluit dit duisende programme in van die "
 "mees gewildste tot die mees tegnieste."
 
@@ -15870,7 +15870,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15887,20 +15887,20 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakestore</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva Store</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux Updates Applet"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux Updates Applet"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -15920,61 +15920,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr "Vind meer uit rakende <b>Personal Solutions</n>:"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -16012,7 +16012,7 @@ msgstr "<b>Kies u grafiese werksomgewing!</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -16033,7 +16033,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -16153,10 +16153,10 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, fuzzy, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Die kieslys in Mandrakelinux het gebruikersvriendelike programme vir alle "
+"Die kieslys in Mandrivalinux het gebruikersvriendelike programme vir alle "
 "behoefdes:"
 
 #: share/advertising/18.pl:16
@@ -16398,17 +16398,17 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux Control Center</b>"
 
 #: share/advertising/25.pl:15
 #, fuzzy, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"Die \"Mandrakelinux Control Center\" is 'n versameling nutsprogramme wat die "
+"Die \"Mandrivalinux Control Center\" is 'n versameling nutsprogramme wat die "
 "opstel van u rekenaar vergemaklik."
 
 #: share/advertising/25.pl:17
@@ -16432,9 +16432,9 @@ msgstr "<b>Die KDE Keuse</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -16446,10 +16446,10 @@ msgstr "<b>MandrakeStore</b>"
 #: share/advertising/27.pl:15
 #, fuzzy, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Hier kan u alle Mandrakesoft produkte en dienste vind. <b>Mandrakestore</b> "
+"Hier kan u alle Mandriva produkte en dienste vind. <b>Mandriva Store</b> "
 "--ons ten volle toegeruste e-handel platvorm."
 
 #: share/advertising/27.pl:17
@@ -16471,20 +16471,20 @@ msgstr "Gaan draai sommer vandag by <b>store.mandrakesoft.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, fuzzy, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 "Hierdie is meer as net 'n gemeenskap, hier kry u ekstra waarde deur produkte "
 "en dienste wat die volgende insluit:"
@@ -16494,7 +16494,7 @@ msgstr ""
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
 "<b>store.mandrakesoft.com</b>."
-msgstr "\t* Spesiale afslag vir produkte en dienste by \"Mandrakestore\""
+msgstr "\t* Spesiale afslag vir produkte en dienste by \"Mandriva Store\""
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -16505,33 +16505,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, fuzzy, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr "\t* Deel in die aanlyn kletzkamers met <b>Kopete</b>"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -16554,32 +16554,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -16883,8 +16883,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "<b>Mandrakestore</b>"
+msgid "Mandriva Wizards"
+msgstr "<b>Mandriva Store</b>"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -17033,7 +17033,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17047,7 +17047,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Mandrake Terminal Server Configurator\n"
+"Mandriva Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17103,7 +17103,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17111,7 +17111,7 @@ msgid ""
 msgstr ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -19891,13 +19891,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux Bug Report Tool"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux Control Center"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19917,8 +19917,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -19963,7 +19963,7 @@ msgstr "Konfigurasie-assistente"
 
 #: standalone/drakbug:81
 #, fuzzy, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr "Mandrake Bug Report Tool"
 
 #: standalone/drakbug:82
@@ -20389,20 +20389,20 @@ msgstr "Gelaai tydens herlaaityd"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Hierdie koppelvlak is nog nie opgestel nie.\n"
-"Loods die \"Add an interface\"-assistent vanuit die Mandrakelinux Control "
+"Loods die \"Add an interface\"-assistent vanuit die Mandrivalinux Control "
 "Center"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Hierdie koppelvlak is nog nie opgestel nie.\n"
-"Loods die \"%s\"-assistent vanuit die Mandrakelinux Control Center"
+"Loods die \"%s\"-assistent vanuit die Mandrivalinux Control Center"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20452,7 +20452,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20750,7 +20750,7 @@ msgstr "Trek in"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -20759,7 +20759,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21303,14 +21303,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Kopiereg © 2003-2004 Mandrakesoft.\n"
+"Kopiereg © 2003-2004 Mandriva.\n"
 "Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
 "GPL.\n"
 "\n"
@@ -21339,8 +21339,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux Hulp Sentrum"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux Hulp Sentrum"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -24858,8 +24858,8 @@ msgstr "Die verandering is aangebring, maar u moet eers afteken"
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinux Tools Logs"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25369,10 +25369,10 @@ msgstr "Voltooide konneksie."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Probleme met die Konneksie\n"
-"Maak tog seker van u konfigurasie in die 'Mandrakelinux Control Center'."
+"Maak tog seker van u konfigurasie in die 'Mandrivalinux Control Center'."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26395,13 +26395,13 @@ msgstr "Installasie het gefaal!"
 #~ msgstr "Fout om %s in skryfmodus te open: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Hierdie is HardDrake,'n Mandrakelinux program vir hardewarekonfigurasie.\n"
+#~ "Hierdie is HardDrake,'n Mandrivalinux program vir hardewarekonfigurasie.\n"
 #~ "<span foreground=\"royalblue3\">Weergawe:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Skrywer</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
@@ -26805,8 +26805,8 @@ msgstr "Installasie het gefaal!"
 #~ msgstr ""
 #~ "Probleme om drukker \"%s\" uit Star Office/OpenOffice.org/GIMP te verwyder"
 
-#~ msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
-#~ msgstr "<b>Veels Geluk met u puik keuse van Mandrakelinux! ;-)</b>"
+#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
+#~ msgstr "<b>Veels Geluk met u puik keuse van Mandrivalinux! ;-)</b>"
 
 #~ msgid ""
 #~ "We would like to thank everyone who participated in the development of "
@@ -26905,12 +26905,12 @@ msgstr "Installasie het gefaal!"
 #~ msgstr ""
 #~ "Bekyk en redigeer foto's en grafika deur <b>GQview</b>en<b>The Gimp!</b>"
 
-#~ msgid "Become a <b>Mandrakeclub</b> member!"
-#~ msgstr "Sluit aan by die <b><Mandrakeclub!</b>"
+#~ msgid "Become a <b>Mandriva Club</b> member!"
+#~ msgstr "Sluit aan by die <b><Mandriva Club!</b>"
 
 #~ msgid ""
 #~ "Take advantage of valuable benefits, products and services by joining "
-#~ "Mandrakeclub, such as:"
+#~ "Mandriva Club, such as:"
 #~ msgstr ""
 #~ "Hierdie is meer as net 'n gemeenskap, hier kry u ekstra waarde deur "
 #~ "produkte en dienste wat die volgende insluit:"
@@ -26919,14 +26919,14 @@ msgstr "Installasie het gefaal!"
 #~ msgstr "\t* Volle toegang na komersiele sagteware"
 
 #~ msgid ""
-#~ "\t* Special download mirror list exclusively for Mandrakeclub Members"
+#~ "\t* Special download mirror list exclusively for Mandriva Club Members"
 #~ msgstr ""
-#~ "\t* Spesiale spieel bedieners wat uitsluitlik vir \"Mandrakeclub\" se "
+#~ "\t* Spesiale spieel bedieners wat uitsluitlik vir \"Mandriva Club\" se "
 #~ "lede is"
 
-#~ msgid "\t* Voting for software to put in Mandrakelinux"
+#~ msgid "\t* Voting for software to put in Mandrivalinux"
 #~ msgstr ""
-#~ "\t* Stemreg om te kan se watter sagteware u in Mandrakelinux wil sien"
+#~ "\t* Stemreg om te kan se watter sagteware u in Mandrivalinux wil sien"
 
 #~ msgid "\t* Plus much more"
 #~ msgstr "\t* Plus veel meer"
@@ -26937,14 +26937,14 @@ msgstr "Installasie het gefaal!"
 #~ msgid "Do you require assistance?"
 #~ msgstr "Verlang u bystand?"
 
-#~ msgid "<b>Mandrakeexpert</b> is the primary source for technical support."
-#~ msgstr "<b>Mandrakeexpert</b> is die hoofbron van tegniese bystand."
+#~ msgid "<b>Mandriva Expert</b> is the primary source for technical support."
+#~ msgstr "<b>Mandriva Expert</b> is die hoofbron van tegniese bystand."
 
 #~ msgid ""
-#~ "If you have Linux questions, subscribe to Mandrakeexpert at <b>www."
+#~ "If you have Linux questions, subscribe to Mandriva Expert at <b>www."
 #~ "mandrakeexpert.com</b>"
 #~ msgstr ""
-#~ "Sou u enige Linux tipe vrae het, sluit aan by Mandrakeexpert <b>www. "
+#~ "Sou u enige Linux tipe vrae het, sluit aan by Mandriva Expert <b>www. "
 #~ "mandrakeexpert.com</b>"
 
 #~ msgid ""
@@ -26962,22 +26962,22 @@ msgstr "Installasie het gefaal!"
 #~ "mandrake- linux.com</b>!"
 
 #~ msgid ""
-#~ "Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus "
+#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "
 #~ "the latest versions of the most popular Open Source applications."
 #~ msgstr ""
-#~ "Mandrakelinux sluit die bekende KDEen GNOME grafiese werkskerms, asook "
+#~ "Mandrivalinux sluit die bekende KDEen GNOME grafiese werkskerms, asook "
 #~ "die nuutste weergawes van die mees gewilde Oopbron programme in."
 
 #~ msgid ""
-#~ "Mandrakelinux is widely known as the most user-friendly and the easiest "
+#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "
 #~ "to install and easy to use Linux distribution."
 #~ msgstr ""
-#~ "Mandrakelinux word deur meeste mense as die gebruikervriendelikste Linux "
+#~ "Mandrivalinux word deur meeste mense as die gebruikervriendelikste Linux "
 #~ "beskou. Dit is maklik om te installeer en maklik om te gebruik."
 
-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with <b>Mandrakemove</b>"
+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandrakemove</b>"
 #~ msgstr ""
-#~ "\t* Vind uit oor Mandrakelinux op 'n selflaai CD - <b>Mandrakemove</b>"
+#~ "\t* Vind uit oor Mandrivalinux op 'n selflaai CD - <b>Mandrakemove</b>"
 
 #~ msgid ""
 #~ "\t* If you use Linux mostly for Office, Internet and Multimedia tasks, "
@@ -27024,7 +27024,7 @@ msgstr "Installasie het gefaal!"
 #~ 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 "
+#~ "Mandrivalinux distribution. A unique blend for incomparable HPC "
 #~ "performance."
 #~ msgstr ""
 #~ "<b>MandrakeClustering</b>: die krag en spoed van 'n Linux-trosrekenaar "
@@ -27040,14 +27040,14 @@ msgstr "Installasie het gefaal!"
 #~ "aankoop waar ons dan 'n probleem per geval hanteer. daar is "
 #~ "verskeidenheid hoveelhede vir elke behoefde!"
 
-#~ msgid "<b>Become a Mandrakeclub member!</b>"
-#~ msgstr "<b>Word 'n lid van die Mandrakeclub!</b>"
+#~ msgid "<b>Become a Mandriva Club member!</b>"
+#~ msgstr "<b>Word 'n lid van die Mandriva Club!</b>"
 
 #~ msgid "<b>Do you require assistance?</b>"
 #~ msgstr "<b>Benodig u bystand?</b>"
 
-#~ msgid "This is the Mandrakelinux <b>Download version</b>."
-#~ msgstr "Hierdie is die Mandrakelinux <b>Download weergawe</b>."
+#~ msgid "This is the Mandrivalinux <b>Download version</b>."
+#~ msgstr "Hierdie is die Mandrivalinux <b>Download weergawe</b>."
 
 #~ msgid ""
 #~ "The free download version does not include commercial software, and "
@@ -27071,25 +27071,25 @@ msgstr "Installasie het gefaal!"
 #~ "'n volledige keuse wereldklas bediener aplikasies in te sluit."
 
 #~ msgid ""
-#~ "It is the only Mandrakelinux product that includes the groupware solution."
+#~ "It is the only Mandrivalinux product that includes the groupware solution."
 #~ msgstr ""
-#~ "Dit is die enigste Mandrakelinux produk wat die \"groupware\" oplossing "
+#~ "Dit is die enigste Mandrivalinux produk wat die \"groupware\" oplossing "
 #~ "bevat."
 
 #~ msgid ""
-#~ "When you log into your Mandrakelinux system for the first time, you can "
+#~ "When you log into your Mandrivalinux system for the first time, you can "
 #~ "choose between several popular graphical desktops environments, "
 #~ "including: KDE, GNOME, WindowMaker, IceWM, and others."
 #~ msgstr ""
-#~ "Sodra u die eerste keer inteken op u Mandrakelinux rekenaar, het u 'n "
+#~ "Sodra u die eerste keer inteken op u Mandrivalinux rekenaar, het u 'n "
 #~ "keuse watter grafiese werksomgewing om te gebruik. Keuses sluit KDE, "
 #~ "GNOME, WindowMaker, IceWM, en ander in."
 
 #~ msgid ""
-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "
+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
 #~ "of your tasks:"
 #~ msgstr ""
-#~ "Die kieslys in Mandrakelinux het gebruikersvriendelike programme vir alle "
+#~ "Die kieslys in Mandrivalinux het gebruikersvriendelike programme vir alle "
 #~ "behoefdes:"
 
 #~ msgid ""
@@ -27134,12 +27134,12 @@ msgstr "Installasie het gefaal!"
 #~ msgstr "\t* Adresboek (kliënt en bediener)"
 
 #~ msgid ""
-#~ "Your new Mandrakelinux distribution is the result of collaborative "
-#~ "efforts between Mandrakesoft developers and Mandrakelinux contributors "
+#~ "Your new Mandrivalinux distribution is the result of collaborative "
+#~ "efforts between Mandriva developers and Mandrivalinux contributors "
 #~ "throughout the world."
 #~ msgstr ""
-#~ "U nuwe Mandrakelinux bedryfstelsel met al sy programme is die resultaat "
-#~ "van 'n wereldwye gemeenskap, wat Mandrakesoft se ontwikkelaars, asook "
+#~ "U nuwe Mandrivalinux bedryfstelsel met al sy programme is die resultaat "
+#~ "van 'n wereldwye gemeenskap, wat Mandriva se ontwikkelaars, asook "
 #~ "mense in Sonnige Suid-Afrika insluit!"
 
 #~ msgid ""
@@ -27208,13 +27208,13 @@ msgstr "Installasie het gefaal!"
 #~ msgid ""
 #~ "Before continuing, you should carefully read the terms of the license. "
 #~ "It\n"
-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "
+#~ "covers the entire Mandrivalinux 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 ""
 #~ "Voordat u voortgaan, lees asb die lisensieterme noukeurig deur. Dit dek\n"
-#~ "die hele Mandrakelinux distribusie. Indien u saamstem met al die\n"
+#~ "die hele Mandrivalinux distribusie. Indien u saamstem met al die\n"
 #~ "voorwaardes daarin, merk die \"%s\" boksie. Indien nie, kan u op die\n"
 #~ "\"%s\" knoppie druk om teherlaai."
 
@@ -27326,25 +27326,25 @@ msgstr "Installasie het gefaal!"
 #~ "nie. "
 
 #~ msgid ""
-#~ "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+#~ "The Mandrivalinux 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 ""
-#~ "Die Mandrakelinux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"
+#~ "Die Mandrivalinux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"
 #~ "weet wanneer 'n gekose pakket op 'n ander CD-ROM is. DrakX sal in so\n"
 #~ "geval die huidige CD uitskop en aandui watter een benodig word."
 
 #~ msgid ""
 #~ "It is now time to specify which programs you wish to install on your\n"
-#~ "system. There are thousands of packages available for Mandrakelinux, and\n"
+#~ "system. There are thousands of packages available for Mandrivalinux, 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. Mandrakelinux sorts packages groups in four categories. You can\n"
+#~ "machine. Mandrivalinux 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"
@@ -27397,12 +27397,12 @@ msgstr "Installasie het gefaal!"
 #~ "updating an existing system."
 #~ msgstr ""
 #~ "Nou moet u spesifiseer watter programme u op die rekenaar wil\n"
-#~ "installeer. Daar is duisende pakkette beskikbaar vir Mandrakelinux, en\n"
+#~ "installeer. Daar is duisende pakkette beskikbaar vir Mandrivalinux, en\n"
 #~ "om alles meer eenvoudig te maak, is die pakkette gegroepeer onder\n"
 #~ "groepe van selfde tipe programme.\n"
 #~ "\n"
 #~ "Die groepe is so saamgestel dat dit saamval met die tipe gebruik van u\n"
-#~ "rekenaar. Mandrakelinux het vier vooraf gespesifseerde installasies\n"
+#~ "rekenaar. Mandrivalinux het vier vooraf gespesifseerde installasies\n"
 #~ "beskikbaar. Dink aan hierdie tipes as houers met verskillende pakkette.\n"
 #~ "U kan wel uit die verskillende houers, verskillende pakkette kies.\n"
 #~ "Dus kan u \"Werkstasie\" ook programme uit die \"Ontwikkeling\"\n"
@@ -27458,11 +27458,11 @@ msgstr "Installasie het gefaal!"
 #~ "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 Mandrakelinux will automatically start any "
+#~ "installed. By default Mandrivalinux 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 Mandrakelinux was\n"
+#~ "security holes were discovered after this version of Mandrivalinux 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"
@@ -27501,7 +27501,7 @@ msgstr "Installasie het gefaal!"
 #~ "Indien u 'n diensprogram kies, of dit nou deel is van 'n groepe pakkette "
 #~ "of\n"
 #~ "'n enkel een, sal u gevra word om die installasie daarvan te bevestig.\n"
-#~ "Mandrakelinux sal by verstek alle bediener-programme afskop nadat u die\n"
+#~ "Mandrivalinux sal by verstek alle bediener-programme afskop nadat u die\n"
 #~ "rekenaar aangeskakel het. Hierdie bediener-programme is verpak sonder\n"
 #~ "enige probleme bekend. Dit kon intussen verander het, nadat sekuriteits-"
 #~ "gate\n"
@@ -27530,7 +27530,7 @@ msgstr "Installasie het gefaal!"
 #~ "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"
-#~ "Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
+#~ "Mandrivalinux 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"
@@ -27551,7 +27551,7 @@ msgstr "Installasie het gefaal!"
 #~ "modems\n"
 #~ "that require additional software to work compared to Normal modems. Some "
 #~ "of\n"
-#~ "those modems actually work under Mandrakelinux, some others do not. You\n"
+#~ "those modems actually work under Mandrivalinux, 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"
@@ -27562,7 +27562,7 @@ msgstr "Installasie het gefaal!"
 #~ "U kan nou die Internet/netwerk konneksie opstel. Indien u graag die "
 #~ "rekenaar\n"
 #~ "aan die Internet of plaaslike netwerk wil koppel, kies \"%s\".\n"
-#~ "Mandrakelinux sal poog om u netwerk toestelle en modems te outospeur.\n"
+#~ "Mandrivalinux sal poog om u netwerk toestelle en modems te outospeur.\n"
 #~ "Indien\n"
 #~ "dit onsuksesvol was, probeer waar \"%s\" nie gemerk is nie. U kan ook "
 #~ "kies\n"
@@ -27689,7 +27689,7 @@ msgstr "Installasie het gefaal!"
 #~ "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 Mandrakelinux rely upon.\n"
+#~ "WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 #~ "\n"
 #~ "You will be presented with a list of different parameters to change to "
 #~ "get\n"
@@ -27874,7 +27874,7 @@ msgstr "Installasie het gefaal!"
 #~ "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"
-#~ "Mandrakelinux system.\n"
+#~ "Mandrivalinux 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 "
@@ -27913,7 +27913,7 @@ msgstr "Installasie het gefaal!"
 #~ "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 Mandrakelinux and Microsoft Windows "
+#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "
 #~ "on\n"
 #~ "the same computer.\n"
 #~ "\n"
@@ -27923,7 +27923,7 @@ msgstr "Installasie het gefaal!"
 #~ "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 Mandrakelinux system,\n"
+#~ "your hard drive and replace them with your new Mandrivalinux system,\n"
 #~ "choose this option. Be careful, because you will not be able to undo "
 #~ "your\n"
 #~ "choice after you confirm.\n"
@@ -27948,11 +27948,11 @@ msgstr "Installasie het gefaal!"
 #~ "refer to the ``Managing Your Partitions'' section in the ``Starter "
 #~ "Guide''."
 #~ msgstr ""
-#~ "Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandrakelinux\n"
+#~ "Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandrivalinux\n"
 #~ "wil installeer. Indien u 'n leë hardeskyf het, of indien 'n bestaande\n"
 #~ "bedryfstelsel al die beskikbare spasie gebruik, sal u partisies moet\n"
 #~ "skep. Om 'n partisie te skep veroorsaak dat u die hardeskyf logies\n"
-#~ "verdeel, om spasie te skep vir u nuwe Mandrakelinux bedryfstelsel.\n"
+#~ "verdeel, om spasie te skep vir u nuwe Mandrivalinux bedryfstelsel.\n"
 #~ "\n"
 #~ "Indien u 'n onervare gebruiker is, kan die skep van partisies vreemd en\n"
 #~ "intimiderend wees.\n"
@@ -27988,7 +27988,7 @@ msgstr "Installasie het gefaal!"
 #~ "geskied\n"
 #~ "sonner verlies van data, mits u die partisie gedefragmenteer het.Ons "
 #~ "beveel ten sterkste aan dat u 'n rugsteun maak van u data. Hierdie is\n"
-#~ "die beste metode indien u beide Mandrakelinux en Microsoft Windows op "
+#~ "die beste metode indien u beide Mandrivalinux en Microsoft Windows op "
 #~ "die\n"
 #~ "rekenaar wil gebruik.\n"
 #~ "\n"
@@ -27998,7 +27998,7 @@ msgstr "Installasie het gefaal!"
 #~ "\n"
 #~ " * \"%s\": Indien u alle data op alle partisies op u hardeskyf wil "
 #~ "uitwis,\n"
-#~ "en dit dan vervang met Mandrakelinux, kan u hierdie opsie kies.\n"
+#~ "en dit dan vervang met Mandrivalinux, kan u hierdie opsie kies.\n"
 #~ "Wees versigtig die opsie is onomkeerbaar!\n"
 #~ "\n"
 #~ "   !! Net weer waarsku: alle data op die skyf sal vernietig word. !! \n"
@@ -28105,7 +28105,7 @@ msgstr "Installasie het gefaal!"
 #~ "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"
-#~ "Mandrakelinux operating system installation.\n"
+#~ "Mandrivalinux operating system installation.\n"
 #~ "\n"
 #~ "Click on \"%s\" if you wish to select partitions that will be checked "
 #~ "for\n"
@@ -28135,7 +28135,7 @@ msgstr "Installasie het gefaal!"
 #~ "getoets moet word."
 
 #~ msgid ""
-#~ "At the time you are installing Mandrakelinux, it is likely that some\n"
+#~ "At the time you are installing Mandrivalinux, 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"
@@ -28150,7 +28150,7 @@ msgstr "Installasie het gefaal!"
 #~ "the\n"
 #~ "selected package(s), or \"%s\" to abort."
 #~ msgstr ""
-#~ "Teen die tyd wat u Mandrakelinux installeer, is dit hoogs waarskynlik\n"
+#~ "Teen die tyd wat u Mandrivalinux installeer, is dit hoogs waarskynlik\n"
 #~ "dat van die pakkette intussen opgedateer is. Foute kom reggestel wees,\n"
 #~ "of sekuriteits probleme is dalk opgelos. Om voordeel hieruit te put, kan\n"
 #~ "u hulle nou van die Internet aflaai. Merk \"%s\" indien u 'n werkende\n"
@@ -28213,7 +28213,7 @@ msgstr "Installasie het gefaal!"
 #~ "\n"
 #~ "DrakX now needs to know if you want to perform a new install or an "
 #~ "upgrade\n"
-#~ "of an existing Mandrakelinux system:\n"
+#~ "of an existing Mandrivalinux system:\n"
 #~ "\n"
 #~ " * \"%s\": For the most part, this completely wipes out the old system. "
 #~ "If\n"
@@ -28225,21 +28225,21 @@ msgstr "Installasie het gefaal!"
 #~ "written.\n"
 #~ "\n"
 #~ " * \"%s\": this installation class allows you to update the packages\n"
-#~ "currently installed on your Mandrakelinux system. Your current\n"
+#~ "currently installed on your Mandrivalinux 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 Mandrakelinux systems\n"
+#~ "Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 #~ "running version \"8.1\" or later. Performing an Upgrade on versions "
 #~ "prior\n"
-#~ "to Mandrakelinux version \"8.1\" is not recommended."
+#~ "to Mandrivalinux version \"8.1\" is not recommended."
 #~ msgstr ""
 #~ "Hierdie stap word slegs gedoen indien ou GNU/Linux partisies op die\n"
 #~ "rekenaar gevind is.\n"
 #~ "\n"
 #~ "DrakX moet nou weet of u 'n nuwe installasie of 'n opgradering van 'n\n"
-#~ "bestaande Mandrakelinux wil doen:\n"
+#~ "bestaande Mandrivalinux wil doen:\n"
 #~ "\n"
 #~ " * \"%s\": Hierdie deel word grootliks gebruik vir 'n hele nuwe "
 #~ "installasie.\n"
@@ -28250,7 +28250,7 @@ msgstr "Installasie het gefaal!"
 #~ "van u partisies se data wil behou.\n"
 #~ "\n"
 #~ " * \"%s\": hierdie tipe installasie laat u toe om pakkette op te dateer\n"
-#~ "wat deel uitmaak van u huidige Mandrakelinux installasie. Die partisies\n"
+#~ "wat deel uitmaak van u huidige Mandrivalinux installasie. Die partisies\n"
 #~ "en gebruiker se data bly onveranderd. Ander stappe is baie dieselfde as\n"
 #~ "'n normale installasie.\n"
 #~ "\n"
@@ -28315,7 +28315,7 @@ msgstr "Installasie het gefaal!"
 #~ "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, Mandrakelinux will be using it\n"
+#~ "still under development. For that reason, Mandrivalinux 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"
@@ -28571,7 +28571,7 @@ msgstr "Installasie het gefaal!"
 #~ "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 Mandrakelinux\n"
+#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"
 #~ "system! Be sure you know what you are doing before changing any of the\n"
 #~ "options. !!\n"
 #~ "\n"
@@ -28703,7 +28703,7 @@ msgstr "Installasie het gefaal!"
 #~ msgid ""
 #~ "Now, it's time to select a printing system for your computer. Other OSs "
 #~ "may\n"
-#~ "offer you one, but Mandrakelinux offers two. Each of the printing "
+#~ "offer you one, but Mandrivalinux offers two. Each of the printing "
 #~ "systems\n"
 #~ "is best suited to particular types of configuration.\n"
 #~ "\n"
@@ -28739,7 +28739,7 @@ msgstr "Installasie het gefaal!"
 #~ "Center and clicking the expert button."
 #~ msgstr ""
 #~ "Dit is nou tyd om u drukkerstelsel te kies. Ander bedryfstelsels sal\n"
-#~ "seker net een aan u bied, maar Mandrakelinux gee twee. Elk van hulle\n"
+#~ "seker net een aan u bied, maar Mandrivalinux gee twee. Elk van hulle\n"
 #~ "is beter as die ander in sekere gevalle.\n"
 #~ "\n"
 #~ " * \"%s\" -- wat vir \"print, do not queue\" staan. Kies dit indien u\n"
@@ -29253,10 +29253,10 @@ msgstr "Installasie het gefaal!"
 #~ "opstel van u rekenaar vergemaklik."
 
 #~ msgid ""
-#~ "Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- "
+#~ "Find all Mandriva products and services at <b>MandrakeStore</b> -- "
 #~ "our full service e-commerce platform."
 #~ msgstr ""
-#~ "Hier kan u alle Mandrakesoft produkte en dienste vind. <b>MandrakeStore</"
+#~ "Hier kan u alle Mandriva produkte en dienste vind. <b>MandrakeStore</"
 #~ "b> --ons ten volle toegeruste e-handel platvorm."
 
 #~ msgid "Become a <b>MandrakeClub</b> member!"
@@ -29278,25 +29278,25 @@ msgstr "Installasie het gefaal!"
 #~ msgid "\t* Special discounts for products and services at MandrakeStore"
 #~ msgstr "\t* Spesiale afslag vir produkte en dienste by \"MandrakeStore\""
 
-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandriva Move</b>"
 #~ msgstr ""
-#~ "\t* Vind uit oor Mandrakelinux op 'n selflaai CD - <b>MandrakeMove</b>"
+#~ "\t* Vind uit oor Mandrivalinux op 'n selflaai CD - <b>Mandriva Move</b>"
 
 #~ msgid ""
-#~ "Find all Mandrakesoft products at <b>MandrakeStore</b> -- our full "
+#~ "Find all Mandriva products at <b>MandrakeStore</b> -- our full "
 #~ "service e-commerce platform."
 #~ msgstr ""
-#~ "Mandrakesoft se produkte is by <b>MandrakeStore</b> -- ons volledige e-"
+#~ "Mandriva se produkte is by <b>MandrakeStore</b> -- ons volledige e-"
 #~ "handel winkel."
 
 #~ msgid "<b>Become a MandrakeClub member!</b>"
 #~ msgstr "<b>Word 'n lid van die MandrakeClub!</b>"
 
 #~ msgid ""
-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "
+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
 #~ "tasks:"
 #~ msgstr ""
-#~ "Die kieslys in Mandrakelinux het gebruikersvriendelike programme vir alle "
+#~ "Die kieslys in Mandrivalinux het gebruikersvriendelike programme vir alle "
 #~ "behoefdes:"
 
 #~ msgid ""
@@ -29334,7 +29334,7 @@ msgstr "Installasie het gefaal!"
 
 #~ msgid ""
 #~ "[OPTIONS]...\n"
-#~ "Mandrake Terminal Server Configurator\n"
+#~ "Mandriva Terminal Server Configurator\n"
 #~ "--enable         : enable MTS\n"
 #~ "--disable        : disable MTS\n"
 #~ "--start          : start MTS\n"
@@ -29349,7 +29349,7 @@ msgstr "Installasie het gefaal!"
 #~ "address, IP, nbi image name)"
 #~ msgstr ""
 #~ "[OPTIONS]...\n"
-#~ "Mandrake Terminal Server Configurator\n"
+#~ "Mandriva Terminal Server Configurator\n"
 #~ "--enable         : enable MTS\n"
 #~ "--disable        : disable MTS\n"
 #~ "--start          : start MTS\n"
@@ -29363,8 +29363,8 @@ msgstr "Installasie het gefaal!"
 #~ "--delclient      : delete a client machine from MTS (requires MAC "
 #~ "address, IP, nbi image name)"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "This interface has not been configured yet.\n"
@@ -29487,8 +29487,8 @@ msgstr "Installasie het gefaal!"
 
 #~ msgid ""
 #~ "Take advantage of valuable benefits, products and services by joining "
-#~ "Mandrake Club, such as:"
-#~ msgstr "Slaan munt uit die voordele wat Mandrake Club u bied, dinge soos:"
+#~ "Mandriva Club, such as:"
+#~ msgstr "Slaan munt uit die voordele wat Mandriva Club u bied, dinge soos:"
 
 #~ msgid "TCP/IP"
 #~ msgstr "TCP/IP"
diff --git a/perl-install/share/po/am.po b/perl-install/share/po/am.po
index 073769026..97def7d54 100644
--- a/perl-install/share/po/am.po
+++ b/perl-install/share/po/am.po
@@ -1,5 +1,5 @@
 # Latest versions of po files are at http://www.mandrakelinux.com/l10n/am.php3
-# Copyright (C) 2004 Mandrakesoft SA
+# Copyright (C) 2004 Mandriva SA
 # Alemayehu Gemeda <alemayehu@gmx.at>, 2004.
 #
 msgid ""
@@ -58,7 +58,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -77,7 +77,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -93,7 +93,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -217,7 +217,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1199,7 +1199,7 @@ msgstr "የመመሪያ ገጾች"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3438,7 +3438,7 @@ msgstr "የሬዲዮ ድጋፍ አስቻል"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3548,7 +3548,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3559,11 +3559,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3670,10 +3670,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3782,7 +3782,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -3880,12 +3880,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -3912,7 +3912,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -3921,7 +3921,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4050,7 +4050,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4068,7 +4068,7 @@ msgstr "የቀድሞው"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4097,7 +4097,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4113,7 +4113,7 @@ msgstr "የደህንነት ተቆጣጣሪ"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4199,7 +4199,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4244,7 +4244,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4253,13 +4253,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4300,7 +4300,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4457,7 +4457,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4478,7 +4478,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4578,7 +4578,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4595,7 +4595,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4657,7 +4657,7 @@ msgstr "አገልግሎት"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -4965,7 +4965,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 
@@ -5069,19 +5069,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5103,7 +5103,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5111,14 +5111,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5128,7 +5128,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5148,10 +5148,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5162,11 +5162,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5182,7 +5182,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5239,7 +5239,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5247,7 +5247,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5279,7 +5279,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -5781,7 +5781,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
 
 #: install_steps_interactive.pm:840
@@ -5986,8 +5986,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "የMandrakelinux ተከላ %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "የMandrivalinux ተከላ %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8546,7 +8546,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12102,7 +12102,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -13766,18 +13766,18 @@ msgstr "አቁም"
 
 #: share/advertising/01.pl:13
 #, fuzzy, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr "ትርጉሙ &ጅምር ነው"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "ወደ <b>Mandrakelinux</b>! እንኳን ደህና መጡ"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "ወደ <b>Mandrivalinux</b>! እንኳን ደህና መጡ"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -13786,7 +13786,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -13803,9 +13803,9 @@ msgstr ""
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -13825,7 +13825,7 @@ msgstr "ማስታወሻ"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -13851,10 +13851,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -13873,8 +13873,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -13901,7 +13901,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -13911,7 +13911,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -13930,13 +13930,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -13948,7 +13948,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -13962,19 +13962,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>የMandrakelinux ባለሞያ</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>የMandrivalinux ባለሞያ</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -13995,61 +13995,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14087,7 +14087,7 @@ msgstr "<b>የእድገት አካባቢዎች</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14108,7 +14108,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -14225,7 +14225,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -14460,14 +14460,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr "አንቀጹን መሀል ኩልኩል አድርግ"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -14489,21 +14489,21 @@ msgstr "Name=ኬዲኢ 1"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
 #: share/advertising/27.pl:13
 #, fuzzy, c-format
 msgid "<b>Online Store</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -14526,20 +14526,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>የMandrakelinux ክለብ</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>የMandrivalinux ክለብ</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -14558,33 +14558,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -14607,32 +14607,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>የMandrakelinux ባለሞያ</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>የMandrivalinux ባለሞያ</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -14923,8 +14923,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "<b>የMandrakelinux ባለሞያ</b>"
+msgid "Mandriva Wizards"
+msgstr "<b>የMandrivalinux ባለሞያ</b>"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -15019,7 +15019,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15067,7 +15067,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17520,13 +17520,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "አንቀጹን መሀል ኩልኩል አድርግ"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "የMandrakelinux ቁጥጥር ማእከል"
+msgid "Mandrivalinux Control Center"
+msgstr "የMandrivalinux ቁጥጥር ማእከል"
 
 #: standalone/drakbug:48
 #, fuzzy, c-format
@@ -17546,8 +17546,8 @@ msgstr ""
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -17591,7 +17591,7 @@ msgstr "የማስተካከያው አራሚ"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -17995,14 +17995,14 @@ msgstr "መረጃ በ%s መጠቀሚያ ፕሮግራም ላይ"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18053,7 +18053,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18338,7 +18338,7 @@ msgstr "ከውጭ አስገባ"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -18796,7 +18796,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -18823,7 +18823,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "አንቀጹን መሀል ኩልኩል አድርግ"
 
 #: standalone/drakhelp:36
@@ -21797,7 +21797,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "/መሣሪያዎች/የነበረው ቀለሞች"
 
 #: standalone/logdrake:51
@@ -22301,7 +22301,7 @@ msgstr "የቅርብ መረብ ማገናኛ"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
diff --git a/perl-install/share/po/ar.po b/perl-install/share/po/ar.po
index 0294842d3..335c10b3f 100644
--- a/perl-install/share/po/ar.po
+++ b/perl-install/share/po/ar.po
@@ -71,13 +71,13 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "يبدو أن مفتاح USB محميّ من الكتابة عليه، إلّا أنّنا لانستطيع فكّ توصيله الآن.\n"
 "\n"
 "\n"
 "اضغط الزّر لإعادة تشغيل الجهاز، فُكّ توصيله، أزل حماية الكتابة،\n"
-"صِلْ المفتاح مرّة أخرى، وشغّل Mandrake Move مرّة أخرى."
+"صِلْ المفتاح مرّة أخرى، وشغّل Mandriva Move مرّة أخرى."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -95,7 +95,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "مفتاح USB لا يحتوي على أي تجزيئات ويندوز (FAT).\n"
@@ -106,13 +106,13 @@ msgstr ""
 "\n"
 "\n"
 "يمكنك أيضاً التقدّم دون مفتاح USB - سوف لا تزال تكون\n"
-"قادراً على استخدام Mandrake Move كنظام تشغيل ماندريك حيّ."
+"قادراً على استخدام Mandriva Move كنظام تشغيل ماندريك حيّ."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -120,11 +120,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "لم نتمكّن من العثور على أي مفتاح USB على نظامك. إن قمت\n"
-"بوصْل مفتاح USB الآن، سوف يقدر Mandrake Move\n"
+"بوصْل مفتاح USB الآن، سوف يقدر Mandriva Move\n"
 "أن يحفظ البيانات بدليلك المنزل بشفافية\n"
 "وإعدادات النّظام العامّة، وذلك عند الإقلاع التّالي على هذا الجهاز\n"
 "أو إقلاع آخر. ملاحظة: إن قمت بتوصيل مفتاح الآن، انتظر عدّة\n"
@@ -132,7 +132,7 @@ msgstr ""
 "\n"
 "\n"
 "يمكنك أيضاً التّقدّم بلا مفتاح USB - سوف تكون لا تزال\n"
-"قادراً على استخدام Mandrake Move كنظام تشغيل\n"
+"قادراً على استخدام Mandriva Move كنظام تشغيل\n"
 "ماندريك حيّ."
 
 #: ../move/move.pm:494
@@ -257,7 +257,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -273,7 +273,7 @@ msgstr ""
 "\n"
 "قد يحدث هذا بسبب ملفّات تهيئة النّظام الفاسدة\n"
 "على مفتاح USB، في هذه الحالة فإن إزالتها ومن ثمّ\n"
-"إعادة تشغيل Mandrake Move قد يُصلح هذه المشكلة. كي تقوم\n"
+"إعادة تشغيل Mandriva Move قد يُصلح هذه المشكلة. كي تقوم\n"
 "بذلك، اضغط على الزرّ المعنيّ.\n"
 "\n"
 "\n"
@@ -1302,7 +1302,7 @@ msgstr "خيار اللغة"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3693,7 +3693,7 @@ msgstr "تمكين دعم الراديو"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3873,7 +3873,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3888,11 +3888,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4052,10 +4052,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4239,7 +4239,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4413,12 +4413,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4445,7 +4445,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4454,7 +4454,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4674,7 +4674,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4713,7 +4713,7 @@ msgstr "السابق "
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4753,7 +4753,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4782,7 +4782,7 @@ msgstr "مدير الأمن"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4940,7 +4940,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5017,7 +5017,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5026,13 +5026,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "يتم تنشيط هذه الخطوة فقط إذا عُثر على تجزيء جنو/لينكس موجود\n"
 "على ماكينتك.\n"
@@ -5110,7 +5110,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5394,7 +5394,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5415,7 +5415,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "الآن، حان وقت اختيار نظام الطباعة لحاسبك. قد توفّر أنظمة التشغيل الأخرى\n"
@@ -5560,7 +5560,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5577,7 +5577,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5706,7 +5706,7 @@ msgstr "الخدمات"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "اختر القرص الصلب الذي تريد محوه لتثبيت تجزيء\n"
@@ -6060,7 +6060,7 @@ msgstr "جاري حساب مساحة تجزيء ويندوز"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "تجزيء ويندوز الخاصّ بك كثير التجزّئات. رجاء أعد تشغيل جهازك إلى ويندوز، شغّل "
@@ -6179,19 +6179,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6213,7 +6213,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6221,14 +6221,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6238,7 +6238,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6258,10 +6258,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6272,11 +6272,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6292,7 +6292,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "مقدّمة\n"
 "\n"
@@ -6371,7 +6371,7 @@ msgstr ""
 "تحتفظ ماندريكسوفت ش.م. بحقّها في تعديل أو تكييف المنتجات البرمجيّة، "
 "بحذافيرها \n"
 "أو أجزاء معيّنة منها، بشتّى الطّرق ولسائر الأغراض.\n"
-"\"Mandrake\" و \"Mandrakelinux\" والشّعارات المتعلّقة هي علاماتٌ تجاريّة "
+"\"Mandriva\" و \"Mandrivalinux\" والشّعارات المتعلّقة هي علاماتٌ تجاريّة "
 "لماندريكسوفت ش.م. \n"
 "\n"
 "\n"
@@ -6476,7 +6476,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6484,7 +6484,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "تهانينا، التثبيت قد انتهى.\n"
 "أزل وسيط الإقلاع و اضغط زر الإدخال لإعادة التشغيل.\n"
@@ -6532,7 +6532,7 @@ msgstr "الانتقال للخطوة `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -7072,7 +7072,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr "جاري الإتصال بموقع ماندريكلينكس للحصول على قائمة بالمرايا المتوفرة..."
 
 #: install_steps_interactive.pm:840
@@ -7293,7 +7293,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
 msgstr "تثبيت ماندريكلينكس %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -9889,7 +9889,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -13890,7 +13890,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -15789,18 +15789,18 @@ msgstr "إيقاف"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr "<b>ما هو ماندريكلينكس؟</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
 msgstr "أهلا بك في <b>ماندريكلينكس</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -15812,7 +15812,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 "ماندريكلينكس هي توزيعة لينكس <b>الأسهل استخداماً</b> حالياً. إنها أيضاً واحدة "
@@ -15831,9 +15831,9 @@ msgstr "أهلاً بك في <b>عالم المصدر المفتوح</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 "ماندريكلينكس هو نظام مخلص لنموذج المصدر المفتوح. هذا يعني أن هذا الإصدار "
@@ -15856,7 +15856,7 @@ msgstr "<b>رخصة GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "معظم البرامج المرفقة مع هذه التوزيعة وكل أدوات ماندريكلينكس مرخّصة ضمن "
 "<b>الرخصة العموميّة الشاملة</b>."
@@ -15889,10 +15889,10 @@ msgstr "<b>انضمّ إلى المجتمع</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 "لدى ماندريكلينكس أحد <b>أكبر المجتمعات</b> من المستخدمين والمطورين. دور "
 "مجتمع كهذا هو واسع جداً، بدءً من تقرير العيوب البرمجية ووصولاً إلى تطوير "
@@ -15917,10 +15917,10 @@ msgstr "<b>نسخة التّنزيل</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"تقوم الآن بتثبيت <b>Mandrakelinux Download</b>. هذه هي النسخة المجانية التي "
+"تقوم الآن بتثبيت <b>Mandrivalinux Download</b>. هذه هي النسخة المجانية التي "
 "تريد ماندريكسوفت إبقائها <b>متوفّرة للجميع</b>."
 
 #: share/advertising/05.pl:19
@@ -15950,7 +15950,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "لن تستطيع الوصول إلى <b>الخدمات المرفقة</b> في منتجات ماندريك الأخرى أيضاً."
 
@@ -15961,8 +15961,8 @@ msgstr "<b>Discovery، سطح مكتب لينكس الأول</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "تقوم الآن بتثبيت <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "تقوم الآن بتثبيت <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -15983,13 +15983,13 @@ msgstr "<b>PowerPack، سطح المكتب المُطلق للينكس</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "تقوم الآن بتثبيت <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "تقوم الآن بتثبيت <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -16004,8 +16004,8 @@ msgstr "<b>PowerPack+، الحلّ لأسطح المكتب والخادمات</b
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "تقوم الآن بتثبيت <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "تقوم الآن بتثبيت <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16021,20 +16021,20 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr "<b>منتجات ماندريكسوفت</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 "قامت <b>ماندريكسوفت</b> بتطوير تشكيلة واسعة من منتجات <b>ماندريكلينكس</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr "منتجات ماندريكلينكس هي:"
 
 #: share/advertising/09.pl:18
@@ -16055,7 +16055,7 @@ msgstr "\t* <b>PowerPack+</b>، حلّ لينكس لأسطح المكتب وال
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 "\t* <b>ماندريكلينكس لأنظمة x86-64</b>، حلّ ماندريكلينكس للحصول على أفضل نتيجة "
@@ -16063,13 +16063,13 @@ msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr "<b>منتجات ماندريكسوفت (منتجات نوماد)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 "قامت ماندريكلينكس بتطوير منتجين يسمحان لك باستخدام ماندريكلينكس <b>على أي "
@@ -16078,14 +16078,14 @@ msgstr ""
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr "\t* <b>Move</b>، توزيعة ماندريكلينكس تشتغل بالكامل من قرص إقلاع مدمج."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 "\t* <b>جلوب تروتر</b>، وهي توزيعة ماندريكلينكس مُتثبيتة مسبقاً على “قرص لاسي "
@@ -16093,30 +16093,30 @@ msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr "<b>منتجات ماندريكسوفت (الحلول الاحترافيّة)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 "أدناه هي منتجات ماندريكسوفت المُصمّمة لملائمة <b>احتياجاتك الاحترافيّة</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr "\t* <b>سطح المكتب المؤسّساتي</b>، وهو سطح مكتب ماندريكلينكس للأعمال."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr "\t* <b>الخادم المؤسّساتي</b>، وهو حلّ خادم ماندريكلينكس."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr "\t* <b>الجدار الناري للشبكات المتعدّدة</b>، حلّ الأمن من ماندريكلينكس."
 
 #: share/advertising/12.pl:13
@@ -16160,7 +16160,7 @@ msgstr "<b>اختر بيئة سطح مكتبك المفضّلة</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "مع PowerPack، سوف يكون لديك خيار <b>بيئة سطح المكتب الرسوميّة</b>. اختارت "
 "ماندريكسوفت <b>كيدي</b> كبيئة افتراضيّة."
@@ -16187,7 +16187,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "باستخدام PowerPack+، سيتوفر لك خيار <b>سطح المكتب الرسومي</b>. اختارت "
 "ماندريكسوفت <b>كيدي</b> كإفتراضي."
@@ -16314,7 +16314,7 @@ msgstr "<b>استمتع بالتشكيلة الواسعة من التطبيقا�
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 "في قائمة ماندريكلينكس ستجد تطبيقات <b>سهلة الاستخدام</b> ل<b>كل مهامّك</b>:"
@@ -16568,14 +16568,14 @@ msgstr "\t* <b>Postfix</b> و <b>Sendmail</b>: خوادم البريد الأك�
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr "<b>مركز تحكّم ماندريكلينكس</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 "<b>مركز تحكم ماندريكلينكس</b> هي مجموعة أساسيّة من أدوات ماندريكلينكس الخاصّة "
@@ -16602,9 +16602,9 @@ msgstr "<b>نموذج المصدر المفتوح</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "كسائر ما يتعلّق ببرمجة الحاسبات، البرمجّيات المفتوحة المصدر  <b>تتطلّب وقتاً "
@@ -16621,7 +16621,7 @@ msgstr "<b>المتجر الآلي</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 "للمزيد من المعلومات حول منتجات وخدمات ماندريكسوفت، يمكنك زيارة <b>منصّة "
@@ -16646,20 +16646,20 @@ msgstr "زُرْنا اليوم على <b>store.mandrakesoft.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr "<b>نادي ماندريك</b> هو <b>المرافق الأمثل</b> لمنتجك ماندريكلينكس."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr "اغتنم فرصة <b>الفوائد القيّمة</b> بالانضمام إلى نادي ماندريك، مثل:"
 
 #: share/advertising/28.pl:20
@@ -16681,39 +16681,39 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr "\t* الاشتراك في <b>منتديات المستخدمين</b> لماندريكلينكس."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>وصول مبكّر وممتاز</b>، قبل الإصدار العام، <b>لصور ISO</b> لماندريك "
 "لينكس."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> هي خدمة جديدة أولية تفخر ماندريك سوفت بتقديمها "
+"<b>Mandriva Online</b> هي خدمة جديدة أولية تفخر ماندريك سوفت بتقديمها "
 "لزبائنها!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"يوفر Mandrakeonline تشكيلة واسعة من الخدمات القيّمة <b>للتحديث الميسّر</b> "
+"يوفر Mandriva Online تشكيلة واسعة من الخدمات القيّمة <b>للتحديث الميسّر</b> "
 "لأنظمة ماندريكلينكس الخاصة بك:"
 
 #: share/advertising/29.pl:18
@@ -16738,18 +16738,18 @@ msgstr "\t* تحديثات <b>مُجدولة</b> مرنة."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr "\t* إدارة <b>كل أنظمة ماندريكلينكس خاصتك</b> باستخدام حساب واحد."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "هل تتطلّب <b>مساعدة؟</b> قابل خبراء ماندريكسوفت التقنيين على <b>موقع الدعم "
@@ -16758,7 +16758,7 @@ msgstr ""
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 "بفضل مساعدة <b>خبراء ماندريكلينكس الأكفاء</b>، سوف توفّر الكثير من الوقت."
@@ -16766,7 +16766,7 @@ msgstr ""
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 "لأي سؤال متعلق بماندريكلينكس، يمكن شراء الدعم من خلال <b>store.mandrakesoft."
@@ -17068,7 +17068,7 @@ msgstr "أدوات مراقبة، محاسبة عمليّات، tcpdump، nmap،
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr "مرشدو ماندريكسوفت"
 
 #: share/compssUsers.pl:197
@@ -17220,7 +17220,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17289,14 +17289,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPTION]...\n"
-"  --no-confirmation      لا تسأل سؤال التّأكيد فيوضع MandrakeUpdate\n"
+"  --no-confirmation      لا تسأل سؤال التّأكيد فيوضع Mandriva Update\n"
 "  --no-verify-rpm        لا تتحقّق من توقيعات الحزم\n"
 "  --changelog-first      عرض سجلّ التّغييرات قبل سرد الملفّات في نافذة الوصف\n"
 "  --merge-all-rpmnew     اقترح دمج كلّ ملفّات .rpmnew/.rpmsave المعثور عليها"
@@ -20041,12 +20041,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "أداة تقرير العيوب في ماندريكلينكس"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
 msgstr "مركز تحكّم ماندريكلينكس"
 
 #: standalone/drakbug:48
@@ -20067,8 +20067,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20112,7 +20112,7 @@ msgstr "مرشدو التهيئة"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr "اختيار أداة ماندريكسوفت:"
 
 #: standalone/drakbug:82
@@ -20537,7 +20537,7 @@ msgstr "يتم تشغيله عند الإقلاع"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "لم تتمّ تهيئة الواجهة بعد.\n"
 "قم بتشغيل مساعد \"أضف واجهة\" من مركز تحكّم ماندريكلينكس"
@@ -20546,7 +20546,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "ليست لديك أية وصلة إنترنت مهيئة.\n"
 "شغّل مساعد \"%s\" من مركز تحكم ماندريكلينكس"
@@ -20599,7 +20599,7 @@ msgstr "KDM (مدير عرض كيدي("
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr "MdkKDM (مدير عرض ماندريكلينكس("
 
 #: standalone/drakedm:37
@@ -20898,7 +20898,7 @@ msgstr "استيراد"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21446,7 +21446,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -21479,7 +21479,7 @@ msgstr " --doc <link>          - رابط بصفحة وب أخرى ( لـWM welc
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "مركز مساعدة ماندريكلينكس"
 
 #: standalone/drakhelp:36
@@ -25005,7 +25005,7 @@ msgstr "تم عمل التغيير، و لكن ليتم تفعيله يجب عل
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "سجلات أدوات ماندريكلينكس"
 
 #: standalone/logdrake:51
@@ -25518,7 +25518,7 @@ msgstr "تم الإتصال."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "فشل الاتّصال.\n"
 "تحقق من تهيئتك في مركز تحكّم ماندريكلينكس."
@@ -26388,11 +26388,11 @@ msgstr "فشل التّثبيت"
 #~ msgid "http://www.mandrakelinux.com/en/101errata.php3"
 #~ msgstr "http://www.mandrakelinux.com/en/101errata.php3"
 
-#~ msgid "The Mandrakelinux 10.1 products are:"
+#~ msgid "The Mandrivalinux 10.1 products are:"
 #~ msgstr "منتجات ماندريكلينكس 10.1 هي:"
 
 #~ msgid ""
-#~ "\t* <b>Mandrakelinux 10.1 for x86-64</b>, The Mandrakelinux solution for "
+#~ "\t* <b>Mandrivalinux 10.1 for x86-64</b>, The Mandrivalinux solution for "
 #~ "making the most of your 64-bit processor."
 #~ msgstr ""
 #~ "\t* <b>ماندريكلينكس 10.1 لأنظمة x86-64</b>، حلّ ماندريكلينكس للحصول على "
diff --git a/perl-install/share/po/az.po b/perl-install/share/po/az.po
index c867feae5..c7c8130e8 100644
--- a/perl-install/share/po/az.po
+++ b/perl-install/share/po/az.po
@@ -2,7 +2,7 @@
 # translation of DrakX-az.po to Azerbaijani Turkish
 # DrakX-az.po faylının Azərbaycan dilinə tərcüməsi
 # Copyright (C) 2000,2003, 2004 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandrakesoft
+# Copyright (c) 2000 Mandriva
 # Vasif Ismailoglu MD<azerb_linux@hotmail.com> , 2000-2001
 # Mətin Əmirov <metin@karegen.com>, 2001-2003, 2004.
 #
@@ -63,7 +63,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -82,7 +82,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -90,7 +90,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -98,7 +98,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -226,7 +226,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1253,11 +1253,11 @@ msgstr "Dil seçkisi"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux müxtəlif dilləri dəstəkləyir. Qurmaq istədiyiniz\n"
+"Mandrivalinux müxtəlif dilləri dəstəkləyir. Qurmaq istədiyiniz\n"
 "dilləri seçin. Onlar qurulum tamamlanandan və sistem yenidən\n"
 "başlayandan sonra istifadəyə hazır olacaqlar."
 
@@ -3654,12 +3654,12 @@ msgstr "radio dəstəyini fəallaşdır"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Davam etmədən əvvəl, diqqətlə lisenziyanın qaydalarını oxumalısınız. O,\n"
-"bütün Mandrakelinux distribusiyasını əhatə edir. Əgər lisenziyadakı bütün\n"
+"bütün Mandrivalinux distribusiyasını əhatə edir. Əgər lisenziyadakı bütün\n"
 "qaydalarla razısınızsa, qutusunu \"%s\" işarələyin. Əgər razı deyilsəniz, "
 "sadəcə olaraq kompüterinizi bağlayın."
 
@@ -3849,13 +3849,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux qurulumu müxtəlif CD-lər üstündə gəlir. DrakX\n"
+"Mandrivalinux qurulumu müxtəlif CD-lər üstündə gəlir. DrakX\n"
 "seçili paketlərin hansı CD'də olduğunu bilir ona görə də lazım olanda\n"
 "hazırkı CD-ni çıxardıb sizdən lazım olan CD-ni daxil etməyi istəyəcək.\n"
 "Əgər əlinizin altında istənən CD yoxdursa \"%s\" düyməsinə basın və istənən\n"
@@ -3865,11 +3865,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3921,11 +3921,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "İndi sisteminizə qurmaq istədiyiniz proqramları müəyyən etmə vaxtıdır.\n"
-"Mandrakelinux daxilində minlərcə proqram mövcuddur və idarələrinin\n"
+"Mandrivalinux daxilində minlərcə proqram mövcuddur və idarələrinin\n"
 "asan olması üçün onlar bənzər paketlər qruplarına ayrılıblar.\n"
 "\n"
 "Paketlər sisteminizin xüsusui istifadə sahəsinə görə qruplanıb.\n"
-"Mandrakelinuxda dörd əvvəldən müəyyən edilmiş qurulum növü mövcuddur.\n"
+"Mandrivalinuxda dörd əvvəldən müəyyən edilmiş qurulum növü mövcuddur.\n"
 "Yalnız siz bu qrupları yenə də qarışdıra bilərsiniz və istədiyiniz əlavə.\n"
 "proqramları seçə bilərsiniz. Misal üçün ''İş Stansiyası'' qurulumu\n"
 "``İnkişaf'' qurulumundakı proqramları daxil edə bilər.\n"
@@ -4021,10 +4021,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4056,7 +4056,7 @@ msgstr ""
 "verici\n"
 "seçilsə, sizə bu vericini həqiqətən də qurmaq istədiyinizi soruşan və "
 "sizdən\n"
-"təsdiq istəyən pəncərə göstəriləcək. Əsas olaraq Mandrakelinux bütün qurulu\n"
+"təsdiq istəyən pəncərə göstəriləcək. Əsas olaraq Mandrivalinux bütün qurulu\n"
 "olan xidmətləri açılışda fəal edir. Distribusiyanın çıxdığı vaxt onların "
 "bilinən heç bir\n"
 "xətası ya da təhlükəli yanı olmasa da, mümkündür ki, müəyyən vaxt sonra\n"
@@ -4067,7 +4067,7 @@ msgstr ""
 "xidmət sisteminizə qurulacaq və sisteminizin açılışında fəal hala "
 "gətiriləcək.\n"
 "Qeyd: Xidmətlərin açılışda fəal olub olmamasını qurulum bitdikdən sonra da\n"
-"Mandrakelinux İdarə Mərkəzindən quraşdıra bilərsiniz!!\n"
+"Mandrivalinux İdarə Mərkəzindən quraşdıra bilərsiniz!!\n"
 "\n"
 "\"%s\" seçimi, bir proqramı seçdiyiniz zaman qurulum proqramının o proqram "
 "ilə\n"
@@ -4221,7 +4221,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4276,7 +4276,7 @@ msgid ""
 "not successful in getting the display configured."
 msgstr ""
 "X (X Pəncərə Sistemi) GNU/Linuks qrafiki ara üzünün qəlbidir.\n"
-"Mandrakelinuxla bərabər gələn qrafiki mühitlərin hamısı (KDE, \n"
+"Mandrivalinuxla bərabər gələn qrafiki mühitlərin hamısı (KDE, \n"
 "GNOME, AfterStep, WindowMaker, vs.) buna bağlıdır.\n"
 "\n"
 "Optimal görünüşü almaq üçün sizə dəyişdiriləcək fərqli parametrlər\n"
@@ -4396,12 +4396,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4428,7 +4428,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4437,7 +4437,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4457,10 +4457,10 @@ 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 ""
-"Bu nöqtədə Mandrakelinuxi sabit diskinizdə haraya quracağınıza\n"
+"Bu nöqtədə Mandrivalinuxi sabit diskinizdə haraya quracağınıza\n"
 "qərar verəcəksiniz. Əgər diskiniz boş isə və ya bir başqa sistem\n"
-"bütün yeri doldurmuş isə, o zaman diskinizdə Mandrakelinux üçün\n"
-"yer açmalısınız. Bölmələndirmə əsasən diskinizdə Mandrakelinuxu\n"
+"bütün yeri doldurmuş isə, o zaman diskinizdə Mandrivalinux üçün\n"
+"yer açmalısınız. Bölmələndirmə əsasən diskinizdə Mandrivalinuxu\n"
 "qurmaqməntiqi sürücülər yaratmaqdan ibarətdir.\n"
 "\n"
 "Ümumiyyətlə bölmələndirmənin təsiri geri dönülməzdir və mə'lumat\n"
@@ -4495,7 +4495,7 @@ msgstr ""
 "'Scandisk' və\n"
 "'Defraq' əmrlərinin icra edilməsinir. Eyni zamanda mə'lumatlarınızın ehtiyat "
 "nüsxəsini almayı\n"
-"da qətiyyən unutmayın. Kompüteriniz üstündə həm Mandrakelinux həm də "
+"da qətiyyən unutmayın. Kompüteriniz üstündə həm Mandrivalinux həm də "
 "Microsoft\n"
 "Windows ƏS'lərini işlətmək istəyirsinizsə bu seçənəyi seçin. Unutmayın ki "
 "Microsoft\n"
@@ -4508,7 +4508,7 @@ msgstr ""
 "bölməniz əvvəlkindən daha kiçik olacaq.\n"
 "\n"
 " * \"%s\": əgər sisteminizdəki bütün mövcud bölmələri silmək və yerinə\n"
-"Mandrakelinux sistemini qurmaq istəyirsinizsə bu seçənəyi seçin.\n"
+"Mandrivalinux sistemini qurmaq istəyirsinizsə bu seçənəyi seçin.\n"
 "Diqqətli olun, ona görə ki seçiminizi təsdiqlədikdən sonra geri ala "
 "bilməyəcəksiniz.\n"
 "\n"
@@ -4670,7 +4670,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4693,7 +4693,7 @@ msgstr ""
 "\n"
 "Bölmələri şəkilləndirməyə hazır olanda \"%s\" düyməsini basın.\n"
 "\n"
-"Yeni Mandrakelinux sisteminizi qurmaq üçün başqa bölmə seçmək\n"
+"Yeni Mandrivalinux sisteminizi qurmaq üçün başqa bölmə seçmək\n"
 "istəyirsinizsə \"%s\" düyməsinə basın.\n"
 "\n"
 "Üstündəki xəsərli blokların yoxlanmasını istədiyiniz bölmələri seçmək\n"
@@ -4711,7 +4711,7 @@ msgstr "Əvvəlki"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4723,7 +4723,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Mandrakelinuxu qurduğunuz vaxtda çox güman ki bə'zi paketlər \n"
+"Mandrivalinuxu qurduğunuz vaxtda çox güman ki bə'zi paketlər \n"
 "ilk çıxışlarından sonra yenilənmiş ola bilər. Bunlarla bir çox xəta "
 "düzəldilmiş\n"
 "ya da təhlükəsizlik qüvvətləndirilmiş ola bilər. Bu yeniləmələrdən istifadə\n"
@@ -4753,7 +4753,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4777,7 +4777,7 @@ msgstr "Təhlükəsizlik İdarəçisi"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4847,7 +4847,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Bu nöqtədə siz Mandrakelinux yüklənəcək bölmə(lər)i seçməlisiniz. Əgər\n"
+"Bu nöqtədə siz Mandrivalinux yüklənəcək bölmə(lər)i seçməlisiniz. Əgər\n"
 "bölmələr əvvəldən mövcuddursa (sistemdə əvvəllər qurulu olan GNU/Linuks \n"
 "bölmələri və ya başqa bölmələndirmə vasitələri ilə hazırladığınız "
 "bölmələr),\n"
@@ -4942,7 +4942,7 @@ msgstr "Normal modla mütəxəssis modu arasında keç"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4971,7 +4971,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Sürücünüzdə bir və ya daha çox Microsoft bölməsi tapıldı.\n"
-"Xahiş edirik, Mandrakelinuxi qurmaq üçün onlardan hansını\n"
+"Xahiş edirik, Mandrivalinuxi qurmaq üçün onlardan hansını\n"
 "yenidən ölçüləndirmək istədiyinizi seçin.\n"
 "\n"
 "Hər bölmə bu cür sıralanıb; \"Linuks adı\",\"Windows adı\"\n"
@@ -5020,7 +5020,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5029,18 +5029,18 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Bu addım, yalnız sisteminizdə daha əvvəldən qurulu olan GNU/Linuks bölməsi\n"
 "tapılanda fəal olur.\n"
 "\n"
-"DrakX indi mövcud Mandrakelinux sisteminizi yeniləmək mi, yoxsa yenidən\n"
+"DrakX indi mövcud Mandrivalinux sisteminizi yeniləmək mi, yoxsa yenidən\n"
 "qurmaq mı istədiyinizi bilməlidir.\n"
 "\n"
 " * \"%s\": Bu seçim köhnə sistemi tamamilə siləcək. Əgər sabit "
@@ -5050,13 +5050,13 @@ msgstr ""
 "bu seçimi seçin. Yalnız, bölmələndirmə sxeminizdən aslı olaraq bə'zi mövcud\n"
 "mə'lumatlarınızın üstündən yazılmasının qabağını ala bilərsiniz.\n"
 "\n"
-" * \"%s\": Hazırkı Mandrakelinux sisteminizdə qurulu olan paketləri "
+" * \"%s\": Hazırkı Mandrivalinux sisteminizdə qurulu olan paketləri "
 "yeniləmə\n"
 "imkanı verir. Qurulum hazırkı bölmələmə sxemi və istifadəçi mə'lumat və "
 "sənədlərinə\n"
 "dəyməyəcək və dəyişdirməyəcək. Digər qurulum addımlarının çoxu isə standart\n"
 "qurulumdakının eynisi olacaq. Bu seçimi \"8.1\" versiyasından əvvəlki "
-"Mandrakelinuxlarda\n"
+"Mandrivalinuxlarda\n"
 "tədbiq etmək uyğun görülmür."
 
 #: help.pm:591
@@ -5115,7 +5115,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5369,7 +5369,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5390,12 +5390,12 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "İndi kompüteriniz üçün çap sistemini seçmə vaxtı gəldi. Digər ƏS'ləri sizə "
 "bir\n"
-"dənəsini təqdim edə bilərlər, yalnız Mandrakelinux ikisini təqdim edir.\n"
+"dənəsini təqdim edə bilərlər, yalnız Mandrivalinux ikisini təqdim edir.\n"
 "Hər çap sistemi xüsusi quraşdırma növləri üçün uyğundur.\n"
 "\n"
 " * \"%s\" -- bu seçim``çap et, növbəyə alma'' mə'nasına gəlir.\n"
@@ -5413,7 +5413,7 @@ msgstr ""
 "əmin oun. .\"%s\" eyni zamanda çapçının quraşdırılması və idarəsi və çap\n"
 "üçün qrafiki ara üzlərə də sahibdir. \n"
 "Əgər indi birisini seçib sonra çap sistemini bəyənməzsəniz, onu "
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "İdarə Mərkəzindəki PrinterDrake bölməsindəki mütəxəssis düyməsi vasitəsiylə\n"
 "dəyişdirə bilərsiniz."
 
@@ -5531,7 +5531,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5548,7 +5548,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5674,10 +5674,10 @@ msgstr "Xidmətlər"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Yeni Mandrakelinux'izi qurmaq üçün silmək istədiyiniz sürücünü seçin.\n"
+"Yeni Mandrivalinux'izi qurmaq üçün silmək istədiyiniz sürücünü seçin.\n"
 "Diqqətli olun, sürücüdəki bütün mə'lumatlar silinəcək\n"
 "və geri gəlməyəcək!"
 
@@ -6024,11 +6024,11 @@ msgstr "Windows bölməsin böyüklüyü hesablanır"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Windows bölümünüz çox dağınıqdır. Daxiş edirik, əvvəlcə kompüterinizi "
-"Windows ilə açın, ''defrag'' vasitəsini işlədin, sonra Mandrakelinux "
+"Windows ilə açın, ''defrag'' vasitəsini işlədin, sonra Mandrivalinux "
 "qurulumunu yenidən başladın."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6143,19 +6143,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6177,7 +6177,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6185,14 +6185,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6202,7 +6202,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6222,10 +6222,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6236,11 +6236,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6256,7 +6256,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Giriş\n"
 "\n"
@@ -6266,14 +6266,14 @@ msgstr ""
 "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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. Lisenziya Müqaviləsi\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6295,7 +6295,7 @@ msgstr ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6303,14 +6303,14 @@ msgstr ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6320,7 +6320,7 @@ msgstr ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6340,10 +6340,10 @@ msgstr ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6354,11 +6354,11 @@ msgstr ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Hökümət Qanunları \n"
@@ -6374,7 +6374,7 @@ msgstr ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6464,7 +6464,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6472,21 +6472,21 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Təbrik edirik, qurulum başa çatdı.\n"
 "Cdrom və disketi çıxartdıqtan sonra Enter'ə basaraq kompüterinizi\n"
 "yenidən başladın.\n"
 "\n"
 "\n"
-"Mandrakelinux'in bu buraxılışındakı yamaqlar haqqında \n"
+"Mandrivalinux'in bu buraxılışındakı yamaqlar haqqında \n"
 "mə'lumat almaq üçün bu ünvana baxın: \n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Sisteminizin qurğuları haqqında daha geniş mə'lumatı Rəsmi\n"
-"Mandrakelinux İstifadəçi Kitabcığının qurulum sonrası bölməsində\n"
+"Mandrivalinux İstifadəçi Kitabcığının qurulum sonrası bölməsində\n"
 "tapa bilərsiniz."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6522,7 +6522,7 @@ msgstr "Başlanğıc addımı `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -7064,9 +7064,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Mövcud əkslərin siyahısını almaq üçün Mandrakelinux səhifəsi ilə təmas "
+"Mövcud əkslərin siyahısını almaq üçün Mandrivalinux səhifəsi ilə təmas "
 "qurulur..."
 
 #: install_steps_interactive.pm:840
@@ -7286,8 +7286,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux Qurulumu %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux Qurulumu %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9873,13 +9873,13 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall quraşdırıcısı\n"
 "\n"
-"Bu, Mandrakelinux sisteminiz üçün şəxsi bir atəş divarını quraşdıracaq.\n"
+"Bu, Mandrivalinux sisteminiz üçün şəxsi bir atəş divarını quraşdıracaq.\n"
 "Daha güclü və e'tibarlı sistem üçün xahiş edirik, xüsusi MandrakeSecurity\n"
 "Firewall buraxılışı ilə maraqlanın."
 
@@ -12517,7 +12517,7 @@ msgstr ""
 "ümumiyyətlə \"Fayl\" menyusunda yer alır).\n"
 "\n"
 "Əgər çapçı ilə əlaqəli hər hansı bir qurğu yerinə gətirmək, ya da yeni çapçı "
-"əlavə etmək / çapçı silmək istəyirsinizsə, Mandrakelinux İdarə Mərkəzindəki "
+"əlavə etmək / çapçı silmək istəyirsinizsə, Mandrivalinux İdarə Mərkəzindəki "
 "\"Avadanlıq\" bölməsində yer alan in the \"Çapçı\" düyməsini istifadə edin."
 
 #: printer/printerdrake.pm:1207 printer/printerdrake.pm:1437
@@ -13835,7 +13835,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14108,9 +14108,9 @@ msgid ""
 "also using the %s Control Center, section \"Hardware\"/\"Printer\""
 msgstr ""
 "Qurulum sırasında edilən şəbəkə quraşdırılması indi başladıla bilməz. Xahiş "
-"dirik, sistem açılandan sonra şəbəkənin işlədiyini yoxlayın və Mandrakelinux "
+"dirik, sistem açılandan sonra şəbəkənin işlədiyini yoxlayın və Mandrivalinux "
 "İdarə Mərkəzindəki Şəbəkə və İnternet bölməsindən qurğuları düzəldin, və "
-"ondan sonra yenə də Mandrakelinux İdarə Mərkəzindəki \"Avadanlıq\"/\"Çapçı\" "
+"ondan sonra yenə də Mandrivalinux İdarə Mərkəzindəki \"Avadanlıq\"/\"Çapçı\" "
 "bölməsindən çapçınızı qurun."
 
 #: printer/printerdrake.pm:4196
@@ -15736,18 +15736,18 @@ msgstr "Dayandır"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mandrakelinux Nədir?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Mandrivalinux Nədir?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "<b>Mandrakelinux</b> Xoş Gəldiniz!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "<b>Mandrivalinux</b> Xoş Gəldiniz!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -15756,7 +15756,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -15773,9 +15773,9 @@ msgstr "Açıq Mənbə Dünyasına Xoş Gəldiniz!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -15795,7 +15795,7 @@ msgstr "<b>Qeyd</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -15816,15 +15816,15 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, fuzzy, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Mandrakelinux cəmiyyətinə qoşulun!</b>"
+msgstr "<b>Mandrivalinux cəmiyyətinə qoşulun!</b>"
 
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -15838,13 +15838,13 @@ msgstr ""
 #: share/advertising/05.pl:15
 #, fuzzy, c-format
 msgid "<b>Download Version</b>"
-msgstr "Bu Mandrakelinux <b>Endirmə buraxılışıdır</b>."
+msgstr "Bu Mandrivalinux <b>Endirmə buraxılışıdır</b>."
 
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -15871,7 +15871,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -15881,7 +15881,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15900,13 +15900,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -15918,7 +15918,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15932,20 +15932,20 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakestore</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva Store</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux Yeniləmələri Appleti"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux Yeniləmələri Appleti"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -15965,61 +15965,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -16057,7 +16057,7 @@ msgstr "<b>Qrafiki Masa Üstü Mühitinizi Seçin!</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -16078,7 +16078,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -16195,7 +16195,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -16436,14 +16436,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux İdarə Mərkəzi</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux İdarə Mərkəzi</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -16465,9 +16465,9 @@ msgstr "<b>KDE Seçimi</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -16479,7 +16479,7 @@ msgstr "<b>MandrakeStore</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -16502,20 +16502,20 @@ msgstr "Bugün <b>store.mandrakesoft.com</b> ünvanını ziyarət edin"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -16534,33 +16534,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, fuzzy, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr "\t* <b>Kopete</b> ilə onlayn söhbətdə yer alın"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr "<b>Mandrake Onlayn</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -16583,32 +16583,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -16906,8 +16906,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "<b>Mandrakestore</b>"
+msgid "Mandriva Wizards"
+msgstr "<b>Mandriva Store</b>"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -17043,7 +17043,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17115,14 +17115,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[SEÇİM]...\n"
-"  --no-confirmation      MandrakeUpdate modundabirinci təsdiqləmə  sualını "
+"  --no-confirmation      Mandriva Update modundabirinci təsdiqləmə  sualını "
 "soruşma\n"
 "  --no-verify-rpm        paket imzalarını yoxlama\n"
 "  --changelog-first      izahat pəncərəsində fayl siyahısından əvvəl "
@@ -19863,13 +19863,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux Xəta Raportlama Vasitəsi"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux Xəta Raportlama Vasitəsi"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux İdarə Mərkəzi"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux İdarə Mərkəzi"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19889,7 +19889,7 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "Mandrake Onlayn"
 
 #: standalone/drakbug:52
@@ -19934,7 +19934,7 @@ msgstr "Quraşdırma Sehirbazları"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -20354,7 +20354,7 @@ msgstr "Açılışda başladılır"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "BU ara üz hələlik quraşdırılmayıb.\n"
 "Ana pəncərədə quraşdırma sehirbazını işə salın"
@@ -20363,7 +20363,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "BU ara üz hələlik quraşdırılmayıb.\n"
 "Ana pəncərədə quraşdırma sehirbazını işə salın"
@@ -20416,7 +20416,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20713,7 +20713,7 @@ msgstr "İdxal Et"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -20722,7 +20722,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Müəllif Hüququ (C) 2001-2002 Mandrakesoft \n"
+"Müəllif Hüququ (C) 2001-2002 Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (orijinal buraxılış)\n"
@@ -21248,14 +21248,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Müəllif Hüququ (C) 2003-2004 Mandrakesoft.\n"
+"Müəllif Hüququ (C) 2003-2004 Mandriva.\n"
 "Bu sərbəst tə'minatdır və yalnız GNU GPL qaydaları altında paylana bilər.\n"
 "\n"
 "İstifadə qaydası: \n"
@@ -21284,8 +21284,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux İdarə Mərkəzi"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux İdarə Mərkəzi"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -24288,7 +24288,7 @@ msgid ""
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
-"Bu HardDrake'dir, Mandrakelinux avadanlıq quraşdırma vasitəsi.\n"
+"Bu HardDrake'dir, Mandrivalinux avadanlıq quraşdırma vasitəsi.\n"
 "<span foreground=\"royalblue3\">Buraxılış:</span> %s\n"
 "<span foreground=\"royalblue3\">Müəllif:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
@@ -24399,8 +24399,8 @@ msgstr "Dəyişikliklər edildi, ancaq effektiv olmaq üçün yenidən giriş ed
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinux Vasitələrinin İzahatı"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinux Vasitələrinin İzahatı"
 
 #: standalone/logdrake:51
 #, c-format
@@ -24913,10 +24913,10 @@ msgstr "Bağlantı tamamlandı."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Bağlantı iflas etdi.\n"
-"Mandrakelinux İdarə Mərkəzindən qurğularınızı yoxlayın."
+"Mandrivalinux İdarə Mərkəzindən qurğularınızı yoxlayın."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -25153,7 +25153,7 @@ msgstr "Quraşdırılmış darayıcıların siyahısı yenidən yaradılır ..."
 #: standalone/scannerdrake:101
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "%s Mandrakelinuxun bu buraxılışı tərəfindən dəstəklənmir."
+msgstr "%s Mandrivalinuxun bu buraxılışı tərəfindən dəstəklənmir."
 
 #: standalone/scannerdrake:104
 #, c-format
@@ -25194,7 +25194,7 @@ msgstr ""
 #: standalone/scannerdrake:144
 #, fuzzy, c-format
 msgid "The %s is not supported under Linux."
-msgstr "%s Mandrakelinuxun bu buraxılışı tərəfindən dəstəklənmir."
+msgstr "%s Mandrivalinuxun bu buraxılışı tərəfindən dəstəklənmir."
 
 #: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
@@ -25295,7 +25295,7 @@ msgid ""
 "You can launch printerdrake from the %s Control Center in Hardware section."
 msgstr ""
 "%s printerdrake tərəfindən quraşdırılmalıdır.\n"
-"Printerdrake'ni Mandrakelinux İdarə Mərkəzindəki Avadanlıq bölməsindən işə "
+"Printerdrake'ni Mandrivalinux İdarə Mərkəzindəki Avadanlıq bölməsindən işə "
 "sala bilərsiniz."
 
 #: standalone/scannerdrake:308 standalone/scannerdrake:315
diff --git a/perl-install/share/po/be.po b/perl-install/share/po/be.po
index d453b7fc0..4aae21be1 100644
--- a/perl-install/share/po/be.po
+++ b/perl-install/share/po/be.po
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 1999 Mandrakesoft.
+# Copyright (C) 1999 Mandriva.
 # Alexander Bokovoy <ab@avilink.net>, 2000
 # Maryia Davidouskaia <maryia@scientist.com>, 2000
 msgid ""
@@ -58,7 +58,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -77,7 +77,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -93,7 +93,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -219,7 +219,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1226,7 +1226,7 @@ msgstr "Выбар мовы"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 "Вы можаце абраць іншыя мовы, якія будуць даступны пасля ўсталявання"
@@ -3476,7 +3476,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3586,7 +3586,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3597,11 +3597,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3708,10 +3708,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3820,7 +3820,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -3918,12 +3918,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -3950,7 +3950,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -3959,7 +3959,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4088,7 +4088,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4106,7 +4106,7 @@ msgstr "прылада"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4135,7 +4135,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4151,7 +4151,7 @@ msgstr "Сістэмнае адміністраваньне"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4237,7 +4237,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4282,7 +4282,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4291,13 +4291,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4338,7 +4338,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4495,7 +4495,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4516,7 +4516,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4616,7 +4616,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4633,7 +4633,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4695,7 +4695,7 @@ msgstr "Сэрвісы"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -5018,7 +5018,7 @@ msgstr "Выкарыстоўваць незанятую прастору на р
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Ваш раздзел з Windows занадта фрагментаваны. \n"
@@ -5126,19 +5126,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5160,7 +5160,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5168,14 +5168,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5185,7 +5185,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5205,10 +5205,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5219,11 +5219,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5239,7 +5239,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5296,7 +5296,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5304,7 +5304,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5340,12 +5340,12 @@ msgstr "Пераход на крок ‛%s’\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "У Вашай сістэме маецца недахоп рэсурсаў, таму магчымы праблемы\n"
-"пры ўсталяванні Mandrakelinux. У гэтым выпадку паспрабуйце тэкставую\n"
+"пры ўсталяванні Mandrivalinux. У гэтым выпадку паспрабуйце тэкставую\n"
 "праграму ўсталявання. Для гэтага націсніце ‛F1’ у час загрузкі, а потым\n"
 "набярыце ‛text’ і націсніце <ENTER>."
 
@@ -5862,7 +5862,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, fuzzy, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr "Сувязь з люрам для атрымання спісу даступных пакетаў"
 
 #: install_steps_interactive.pm:840
@@ -6071,8 +6071,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Усталяванне Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Усталяванне Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8640,7 +8640,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12214,7 +12214,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -13942,18 +13942,18 @@ msgstr "Спыніць"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Сардэчна запрашаем у <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Сардэчна запрашаем у <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -13962,7 +13962,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -13979,9 +13979,9 @@ msgstr ""
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -14001,7 +14001,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14027,10 +14027,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14049,8 +14049,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14077,7 +14077,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14087,7 +14087,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14106,13 +14106,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14124,7 +14124,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14138,19 +14138,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr "Цэнтар кіраваньня"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -14171,61 +14171,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14263,7 +14263,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14284,7 +14284,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -14401,7 +14401,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -14636,14 +14636,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr "Цэнтар кіраваньня"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -14665,9 +14665,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -14679,7 +14679,7 @@ msgstr ""
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -14702,20 +14702,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, fuzzy, c-format
-msgid "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
 msgstr "Цэнтар кіраваньня"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -14734,33 +14734,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr "Цэнтар кіраваньня"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -14783,32 +14783,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
 msgstr "Цэнтар кіраваньня"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15107,7 +15107,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr "Цэнтар кіраваньня"
 
 #: share/compssUsers.pl:197
@@ -15222,7 +15222,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15270,7 +15270,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17724,12 +17724,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Дастасаваньне для кіраваньня карыстальнікамі Mandrakelinux"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Дастасаваньне для кіраваньня карыстальнікамі Mandrivalinux"
 
 #: standalone/drakbug:46
 #, fuzzy, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
 msgstr "Цэнтар кіраваньня"
 
 #: standalone/drakbug:48
@@ -17750,7 +17750,7 @@ msgstr ""
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr ""
 
 #: standalone/drakbug:52
@@ -17795,7 +17795,7 @@ msgstr "Канфігурацыя"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -18201,14 +18201,14 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18259,7 +18259,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18544,7 +18544,7 @@ msgstr "Імпарт"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19023,7 +19023,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -19050,7 +19050,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Цэнтар кіраваньня"
 
 #: standalone/drakhelp:36
@@ -22030,7 +22030,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Цэнтар кіраваньня"
 
 #: standalone/logdrake:51
@@ -22534,7 +22534,7 @@ msgstr "Імя злучэння"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
@@ -23360,7 +23360,7 @@ msgstr "Усталяванне SILO"
 #~ msgstr "(ужо дададзена %s)"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
+#~ msgid "Mandriva Wizards"
 #~ msgstr "Цэнтар кіраваньня"
 
 #, fuzzy
diff --git a/perl-install/share/po/bg.po b/perl-install/share/po/bg.po
index d5d1d393c..f670bd9ca 100644
--- a/perl-install/share/po/bg.po
+++ b/perl-install/share/po/bg.po
@@ -1,6 +1,6 @@
 # translation of DrakX-bg.po to Bulgarian
 # Copyright (C) 2000,2003 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandrakesoft
+# Copyright (c) 2000 Mandriva
 # Bozhan Boiadzhiev <bozhan@plov.omega.bg>, 2000.
 # Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>, 2003.
 # Boyan Ivanov <boyan17@bulgaria.com>, 2003.
@@ -63,7 +63,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -82,7 +82,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -90,7 +90,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -98,7 +98,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -224,7 +224,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1245,11 +1245,11 @@ msgstr "ръчно"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux може да подържа много езици. Изберете\n"
+"Mandrivalinux може да подържа много езици. Изберете\n"
 "езиците които искате ад инсталирате. Те ще бъдат налични след\n"
 "като завърши инсталацията и вие престартирате системата."
 
@@ -3564,13 +3564,13 @@ msgstr "разрешава подръжка на радио"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Преди да продължите, трябва внимателно да прочетете условията на лиценза. "
 "Той\n"
-"покрива цялата Mandrakelinux дистрибуция, и, ако сте съгласни с всички "
+"покрива цялата Mandrivalinux дистрибуция, и, ако сте съгласни с всички "
 "условия\n"
 "в него, сложете отметка на \"%s\".Ако не сте съгласни,просто спрете "
 "компютъра си."
@@ -3757,13 +3757,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Инсталацията на Mandrakelinux е разположена на няколко CDROM-а. DrakX\n"
+"Инсталацията на Mandrivalinux е разположена на няколко CDROM-а. DrakX\n"
 "знае дали избран пакет не се намира на друг CDROM,така че ще извади "
 "текущото\n"
 "CD и ще ви остави да вкарате това, от което има нужда."
@@ -3772,11 +3772,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3828,7 +3828,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Сега е моментът да определите кои програми искате да бъдат инсталирани на\n"
-"системата ви. В Mandrakelinux дистрибуцията има хиляди пакети, но не е\n"
+"системата ви. В Mandrivalinux дистрибуцията има хиляди пакети, но не е\n"
 "задължително да ги знаете наизуст.\n"
 "\n"
 "Ако извършвате стандартна инстлация от CDROM, първо ще бъдете попитани кои\n"
@@ -3924,10 +3924,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3963,10 +3963,10 @@ msgstr ""
 "\n"
 "!! Ако е избран сървърен пакет, било то умишлено или защото е част от цяла\n"
 "група, ще бъдете помолени за потвърждение, че наистина искате този сървър\n"
-"да бъде инсталиран. В Mandrakelinux, всички сървъри тръгват по подразбиране\n"
+"да бъде инсталиран. В Mandrivalinux, всички сървъри тръгват по подразбиране\n"
 "при зареждане.Даже ако са сигурни и нямат известни проблеми, когато\n"
 "дистрибуцията се разпространява, може да се случи така, че да се появят\n"
-"дупки в сигурността, след като версията на Mandrakelinux е завършена. Ако\n"
+"дупки в сигурността, след като версията на Mandrivalinux е завършена. Ако\n"
 "не знаете за какво служи определена услуга или защо е инсталирана, цъкнете\n"
 "\"Не\". С цъкане на \"Да\"  ще инсталирате изброени услуги и те ще бъдат\n"
 "стартирани автоматично по подразбиране. !!\n"
@@ -4090,7 +4090,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4193,12 +4193,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4225,7 +4225,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4234,7 +4234,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4256,12 +4256,12 @@ msgid ""
 msgstr ""
 "В този момент трябва изберете къде на твърдия си диска да инсталирате "
 "вашата\n"
-"Mandrakelinux операционна система. Ако твърдият ви диск е празен или друга\n"
+"Mandrivalinux операционна система. Ако твърдият ви диск е празен или друга\n"
 "операционна система използва цялото пространство, ще трябва да го "
 "разделите.\n"
 "Казано простичко, разделянето на твърдия диск се състои в логическо "
 "разделяне\n"
-"цел да се създаде място за инсталация на новата Mandrakelinux система.\n"
+"цел да се създаде място за инсталация на новата Mandrivalinux система.\n"
 "\n"
 "Тъй като процесът на разделяне обикновено е необратим, разделянето може да\n"
 "изглежда плашещ и стряскащ, ако сте неопитен потребител. Слава Богу, има\n"
@@ -4270,7 +4270,7 @@ msgstr ""
 "с ръководството и не бързайте.\n"
 "\n"
 "Ако пускате инсталацията в Експертен режим, ще бъдете въведени в DiskDrake,\n"
-"разделящия инструмент на Mandrakelinux, който ви позволява да донастроите\n"
+"разделящия инструмент на Mandrivalinux, който ви позволява да донастроите\n"
 "дяловете си. Вижте главата DiskDrake от ръководството. От инсталационния\n"
 "интерфейс можете да използвате магьосниците, като натиснете бутона\n"
 "\"Магьосник\" на диалога.\n"
@@ -4298,7 +4298,7 @@ msgstr ""
 "решенията \"Изтрий целия диск\" или \"Екпертен режим\") или да промените\n"
 "големината на Microsoft Windows дяла. Промяната на големината може да бъде\n"
 "извършена без загуба на данни. Това решение се препоръчва, ако искате\n"
-"едновременно Mandrakelinux и Microsoft Windows на един и същи компютър.\n"
+"едновременно Mandrivalinux и Microsoft Windows на един и същи компютър.\n"
 "\n"
 "   Преди да изберете тази опция, моля, разберете, че след тази процедура,\n"
 "големината на Microsoft Windows дяла ще бъде по-малка, отколкото преди "
@@ -4308,7 +4308,7 @@ msgstr ""
 "инсталира на нов софтуер.\n"
 "\n"
 " * \"%s\": ако искате да изтриете всички данни и дялове, които\n"
-"съществуват на вашия твърд диск и да ги замените с новата Mandrakelinux\n"
+"съществуват на вашия твърд диск и да ги замените с новата Mandrivalinux\n"
 "система, изберете тази опция. Бъдете внимателни с това решения, защото няма\n"
 "да можете да върнете обратно избора си, след като потвърдите.\n"
 "\n"
@@ -4467,7 +4467,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4497,7 +4497,7 @@ msgstr ""
 "\n"
 "Цъкнете \"Отказ\", ако искате да изберете други дялове за инсталация на "
 "новата\n"
-"си Mandrakelinux операционна система.\n"
+"си Mandrivalinux операционна система.\n"
 "\n"
 "Цъкнете \"Напредничав\", ако искате да изберете дялове, които да бъдат\n"
 "проверени за лоши блокове от диска."
@@ -4514,7 +4514,7 @@ msgstr "Предишен"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4543,7 +4543,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4570,7 +4570,7 @@ msgstr "Администратор по защита:"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4642,7 +4642,7 @@ msgid ""
 msgstr ""
 "В този момент трябва да изберете кой дялове да бъдат използвани за "
 "инсталация\n"
-"на вашата Mandrakelinux система. Ако дяловете вече са определени, дали от\n"
+"на вашата Mandrivalinux система. Ако дяловете вече са определени, дали от\n"
 "предишна инсталация на GNU/Linux или от друг инструмент за разделяне, "
 "можете\n"
 "да използвате съществуващите далове. В противен случай трябва да определите\n"
@@ -4722,7 +4722,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4753,7 +4753,7 @@ msgstr ""
 "Беше засечен повече от един Microsoft Windows дял\n"
 "на твърдия ви диска. Изберете този, чиято дължина искате да промените, за "
 "да\n"
-"инсталирате Mandrakelinux операционна система.\n"
+"инсталирате Mandrivalinux операционна система.\n"
 "\n"
 "\n"
 "За информация, всеки дял е изброен както следва: \"Linux име\", \"Windows име"
@@ -4801,7 +4801,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4810,13 +4810,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4878,7 +4878,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5060,7 +5060,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5081,7 +5081,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Дойде времето да изберете система за печат за вашия компютър.Другите\n"
@@ -5210,7 +5210,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5227,7 +5227,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5289,11 +5289,11 @@ msgstr "Услуги"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Изберете твърдия диск, който искате да изтриете, за да\n"
-"инсталирам новия ви Mandrakelinux дял. Внимание, всички данни на него ще "
+"инсталирам новия ви Mandrivalinux дял. Внимание, всички данни на него ще "
 "бъдат загубени\n"
 "и няма да могат да се възстановят."
 
@@ -5645,7 +5645,7 @@ msgstr "Изчислява свободното място на Windows дял"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Вашият Windows дял е много фрагментиран, моля първо стартирайте ''defrag''"
@@ -5760,19 +5760,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5794,7 +5794,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5802,14 +5802,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5819,7 +5819,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5839,10 +5839,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5853,11 +5853,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5873,24 +5873,24 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Въведение\n"
 "\n"
-"Операционната система и различните компоненти достъпни в Mandrakelinux "
+"Операционната система и различните компоненти достъпни в Mandrivalinux "
 "дистрибуцията по-долу ще се\n"
 "наричат \"Софтуерен Продукти\". Софтуерните Продукти включват, но не се "
 "ограничават само до, набора\n"
 "програми, методи, правила и документация отнасяща се до операционната "
 "система и различните\n"
-"компоненти на Mandrakelinux дистрибуцията.\n"
+"компоненти на Mandrivalinux дистрибуцията.\n"
 "\n"
 "\n"
 "1. Лицензионен договор\n"
 "\n"
 "Моля, прочетете внимателно този документ. Този документ е лицензионен "
 "договор между вас и\n"
-"Mandrakesoft S.A., който се отнася до Софтуерния Продукт. Чрез "
+"Mandriva S.A., който се отнася до Софтуерния Продукт. Чрез "
 "инсталирането, копирането\n"
 "или използването на Софтуерния Продукт по какъвто и да е начин вие изрично "
 "приемате и\n"
@@ -5911,7 +5911,7 @@ msgstr ""
 "Софтуерните Продукти и приложената документация се предоставят \"такива "
 "каквито са\", без гаранция,\n"
 "в рамките на разрешеното от закона.\n"
-"Mandrakesoft S.A., при никакви обстоятелства и в рамките на закона, не е "
+"Mandriva S.A., при никакви обстоятелства и в рамките на закона, не е "
 "отговорна за каквито да e\n"
 "умишлени, случайни, преки или косвени щети (включително загуба на данни за "
 "работа, прекратяване на,\n"
@@ -5919,13 +5919,13 @@ msgstr ""
 "решение или каквато и да е\n"
 "друга произлизащи от това загуби) произтичащи от употребата или от "
 "невъзможността да се употреби\n"
-"Софтуерния Продукт, даже ако Mandrakesoft S.A. да е известила за "
+"Софтуерния Продукт, даже ако Mandriva S.A. да е известила за "
 "възможността или случването на такава загуба.\n"
 "\n"
 "ОГРАНИЧЕНА ОТГОВОРНОСТ СВЪРЗАНА С ПРИТЕЖАВАНЕТО ИЛИ ИЗПОЛЗВАНЕТО НА ЗАБРАНЕН "
 "СОФТУЕР В НЯКОИ СТРАНИ\n"
 "\n"
-"В рамките на закона, Mandrakesoft S.A. и нейните дистрибутори няма при "
+"В рамките на закона, Mandriva S.A. и нейните дистрибутори няма при "
 "никакви условия да бъдат\n"
 "отговорни за каквито и да било умишлени, случайни, преки или косвени щети "
 "(включително загуба на данни\n"
@@ -5934,7 +5934,7 @@ msgstr ""
 "съдебно решение или каквато и да е друга произлизащи от това загуби) "
 "произтичащи от притежаването\n"
 "и употребата на софтуерни компоненти и от изтеглянето на софтуерни "
-"компоненти от сайтовете на Mandrakelinux,\n"
+"компоненти от сайтовете на Mandrivalinux,\n"
 "които са забранени в някои страни от местното законодателство.\n"
 "Тази ограничена отговорност се отнася до, но не само за, мощните "
 "криптографски компоненти включени\n"
@@ -5954,10 +5954,10 @@ msgstr ""
 "лицензионния договор на всеки компонент преди да го използвате. Всякакви "
 "въпроси относно лиценза\n"
 "на компонентите би трябвало да бъдат насочени към съответния им автор, а не "
-"към Mandrakesoft.\n"
-"Програмите разработени от Mandrakesoft S.A. се управляват от GPL Лиценза. "
+"към Mandriva.\n"
+"Програмите разработени от Mandriva S.A. се управляват от GPL Лиценза. "
 "Документацията написана\n"
-"от Mandrakesoft S.A. се управлява от специален лиценз. Моля, погледнете "
+"от Mandriva S.A. се управлява от специален лиценз. Моля, погледнете "
 "документацията за\n"
 "повече информация.\n"
 "\n"
@@ -5968,11 +5968,11 @@ msgstr ""
 "съответните им автори и са\n"
 "защитени от законите за интелектуалната собственост и за копиране прилагани "
 "за софтуерните програми.\n"
-"Mandrakesoft S.A. запазва правото си да модифицира и пригодява Софтуерния "
+"Mandriva S.A. запазва правото си да модифицира и пригодява Софтуерния "
 "Продукт, като цяло или на\n"
 "части, по всякакъв начин и с всякакви цели.\n"
-"\"Mandrake\", \"Mandrakelinux\" и свързаните логота са запазена марка на "
-"Mandrakesoft S.A.\n"
+"\"Mandriva\", \"Mandrivalinux\" и свързаните логота са запазена марка на "
+"Mandriva S.A.\n"
 "\n"
 "\n"
 "5. Управляващи Закони\n"
@@ -5986,7 +5986,7 @@ msgstr ""
 "съда. Като крайна мярка,\n"
 "споровете ще бъдат отнасяни до подходящия правни съдилища на Париж - "
 "Франция.\n"
-"За всякакви въпроси по този документ, моля, свържете се с Mandrakesoft S.A.\n"
+"За всякакви въпроси по този документ, моля, свържете се с Mandriva S.A.\n"
 "\n"
 "ЗАБЕЛЕЖКА: Това е български приблизителен превод на документа, което "
 "означава, че той\n"
@@ -6077,7 +6077,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6085,13 +6085,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Поздравления, инсталацията е преключена.\n"
 "Премахнете стартовото устройство и натисене Enter за да рестартирайте.\n"
 "\n"
 "\n"
-"За информация относно поправки, на тази версия на Mandrakelinux,\n"
+"За информация относно поправки, на тази версия на Mandrivalinux,\n"
 "се консултирайте с Errata, на адрес : \n"
 "\n"
 "\n"
@@ -6099,7 +6099,7 @@ msgstr ""
 "\n"
 "\n"
 "Информация за настройване на системата ви можете да намерите в\n"
-"слединсталационната глава от Official Mandrakelinux User's Guide."
+"слединсталационната глава от Official Mandrivalinux User's Guide."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6134,12 +6134,12 @@ msgstr "Навлизам в етап `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Вашата система е с малки ресурси. Може да имате проблеми с инсталирането\n"
-"на Mandrakelinux. Ако се появи проблем опитайте с текстовата инсалация. "
+"на Mandrivalinux. Ако се появи проблем опитайте с текстовата инсалация. "
 "Зацелта,\n"
 "натиснете 'F1', когато стартирате от CDROM и въведете 'теьт'."
 
@@ -6669,9 +6669,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Свързване с Mandrakelinux web сайт за получаване на списъка с налични "
+"Свързване с Mandrivalinux web сайт за получаване на списъка с налични "
 "огледални сървъри..."
 
 #: install_steps_interactive.pm:840
@@ -6892,8 +6892,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Инсталация на Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Инсталация на Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9473,13 +9473,13 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Настройчик за малка защитна стена\n"
 "\n"
-"Това настройва персонална защитна стена за тази Mandrakelinux машина.\n"
+"Това настройва персонална защитна стена за тази Mandrivalinux машина.\n"
 "За мощно постветено на защитата решение, моле, погледнете специализираната\n"
 "MandrakeSecurity Firewall дистрибуция."
 
@@ -13268,7 +13268,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -15064,18 +15064,18 @@ msgstr "Стоп"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Добре дошли в <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Добре дошли в <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -15084,7 +15084,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -15101,9 +15101,9 @@ msgstr "Добре дошли в света на Отвореният Изход
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -15123,7 +15123,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -15149,10 +15149,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -15171,8 +15171,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -15199,7 +15199,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -15209,7 +15209,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15228,13 +15228,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -15246,7 +15246,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15260,19 +15260,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "Контролен център на Mandrakelinux"
+msgid "<b>Mandriva Products</b>"
+msgstr "Контролен център на Mandrivalinux"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -15293,61 +15293,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -15385,7 +15385,7 @@ msgstr "Избор на криптиращ ключ за еашата файло
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -15406,7 +15406,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -15523,7 +15523,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -15758,14 +15758,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Контролен център на Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Контролен център на Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -15787,21 +15787,21 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
 #: share/advertising/27.pl:13
 #, fuzzy, c-format
 msgid "<b>Online Store</b>"
-msgstr "Контролен център на Mandrakelinux"
+msgstr "Контролен център на Mandrivalinux"
 
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -15824,20 +15824,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
 msgstr "<b>Мандрейклинукс Клуб</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -15856,33 +15856,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -15905,32 +15905,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
 msgstr "<b>МандрейкЕксперт</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -16216,7 +16216,7 @@ msgstr "Webmin Обслужване"
 #: share/compssUsers.pl:187
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "Конфигурация на Терминален Сървър в Mandrakelinux"
+msgstr "Конфигурация на Терминален Сървър в Mandrivalinux"
 
 #: share/compssUsers.pl:191
 #, fuzzy, c-format
@@ -16230,8 +16230,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Контролен център на Mandrakelinux"
+msgid "Mandriva Wizards"
+msgstr "Контролен център на Mandrivalinux"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -16326,7 +16326,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16374,7 +16374,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -16449,7 +16449,7 @@ msgstr ""
 #: standalone/drakTermServ:211 standalone/drakTermServ:214
 #, fuzzy, c-format
 msgid "Terminal Server Configuration"
-msgstr "Конфигурация на Терминален Сървър в Mandrakelinux"
+msgstr "Конфигурация на Терминален Сървър в Mandrivalinux"
 
 #: standalone/drakTermServ:220
 #, c-format
@@ -16594,7 +16594,7 @@ msgstr ""
 #: standalone/drakTermServ:509
 #, fuzzy, c-format
 msgid "Terminal Server Overview"
-msgstr "Конфигурация на Терминален Сървър в Mandrakelinux"
+msgstr "Конфигурация на Терминален Сървър в Mandrivalinux"
 
 #: standalone/drakTermServ:510
 #, c-format
@@ -18873,13 +18873,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Контролен център на Mandrakelinux"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Контролен център на Mandrivalinux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Контролен център на Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Контролен център на Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18899,8 +18899,8 @@ msgstr "ХардДрейк"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -18944,7 +18944,7 @@ msgstr "Конфигурационни Магьосници"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -19357,14 +19357,14 @@ msgstr "Пуснат при стартиране"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Нямате Internet връзка.\n"
 "Създайте такава, като цъкнете на 'Настрой'"
@@ -19417,7 +19417,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -19707,7 +19707,7 @@ msgstr "Импорт"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -20192,7 +20192,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -20219,8 +20219,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Контролен център на Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Контролен център на Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -23233,7 +23233,7 @@ msgstr "Промените са запазени, но за да бъдат еф
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Самостоятелни инструменти"
 
 #: standalone/logdrake:51
@@ -23742,10 +23742,10 @@ msgstr "Връзката е установена."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Връзката пропадна.\n"
-"Проверете си конфигурацията в Контролен център на Mandrakelinux."
+"Проверете си конфигурацията в Контролен център на Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -23980,7 +23980,7 @@ msgstr ""
 #: standalone/scannerdrake:101
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "%s не се подържа от тази версия на Mandrakelinux."
+msgstr "%s не се подържа от тази версия на Mandrivalinux."
 
 #: standalone/scannerdrake:104
 #, c-format
@@ -24020,7 +24020,7 @@ msgstr ""
 #: standalone/scannerdrake:144
 #, fuzzy, c-format
 msgid "The %s is not supported under Linux."
-msgstr "%s не се подържа от тази версия на Mandrakelinux."
+msgstr "%s не се подържа от тази версия на Mandrivalinux."
 
 #: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
@@ -24591,8 +24591,8 @@ msgstr "Инсталацията провалена"
 #~ msgstr "Не сте избрали никакъв шрифт"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Контролен център на Mandrakelinux"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Контролен център на Mandrivalinux"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Няма налична програма за преглед! Моля изберете една"
@@ -24766,13 +24766,13 @@ msgstr "Инсталацията провалена"
 #~ msgstr "Грешка при отваряне на %s за запис: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Това е HardDrake, хардуерен конфигурационен инструмент на Mandrakelinux.\n"
+#~ "Това е HardDrake, хардуерен конфигурационен инструмент на Mandrivalinux.\n"
 #~ "<span foreground=\"royalblue3\">Версия:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Автор:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
@@ -25267,15 +25267,15 @@ msgstr "Инсталацията провалена"
 #~ msgid "mkraid failed"
 #~ msgstr "mkraid пропадна"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "Connection failed.\n"
 #~ "Verify your configuration in the Mandrake Control Center."
 #~ msgstr ""
 #~ "Връзката пропадна.\n"
-#~ "Проверете си конфигурацията в Контролен център на Mandrakelinux."
+#~ "Проверете си конфигурацията в Контролен център на Mandrivalinux."
 
 #~ msgid "The package %s is needed. Install it?"
 #~ msgstr "Пакет %s е необходим. Да го инсталирам?"
diff --git a/perl-install/share/po/bn.po b/perl-install/share/po/bn.po
index 773985157..5524625b1 100644
--- a/perl-install/share/po/bn.po
+++ b/perl-install/share/po/bn.po
@@ -68,7 +68,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "মনেহচ্ছে ইউএসবি ডিস্কে রাইট প্রটেকশন কার্যকর করা রয়েছে, কিন্তু এখন\n"
 "আমরা নিরাপদভাবে এটা আন-প্লাগও করতে পারছিনা।\n"
@@ -94,7 +94,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "আপনার ইউএসবি ডিস্কে কোন উইন্ডোজ (FAT) পার্টিশন নেই।\n"
@@ -113,7 +113,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -121,7 +121,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "আমরা আপনার সিস্টেমে কোন ইউএসবি ড্রাইভ সনাক্ত করতে\n"
@@ -263,7 +263,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1312,11 +1312,11 @@ msgstr "পছন্দনীয় ভাষা"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux বাভিন্ন ভাষা সমর্থন করে।\n"
+"Mandrivalinux বাভিন্ন ভাষা সমর্থন করে।\n"
 "আপনি যেই ভাষাটি ইনস্টল করতে চান তা পছন্দ করুন।\n"
 "ইনস্টল শেষে রি-স্টার্ট করার পরে সেই ভাষাগুলি উপলব্ধ হবে।"
 
@@ -3733,7 +3733,7 @@ msgstr "রেডিও সাপোর্ট সক্রিয় করো"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3924,7 +3924,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3942,11 +3942,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3998,11 +3998,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "এখন আপনাকে নির্বাচন করতে হবে আপনি কোন কোন প্রোগ্রাম সিস্টেমে ইনস্টল করতে চান।\n"
-"Mandrakelinux এর জন্য কয়েক হাজার প্যাকেজ রয়েছে, এবং ব্যাবস্থাপনার সুবিধার্থে "
+"Mandrivalinux এর জন্য কয়েক হাজার প্যাকেজ রয়েছে, এবং ব্যাবস্থাপনার সুবিধার্থে "
 "সেগুলোকে\n"
 "অ্যাপ্লিকেশনের ধরন অনুযায়ী ভাগ করা হয়েছে।\n"
 "\n"
-"Mandrakelinux সব প্যাকেজগ্রুপসমূহ চারটি শ্রেণীতে ভাগ করে। আপনি বিভিন্ন শ্রেণীর\n"
+"Mandrivalinux সব প্যাকেজগ্রুপসমূহ চারটি শ্রেণীতে ভাগ করে। আপনি বিভিন্ন শ্রেণীর\n"
 "অ্যাপ্লিকেশনমিলিয়ে ও মিশিয়ে ইনস্টল করতে পারেন, যেমন একটি ``Workstation''\n"
 "ইনস্টলেশনে আপনি ''Server'' শ্রেণী থেকে অ্যাপ্লিকেশন ইনস্টল\n"
 "করতে পারেন।\n"
@@ -4110,10 +4110,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4252,7 +4252,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4372,12 +4372,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4404,7 +4404,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4413,7 +4413,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4543,7 +4543,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4562,7 +4562,7 @@ msgstr ""
 "\n"
 "পার্টিশন ফরম্যাট শুরু করতে \"%s\" চাপুন।\n"
 "\n"
-"আপনার নতুন Mandrakelinux অপারেটিং সিস্টেম ইনস্টেশনের জন্য আপনি যদি অন্য একটি "
+"আপনার নতুন Mandrivalinux অপারেটিং সিস্টেম ইনস্টেশনের জন্য আপনি যদি অন্য একটি "
 "পার্টিশন নির্বাচন করতে, তবে \"%s\" ক্লিক করুন।\n"
 "\n"
 "যদি আপনি পার্টিশনের জন্য ডিস্কের খারাপ ব্লক সনাক্ত করাতে চান তাহলে \"%s\" ক্লিক "
@@ -4582,7 +4582,7 @@ msgstr "পূর্ববর্তী"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4594,7 +4594,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"আপনি যখন Mandrakelinux ইনস্টল করবেন, সম্ভবত প্রথম রিলিজ থেকে কিছু\n"
+"আপনি যখন Mandrivalinux ইনস্টল করবেন, সম্ভবত প্রথম রিলিজ থেকে কিছু\n"
 "প্যাকেজ আপডেট হয়ে গেছে। কোন সাধারন বা নিরাপত্তা ত্রুটি সমাধান করা হয়েছে।\n"
 "আপনাকে এই সুবিধাগুলি দেয়ার লক্ষ্যে এই আপডেটগুলো ইন্টারনেট থেকে ডাউনলোড\n"
 "করার সুযোগ দেয়া হয়েছে। যদি আপনার সক্রিয় ইন্টারনেট সংযোগ থাকে, \"%s\" চেক\n"
@@ -4624,7 +4624,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4636,7 +4636,7 @@ msgstr ""
 "হয়। নিরাপত্তা যত বেশী, ব্যবহারের স্বাচ্ছন্দ্য তত কমে যায়।\n"
 "\n"
 "আপনি যদি নিশ্চিত না হন কোন অপশনটি রাখবেন তবে ডিফল্ট অপশনটিই রাখুন।\n"
-"পরবর্তীতে আপনি এটি draksec টুল (যেটি Mandrakelinux নিয়ন্ত্রন কেন্দ্রের একটি অংশ)\n"
+"পরবর্তীতে আপনি এটি draksec টুল (যেটি Mandrivalinux নিয়ন্ত্রন কেন্দ্রের একটি অংশ)\n"
 "দিয়ে পরিবর্তন করতে পারবেন।\n"
 "\n"
 "\"%s\" ক্ষেত্রটিতে যিনি নিরাপত্তার দায়িত্বে নিয়োজিত তার ই-মেইল অ্যাড্রেস দিন।\n"
@@ -4652,7 +4652,7 @@ msgstr "সিকিউরিটি এ্যডমিনিস্ট্রে�
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4722,7 +4722,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"এই সময়ে আপনাকে Mandrakelinux যে পার্টিশনে ইনস্টল হবে তা নির্বাচন\n"
+"এই সময়ে আপনাকে Mandrivalinux যে পার্টিশনে ইনস্টল হবে তা নির্বাচন\n"
 "করতে হবে। যদি আগে থেকেই পার্টিশন তৈরী থাকে, (GNU/Linux এর পুর্বের\n"
 "কোন ইনস্টলেশনের কারনে বা অন্য কোন পার্টিশন টুল দিয়ে তৈরী করা) আপনি\n"
 "সেগুলো ব্যবহার করতে পারেন। অন্যথায় হার্ডড্রাইভ পার্টিশন তৈরী করতে হবে।\n"
@@ -4805,7 +4805,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4854,7 +4854,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4863,13 +4863,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 # সাম
@@ -4928,7 +4928,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5089,7 +5089,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5110,11 +5110,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "এখন সময় আপনার কম্পিউটারের জন্য একটি প্রিন্টিং সিস্টেম নির্বাচন করার। অনান্য\n"
-"অপারেটিং সিস্টেম আপনাকে একটি অপশন দিতে পারে কিন্তু Mandrakelinux দেবে দুটি।\n"
+"অপারেটিং সিস্টেম আপনাকে একটি অপশন দিতে পারে কিন্তু Mandrivalinux দেবে দুটি।\n"
 "প্রিন্টিং সিস্টেমগুলো বিভিন্ন কনফিগারেশনের জন্য প্রযোজ্য।\n"
 "\n"
 " * \"%s\" -- অর্থ হচ্ছে \"প্রিন্ট করো, সারিতে রাখবেনা\". এটি নির্বাচন করুন যদি "
@@ -5141,7 +5141,7 @@ msgstr ""
 "ইন্টারফেস রয়েছে।\n"
 "\n"
 "আপনার বাছাইকৃত প্রিন্টিং সিস্টেমটি যদি আপনার পরে পছন্দ না হয়,\n"
-"তবে আপনি Mandrakelinux নিয়ন্ত্রন কেন্দ্র থেকে PrinterDrake চালিয়ে ও \"%s\" বাটন "
+"তবে আপনি Mandrivalinux নিয়ন্ত্রন কেন্দ্র থেকে PrinterDrake চালিয়ে ও \"%s\" বাটন "
 "ক্লিক\n"
 "করে তা বদল করতে পারেন।"
 
@@ -5262,7 +5262,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5279,7 +5279,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5341,7 +5341,7 @@ msgstr "সার্ভিস সমূহ"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "হার্ড ড্রাইভ বেছে নিন যেটি আপনি আপনার নতুন ম্যানড্রেকলিনাক্স পার্টিশন ইনস্টল করার "
@@ -5701,7 +5701,7 @@ msgstr "আপনার উইন্ডোজের পার্টিশনে�
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "আপনার উইন্ডোজের পার্টিশনটি প্রচন্ড অসম। অনুগ্রহ করে আপনার কম্পিউটারটি উইন্ডোজে রি-বুট "
@@ -5819,19 +5819,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5853,7 +5853,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5861,14 +5861,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5878,7 +5878,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5898,10 +5898,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5912,11 +5912,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5932,7 +5932,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5994,7 +5994,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6002,7 +6002,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "অভিনন্দন, ইনস্টলেশন পুরোপুরিভাবে হয়ে গেছে।\n"
 "দ্নবুট মিডিয়া সরিয়ে ফেলুন, এবং পুনরায় চালু করার জন্য return চাপুন।\n"
@@ -6051,7 +6051,7 @@ msgstr "`%s' স্টেপে প্রবেশ করছি\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -6603,8 +6603,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "উপস্থিত মিররের তালিকার জন্য Mandrakelinux-এ সংযুক্ত করা হচ্ছে..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
+msgstr "উপস্থিত মিররের তালিকার জন্য Mandrivalinux-এ সংযুক্ত করা হচ্ছে..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -6826,8 +6826,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux ইনস্টলেশন %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux ইনস্টলেশন %s"
 
 #  -PO: This string must fit in a 80-char wide text screen
 #. -PO: This string must fit in a 80-char wide text screen
@@ -9443,7 +9443,7 @@ msgstr "বিটTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -13564,11 +13564,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"আপনার স্ক্যানারটি নেটওয়ার্ক শেয়ার করার জন্য Scannerdrake (Mandrakelinux নিয়ন্ত্রণ "
+"আপনার স্ক্যানারটি নেটওয়ার্ক শেয়ার করার জন্য Scannerdrake (Mandrivalinux নিয়ন্ত্রণ "
 "কেন্দ্র হার্ডওয়্যার/স্ক্যানার) চালান।\n"
 "\n"
 
@@ -15580,24 +15580,24 @@ msgstr "বন্ধ"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr "<b>ম্যানড্রেককলিনাক্স কি?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
 msgstr "<b>ম্যানড্রেককলিনাক্স</b>-এ আপনাকে স্বাগতম!"
 
 # সাম
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux একটি <b>লিনাক্স ডিস্ট্রিবিউশন</b> যা গঠিত হয়েছে সিস্টেম মূল অংশ বা "
+"Mandrivalinux একটি <b>লিনাক্স ডিস্ট্রিবিউশন</b> যা গঠিত হয়েছে সিস্টেম মূল অংশ বা "
 "<b>অপারেটিং সিস্টেম</b> (লিনাক্স কার্নেল এর উপর ভিত্তি করে) এবং <b>বিভিন্ন অনেক "
 "অ্যাপ্লিকেশন</b> দিয়ে যা কিনা আপনার সম্ভাব্য সব চাহিদা পূরন করে।"
 
@@ -15605,10 +15605,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux আজকের সবচেয়ে <b>ব্যবহারকারীর বন্ধুসূলভ</b> লিনাক্স ডিস্ট্রিবিউশন। এটি "
+"Mandrivalinux আজকের সবচেয়ে <b>ব্যবহারকারীর বন্ধুসূলভ</b> লিনাক্স ডিস্ট্রিবিউশন। এটি "
 "পৃথিবীর সবচেয়ে <b>বহুল-ব্যবহৃত</b> লিনাক্স ডিস্ট্রিবিউশনের মধ্যে অন্যতম!"
 
 #: share/advertising/02.pl:13
@@ -15626,13 +15626,13 @@ msgstr "<b>উন্মুক্ত সোর্সের পৃথিবী</b>
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux উন্মুক্ত সোর্স মডেলে প্রতিশ্রুতিবদ্ধ। এর অর্থ, এই নতুন রিলিজটি "
-"<b>Mandrakesoft এর ডেভেলপমেন্ট টিম</b> এবং <b>বিশ্বব্যাপী কমিউনিটির</b> "
+"Mandrivalinux উন্মুক্ত সোর্স মডেলে প্রতিশ্রুতিবদ্ধ। এর অর্থ, এই নতুন রিলিজটি "
+"<b>Mandriva এর ডেভেলপমেন্ট টিম</b> এবং <b>বিশ্বব্যাপী কমিউনিটির</b> "
 "<b>সহযোগিতার</b> ফসল।"
 
 #: share/advertising/02.pl:19
@@ -15653,7 +15653,7 @@ msgstr "<b>জি-পি-এল</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "ডিস্ট্রিবিউশন এবং ম্যানড্রেকলিনাক্স টুলসমূহের বেশিরভাগ সফ্‌টওয়্যার <b>General Public "
 "License</b> এর অধীনে লাইসেন্সকৃত।"
@@ -15689,14 +15689,14 @@ msgstr "<b>কমিউনিটিতে যোগ দিন</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux এর আছে ব্যবহারকারী ও ডেভেলপারদের <b>সবচেয়ে বড় কমিউনিটি</b> গুলোর "
+"Mandrivalinux এর আছে ব্যবহারকারী ও ডেভেলপারদের <b>সবচেয়ে বড় কমিউনিটি</b> গুলোর "
 "একটি। এই কমিউনিটির কার্যক্রমও অনেক বিস্তৃত, ত্রুটি রিপোর্ট করা থেকে নতুন অ্যাপলিকেশন "
-"তৈরী পর্যন্ত। এ কমিউনিটি Mandrakelinux এর ভুবনে অপরিহার্য ভুমিকা পালন করে।"
+"তৈরী পর্যন্ত। এ কমিউনিটি Mandrivalinux এর ভুবনে অপরিহার্য ভুমিকা পালন করে।"
 
 # সাম
 #: share/advertising/04.pl:17
@@ -15719,11 +15719,11 @@ msgstr "<b>ডাউনলোড সংস্করণ</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"আপনি এখন <b>Mandrakelinux ডাউনলোড</b> ইনস্টল করছেন। এটি একটি ফ্রী ভার্সন যা "
-"কিনা Mandrakesoft <b>সবার জন্য সহজলভ্য</b> রাখতে চায়।"
+"আপনি এখন <b>Mandrivalinux ডাউনলোড</b> ইনস্টল করছেন। এটি একটি ফ্রী ভার্সন যা "
+"কিনা Mandriva <b>সবার জন্য সহজলভ্য</b> রাখতে চায়।"
 
 # সাম
 #: share/advertising/05.pl:19
@@ -15756,9 +15756,9 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
-"অনান্য Mandrakesoft পণ্যেও <b>সংযোজিত সার্ভিসগুলো</b> আপনি ব্যবহার করতে পারবেন না।"
+"অনান্য Mandriva পণ্যেও <b>সংযোজিত সার্ভিসগুলো</b> আপনি ব্যবহার করতে পারবেন না।"
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -15767,7 +15767,7 @@ msgstr "<b>আবিষ্কার করুন, আপনার প্রথ�
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr "আপনি এখন <b>ম্যানড্রেকলিনাস্ক আবিষ্কার</b> ইনস্টল করছেন।"
 
 # সাম:
@@ -15792,7 +15792,7 @@ msgstr "<b>পাওয়ারপ্যাক, চূড়ান্ত লিনা
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr "আপনি এখন <b>ম্যানড্রেকলিনাক্স পাওয়ারপ্যাক</b> ইনস্টল করছেন।"
 
 # সাম
@@ -15800,11 +15800,11 @@ msgstr "আপনি এখন <b>ম্যানড্রেকলিনাক�
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack হচ্ছে Mandrakesoft এর <b>premier লিনাক্স ডেস্কটপ</b> পণ্য। PowerPack এ "
+"PowerPack হচ্ছে Mandriva এর <b>premier লিনাক্স ডেস্কটপ</b> পণ্য। PowerPack এ "
 "আছে <b>হাজারেরও অধিক অ্যাপ্লিকেশন</b> - সবচেয়ে জনপ্রিয় থেকে শুরু করে সবচেয়ে উন্নত "
 "পর্যন্ত।"
 
@@ -15815,7 +15815,7 @@ msgstr "<b>পাওয়ারপ্যাক+, ডেস্কটপ এবং �
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr "আপনি এখন <b>ম্যানড্রেকলিনাক্স পাওয়ারপ্যা++</b> ইনস্টল করছেন।"
 
 # সাম 
@@ -15832,24 +15832,24 @@ msgstr ""
 "লিনাক্স সমাধান</b>। PowerPack+ এ আছে হাজারেরও অধিক <b>ডেস্কটপ অ্যাপ্লিকেশন</b> "
 "এবং কিছু অতি উন্নত সমন্বিত <b>সার্ভার অ্যাপ্লিকেশন</b>।"
 
-# সাম: Mandrakesoft 
+# সাম: Mandriva 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesoft পণ্যসমূহ</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva পণ্যসমূহ</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr "<b>ম্যানড্রেকসফ্‌ট</b> <b>ম্যানড্রেকলিনাক্স</b> প্রচুর প্রোডাক্ট তৈরী করেছে।"
 
 # সাম
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux এর পণ্যসমূহ হলো:"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux এর পণ্যসমূহ হলো:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -15870,58 +15870,58 @@ msgstr "\t* <b>পাওয়ারপ্যাক+</b>, ডেস্কটপ এ
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>x86-64 এর জন্য Mandrakelinux</b>, আপনার ৬৪‌-বিট প্রোসেসরের সব সম্ভবনাকে "
-"কাজে লাগানোর Mandrakelinux সমাধান। "
+"\t* <b>x86-64 এর জন্য Mandrivalinux</b>, আপনার ৬৪‌-বিট প্রোসেসরের সব সম্ভবনাকে "
+"কাজে লাগানোর Mandrivalinux সমাধান। "
 
 # সাম
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesoft পণ্যসমূহ (Nomad পণ্যসমূহ)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandriva পণ্যসমূহ (Nomad পণ্যসমূহ)</b>"
 
 # সাম
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft দুটি পণ্য তৈরী করেছে যা আপনাকে ইনস্টল করা ছাড়াই <b>যেকোন "
-"কম্পিউটারে</b> Mandrakelinux ব্যবহার করার সুযোগ দেবে। "
+"Mandriva দুটি পণ্য তৈরী করেছে যা আপনাকে ইনস্টল করা ছাড়াই <b>যেকোন "
+"কম্পিউটারে</b> Mandrivalinux ব্যবহার করার সুযোগ দেবে। "
 
 # সাম
 # bootable = ?
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>মুভ</b>, একটি Mandrakelinux ডিস্ট্রিবিউশন সম্পূর্ণভাবে একটি বুট CD-ROM থেকে "
+"\t* <b>মুভ</b>, একটি Mandrivalinux ডিস্ট্রিবিউশন সম্পূর্ণভাবে একটি বুট CD-ROM থেকে "
 "চলতে পারে।"
 
 # সাম: ultra-compact = ?
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, একটি Mandrakelinux ডিস্ট্রিবিউশন যা কিনা আলট্রা‌-"
+"\t* <b>GlobeTrotter</b>, একটি Mandrivalinux ডিস্ট্রিবিউশন যা কিনা আলট্রা‌-"
 "কমপ্যাক্ট “LaCie মোবাইল হার্ড ড্রাইভ” এ পূর্ব-ইনস্টলকৃত।"
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr "<b>ম্যানড্রেকসফ্‌ট প্রোডাক্টসমূহ (পেশাদারী সমাধান)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 "নিচের ম্যানড্রেকসফ্‌ট প্রোডাক্টসমূহ <b>পেশাদারী প্রয়োজন</b> মেটানোর জন্য ডিজাইন করা "
@@ -15930,22 +15930,22 @@ msgstr ""
 # সাম: Corporate = প্রাতিষ্ঠানিক লিখলাম...সিওর না।
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
-"\t* <b>কর্পোরেট ডেস্কটপ</b>, ব্যবসা প্রতিষ্ঠানের উপযুক্ত Mandrakelinux ডেস্কটপ।"
+"\t* <b>কর্পোরেট ডেস্কটপ</b>, ব্যবসা প্রতিষ্ঠানের উপযুক্ত Mandrivalinux ডেস্কটপ।"
 
 # সাম
 # প্রাতিষ্ঠানিক
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>কর্পোরেট সার্ভার</b>, Mandrakelinux সার্ভার সমাধান।"
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>কর্পোরেট সার্ভার</b>, Mandrivalinux সার্ভার সমাধান।"
 
 # সাম
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>একাধিক-নেটওয়ার্ক ফায়ারওয়াল</b>, Mandrakelinux নিরাপত্তা সমাধান।"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>একাধিক-নেটওয়ার্ক ফায়ারওয়াল</b>, Mandrivalinux নিরাপত্তা সমাধান।"
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -15996,10 +15996,10 @@ msgstr "<b>আপনার পছন্দনীয় ডেস্কটপ পর
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "PowerPack এর মাধ্যমে আপনি আপনার পচ্ছন্দ অনুযায়ী <b>গ্রাফিক্যাল ডেস্কটপ পরিবেশ<b> "
-"বেছে নিতে পারবেন। Mandrakesoft এর জন্য ডিফল্ট <b>KDE</b>। "
+"বেছে নিতে পারবেন। Mandriva এর জন্য ডিফল্ট <b>KDE</b>। "
 
 # সাম
 # ব্যবহারকারীর বন্ধুসূলভ
@@ -16028,10 +16028,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "PowerPack এর মাধ্যমে আপনি আপনার পচ্ছনুযায়ী <b>গ্রাফিক্যাল ডেস্কটপ পরিবেশ</b> বেছে "
-"নিতে পারবেন। Mandrakesoft এর জন্য ডিফল্ট হচ্ছে <b>KDE</b>। "
+"নিতে পারবেন। Mandriva এর জন্য ডিফল্ট হচ্ছে <b>KDE</b>। "
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16164,7 +16164,7 @@ msgstr "<b>অ্যাপ্লিকেশনের বিশাল সীম�
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 "ম্যানড্রেকলিনাক্স মেনু'তে <b>আপনার সকল কাজসমূহ</b> এর জন্য আপনি </b>সহজে-ব্যবহার্য</"
@@ -16449,7 +16449,7 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr "<b>ম্যান্ড্রেক-লিনাক্স নিয়ন্ত্রণ কেন্দ্র</b>"
 
 # সাম
@@ -16457,11 +16457,11 @@ msgstr "<b>ম্যান্ড্রেক-লিনাক্স নিয়ন�
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrakelinux নিয়ন্ত্রণ কেন্দ্র</b> একটি Mandrakelinux-সম্পর্কিত মৌলিক "
+"<b>Mandrivalinux নিয়ন্ত্রণ কেন্দ্র</b> একটি Mandrivalinux-সম্পর্কিত মৌলিক "
 "ইউটিলিটির সমষ্টি যা কিনা আপনার কম্পিউটারের কনফিগারেশন সহজ করে তোলে।  "
 
 # সাম
@@ -16489,14 +16489,14 @@ msgstr "<b>উন্মুক্ত সোর্সের মডেল</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "সব কম্পিউটার প্রোগ্রামিং এর মতই, উন্মুক্ত সোর্স সফ্টওয়্যার ডেভেলপমেন্টেও প্রয়োজন <b>সময় "
-"এবং লোকবল</b>। উন্মুক্ত সোর্স ধারনাটির সমর্থনে এবং <b>Mandrakelinux উন্নততর করার "
-"উদ্দেশ্যে</b> Mandrakesoft মূল্য সংযোজিত পণ্য ও সেবা বিক্রয় করে থাকে। আপনি যদি এই "
+"এবং লোকবল</b>। উন্মুক্ত সোর্স ধারনাটির সমর্থনে এবং <b>Mandrivalinux উন্নততর করার "
+"উদ্দেশ্যে</b> Mandriva মূল্য সংযোজিত পণ্য ও সেবা বিক্রয় করে থাকে। আপনি যদি এই "
 "প্রচেষ্টায় সাহায্য করতে চান তবে <b>অনুগ্রহ করে</b> আমাদের যেকোন পণ্য বা সেবা ক্রয় "
 "করুন!"
 
@@ -16509,7 +16509,7 @@ msgstr "<b>অনলাইন বিপনীকেন্দ্র</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 "ম্যনড্রেকসফ্‌টের প্রোডাক্টসমূহ এবং সার্ভিস সম্বন্ধে জ্ঞানার্জনের জন্য, আপনি আমাদের <b>ই-"
@@ -16537,20 +16537,20 @@ msgstr "আজ <b>store.mandrakesoft.com</b> এ থেমে যান!"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
 msgstr "<b>ম্যানড্রেকক্লাব</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr "<b>ম্যানড্রেকক্লাব</b> আপনার ম্যানড্রেকলিনাক্স প্রোডাক্টের <b>সঠিক সংগী</b>.."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr "ম্যানড্রেকক্লাবে যোগ দিয়ে <b>মূল্যবান উপকারসমূহের</b> সুবিধা নিন, যেমন:"
 
 #: share/advertising/28.pl:20
@@ -16573,7 +16573,7 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr "\t* ম্যানড্রেকলিনাক্স <b>ব্যবহারকারীদের ফোরাম</b> এ অংশগ্রহণ।"
 
 # সাম
@@ -16581,20 +16581,20 @@ msgstr "\t* ম্যানড্রেকলিনাক্স <b>ব্যব�
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
-"\t* Mandrakelinux <b>ISO ইমেজগুলো</b>, <b>নির্ধারিত সময়ের পূর্বেই</b>, পাওয়ার "
+"\t* Mandrivalinux <b>ISO ইমেজগুলো</b>, <b>নির্ধারিত সময়ের পূর্বেই</b>, পাওয়ার "
 "বিশেষ সুবিধা।"
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>ম্যান্ড্রকঅনলাইন (MandrakeOnline)</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>ম্যান্ড্রকঅনলাইন (Mandriva Online)</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 "<b>ম্যানড্রেকঅনলাইন</b> হচ্ছে একটি নতুন প্রিমিয়াম সার্ভিস যা ম্যানড্রেকসফ্‌ট তার "
@@ -16603,8 +16603,8 @@ msgstr ""
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 "ম্যানড্রেকঅনলাইন আপনার ম্যানড্রেকলিনাক্স সিস্টেমের জন্য <b>সহজে আপডেট</b> এর জন্য "
 "বিশাল সীমানার গুরুত্বপূর্ণ সার্ভিস:"
@@ -16631,19 +16631,19 @@ msgstr "\t* নমনীয় <b>রুটিনমাফিক</b> আপডে�
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 "\t* একটি অ্যাকাউন্ট দিয়ে <b>আপনার সম্পূর্ণ ম্যানড্রেকলিনাক্স সিস্টেমের</b> ম্যানেজমেন্ট।"
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "আপনার কি কোন <b>সহযোগিতা</b> প্রয়োজন? www.mandrakeexpert.com এর  <b>আমাদের "
@@ -16653,7 +16653,7 @@ msgstr ""
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 "<b>যোগ্যতাসম্পন্ন অভিজ্ঞ ম্যানড্রেকলিনাক্স ব্যবহারকারীদের</b> সাহায্যের জন্য ধন্যবাদ, "
@@ -16662,7 +16662,7 @@ msgstr ""
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 "ম্যানড্রেকলিনাক্স সম্পর্কিত কোন প্রশ্নের জন্য, আপনাকে <b>store.mandrakesoft.com</b> "
@@ -16975,8 +16975,8 @@ msgstr "পর্যবেক্ষণ টুলসমূহ, হিসাবর
 # সাম
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesoft উইজার্ডসমূহ"
+msgid "Mandriva Wizards"
+msgstr "Mandriva উইজার্ডসমূহ"
 
 # সাম
 #: share/compssUsers.pl:197
@@ -17129,12 +17129,12 @@ msgstr ""
 "                 : এবং ghostscript এর জন্য gs।"
 
 # সাম
-# Mandrakelinux Terminal
+# Mandrivalinux Terminal
 #: standalone.pm:84
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17148,7 +17148,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Mandrakelinux টার্মিনাল সার্ভার কনফিগারকারী\n"
+"Mandrivalinux টার্মিনাল সার্ভার কনফিগারকারী\n"
 "--enable        :MTS সক্রিয় করো\n"
 "--disable        : MTS নিষ্ক্রিয় করো\n"
 "--start           : MTS চালু করো\n"
@@ -17209,14 +17209,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPTION]...\n"
-"  --no-confirmation      MandrakeUpdate মোডে প্রথম নিশ্চিতকরন প্রশ্ন জিজ্ঞাসা করো "
+"  --no-confirmation      Mandriva Update মোডে প্রথম নিশ্চিতকরন প্রশ্ন জিজ্ঞাসা করো "
 "না\n"
 "  --no-verify-rpm        প্যাকেজ স্বাক্ষর নিরীক্ষা করো না\n"
 "  --changelog-first      বর্ণনা উইন্ডোতে filelist এর আগে changelog দোখাও\n"
@@ -19953,12 +19953,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "ম্যানড্রেকলিনাক্স ত্রুটি রিপোর্টকারী টুল"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
 msgstr "ম্যানড্রেকলিনাক্স নিয়ন্ত্রন (control) সেন্টার"
 
 #: standalone/drakbug:48
@@ -19979,8 +19979,8 @@ msgstr "হার্ডড্রেক"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "ম্যানড্রেকঅনলাইন (MandrakeOnline)"
+msgid "Mandriva Online"
+msgstr "ম্যানড্রেকঅনলাইন (Mandriva Online)"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20027,8 +20027,8 @@ msgstr "কনফিগারেশন উইজার্ড"
 # সাম
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Mandrakesoft টুল বেছে নিন:"
+msgid "Select Mandriva Tool:"
+msgstr "Mandriva টুল বেছে নিন:"
 
 # সাম
 #: standalone/drakbug:82
@@ -20456,7 +20456,7 @@ msgstr "বুট হওয়ার সময় সচল হয়"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "এই ইন্টারফেস এখনো কন্‌ফিগার করা হয়নি।\n"
 "ম্যানড্রেকলিনাক্স নিয়ন্ত্রক কেন্দ্র থেকে সহকারী \"ইন্টারফেস যুক্ত করো\" চালান"
@@ -20466,10 +20466,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "আপনার সিস্টেমে কোন ইন্টারনেট সংযোগ কনফিগার করা নেই।\n"
-"অনুগ্রহপূর্বক Mandrakelinux নিয়ন্ত্রণকেন্দ্র থেকে \"%s\" চালান।"
+"অনুগ্রহপূর্বক Mandrivalinux নিয়ন্ত্রণকেন্দ্র থেকে \"%s\" চালান।"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20520,7 +20520,7 @@ msgstr "KDM (কেডিই ডিসপ্লে ম্যানেজার)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr "MdkKDM (ম্যানড্রেকলিনাক্স ডিসপ্লে ম্যানেজার)"
 
 #: standalone/drakedm:37
@@ -20824,7 +20824,7 @@ msgstr "ইমপোর্ট"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21381,7 +21381,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -21417,8 +21417,8 @@ msgstr " --doc <link>          - অন্য ওয়েব পেজে সং�
 # সাম
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux সাহায্যকেন্দ্র"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux সাহায্যকেন্দ্র"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -24934,8 +24934,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinux টুলসমুহের লগ"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinux টুলসমুহের লগ"
 
 # ##যন্ত্রপাতি
 # Logdrake-এর কোন বাংলা হবে বলে আমার মনে হয়না।
@@ -25476,7 +25476,7 @@ msgstr "সংযোগ সম্পন্ন হয়েছে।"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "কানেকশন হয়নি।\n"
 "ম্যান্ড্রেক-লিনাক্স কন্ট্রোল প্যানেলে আপনার কনফিগারেশন যাচাই করুন।"
diff --git a/perl-install/share/po/br.po b/perl-install/share/po/br.po
index 62dd61d81..f4d17e1e3 100644
--- a/perl-install/share/po/br.po
+++ b/perl-install/share/po/br.po
@@ -1,5 +1,5 @@
 # DrakX e Brezhoneg.
-# Copyright (C) 1999-2003 Mandrakesoft
+# Copyright (C) 1999-2003 Mandriva
 # Thierry Vignaud <tvignaud@mandrakesoft.com>, 1999-2005
 # Jañ-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>, 1999-2000
 #
@@ -59,7 +59,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -78,7 +78,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -86,7 +86,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -94,7 +94,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -223,7 +223,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1230,7 +1230,7 @@ msgstr "Diba ho yezh"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 "Gallout a rit dibab yezhoù all hag a vo hegerz goude staliañ"
@@ -3503,7 +3503,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3613,7 +3613,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3624,11 +3624,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3735,10 +3735,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3855,7 +3855,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -3953,12 +3953,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -3985,7 +3985,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -3994,7 +3994,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4123,7 +4123,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4141,7 +4141,7 @@ msgstr "Diaraog"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4170,7 +4170,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4186,7 +4186,7 @@ msgstr "Melestradur an surentez"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4272,7 +4272,7 @@ msgstr "Tremen er mod boas/mailh"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4317,7 +4317,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4326,13 +4326,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4373,7 +4373,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4532,7 +4532,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4553,7 +4553,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4653,7 +4653,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4670,7 +4670,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4732,7 +4732,7 @@ msgstr "Servijerioù"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -5055,7 +5055,7 @@ msgstr "Emaon o jediñ ment ar barzhadur Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 
@@ -5170,19 +5170,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5204,7 +5204,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5212,14 +5212,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5229,7 +5229,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5249,10 +5249,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5263,11 +5263,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5283,7 +5283,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5340,7 +5340,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5348,13 +5348,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Gourc'hemennoù, peurc'hraet eo ar staliadur.\n"
 "Lamit ar bladenn loc'hañ ha gwaskit enkas evit adloc'hañ.\n"
 "\n"
 "\n"
-"Evit titouroù war palastroù hegerz evit stumm-mañ Mandrakelinux,\n"
+"Evit titouroù war palastroù hegerz evit stumm-mañ Mandrivalinux,\n"
 "sellit ouzh ar Errata war : \n"
 "\n"
 "\n"
@@ -5362,7 +5362,7 @@ msgstr ""
 "\n"
 "\n"
 "Titouroù war gefluniañ ho reizhiad a zo hegerz e rannbennad Goude\n"
-"Staliañ Sturier ofisiel an Arveriad Mandrakelinux."
+"Staliañ Sturier ofisiel an Arveriad Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -5393,7 +5393,7 @@ msgstr "O kregiñ gant al lankad `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -5911,9 +5911,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"O taremprediñ al lec'hienn Mandrakelinux evit kaout roll ar pakadoù "
+"O taremprediñ al lec'hienn Mandrivalinux evit kaout roll ar pakadoù "
 "hegerz ..."
 
 #: install_steps_interactive.pm:840
@@ -6123,8 +6123,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Staliadur Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Staliadur Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8697,7 +8697,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12294,7 +12294,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14042,18 +14042,18 @@ msgstr "Plaenaozañ"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Petra eo Mandrakelinux ?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Petra eo Mandrivalinux ?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Degemer e <b>Mandrakelinux</b> !"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Degemer e <b>Mandrivalinux</b> !"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14062,7 +14062,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -14079,9 +14079,9 @@ msgstr "Degemer er <b>bed dieub</b> !"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -14101,7 +14101,7 @@ msgstr "<b>Ar GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14127,10 +14127,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14149,8 +14149,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14177,7 +14177,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14187,7 +14187,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14206,13 +14206,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14224,7 +14224,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14238,20 +14238,20 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakestore</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva Store</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux Control Center"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux Control Center"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -14271,61 +14271,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14363,7 +14363,7 @@ msgstr "All burevioù c'hrafek"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14384,7 +14384,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -14501,7 +14501,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -14736,14 +14736,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Kreizenn ren Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Kreizenn ren Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -14765,9 +14765,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -14779,7 +14779,7 @@ msgstr "<b>MandrakeStore</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -14802,20 +14802,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, fuzzy, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -14834,33 +14834,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -14883,32 +14883,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakestore</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Store</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15199,8 +15199,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "<b>Mandrakestore</b>"
+msgid "Mandriva Wizards"
+msgstr "<b>Mandriva Store</b>"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -15295,7 +15295,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15343,7 +15343,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17815,13 +17815,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux Control Center"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux Control Center"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Kreizenn ren Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Kreizenn ren Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -17841,8 +17841,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -17886,8 +17886,8 @@ msgstr "Skoazellerien kefluniadur"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Dibabit un ostilh Mandrakesoft :"
+msgid "Select Mandriva Tool:"
+msgstr "Dibabit un ostilh Mandriva :"
 
 #: standalone/drakbug:82
 #, c-format
@@ -18299,14 +18299,14 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18357,7 +18357,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18642,7 +18642,7 @@ msgstr "Enporzh"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19102,7 +19102,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -19129,8 +19129,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Kreizenn sikourMandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Kreizenn sikourMandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22106,8 +22106,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinux Control Center"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinux Control Center"
 
 #: standalone/logdrake:51
 #, c-format
@@ -22613,7 +22613,7 @@ msgstr "Echu eo ar gevreadenn"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
@@ -23452,8 +23452,8 @@ msgstr " Sac'het eo ar staliadur"
 #~ msgid "You've not selected any font"
 #~ msgstr "N'oc'h eus ket dibabet un nodrezh bennak"
 
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Skozelerien MandrakeSoft"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Skozelerien Mandriva"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "N'eus furcher da gaout ebet ! Stalit unan mar plij"
diff --git a/perl-install/share/po/bs.po b/perl-install/share/po/bs.po
index 56c38a80a..9f1f91f2a 100644
--- a/perl-install/share/po/bs.po
+++ b/perl-install/share/po/bs.po
@@ -68,14 +68,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Izgleda da je na USB ključu aktivirana zaštita, ali ga sada ne možemo\n"
 "bezbjedno isključiti.\n"
 "\n"
 "\n"
 "Kliknite na dugme da restartujete računar, isključite ga, uklonite zašitu\n"
-"od pisanja, ponovo utaknite ključ i pokrenite Mandrake Move."
+"od pisanja, ponovo utaknite ključ i pokrenite Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -93,7 +93,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Vaš USB ključ ne sadrži ispravne Windows (FAT) particije.\n"
@@ -104,13 +104,13 @@ msgstr ""
 "\n"
 "\n"
 "Takođe možete nastaviti bez USB ključ - još uvijek možete\n"
-"koristiti Mandrake Move kao običan Mandrake operativni sistem."
+"koristiti Mandriva Move kao običan Mandrake operativni sistem."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -118,11 +118,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Nisam pronašao USB ključ na vašem sistemu. Ako\n"
-"uključite USB ključ, Mandrake Move će imati mogućnost\n"
+"uključite USB ključ, Mandriva Move će imati mogućnost\n"
 "da transparentno čuva vaše podatke u vašem home direktoriju\n"
 "kao i konfiguraciju sistema za sljedeće pokretanje sistema na\n"
 "ovom ili nekom drugom računaru. Pažnja: ako sada uključite\n"
@@ -130,7 +130,7 @@ msgstr ""
 "\n"
 "\n"
 "Takođe možete nastaviti bez USB ključa - još uvijek možete\n"
-"koristiti Mandrake Move kao običan Mandrake operativni sistem."
+"koristiti Mandriva Move kao običan Mandrake operativni sistem."
 
 #: ../move/move.pm:494
 #, c-format
@@ -255,7 +255,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -271,7 +271,7 @@ msgstr ""
 "\n"
 "Ovo je možda posljedica korumpiranih sistemskih datoteka\n"
 "na USB ključu, u kojem slučaju će njihovo brisanje i restart\n"
-"Mandrake Move riješiti problem. Da to uradite, kliknite na\n"
+"Mandriva Move riješiti problem. Da to uradite, kliknite na\n"
 "odgovarajuće dugme.\n"
 "\n"
 "\n"
@@ -1305,11 +1305,11 @@ msgstr "Izbor jezika"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux podržava više jezika. Izaberite jezike koje\n"
+"Mandrivalinux podržava više jezika. Izaberite jezike koje\n"
 "želite instalirati. Oni će biti dostupni kada se završi vaša\n"
 "instalacija i restartujete vaš sistem."
 
@@ -3735,12 +3735,12 @@ msgstr "uključi radio podršku"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Prije nego što nastavimo, trebate pažljivo pročitati uvjete licence. Ona\n"
-"pokriva cijelu Mandrakelinux distribuciju. Ako se slažete sa svim\n"
+"pokriva cijelu Mandrivalinux distribuciju. Ako se slažete sa svim\n"
 "uvjetima u njoj, izaberite opciju \"%s\". Ako ne, klikom na \"%s\" ćete\n"
 "restartovati vaš računar."
 
@@ -3928,13 +3928,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux instalacija se prostire na nekoliko CDova. Ako je neki\n"
+"Mandrivalinux instalacija se prostire na nekoliko CDova. Ako je neki\n"
 "paket smješten na drugom CDu, DrakX će izbaciti trenutni CD i zamoliti vas\n"
 "da ubacite neki drugi po potrebi. Ako nemate potreban CD pri ruci,\n"
 "samo kliknite na \"%s\", odgovarajući paketi neće biti instalirani."
@@ -3943,11 +3943,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3999,12 +3999,12 @@ msgid ""
 "megabytes."
 msgstr ""
 "Sada je vrijeme da izaberete koje programe želite instalirati na vaš\n"
-"sistem. Za Mandrakelinux su dostupne hiljade paketa, pa da bi\n"
+"sistem. Za Mandrivalinux su dostupne hiljade paketa, pa da bi\n"
 "njihovo upravljanje bilo lakše, organizovani su u grupe slične\n"
 "primjene.\n"
 "\n"
 "Paketi su sortirani u grupe ovisno o tipičnoj namjeni vašeg računara.\n"
-"U Mandrakelinuxu date su četiri predefinisane kategorije. Možete\n"
+"U Mandrivalinuxu date su četiri predefinisane kategorije. Možete\n"
 "miješati i poklapati programe iz raznih grupa, pa tako instalacija ``Radna\n"
 "stanica'' može sadržavati programe iz grupe ``Programiranje''.\n"
 "\n"
@@ -4110,10 +4110,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4143,11 +4143,11 @@ msgstr ""
 "\n"
 "!! Ako izaberete neki serverski paket, zato što ste specifično izabrali taj\n"
 "paket ili zato što je on dio grupe paketa, bićete zamoljeni da potvrdite da\n"
-"zaista želite da taj server bude instaliran. Mandrakelinux obično\n"
+"zaista želite da taj server bude instaliran. Mandrivalinux obično\n"
 "automatski pokreće sve instalirane servise prilikom pokretanja sistema.\n"
 "Čak i ako su sigurni i nemaju poznatih problema u trenutku pakovanja\n"
 "distribucije, sasvim je moguće da su neke sigurnosne rupe otkrivene\n"
-"nakon što je dovršena ova verzija Mandrakelinuxa. Ako niste sigurni\n"
+"nakon što je dovršena ova verzija Mandrivalinuxa. Ako niste sigurni\n"
 "čemu tačno služi taj paket ili zašto ga treba instalirati, kliknite na \"%s"
 "\".\n"
 "Klikom na \"%s\" instalirate navedene servise i oni će biti automatski\n"
@@ -4304,7 +4304,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4360,7 +4360,7 @@ msgid ""
 msgstr ""
 "X (skraćeno od X Window System) je srce GNU/Linux grafičkog interfejsa\n"
 "o kojem ovise sve grafičke okoline (KDE, GNOME, AfterStep,\n"
-"WindowMaker itd.) uključene u Mandrakelinux.\n"
+"WindowMaker itd.) uključene u Mandrivalinux.\n"
 "\n"
 "Biće vam predstavljena lista različitih parametara koje možete promijeniti\n"
 "da biste dobili optimalan grafički prikaz.\n"
@@ -4477,12 +4477,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4509,7 +4509,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4518,7 +4518,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4538,12 +4538,12 @@ 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 ""
-"Na ovom mjestu trebate izabrati gdje želite instalirati Mandrakelinux\n"
+"Na ovom mjestu trebate izabrati gdje želite instalirati Mandrivalinux\n"
 "operativni sistem na vašem hard disku. Ako je disk prazan ili ako postojeći\n"
 "operativni sistem koristi sav prostor na njemu, potrebno je da ga\n"
 "particionirate. U biti, particioniranje hard diska predstavlja logičko\n"
 "organiziranje kako bi se stvorio prostor za instaliranje vašeg novog\n"
-"Mandrakelinux sistema.\n"
+"Mandrivalinux sistema.\n"
 "\n"
 "Pošto su efekti particioniranja obično nepovratni, i mogu voditi do gubitka\n"
 "podataka na eventualnom postojećem operativnom sistemu, particioniranje\n"
@@ -4575,7 +4575,7 @@ msgstr ""
 "podataka, pod uslovom da prethodno defragmentirate Windows particiju\n"
 "i da ona koristi FAT format. Backupovanje vaših podataka je strogo\n"
 "preporučeno. Ova mogućnost je preporučena ako namjeravate koristiti i\n"
-"Mandrakelinux i Microsoft Windows na istom računaru.\n"
+"Mandrivalinux i Microsoft Windows na istom računaru.\n"
 "\n"
 "    Prije izbora ove opcije, molim da imate na umu da će, nakon ove\n"
 "procedure, veličina vaše Microsoft Windows particije biti manja nego\n"
@@ -4743,7 +4743,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4765,7 +4765,7 @@ msgstr ""
 "Kliknite na \"%s\" kada budete spremni za formatiranje particija.\n"
 "\n"
 "Kliknite na \"%s\" ako želite da izaberete druge particije za instalaciju\n"
-"vašeg novog Mandrakelinux operativnog sistema.\n"
+"vašeg novog Mandrivalinux operativnog sistema.\n"
 "\n"
 "Kliknite na \"%s\" da izaberete particije koje želite provjeriti radi\n"
 "loših blokova."
@@ -4782,7 +4782,7 @@ msgstr "Nazad"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4794,7 +4794,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Kada završite instalaciju Mandrakelinuxa, moguće je da su neki paketi\n"
+"Kada završite instalaciju Mandrivalinuxa, moguće je da su neki paketi\n"
 "ažurirani od zadnjeg izdanja. Moguće je da su ispravljeni bugovi ili\n"
 "rješena neka sigurnosna pitanja. Ako želite iskoristiti ova unaprjeđenja,\n"
 "možete ih sada dobaviti sa Interneta. Izaberite \"%s\" ako imate ispravnu\n"
@@ -4822,7 +4822,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4835,7 +4835,7 @@ msgstr ""
 "jednostavnosti korištenja.\n"
 "\n"
 "Ako ne znate šta izabrati, zadržite ponuđenu opciju. Možete promijeniti\n"
-"nivo sigurnosti naknadno koristeći program draksec iz Mandrakelinux\n"
+"nivo sigurnosti naknadno koristeći program draksec iz Mandrivalinux\n"
 "Kontrolnog centra.\n"
 "\n"
 "Polje \"%s\" obavještava sistem o korisniku koji će biti odgovoran za\n"
@@ -4850,7 +4850,7 @@ msgstr "Sigurnosni administrator"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4921,7 +4921,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Sada trebate izabrati koje particije želite koristiti za instalaciju vašeg\n"
-"Mandrakelinux sistema. Ako su particije već definisane, iz prijašnje\n"
+"Mandrivalinux sistema. Ako su particije već definisane, iz prijašnje\n"
 "GNU/Linux instalacije ili nekim drugim alatom za particioniranje, možete\n"
 "koristiti postojeće particije. U suprotnom, sada morate definisati\n"
 "particije vašeg hard diska.\n"
@@ -5008,7 +5008,7 @@ msgstr "Prekidač normalnog/ekspertnog moda"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5038,7 +5038,7 @@ msgid ""
 msgstr ""
 "Na vašem hard disku ustanovljeno je više od jedne Microsoft particije.\n"
 "Molim izaberite onu koju želite smanjiti kako biste instalirali vaš\n"
-"Mandrakelinux operativni sistem.\n"
+"Mandrivalinux operativni sistem.\n"
 "\n"
 "Svaka particija je navedena ovako: \"Linux ime\", \"Windows ime\",\n"
 "\"Kapacitet\".\n"
@@ -5086,7 +5086,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5095,19 +5095,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Ovaj korak se aktivira samo ako je na vašem računaru pronađena postojeća\n"
 "GNU/Linux particija.\n"
 "\n"
 "DrakX sada treba znati da li želite izvršiti novu instalaciju ili\n"
-"nadogradnju postojećeg Mandrakelinux sistema:\n"
+"nadogradnju postojećeg Mandrivalinux sistema:\n"
 "\n"
 " * \"%s\". Najčešće ovo će u potpunosti obrisati stari sistem. Ipak,\n"
 "ovisno o vašoj šemi particioniranja, možete spriječiti da neki od vaših\n"
@@ -5116,14 +5116,14 @@ msgstr ""
 "datotečni sistem, trebate koristiti ovu opciju.\n"
 "\n"
 " * \"%s\". Ova vrsta instalacije vam omogućuje da ažurirate pakete\n"
-"koji su trenutno instalirani na vašem Mandrakelinux sistemu. Vaša trenutna\n"
+"koji su trenutno instalirani na vašem Mandrivalinux sistemu. Vaša trenutna\n"
 "šema particioniranja i korisnički podaci neće biti izmijenjeni. Većina\n"
 "ostalih koraka konfiguracije ostaju kao što jesu, slično običnoj "
 "instalaciji.\n"
 "\n"
-"Opcija ''Nadogradi'' bi trebala raditi ispravno na Mandrakelinux sistemima\n"
+"Opcija ''Nadogradi'' bi trebala raditi ispravno na Mandrivalinux sistemima\n"
 "koji koriste verziju \"8.1\" ili kasniju. Obavljanje nadogradnje na ranijim\n"
-"verzijama Mandrakelinuxa, prije verzije \"8.1\", nije preporučeno."
+"verzijama Mandrivalinuxa, prije verzije \"8.1\", nije preporučeno."
 
 #: help.pm:591
 #, c-format
@@ -5181,7 +5181,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5221,7 +5221,7 @@ msgstr ""
 "\n"
 "O UTF-8 (Unicode) podršci. Unicode je novi način kodiranja znakova čiji\n"
 "je cilj da obuhvati sve postojeće jezike. Ipak puna podrška za njega pod\n"
-"GNU/Linuxom je još uvijek u razvoju. Iz tog razloga, Mandrakelinux će ga\n"
+"GNU/Linuxom je još uvijek u razvoju. Iz tog razloga, Mandrivalinux će ga\n"
 "koristiti ovisno o drugim izborima korisnika:\n"
 "\n"
 " * Ako izaberete jezike sa raširenim starim kodiranjem (latin1 jezici, "
@@ -5462,7 +5462,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5483,11 +5483,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Sada je vrijeme da izaberete sistem štampe za vaš računar. Drugi\n"
-"operativni sistemi vam možda nude jedan, ali Mandrakelinux nudi\n"
+"operativni sistemi vam možda nude jedan, ali Mandrivalinux nudi\n"
 "dva. Svaki od ovih sistema je najbolji za određenu vrstu konfiguracije.\n"
 "\n"
 "* \"%s\" -- skraćeno za ``štampaj i nemoj stavljati u red'' (print, do not\n"
@@ -5514,7 +5514,7 @@ msgstr ""
 "\n"
 "Ako sada napravite izbor, pa kasnije zaključite da vam se ne sviđa izabrani\n"
 "sistem štampe, možete ga promijeniti pokretanjem PrinterDrake iz\n"
-"Mandrakelinux Kontrolnog centra i klikanjem na dugme \"%s\"."
+"Mandrivalinux Kontrolnog centra i klikanjem na dugme \"%s\"."
 
 #: help.pm:765
 #, c-format
@@ -5632,7 +5632,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5649,7 +5649,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5701,7 +5701,7 @@ msgstr ""
 "\n"
 "* \"%s\": ako želite, možete podesiti vaš Internet pristup ili pristup\n"
 "lokalnoj mreži. Pogledajte štampanu dokumentaciju ili koristite\n"
-"Mandrakelinux Kontrolni centar nakon što je završena instalacija\n"
+"Mandrivalinux Kontrolni centar nakon što je završena instalacija\n"
 "kako biste koristili ugrađenu pomoć. \n"
 " * \"%s\": omogućuje vam da podesite adrese HTTP i FTP proxyja ako\n"
 "se računar na koji instalirate nalazi iza proxy servera.\n"
@@ -5716,7 +5716,7 @@ msgstr ""
 "* \"%s\": ako želite promijeniti postavke bootloadera, kliknite na to\n"
 "dugme. Ovo bi trebalo biti rezervisano za napredne korisnike. Pogledajte\n"
 "štampanu dokumentaciju ili pomoć za bootloader konfiguraciju uključenu\n"
-"u Mandrakelinux Kontrolni centar.\n"
+"u Mandrivalinux Kontrolni centar.\n"
 "\n"
 "* \"%s\": ovdje možete fino podešavati koji servisi će biti pokrenuti\n"
 "na vašem računaru. Ako planirate koristiti ovaj računar kao server,\n"
@@ -5777,11 +5777,11 @@ msgstr "Servisi"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Izaberite hard disk koji želite obrisati kako biste instalirali vašu novu\n"
-"Mandrakelinux particiju. Budite pažljivi, svi podaci koji se nalaze na\n"
+"Mandrivalinux particiju. Budite pažljivi, svi podaci koji se nalaze na\n"
 "njemu će biti izgubljeni i neće se moći vratiti!"
 
 #: help.pm:863
@@ -6137,12 +6137,12 @@ msgstr "Izračunavam veličinu Windows particije"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Vaša Windows particija je previše fragmentirana. Molim restartujte vaš "
 "računar pod Windows-om, pokrenite ``defrag'' alat, zatim pokrenite "
-"Mandrakelinux instalaciju."
+"Mandrivalinux instalaciju."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6260,19 +6260,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6294,7 +6294,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6302,14 +6302,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6319,7 +6319,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6339,10 +6339,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6353,11 +6353,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6373,7 +6373,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Budući da prevodilac ovog teksta nije u mogućnosti da osigura pravnu\n"
 "provjeru prevedenog teksta, tekst licence je ostavljen u originalnom "
@@ -6384,19 +6384,19 @@ msgstr ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6418,7 +6418,7 @@ msgstr ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6426,14 +6426,14 @@ msgstr ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6443,7 +6443,7 @@ msgstr ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6463,10 +6463,10 @@ msgstr ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6477,11 +6477,11 @@ msgstr ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6497,7 +6497,7 @@ msgstr ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6592,7 +6592,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6600,13 +6600,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Čestitamo, instalacija je završena.\n"
 "Uklonite boot medij i pritisnite Enter da restartujete računar.\n"
 "\n"
 "\n"
-"Za informacije o ispravkama koje su dostupne za ovu verziju Mandrakelinuxa,\n"
+"Za informacije o ispravkama koje su dostupne za ovu verziju Mandrivalinuxa,\n"
 "pogledajte Errata koja je dostupna na:\n"
 "\n"
 "\n"
@@ -6614,7 +6614,7 @@ msgstr ""
 "\n"
 "\n"
 "Informacije o podešavanju vašeg sistema su dostupne u poglavlju\n"
-"\"Nakon instalacije\" vašeg zvaničnog Mandrakelinux Priručnika za upotrebu."
+"\"Nakon instalacije\" vašeg zvaničnog Mandrivalinux Priručnika za upotrebu."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6649,12 +6649,12 @@ msgstr "Prelazim na korak `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Vašem sistemu ponestaje resursa. Možda imate neki problem sa instalacijom\n"
-"Mandrakelinuxa. Ako se ovo desi, možete pokušati tekstualnu instalaciju. Za "
+"Mandrivalinuxa. Ako se ovo desi, možete pokušati tekstualnu instalaciju. Za "
 "ovo,\n"
 "pritisnite `F1' prilikom bootanja CDROMa, zatim unesite `text'."
 
@@ -7193,9 +7193,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Kontaktiram Mandrakelinux web stranicu da bih saznao listu dostupnih "
+"Kontaktiram Mandrivalinux web stranicu da bih saznao listu dostupnih "
 "mirrora..."
 
 #: install_steps_interactive.pm:840
@@ -7419,8 +7419,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux instalacija %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux instalacija %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10006,13 +10006,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall podešavanje\n"
 "\n"
-"Podesite lični firewall na ovom Mandrakelinux računaru.\n"
+"Podesite lični firewall na ovom Mandrivalinux računaru.\n"
 "Ako želite moćnu soluciju posebnog firewalla, molim pogledajte\n"
 "specijaliziranu MandrakeSecurity Firewall distribuciju."
 
@@ -14062,11 +14062,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"Pokrenite Scannerdrake (Hardver/Skener u Mandrakelinux Kontrolnom centru) "
+"Pokrenite Scannerdrake (Hardver/Skener u Mandrivalinux Kontrolnom centru) "
 "kako biste dijelili vaš skener putem mreže.\n"
 "\n"
 
@@ -16001,23 +16001,23 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Šta je Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Šta je Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Dobro došli u <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Dobro došli u <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux je <b>Linux distribucija</b> koja sadržava jezgru sistema, "
+"Mandrivalinux je <b>Linux distribucija</b> koja sadržava jezgru sistema, "
 "koja se naziva <b>operativni sistem</b> (baziranu na Linux kernelu) kao i "
 "<b>mnoštvo programa</b> koji zadovoljavaju sve potrebe koje vam mogu pasti "
 "na pamet."
@@ -16025,10 +16025,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux je <b>najprijateljskija</b> Linux distribucija danas. On je "
+"Mandrivalinux je <b>najprijateljskija</b> Linux distribucija danas. On je "
 "takođe i jedna od <b>najšire korištenih</b> Linux distribucija na svijetu!"
 
 #: share/advertising/02.pl:13
@@ -16044,14 +16044,14 @@ msgstr "Dobro došli u svijet <b>otvorenog izvornog koda</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux u potpunosti podržava open-source model. To znači da je ovo "
-"novo izdanje je rezultat <b>saradnje</b> između <b>Mandrakesoft-ovog tima "
-"programera</b> i <b>međunarodne zajednice</b> Mandrakelinux saradnika."
+"Mandrivalinux u potpunosti podržava open-source model. To znači da je ovo "
+"novo izdanje je rezultat <b>saradnje</b> između <b>Mandriva-ovog tima "
+"programera</b> i <b>međunarodne zajednice</b> Mandrivalinux saradnika."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16071,10 +16071,10 @@ msgstr "<b>GPL - General Public License</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "Većina softvera koji je uključen u ovoj distribuciji, kao i svi "
-"Mandrakelinux alati, koriste <b>GNU General Public License</b>."
+"Mandrivalinux alati, koriste <b>GNU General Public License</b>."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16104,15 +16104,15 @@ msgstr "<b>Uključite se u zajednicu</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux ima jednu od <b>najvećih zajednica</b> korisnika i programera. "
+"Mandrivalinux ima jednu od <b>najvećih zajednica</b> korisnika i programera. "
 "Uloga takve zajednice je raznolika, počevši od prijavljivanja bugova do "
 "razvoja novih programa. Zajednica igra <b>ključnu ulogu</b> u svijetu "
-"Mandrakelinuxa."
+"Mandrivalinuxa."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16133,11 +16133,11 @@ msgstr "<b>Download verzija</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Trenutno instalirate <b>Mandrakelinux Download</b>. To je besplatna verzija "
-"koju Mandrakesoft želi zadržati <b>dostupnom svima</b>."
+"Trenutno instalirate <b>Mandrivalinux Download</b>. To je besplatna verzija "
+"koju Mandriva želi zadržati <b>dostupnom svima</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16169,10 +16169,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Takođe nećete imati pristup <b>servisima</b> koji su sastavni dio nekih "
-"drugih Mandrakesoft proizvoda."
+"drugih Mandriva proizvoda."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16181,8 +16181,8 @@ msgstr "<b>Discovery, Tvoj prvi Linux Desktop</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Trenutno instalirate <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Trenutno instalirate <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16204,17 +16204,17 @@ msgstr "<b>PowerPack, Najbolji Linux Desktop</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Trenutno instalirate <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Trenutno instalirate <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack je Mandrakesoft-ov <b>premijerni Linux desktop</b> proizvod. "
+"PowerPack je Mandriva-ov <b>premijerni Linux desktop</b> proizvod. "
 "PowerPack uključuje <b>hiljade programa</b> - sve od najpopularnijih do "
 "najsloženijih."
 
@@ -16225,8 +16225,8 @@ msgstr "<b>PowerPack+, Linux rješenje za Desktop i Server</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Trenutno instalirate <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Trenutno instalirate <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16242,21 +16242,21 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesoft proizvodi</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva proizvodi</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> je razvio širok raspon <b>Mandrakelinux</b> proizvoda."
+"<b>Mandriva</b> je razvio širok raspon <b>Mandrivalinux</b> proizvoda."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux proizvodi su:"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux proizvodi su:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16276,74 +16276,74 @@ msgstr "\t* <b>PowerPack+</b>, Linux rješenje za Desktop i Server."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux za x86-64</b>, Mandrakelinux rješenje kojim ćete izvući "
+"\t* <b>Mandrivalinux za x86-64</b>, Mandrivalinux rješenje kojim ćete izvući "
 "maksimum iz vašeg 64-bitnog procesora."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesoft proizvodi (mobilni proizvodi)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandriva proizvodi (mobilni proizvodi)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft je razvio dva proizvoda koji vam omogućuju da koristite "
-"Mandrakelinux <b>na bilo kojem računaru</b> bez potrebe da ga ustvari "
+"Mandriva je razvio dva proizvoda koji vam omogućuju da koristite "
+"Mandrivalinux <b>na bilo kojem računaru</b> bez potrebe da ga ustvari "
 "instalirate:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, Mandrakelinux distribucija koja se izvršava u potpunosti sa "
+"\t* <b>Move</b>, Mandrivalinux distribucija koja se izvršava u potpunosti sa "
 "bootabilnog CD-ROMa."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, Mandrakelinux distribucija preinstalirana na "
+"\t* <b>GlobeTrotter</b>, Mandrivalinux distribucija preinstalirana na "
 "kompaktnom USB hard disku - “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Mandrakesoft proizvodi (profesionalna rješenja)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Mandriva proizvodi (profesionalna rješenja)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Ispod su navedeni Mandrakesoft proizvodi dizajnirani da zadovolje "
+"Ispod su navedeni Mandriva proizvodi dizajnirani da zadovolje "
 "<b>profesionalne potrebe</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, Mandrakelinux Desktop za preduzeća."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Mandrivalinux Desktop za preduzeća."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Mandrakelinux rješenje za servere."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandrivalinux rješenje za servere."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
-"\t* <b>Multi-Network Firewall</b>, Mandrakelinux rješenje za sigurnost mreža."
+"\t* <b>Multi-Network Firewall</b>, Mandrivalinux rješenje za sigurnost mreža."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16386,10 +16386,10 @@ msgstr "<b>Izaberite vaše grafičko radno okruženje</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Sa PowerPack-om, imaćete izbor <b>grafičkog radnog okruženja</b>. "
-"Mandrakesoft je izabrao <b>KDE</b> kao podrazumijevano okruženje."
+"Mandriva je izabrao <b>KDE</b> kao podrazumijevano okruženje."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16414,9 +16414,9 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"Uz PowerPack+, imaćete izbor <b>grafičkog radnog okruženja</b>. Mandrakesoft "
+"Uz PowerPack+, imaćete izbor <b>grafičkog radnog okruženja</b>. Mandriva "
 "je izabrao <b>KDE</b> kao podrazumijevano okruženje."
 
 #: share/advertising/14.pl:15
@@ -16544,10 +16544,10 @@ msgstr "<b>Uživajte u širokoj paleti programa</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"U Mandrakelinux meniju naći ćete <b>jednostavne</b> programe <b>za sve "
+"U Mandrivalinux meniju naći ćete <b>jednostavne</b> programe <b>za sve "
 "zadatke</b>:"
 
 #: share/advertising/18.pl:16
@@ -16809,18 +16809,18 @@ msgstr "\t* <b>Postfix</b> i <b>Sendmail</b>: Popularni i moćni mail serveri."
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux Kontrolni centar</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux Kontrolni centar</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrakelinux Kontrolni centar</b> je kolecija najvažnijih alata "
-"specifičnih za Mandrakelinux koji olakšavaju podešavanje vašeg računara."
+"<b>Mandrivalinux Kontrolni centar</b> je kolecija najvažnijih alata "
+"specifičnih za Mandrivalinux koji olakšavaju podešavanje vašeg računara."
 
 #: share/advertising/25.pl:17
 #, c-format
@@ -16844,16 +16844,16 @@ msgstr "<b>Open-source model</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Kao i svo računarsko programiranje, za razvoj open-source softwara je "
 "<b>potrebno vrijeme i ljudi</b>. Kako bi poštovao open-source filozofiju, "
-"Mandrakesoft vam prodaje dodatnu vrijednost proizvoda i usluga kako bi "
-"<b>nastavio usavršavati Mandrakelinux</b>. Ako želite <b>podržati open-"
-"source filozofiju</b> kao i razvoj Mandrakelinuxa, <b>molimo vas</b> da "
+"Mandriva vam prodaje dodatnu vrijednost proizvoda i usluga kako bi "
+"<b>nastavio usavršavati Mandrivalinux</b>. Ako želite <b>podržati open-"
+"source filozofiju</b> kao i razvoj Mandrivalinuxa, <b>molimo vas</b> da "
 "razmotrite kupovinu nekog od naših proizvoda ili usluga!"
 
 #: share/advertising/27.pl:13
@@ -16864,7 +16864,7 @@ msgstr "<b>On-line prodavnica</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 "Da naučite više o našim proizvodima i uslugama, možete posjetiti našu e-"
@@ -16893,24 +16893,24 @@ msgstr "Navratite danas u <b>store.mandrakesoft.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> je <b>savršen dodatak</b> vašem Mandrakelinux proizvodu."
+"<b>Mandriva Club</b> je <b>savršen dodatak</b> vašem Mandrivalinux proizvodu."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 "Iskoristite razne <b>vrijedne pogodnosti<b> tako što ćete se učlaniti u "
-"Mandrakeclub, među kojima su:"
+"Mandriva Club, među kojima su:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -16932,40 +16932,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Učešće u Mandrakelinux <b>korisničkim forumima</b>"
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Učešće u Mandrivalinux <b>korisničkim forumima</b>"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
-"\t* <b>Rani i privilegovani pristup</b>, prije javnog izdanja, Mandrakelinux "
+"\t* <b>Rani i privilegovani pristup</b>, prije javnog izdanja, Mandrivalinux "
 "<b>ISO imidžima</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> je nova premijum usluga koju Mandrakesoft s ponosom "
+"<b>Mandriva Online</b> je nova premijum usluga koju Mandriva s ponosom "
 "nudi svojim klijentima!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline vam pruža širok izbor usluga za <b>jednostavno ažuriranje</b> "
-"vaših Mandrakelinux sistema:"
+"Mandriva Online vam pruža širok izbor usluga za <b>jednostavno ažuriranje</b> "
+"vaših Mandrivalinux sistema:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16990,42 +16990,42 @@ msgstr "\t* Fleksibilno <b>planiranje</b> ažuriranja."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* Menadžment <b>svih vaših Mandrakelinux sistema</b> putem jednog "
+"\t* Menadžment <b>svih vaših Mandrivalinux sistema</b> putem jednog "
 "korisničkog računa."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Da li vam je potrebna <b>podrška?</b> Upoznajte Mandrakesoft tehničke "
+"Da li vam je potrebna <b>podrška?</b> Upoznajte Mandriva tehničke "
 "eksperte na našoj <b>platformi za tehničku podršku</b> www.mandrakeexpert."
 "com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Zahvaljujući pomoći <b>kvalificiranih eksperata za Mandrakelinux</b>, "
+"Zahvaljujući pomoći <b>kvalificiranih eksperata za Mandrivalinux</b>, "
 "uštedićete mnogo vremena."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Za bilo kakva pitanja u vezi Mandrakelinuxa, možete kupiti incidente za "
+"Za bilo kakva pitanja u vezi Mandrivalinuxa, možete kupiti incidente za "
 "podršku na <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17324,8 +17324,8 @@ msgstr "Alati za nadzor, praćenje potrošnje, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesoft čarobnjaci"
+msgid "Mandriva Wizards"
+msgstr "Mandriva čarobnjaci"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17474,7 +17474,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17488,7 +17488,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Podešavanje Mandrakelinux Terminal Servera\n"
+"Podešavanje Mandrivalinux Terminal Servera\n"
 "--enable         : omogući MTS\n"
 "--disable        : onemogući MTS\n"
 "--start          : pokreni MTS\n"
@@ -17545,14 +17545,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPTION]...\n"
-"  --no-confirmation      ne postavljaj prvo pitanje u MandrakeUpdate modu\n"
+"  --no-confirmation      ne postavljaj prvo pitanje u Mandriva Update modu\n"
 "  --no-verify-rpm        ne provjeravaj potpise paketa\n"
 "  --changelog-first      prikaži changelog prije filelist u opisnom prozoru\n"
 "  --merge-all-rpmnew     predloži merge svih pronađenih .rpmnew/.rpmsave "
@@ -20328,13 +20328,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux alat za prijavu bugova"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux alat za prijavu bugova"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Kontrolni centar"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux Kontrolni centar"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20354,8 +20354,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20399,8 +20399,8 @@ msgstr "Čarobnjaci za podešavanje"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Izaberite Mandrakesoft alat:"
+msgid "Select Mandriva Tool:"
+msgstr "Izaberite Mandriva alat:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20825,19 +20825,19 @@ msgstr "Pokrenut na bootu"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Interfejs još nije podešen.\n"
-"Pokrenite asistent \"Dodaj interfejs\" iz Mandrakelinux Kontrolnog centra"
+"Pokrenite asistent \"Dodaj interfejs\" iz Mandrivalinux Kontrolnog centra"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Niste podesili nijednu Internet konekciju.\n"
-"Pokrenite asistent \"%s\" iz Mandrakelinux Kontrolnog centra"
+"Pokrenite asistent \"%s\" iz Mandrivalinux Kontrolnog centra"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20887,8 +20887,8 @@ msgstr "KDM (KDE Display Manager)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux Display Manager)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21187,7 +21187,7 @@ msgstr "Uvezi"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21196,7 +21196,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (originalna verzija)\n"
@@ -21739,14 +21739,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "Ovo je slobodan softver i može se distribuirati pod uslovima GNU GPLa.\n"
 "\n"
 "Upotreba: \n"
@@ -21775,8 +21775,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux Centar za pomoć"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux Centar za pomoć"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22046,7 +22046,7 @@ msgid ""
 msgstr ""
 "Sada ćete podesiti instalacioni server, koji se sastoji od PXE servera (DHCP "
 "servera) i TFTP servera.\n"
-"Sa ovom opcijom, moći ćete instalirati Mandrakelinux na druge računare na "
+"Sa ovom opcijom, moći ćete instalirati Mandrivalinux na druge računare na "
 "vašoj lokalnoj mreži koristećiovaj računar kao izvor.\n"
 "\n"
 "Prije nego što nastavite, provjerite da li ste podesili mrežni/internet "
@@ -25302,8 +25302,8 @@ msgstr "Izmjena je napravljena, ali da bi stupila na snagu morate se odjaviti"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Dnevnici Mandrakelinux alata"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Dnevnici Mandrivalinux alata"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25816,10 +25816,10 @@ msgstr "Konekcija završena."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Konekcija nije uspjela.\n"
-"Provjerite konfiguraciju u Mandrakelinux Kontrolnom centru."
+"Provjerite konfiguraciju u Mandrivalinux Kontrolnom centru."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26701,8 +26701,8 @@ msgstr "Instalacija nije uspjela"
 #~ msgid "You've not selected any font"
 #~ msgstr "Niste izabrali nijedan font"
 
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Mandrakesoft čarobnjaci"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Mandriva čarobnjaci"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Nemate nijedan browser! Molim instalirajte neki browser"
diff --git a/perl-install/share/po/ca.po b/perl-install/share/po/ca.po
index d88f56d01..068b7ed9e 100644
--- a/perl-install/share/po/ca.po
+++ b/perl-install/share/po/ca.po
@@ -63,7 +63,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -82,7 +82,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -90,7 +90,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -98,7 +98,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -227,7 +227,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1276,11 +1276,11 @@ msgstr "Tria d'idioma"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux pot utilitzar múltiples idiomes. Seleccioneu\n"
+"Mandrivalinux pot utilitzar múltiples idiomes. Seleccioneu\n"
 "els llenguatges que vulgueu instal·lar. Estaran disponibles\n"
 "quan reinicieu el sistema, després que la instal·lació s'hagi completat."
 
@@ -3751,13 +3751,13 @@ msgstr "habilita l'ús de la ràdio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Abans de continuar, llegiu atentament les clàusules de la llicència. "
 "Cobreix\n"
-"tota la distribució Mandrakelinux. Si esteu d'acord amb tots els termes de "
+"tota la distribució Mandrivalinux. Si esteu d'acord amb tots els termes de "
 "la\n"
 "llicència, feu clic al quadre \"%s\"; si no, prémer el botó \"%s\"\n"
 "reiniciarà el vostre ordinador."
@@ -3959,13 +3959,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"La instal·lació del Mandrakelinux està repartida en diversos CD-ROM. Si\n"
+"La instal·lació del Mandrivalinux està repartida en diversos CD-ROM. Si\n"
 "un dels paquets escollits està en un altre CD-ROM, DrakX expulsarà el CD\n"
 "actual i us demanarà que n'inseriu un altre. Si no teniu el CD necessari a\n"
 "mà, premeu \"%s\" i els paquets corresponents no s'instal·laran."
@@ -3974,11 +3974,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4030,10 +4030,10 @@ msgid ""
 "megabytes."
 msgstr ""
 "Ha arribat el moment d'indicar els programes que voleu instal·lar en el\n"
-"sistema. Mandrakelinux té milers de paquets, i per facilitar-ne la\n"
+"sistema. Mandrivalinux té milers de paquets, i per facilitar-ne la\n"
 "gestió s'han distribuït en grups d'aplicacions similars.\n"
 "\n"
-"Mandrakelinux agrupa els paquets en quatre categories. Podeu mesclar i fer\n"
+"Mandrivalinux agrupa els paquets en quatre categories. Podeu mesclar i fer\n"
 "coincidir aplicacions de grups diversos, de manera que una instal·lació\n"
 "d'``Estació de treball'' pot perfectament tenir instal·lades aplicacions\n"
 "de la categoria ``Servidor'' \n"
@@ -4139,10 +4139,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4173,11 +4173,11 @@ msgstr ""
 "\n"
 "Si heu seleccionat un paquet de servidor, intencionadament o perquè\n"
 "formava part d'un grup, se us demanarà que confirmeu si realment voleu\n"
-"instal·lar aquests servidors. Per defecte, Mandrakelinux iniciarà i "
+"instal·lar aquests servidors. Per defecte, Mandrivalinux iniciarà i "
 "instal·larà automàticament qualsevol servidor durant l'arrencada. Tot i que\n"
 "siguin segurs i no tinguin cap problema conegut quan es publica la\n"
 "distribució, és totalment possible que es descobreixin forats de seguretat\n"
-"després que aquesta versió de Mandrakelinux quedi finalitzada.\n"
+"després que aquesta versió de Mandrivalinux quedi finalitzada.\n"
 "Si no sabeu què se suposa que fa un servei en particular, o per què s'està\n"
 "instal·lant, feu clic a \"%s\". Per defecte, si feu clic a \"%s\" els "
 "serveis\n"
@@ -4339,7 +4339,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4396,7 +4396,7 @@ msgstr ""
 "L'X (per sistema X Window) és el cor de la interfície gràfica de GNU/Linux\n"
 "de què depenen tots els entorns gràfics (KDE, GNOME, AfterStep, "
 "WindowMaker,\n"
-"etc.) que venen amb Mandrakelinux.\n"
+"etc.) que venen amb Mandrivalinux.\n"
 "\n"
 "Veureu una relació de diferents paràmetres que podeu canviar per aconseguir\n"
 "una visualització gràfica òptima: Targeta gràfica\n"
@@ -4512,12 +4512,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4544,7 +4544,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4553,7 +4553,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4575,11 +4575,11 @@ msgid ""
 msgstr ""
 "Ara és quan heu de decidir en quin lloc del vostre disc dur voleu "
 "instal·lar\n"
-"el sistema operatiu Mandrakelinux. Si el disc és buit, o si un sistema\n"
+"el sistema operatiu Mandrivalinux. Si el disc és buit, o si un sistema\n"
 "operatiu existent n'utilitza tot l'espai disponible, us caldrà \n"
 "particionar-lo. Bàsicament, particionar un disc dur consisteix a dividir-lo "
 "de\n"
-"manera lògica per crear espai on instal·lar el nou sistema Mandrakelinux.\n"
+"manera lògica per crear espai on instal·lar el nou sistema Mandrivalinux.\n"
 "\n"
 "Atès que els efectes d'aquest procés solen ser irreversibles i poden\n"
 "implicar pèrdua de dades si ja teniu un sistema operatiu instal·lat, el\n"
@@ -4613,7 +4613,7 @@ msgstr ""
 "de\n"
 "daDES, sempre que la partició de Windows hagi estat desfragmentada\n"
 "prèviament. És molt recomenable, fer una còpia de seguretat de les dades.\n"
-"Aquesta opció és la més recomanable si voleu utilitzar tant Mandrakelinux\n"
+"Aquesta opció és la més recomanable si voleu utilitzar tant Mandrivalinux\n"
 "com Microsoft Windows al mateix ordinador.\n"
 "\n"
 "  Abans de decidir-vos per aquesta opció, penseu que en acabar la partició\n"
@@ -4622,7 +4622,7 @@ msgstr ""
 "programari.\n"
 "\n"
 " *\"%s\": si voleu suprimir totes les dades i particions que teniu al disc\n"
-"dur i substituir-les pel sistema Mandrakelinux, podeu escollir aquesta\n"
+"dur i substituir-les pel sistema Mandrivalinux, podeu escollir aquesta\n"
 "opció. Aneu amb compte, però, perquè, un cop la confirmeu, no podreu fer-vos "
 "enrere.\n"
 "\n"
@@ -4782,7 +4782,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4805,7 +4805,7 @@ msgstr ""
 "Feu clic a \"%s\" quan estigueu a punt per formatar les particions.\n"
 "\n"
 "Feu clic a \"%s\" si voleu seleccionar una altra partició per instal·lar\n"
-"el nou sistema Mandrakelinux.\n"
+"el nou sistema Mandrivalinux.\n"
 "\n"
 "Feu clic a \"%s\" si voleu seleccionar particions on cercar-hi blocs "
 "defectuosos."
@@ -4822,7 +4822,7 @@ msgstr "Anterior"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4834,7 +4834,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Ara esteu instal·lant Mandrakelinux, és probable que alguns paquets\n"
+"Ara esteu instal·lant Mandrivalinux, és probable que alguns paquets\n"
 "hagin estat actualitzats desde la data de llançament. Alguns errors poden\n"
 "haver estat resolts, i altres problemes de seguretat poden estar ja "
 "corregits.\n"
@@ -4864,7 +4864,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4878,7 +4878,7 @@ msgstr ""
 "\n"
 "Si no sabeu quin escollir, deixeu l'opció per defecte.. Podreu canviar\n"
 "el nivell de seguretat més tard amb l'eina draksec del\n"
-"Centre de Control Mandrakelinux.\n"
+"Centre de Control Mandrivalinux.\n"
 "\n"
 "El camp \"%s\" pot informar l'usuari del sistema qui serà el responsable\n"
 "de la seguretat. Els missatges de seguretat s'enviaran a aquesta adreça."
@@ -4892,7 +4892,7 @@ msgstr "Administrador de seguretat"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4963,7 +4963,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Ara és quan heu de decidir quina(es) partició(ns) voleu utilitzar per\n"
-"instal·lar el sistema Mandrakelinux. Si ja s'han definit les particions\n"
+"instal·lar el sistema Mandrivalinux. Si ja s'han definit les particions\n"
 "en una instal·lació anterior de GNU/Linux o mitjançant una altra eina de\n"
 "particionament, podeu utilitzar les particions existents. En cas contrari,\n"
 "s'han de definir particions al disc dur.\n"
@@ -5054,7 +5054,7 @@ msgstr "Commuta entre els modes normal i expert"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5084,7 +5084,7 @@ msgid ""
 msgstr ""
 "S'ha detectat més d'una partició de Microsoft a la unitat de disc.\n"
 "Si us plau, trieu quina d'elles voleu redimensionar per instal·lar el nou\n"
-"sistema operatiu Mandrakelinux.\n"
+"sistema operatiu Mandrivalinux.\n"
 "\n"
 "Cada partició està identificada d'aquesta manera: \"Nom Linux\",\n"
 "\"Nom Windows\" \"Capacitat\".\n"
@@ -5136,7 +5136,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5145,19 +5145,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Aquest pas només s'activa si s'ha trobat una partició GNU/Linux antiga\n"
 "al vostre ordinador.\n"
 "\n"
 "DrakX necessita saber si voleu realitzar una instal·lació nova o\n"
-"una actualització d'un sistema Mandrakelinux existent:\n"
+"una actualització d'un sistema Mandrivalinux existent:\n"
 "\n"
 " * \"%s\": aquesta opció destrueix gairebé del tot el sistema antic. Si\n"
 "voleu canviar les particions dels discs durs, o el sistema de fitxers,\n"
@@ -5167,14 +5167,14 @@ msgstr ""
 "\n"
 " * \"%s\": aquest tipus d'instal·lació us permet actualitzar els paquets "
 "que\n"
-"ja estan instal·lats al sistema Mandrakelinux. L'esquema de particionament\n"
+"ja estan instal·lats al sistema Mandrivalinux. L'esquema de particionament\n"
 "actual i les dades d'usuari no queden afectades. La majoria de les altres\n"
 "fases de configuració queden disponibles, de manera similar a una\n"
 "instal·lació estàndard.\n"
 "\n"
-"L'opció “Actualitza” ha de funcionar correctament en sistemes Mandrakelinux\n"
+"L'opció “Actualitza” ha de funcionar correctament en sistemes Mandrivalinux\n"
 "amb la versió \"8.1\" o posteriors. No es recomana realitzar una\n"
-"actualització en versions de Mandrakelinux anteriors a la \"8.1\"."
+"actualització en versions de Mandrivalinux anteriors a la \"8.1\"."
 
 #: help.pm:591
 #, fuzzy, c-format
@@ -5233,7 +5233,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5271,7 +5271,7 @@ msgstr ""
 "\n"
 "En quant al suport UTF-8 (unicode): Unicode és una nova codificació de\n"
 "caràcters que cobreix tots els idiomes existents. El suport complet a\n"
-"GNU/Linux encara està sota desenvolupament. Per aquesta raó, Mandrakelinux\n"
+"GNU/Linux encara està sota desenvolupament. Per aquesta raó, Mandrivalinux\n"
 "l'usarà o no depenent de les opcions que esculli l'usuari:\n"
 "\n"
 " * Si escolliu un idioma amb una codificació existent forta(idiomes\n"
@@ -5510,7 +5510,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5531,11 +5531,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Ara cal seleccionar el sistema d'impressió del vostre ordinador. Altres\n"
-"sistemes operatius us poden oferir un, però el Mandrakelinux n'ofereix\n"
+"sistemes operatius us poden oferir un, però el Mandrivalinux n'ofereix\n"
 "dos. Cada sistema d'impressió és el més convenient per a un tipus de\n"
 "configuració determinat.\n"
 "\n"
@@ -5562,7 +5562,7 @@ msgstr ""
 "Si ara feu una tria, i després veieu que el sistema d'impressió no us\n"
 "agrada, podeu canviar-lo executant el PrinterDrake des del Centre de "
 "control\n"
-"de Mandrakelinux i fent clic al botó Expert."
+"de Mandrivalinux i fent clic al botó Expert."
 
 #: help.pm:765
 #, c-format
@@ -5684,7 +5684,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5701,7 +5701,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5826,11 +5826,11 @@ msgstr "Serveis"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Escolliu el disc dur que voleu buidar per instal·lar la nova partició\n"
-"Mandrakelinux. Aneu amb compte, totes les dades actuals es perdran i no\n"
+"Mandrivalinux. Aneu amb compte, totes les dades actuals es perdran i no\n"
 "es podran recuperar!"
 
 #: help.pm:863
@@ -6187,12 +6187,12 @@ msgstr "S'està calculant la mida de la partició de Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "La partició de Windows està massa fragmentada. Si us plau, reinicieu "
 "l'ordinador sota Windows i executeu l'eina \"defrag\". Llavors, torneu a "
-"començar la instal·lació del Mandrakelinux."
+"començar la instal·lació del Mandrivalinux."
 
 #
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6312,19 +6312,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6346,7 +6346,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6354,14 +6354,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6371,7 +6371,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6391,10 +6391,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6405,11 +6405,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6425,22 +6425,22 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Introducció\n"
 "\n"
 "D'ara endavant, hom es referirà al sistema operatiu i als diferents\n"
-"components disponibles en la distribució Mandrakelinux com als\n"
+"components disponibles en la distribució Mandrivalinux com als\n"
 "\"Productes de programari\". Els Productes de programari inclouen,\n"
 "però no estan restringits a, el conjunt de programes, mètoDES, regles\n"
 "i documentació relativa al sistema operatiu i els diferents\n"
-"components de la distribució Mandrakelinux.\n"
+"components de la distribució Mandrivalinux.\n"
 "\n"
 "\n"
 "1. Acord de llicència\n"
 "\n"
 "Si us plau, llegiu atentament aquest document. Aquest document és un\n"
-"acord de llicència entre la vostra persona i Mandrakesoft S.A., que\n"
+"acord de llicència entre la vostra persona i Mandriva S.A., que\n"
 "s'aplica als Productes de programari. Pel fet d'instal·lar, duplicar\n"
 "o utilitzar els Productes de programari en qualsevol forma esteu\n"
 "acceptant explícitament, i expressant el vostre acord a avenir-vos a\n"
@@ -6458,27 +6458,27 @@ msgstr ""
 "\n"
 "Els Productes de programari i documentació adjunta es subministren\n"
 "\"tal com són\", sense cap garantia, fins al punt permés per la llei.\n"
-"Mandrakesoft S.A. no serà, sota cap circumstància, i fins al punt\n"
+"Mandriva S.A. no serà, sota cap circumstància, i fins al punt\n"
 "permés per la llei, responsable de cap dany especial, incidental ni\n"
 "directe (incloent, sense limitar-se a, els danys per pèrdua de\n"
 "negocis, interrupció de negocis, pèrdues financeres, multes i costes\n"
 "judicials, o qualsevol altre dany que resultin d'un judici, o\n"
 "qualsevol altre pèrdua d'importància) que resulti de l'ús o de la\n"
 "impossibilitat d'utilitzar els Productes de programari, fins i tot si\n"
-"Mandrakesoft S.A. ha estat avisat de la possibilitat que\n"
+"Mandriva S.A. ha estat avisat de la possibilitat que\n"
 "s'esdevinguin aquests danys.\n"
 "\n"
 "RESPONSABILITAT LIMITADA RELATIVA A LA POSSESSIÓ O UTILITZACIÓ DE PROGRAMARI "
 "PROHIBIT EN ALGUNS PAÏSOS\n"
 "\n"
-"Fins al punt permés per la llei, Mandrakesoft S.A. o els seus\n"
+"Fins al punt permés per la llei, Mandriva S.A. o els seus\n"
 "distribuïdors no seran, sota cap circumstància, responsables de cap\n"
 "dany especial, incidental ni directe (incloent, sense limitar-se a,\n"
 "els danys per pèrdua de negocis, interrupció de negocis, pèrdues\n"
 "financeres, multes i costes judicials, o qualsevol altre dany que\n"
 "resultin d'un judici, o qualsevol altre pèrdua d'importància) que\n"
 "resulti de la possessió i utilització dels components de programari o\n"
-"de la seva descàrrega des d'un dels llocs de Mandrakelinux, que\n"
+"de la seva descàrrega des d'un dels llocs de Mandrivalinux, que\n"
 "estiguin prohibides o restringides en alguns països per les lleis\n"
 "locals. Aquesta responsabilitat limitada s'aplica, però no hi està\n"
 "restringida, als potents components criptogràfics inclosos als\n"
@@ -6496,9 +6496,9 @@ msgstr ""
 "cobreixen. Si us plau, llegiu atentament les clàusules i condicions\n"
 "de l'acord de llicència de cada component abans d'utilitzar-lo.\n"
 "Qualsevol pregunta sobre la llicència d'un component s'ha d'adreçar\n"
-"al seu autor i no a Mandrakesoft.\n"
-"Els programes desenvolupats per Mandrakesoft S.A. es regeixen per la\n"
-"llicència GPL.La documentació escrita per Mandrakesoft S.A. està regida per "
+"al seu autor i no a Mandriva.\n"
+"Els programes desenvolupats per Mandriva S.A. es regeixen per la\n"
+"llicència GPL.La documentació escrita per Mandriva S.A. està regida per "
 "una\n"
 "llicència específica; consulteu la documentació per a més\n"
 "informació.\n"
@@ -6510,11 +6510,11 @@ msgstr ""
 "pertanyen als seus autors respectius i estan protegits per les lleis\n"
 "de propietat intel·lectual i de copyright aplicables als programes\n"
 "informàtics.\n"
-"Mandrakesoft S.A. es reserva els drets de modificar o adaptar els\n"
+"Mandriva S.A. es reserva els drets de modificar o adaptar els\n"
 "Productes de programari, totalment o parcialment, per tots els\n"
 "mitjans i amb totes les finalitats.\n"
-"\"Mandrake\", \"Mandrakelinux\" i els logotips associats son marques\n"
-"registrades de Mandrakesoft S.A.\n"
+"\"Mandriva\", \"Mandrivalinux\" i els logotips associats son marques\n"
+"registrades de Mandriva S.A.\n"
 "\n"
 "\n"
 "5. Lleis rectores \n"
@@ -6529,7 +6529,7 @@ msgstr ""
 "preferiblement fora dels tribunals. Com a últim recurs, el litigi es\n"
 "portarà als tribunals competents de París, França.\n"
 "Per a qualsevol tema relacionat amb aquest document, poseu-vos en\n"
-"contacte amb Mandrakesoft S.A.\n"
+"contacte amb Mandriva S.A.\n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6626,7 +6626,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6634,14 +6634,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Felicitats! La instal·lació ha acabat.\n"
 "Traieu el suport d'arrencada i premeu Retorn per tornar a arrencar.\n"
 "\n"
 "\n"
 "Trobareu la solució als problemes coneguts d'aquesta versió del\n"
-"Mandrakelinux a la fe d'errates que hi ha a \n"
+"Mandrivalinux a la fe d'errates que hi ha a \n"
 "\n"
 "\n"
 "%s\n"
@@ -6649,7 +6649,7 @@ msgstr ""
 "\n"
 "La informació sobre com configurar el vostre sistema està disponible a\n"
 "l'últim capítol d'instal·lació de la Guia Oficial de l'Usuari del\n"
-"Mandrakelinux."
+"Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6684,12 +6684,12 @@ msgstr "S'està entrant en el pas '%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "El vostre sistema està baix de recursos; podeu tenir algun problema en\n"
-"instal·lar el Mandrakelinux. Si això passa, podeu provar d'instal·lar-lo en\n"
+"instal·lar el Mandrivalinux. Si això passa, podeu provar d'instal·lar-lo en\n"
 "mode text. Per fer-ho, premeu 'F1' en arrencar des del CD-ROM i escriviu "
 "'text'."
 
@@ -7240,9 +7240,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"S'està contactant amb el servidor Mandrakelinux per obtenir la llista de "
+"S'està contactant amb el servidor Mandrivalinux per obtenir la llista de "
 "rèpliques disponibles..."
 
 #: install_steps_interactive.pm:840
@@ -7476,8 +7476,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Instal·lació del Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Instal·lació del Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10085,14 +10085,14 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Configuració del drakfirewall\n"
 "\n"
 "Aquí es configura un tallafocs personal per a aquest ordinador "
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "Per a una potent solució de tallafocs dedicada, consulteu si us plau la \n"
 "distribució especialitzada MandrakeSecurity Firewall."
 
@@ -14208,7 +14208,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -16192,18 +16192,18 @@ msgstr "Atura"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Què és Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Què és Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Benvingut al <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Benvingut al <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -16212,10 +16212,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, fuzzy, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux és ampliament coneguda com la distribució de Linux més "
+"Mandrivalinux és ampliament coneguda com la distribució de Linux més "
 "amigable, fàcil d'instal·lar i usar."
 
 #: share/advertising/02.pl:13
@@ -16231,15 +16231,15 @@ msgstr "Benvingut al <b>món del Codi Font Obert</b>!"
 #: share/advertising/02.pl:17
 #, fuzzy, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux està compromès amb el model de codi font obert i respecta "
+"Mandrivalinux està compromès amb el model de codi font obert i respecta "
 "completament la General Public License. Aquesta nova versió és el resultat "
-"de l'esforç col·laboratiu dels desenvolupadors de Mandrakesoft i els "
-"contribuïdors de Mandrakelinux al voltant del món."
+"de l'esforç col·laboratiu dels desenvolupadors de Mandriva i els "
+"contribuïdors de Mandrivalinux al voltant del món."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16259,10 +16259,10 @@ msgstr "<b>La GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "La major part dels programes inclosos en aquesta distribució i totes les "
-"eines de Mandrakelinux estan llicenciades sota la <b>General Public License</"
+"eines de Mandrivalinux estan llicenciades sota la <b>General Public License</"
 "b>."
 
 #: share/advertising/03.pl:17
@@ -16294,10 +16294,10 @@ msgstr "<b>Uniu-vos a la comunitat</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -16316,8 +16316,8 @@ msgstr "<b>Versió de descàrrega</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -16348,7 +16348,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -16358,8 +16358,8 @@ msgstr "<b>Discovery, El vostre primer escriptori Linux</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Esteu instal·lant <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Esteu instal·lant <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, fuzzy, c-format
@@ -16379,13 +16379,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Esteu instal·lant <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Esteu instal·lant <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -16397,8 +16397,8 @@ msgstr "<b>PowerPack+, La solució Linux per escriptoris i servidors</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Esteu instal·lant <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Esteu instal·lant <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16411,22 +16411,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Productes de Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Productes de Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> ha desenvolupat una àmplia gama de productes "
-"<b>Mandrakelinux</b>."
+"<b>Mandriva</b> ha desenvolupat una àmplia gama de productes "
+"<b>Mandrivalinux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Els productes Mandrakelinux són:"
+msgid "The Mandrivalinux products are:"
+msgstr "Els productes Mandrivalinux són:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16446,63 +16446,63 @@ msgstr "\t* <b>PowerPack+</b>, La solució Linux per escriptoris i servidors."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux per x86-64</b>, La solució Mandrakelinux per obtenir el "
+"\t* <b>Mandrivalinux per x86-64</b>, La solució Mandrivalinux per obtenir el "
 "màxim del vostre processador de 64-bit."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Productes de Mandrakesoft (Solucions professionals)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Productes de Mandriva (Solucions professionals)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -16540,7 +16540,7 @@ msgstr "<b>Escolliu el vostre entorn d'escriptori favorit</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -16561,7 +16561,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -16681,10 +16681,10 @@ msgstr "<b>Disfruteu de la àmplia gama d'aplicacions</b>"
 #: share/advertising/18.pl:15
 #, fuzzy, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Al menú de Mandrakelinux trobareu aplicacions fàcils d'usar per totes les "
+"Al menú de Mandrivalinux trobareu aplicacions fàcils d'usar per totes les "
 "tasques:"
 
 #: share/advertising/18.pl:16
@@ -16933,18 +16933,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Centre de Control Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Centre de Control Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"El <b>Centre de Control Mandrakelinux</b> és una col·lecció essencial de "
-"utilitats específiques de Mandrakelinux per simplificar la configuració del "
+"El <b>Centre de Control Mandrivalinux</b> és una col·lecció essencial de "
+"utilitats específiques de Mandrivalinux per simplificar la configuració del "
 "vostre ordinador."
 
 #: share/advertising/25.pl:17
@@ -16965,9 +16965,9 @@ msgstr "<b>El model del codi font obert</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -16979,10 +16979,10 @@ msgstr "<b>Tenda en línia</b>"
 #: share/advertising/27.pl:15
 #, fuzzy, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Conegui tots els productes i serveis de Mandrakesoft a <b>Mandrakestore</b> "
+"Conegui tots els productes i serveis de Mandriva a <b>Mandriva Store</b> "
 "-- la nostra plataforma de serveis de comerç electrònic."
 
 #: share/advertising/27.pl:17
@@ -17004,22 +17004,22 @@ msgstr "Passeu-vos avui per <b>store.mandrakesoft.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> és el <b>company perfecte</b> pel vostre producte "
-"Mandrakelinux."
+"<b>Mandriva Club</b> és el <b>company perfecte</b> pel vostre producte "
+"Mandrivalinux."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -17027,7 +17027,7 @@ msgstr ""
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
 "<b>store.mandrakesoft.com</b>."
-msgstr "\t* Descomptes especials en productes i serveis de Mandrakestore"
+msgstr "\t* Descomptes especials en productes i serveis de Mandriva Store"
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -17040,33 +17040,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Participació en els <b>fòrums d'usuaris</b> de Mandrakelinux"
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Participació en els <b>fòrums d'usuaris</b> de Mandrivalinux"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -17091,32 +17091,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -17422,8 +17422,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Auxiliars de Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Auxiliars de Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17519,8 +17519,8 @@ msgstr ""
 "OPCIONS:\n"
 "  --help            - imprimeix aquest missatge d'ajuda.\n"
 "  --report          - el programa ha de ser una de les eines de "
-"Mandrakelinux\n"
-"  --incident        - el programa ha de ser una de les eines de Mandrakelinux"
+"Mandrivalinux\n"
+"  --incident        - el programa ha de ser una de les eines de Mandrivalinux"
 
 #: standalone.pm:63
 #, c-format
@@ -17571,7 +17571,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17585,7 +17585,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPCIONS]...\n"
-"Configurador del servidor de terminal de Mandrakelinux (MTS)\n"
+"Configurador del servidor de terminal de Mandrivalinux (MTS)\n"
 "--enable         : habilita l'MTS\n"
 "--disable        : inhabilita l'MTS\n"
 "--start          : inicia l'MTS\n"
@@ -17642,7 +17642,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17650,7 +17650,7 @@ msgid ""
 msgstr ""
 "[OPCIÓ]...\n"
 "  --no-confirmation      no facis la primera pregunta de confirmació en el "
-"mode MandrakeUpdate\n"
+"mode Mandriva Update\n"
 "  --no-verify-rpm        no comprovis les signatures dels paquets\n"
 "  --changelog-first      mostra el registre de canvis abans de la llista de "
 "fitxers en la finestra de descripció\n"
@@ -20481,14 +20481,14 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr ""
-"Eina per a la comunicació d'errors de programació (bugs) de Mandrakelinux"
+"Eina per a la comunicació d'errors de programació (bugs) de Mandrivalinux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centre de Control Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Centre de Control Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20508,8 +20508,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #
 #: standalone/drakbug:52
@@ -20554,7 +20554,7 @@ msgstr "Auxiliars de configuració"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -20989,20 +20989,20 @@ msgstr "Iniciat en l'arrencada"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Aquesta interfície encara no s'ha configurat.\n"
 "Executeu l'auxiliar \"Afegeix una interfície\" del Centre de Control de "
-"Mandrakelinux"
+"Mandrivalinux"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Aquesta interfície encara no s'ha configurat.\n"
-"Executeu l'auxiliar \"%s\" del Centre de Control de Mandrakelinux"
+"Executeu l'auxiliar \"%s\" del Centre de Control de Mandrivalinux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21052,8 +21052,8 @@ msgstr "KDM (KDE Display Manager)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux Display Manager)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21360,7 +21360,7 @@ msgstr "Importa"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21369,7 +21369,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 per Mandrakesoft \n"
+"Copyright (C) 2001-2002 per Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versió original)\n"
@@ -21942,14 +21942,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "Aquest programa és programari lliure i pot ser redistribuït sota els termes "
 "de la GNU GPL.\n"
 "\n"
@@ -21975,8 +21975,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Centre d'ajuda de Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Centre d'ajuda de Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25132,7 +25132,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr ""
 
 #: standalone/logdrake:51
@@ -25657,10 +25657,10 @@ msgstr "Connexió completa."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "La connexió ha fallat.\n"
-"Comproveu la vostra configuració al Centre de control de Mandrakelinux."
+"Comproveu la vostra configuració al Centre de control de Mandrivalinux."
 
 #
 #: standalone/net_monitor:341
@@ -26548,8 +26548,8 @@ msgstr "La instal·lació ha fallat"
 #~ msgid "You've not selected any font"
 #~ msgstr "No heu seleccionat cap tipus de lletra"
 
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Auxiliars de Mandrakesoft"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Auxiliars de Mandriva"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "No hi ha cap navegador disponible! Si us plau, instal·leu-ne un"
@@ -26732,14 +26732,14 @@ msgstr "La instal·lació ha fallat"
 #~ msgstr "S'ha produït un error en obrir %s per escriure: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
 #~ "Aquest és el HardDrake, l'eina de configuració de maquinari de "
-#~ "Mandrakelinux.\n"
+#~ "Mandrivalinux.\n"
 #~ "<span foreground=\"royalblue3\">Versió:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
@@ -27183,17 +27183,17 @@ msgstr "La instal·lació ha fallat"
 #~ "És impossible de suprimir la impressora \"%s\" d'Star Office/OpenOffice."
 #~ "org/GIMP."
 
-#~ msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
-#~ msgstr "<b>Felicitats per triar Mandrakelinux!</b>"
+#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
+#~ msgstr "<b>Felicitats per triar Mandrivalinux!</b>"
 
 #~ 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."
+#~ "Your new Mandrivalinux operating system and its many applications is the "
+#~ "result of collaborative efforts between Mandriva developers and "
+#~ "Mandrivalinux contributors throughout the world."
 #~ msgstr ""
-#~ "El vostre nou sistema operatiu Mandrakelinux i les seves múltiples "
+#~ "El vostre nou sistema operatiu Mandrivalinux i les seves múltiples "
 #~ "aplicacions són el resultat de l'esforç col·laboratiu dels "
-#~ "desenvolupadors de Mandrakesoft i els contribuïdors de Mandrakelinux al "
+#~ "desenvolupadors de Mandriva i els contribuïdors de Mandrivalinux al "
 #~ "voltant del món."
 
 #~ msgid ""
@@ -27290,18 +27290,18 @@ msgstr "La instal·lació ha fallat"
 #~ msgstr "Veieu i editeu imatges i fotos amb <b>GQview</b>i <b>El Gimp</b>"
 
 #
-#~ msgid "Become a <b>Mandrakeclub</b> member!"
-#~ msgstr "Esdeveniu un membre del <b>Mandrakeclub</b>!"
+#~ msgid "Become a <b>Mandriva Club</b> member!"
+#~ msgstr "Esdeveniu un membre del <b>Mandriva Club</b>!"
 
 #~ msgid "\t* Full access to commercial applications"
 #~ msgstr "\t* Accés complet a aplicacions comercials"
 
 #~ msgid ""
-#~ "\t* Special download mirror list exclusively for Mandrakeclub Members"
-#~ msgstr "\t* Llista de rèpliques exclusiva pels membres del Mandrakeclub"
+#~ "\t* Special download mirror list exclusively for Mandriva Club Members"
+#~ msgstr "\t* Llista de rèpliques exclusiva pels membres del Mandriva Club"
 
-#~ msgid "\t* Voting for software to put in Mandrakelinux"
-#~ msgstr "\t* Votació dels programes a posar en Mandrakelinux"
+#~ msgid "\t* Voting for software to put in Mandrivalinux"
+#~ msgstr "\t* Votació dels programes a posar en Mandrivalinux"
 
 #~ msgid "\t* Plus much more"
 #~ msgstr "\t* i molt més"
@@ -27312,14 +27312,14 @@ msgstr "La instal·lació ha fallat"
 #~ msgid "Do you require assistance?"
 #~ msgstr "Necessiteu ajuda?"
 
-#~ msgid "<b>Mandrakeexpert</b> is the primary source for technical support."
-#~ msgstr "<b>Mandrakeexpert</b> és la font primària per suport tècnic."
+#~ msgid "<b>Mandriva Expert</b> is the primary source for technical support."
+#~ msgstr "<b>Mandriva Expert</b> és la font primària per suport tècnic."
 
 #~ msgid ""
-#~ "If you have Linux questions, subscribe to Mandrakeexpert at <b>www."
+#~ "If you have Linux questions, subscribe to Mandriva Expert at <b>www."
 #~ "mandrakeexpert.com</b>"
 #~ msgstr ""
-#~ "Si teniu preguntes en quant a Linux, apunteu-vos a Mandrakeexpert <b>www."
+#~ "Si teniu preguntes en quant a Linux, apunteu-vos a Mandriva Expert <b>www."
 #~ "mandrakeexpert.com</b>"
 
 #~ msgid ""
@@ -27337,22 +27337,22 @@ msgstr "La instal·lació ha fallat"
 #~ "mandrake-linux.com</b>!"
 
 #~ msgid ""
-#~ "Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus "
+#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "
 #~ "the latest versions of the most popular Open Source applications."
 #~ msgstr ""
-#~ "Mandrakelinux inclou els famosos entorns gràfics KDE i GNOME, a més de "
+#~ "Mandrivalinux inclou els famosos entorns gràfics KDE i GNOME, a més de "
 #~ "les últimes versions de les aplicacions de Codi Font Obert més populars."
 
 #~ msgid ""
-#~ "Mandrakelinux is widely known as the most user-friendly and the easiest "
+#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "
 #~ "to install and easy to use Linux distribution."
 #~ msgstr ""
-#~ "Mandrakelinux és ampliament coneguda com la distribució de Linux més "
+#~ "Mandrivalinux és ampliament coneguda com la distribució de Linux més "
 #~ "amigable, fàcil d'instal·lar i usar."
 
-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with <b>Mandrakemove</b>"
+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandrakemove</b>"
 #~ msgstr ""
-#~ "\t* Conegui Mandrakelinux en un CD autoarrancable amb <b>Mandrakemove</b>"
+#~ "\t* Conegui Mandrivalinux en un CD autoarrancable amb <b>Mandrakemove</b>"
 
 #~ msgid ""
 #~ "\t* If you use Linux mostly for Office, Internet and Multimedia tasks, "
@@ -27379,14 +27379,14 @@ msgstr "La instal·lació ha fallat"
 #~ msgstr "Conegui també les nostres <b>Solucions per empreses</b>!"
 
 #
-#~ msgid "<b>Become a Mandrakeclub member!</b>"
-#~ msgstr "<b>Esdeveniu un membre del Mandrakeclub!</b>"
+#~ msgid "<b>Become a Mandriva Club member!</b>"
+#~ msgstr "<b>Esdeveniu un membre del Mandriva Club!</b>"
 
 #~ msgid "<b>Do you require assistance?</b>"
 #~ msgstr "<b>Necessiteu ajuda?</b>"
 
-#~ msgid "This is the Mandrakelinux <b>Download version</b>."
-#~ msgstr "Això és Mandrakelinux <b>versió de descàrrega</b>."
+#~ msgid "This is the Mandrivalinux <b>Download version</b>."
+#~ msgstr "Això és Mandrivalinux <b>versió de descàrrega</b>."
 
 #~ msgid ""
 #~ "The free download version does not include commercial software, and "
@@ -27398,28 +27398,28 @@ msgstr "La instal·lació ha fallat"
 #~ "gràfiques (com ATI® i NVIDIA®)."
 
 #~ msgid ""
-#~ "Your new Mandrakelinux distribution and its many applications are the "
-#~ "result of collaborative efforts between Mandrakesoft developers and "
-#~ "Mandrakelinux contributors throughout the world."
+#~ "Your new Mandrivalinux distribution and its many applications are the "
+#~ "result of collaborative efforts between Mandriva developers and "
+#~ "Mandrivalinux contributors throughout the world."
 #~ msgstr ""
-#~ "La vostra nova distribució Mandrakelinux i les seves múltiples "
+#~ "La vostra nova distribució Mandrivalinux i les seves múltiples "
 #~ "aplicacions són el resultat de l'esforç col·laboratiu dels "
-#~ "desenvolupadors de Mandrakesoft i els contribuïdors de Mandrakelinux al "
+#~ "desenvolupadors de Mandriva i els contribuïdors de Mandrivalinux al "
 #~ "voltant del món."
 
 #~ msgid "<b>PowerPack+</b>"
 #~ msgstr "<b>PowerPack+</b>"
 
 #~ msgid ""
-#~ "It is the only Mandrakelinux product that includes the groupware solution."
-#~ msgstr "És l'únic producte Mandrakelinux que inclou la solució groupware."
+#~ "It is the only Mandrivalinux product that includes the groupware solution."
+#~ msgstr "És l'únic producte Mandrivalinux que inclou la solució groupware."
 
 #~ msgid ""
-#~ "When you log into your Mandrakelinux system for the first time, you can "
+#~ "When you log into your Mandrivalinux system for the first time, you can "
 #~ "choose between several popular graphical desktops environments, "
 #~ "including: KDE, GNOME, WindowMaker, IceWM, and others."
 #~ msgstr ""
-#~ "Quan entreu per primer cop a Mandrakelinux, podeu escollir entre els "
+#~ "Quan entreu per primer cop a Mandrivalinux, podeu escollir entre els "
 #~ "populars entorns gràfics d'escriptori, incloent: KDE, GNOME, WindowMaker, "
 #~ "IceWM, i altres."
 
@@ -27452,13 +27452,13 @@ msgstr "La instal·lació ha fallat"
 #~ msgstr "\t* Llibreta d'adreces (servidor i client)"
 
 #~ msgid ""
-#~ "Your new Mandrakelinux distribution is the result of collaborative "
-#~ "efforts between Mandrakesoft developers and Mandrakelinux contributors "
+#~ "Your new Mandrivalinux distribution is the result of collaborative "
+#~ "efforts between Mandriva developers and Mandrivalinux contributors "
 #~ "throughout the world."
 #~ msgstr ""
-#~ "La vostra nova distribució Mandrakelinux és el resultat de l'esforç "
-#~ "col·laboratiu dels desenvolupadors de Mandrakesoft i els contribuïdors de "
-#~ "Mandrakelinux al voltant del món."
+#~ "La vostra nova distribució Mandrivalinux és el resultat de l'esforç "
+#~ "col·laboratiu dels desenvolupadors de Mandriva i els contribuïdors de "
+#~ "Mandrivalinux al voltant del món."
 
 #~ msgid ""
 #~ "We would like to thank everyone who participated in the development of "
@@ -27528,14 +27528,14 @@ msgstr "La instal·lació ha fallat"
 #~ msgid ""
 #~ "Before continuing, you should carefully read the terms of the license. "
 #~ "It\n"
-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "
+#~ "covers the entire Mandrivalinux 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 ""
 #~ "Abans de continuar, llegiu atentament les clàusules de la llicència. "
 #~ "Cobreix\n"
-#~ "tota la distribució Mandrakelinux. Si esteu d'acord amb tots els termes "
+#~ "tota la distribució Mandrivalinux. Si esteu d'acord amb tots els termes "
 #~ "de la\n"
 #~ "llicència, feu clic al quadre \"%s\"; si no, prémer el botó \"%s\"\n"
 #~ "reiniciarà el vostre ordinador."
@@ -27653,25 +27653,25 @@ msgstr "La instal·lació ha fallat"
 #~ "Si no hi esteu interessat, desactiveu el quadre \"%s\"."
 
 #~ msgid ""
-#~ "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+#~ "The Mandrivalinux 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 instal·lació del Mandrakelinux està repartida en diversos CD-ROM. Si\n"
+#~ "La instal·lació del Mandrivalinux està repartida en diversos CD-ROM. Si\n"
 #~ "un dels paquets escollits està en un altre CD-ROM, DrakX expulsarà el CD\n"
 #~ "actual i us demanarà que n'inseriu un altre."
 
 #~ msgid ""
 #~ "It is now time to specify which programs you wish to install on your\n"
-#~ "system. There are thousands of packages available for Mandrakelinux, and\n"
+#~ "system. There are thousands of packages available for Mandrivalinux, 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. Mandrakelinux sorts packages groups in four categories. You can\n"
+#~ "machine. Mandrivalinux 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"
@@ -27724,11 +27724,11 @@ msgstr "La instal·lació ha fallat"
 #~ "updating an existing system."
 #~ msgstr ""
 #~ "Ha arribat el moment d'indicar els programes que voleu instal·lar en el\n"
-#~ "sistema. Mandrakelinux té milers de paquets, i per facilitar-ne la\n"
+#~ "sistema. Mandrivalinux té milers de paquets, i per facilitar-ne la\n"
 #~ "gestió s'han distribuït en grups d'aplicacions similars.\n"
 #~ "\n"
 #~ "Els paquets s'agrupen segons l'ús que vulgueu donar a l'ordinador.\n"
-#~ "Mandrakelinux agrupa els paquets en quatre categories. Podeu mesclar i "
+#~ "Mandrivalinux agrupa els paquets en quatre categories. Podeu mesclar i "
 #~ "fer\n"
 #~ "coincidir aplicacions de grups diversos, de manera que una instal·lació\n"
 #~ "d'``Estació de treball'' pot perfectament tenir instal·lades aplicacions\n"
@@ -27792,11 +27792,11 @@ msgstr "La instal·lació ha fallat"
 #~ "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 Mandrakelinux will automatically start any "
+#~ "installed. By default Mandrivalinux 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 Mandrakelinux was\n"
+#~ "security holes were discovered after this version of Mandrivalinux 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"
@@ -27835,13 +27835,13 @@ msgstr "La instal·lació ha fallat"
 #~ "\n"
 #~ "Si heu seleccionat un paquet de servidor, intencionadament o perquè\n"
 #~ "formava part d'un grup, se us demanarà que confirmeu si realment voleu\n"
-#~ "instal·lar aquests servidors. Per defecte, Mandrakelinux iniciarà i "
+#~ "instal·lar aquests servidors. Per defecte, Mandrivalinux iniciarà i "
 #~ "instal·larà automàticament qualsevol servidor durant l'arrencada. Tot i "
 #~ "que\n"
 #~ "siguin segurs i no tinguin cap problema conegut quan es publica la\n"
 #~ "distribució, és totalment possible que es descobreixin forats de "
 #~ "seguretat\n"
-#~ "després que aquesta versió de Mandrakelinux quedi finalitzada.\n"
+#~ "després que aquesta versió de Mandrivalinux quedi finalitzada.\n"
 #~ "Si no sabeu què se suposa que fa un servei en particular, o per què "
 #~ "s'està\n"
 #~ "instal·lant, feu clic a \"%s\". Per defecte, si feu clic a \"%s\" els "
@@ -27876,7 +27876,7 @@ msgstr "La instal·lació ha fallat"
 #~ "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"
-#~ "Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
+#~ "Mandrivalinux 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"
@@ -27897,7 +27897,7 @@ msgstr "La instal·lació ha fallat"
 #~ "modems\n"
 #~ "that require additional software to work compared to Normal modems. Some "
 #~ "of\n"
-#~ "those modems actually work under Mandrakelinux, some others do not. You\n"
+#~ "those modems actually work under Mandrivalinux, 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"
@@ -27907,7 +27907,7 @@ msgstr "La instal·lació ha fallat"
 #~ msgstr ""
 #~ "Ara configurareu la connexió a Internet/xarxa. Si voleu connectar\n"
 #~ "el vostre ordinador a Internet o a una xarxa local, feu clic a \"%s\".\n"
-#~ "Mandrakelinux intentarà detectar automàticament els dispositius\n"
+#~ "Mandrivalinux intentarà detectar automàticament els dispositius\n"
 #~ "de xarxa i els mòdems. Si aquesta detecció falla, desactiveu la\n"
 #~ "casella \"%s\". També podeu decidir no configurar la xarxa, o\n"
 #~ "fer-ho més endavant; en aquest cas feu clic al botó \"%s\" per\n"
@@ -27927,7 +27927,7 @@ msgstr "La instal·lació ha fallat"
 #~ "especials\n"
 #~ "integrats de gama baixa que necessiten programari addicional per "
 #~ "funcionar.\n"
-#~ "Alguns d'aquests mòdems funcionen a Mandrakelinux, i d'altres no. Podeu\n"
+#~ "Alguns d'aquests mòdems funcionen a Mandrivalinux, i d'altres no. Podeu\n"
 #~ "consultar una llista de mòdems suportats a LinModems.\n"
 #~ "\n"
 #~ "Podeu consultar el capítol sobre connexions a Internet de la ``Guia\n"
@@ -28062,7 +28062,7 @@ msgstr "La instal·lació ha fallat"
 #~ "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 Mandrakelinux rely upon.\n"
+#~ "WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 #~ "\n"
 #~ "You will be presented with a list of different parameters to change to "
 #~ "get\n"
@@ -28127,7 +28127,7 @@ msgstr "La instal·lació ha fallat"
 #~ "Linux\n"
 #~ "de què depenen tots els entorns gràfics (KDE, GNOME, AfterStep, "
 #~ "WindowMaker,\n"
-#~ "etc.) que venen amb Mandrakelinux.\n"
+#~ "etc.) que venen amb Mandrivalinux.\n"
 #~ "\n"
 #~ "Veureu una relació de diferents paràmetres que podeu canviar per "
 #~ "aconseguir\n"
@@ -28256,7 +28256,7 @@ msgstr "La instal·lació ha fallat"
 #~ "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"
-#~ "Mandrakelinux system.\n"
+#~ "Mandrivalinux 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 "
@@ -28295,7 +28295,7 @@ msgstr "La instal·lació ha fallat"
 #~ "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 Mandrakelinux and Microsoft Windows "
+#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "
 #~ "on\n"
 #~ "the same computer.\n"
 #~ "\n"
@@ -28305,7 +28305,7 @@ msgstr "La instal·lació ha fallat"
 #~ "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 Mandrakelinux system,\n"
+#~ "your hard drive and replace them with your new Mandrivalinux system,\n"
 #~ "choose this option. Be careful, because you will not be able to undo "
 #~ "your\n"
 #~ "choice after you confirm.\n"
@@ -28332,12 +28332,12 @@ msgstr "La instal·lació ha fallat"
 #~ msgstr ""
 #~ "Ara és quan heu de decidir en quin lloc del vostre disc dur voleu "
 #~ "instal·lar\n"
-#~ "el sistema operatiu Mandrakelinux. Si el disc és buit, o si un sistema\n"
+#~ "el sistema operatiu Mandrivalinux. Si el disc és buit, o si un sistema\n"
 #~ "operatiu existent n'utilitza tot l'espai disponible, us caldrà \n"
 #~ "particionar-lo. Bàsicament, particionar un disc dur consisteix a dividir-"
 #~ "lo de\n"
 #~ "manera lògica per crear espai on instal·lar el nou sistema "
-#~ "Mandrakelinux.\n"
+#~ "Mandrivalinux.\n"
 #~ "\n"
 #~ "Atès que els efectes d'aquest procés solen ser irreversibles i poden\n"
 #~ "implicar pèrdua de dades si ja teniu un sistema operatiu instal·lat, el\n"
@@ -28376,7 +28376,7 @@ msgstr "La instal·lació ha fallat"
 #~ "prèviament. És molt recomenable, fer una còpia de seguretat de les "
 #~ "dades.\n"
 #~ "Aquesta opció és la més recomanable si voleu utilitzar tant "
-#~ "Mandrakelinux\n"
+#~ "Mandrivalinux\n"
 #~ "com Microsoft Windows al mateix ordinador.\n"
 #~ "\n"
 #~ "  Abans de decidir-vos per aquesta opció, penseu que en acabar la "
@@ -28388,7 +28388,7 @@ msgstr "La instal·lació ha fallat"
 #~ "\n"
 #~ " *\"%s\": si voleu suprimir totes les dades i particions que teniu al "
 #~ "disc\n"
-#~ "dur i substituir-les pel sistema Mandrakelinux, podeu escollir aquesta\n"
+#~ "dur i substituir-les pel sistema Mandrivalinux, podeu escollir aquesta\n"
 #~ "opció. Aneu amb compte, però, perquè, un cop la confirmeu, no podreu fer-"
 #~ "vos enrere.\n"
 #~ "\n"
@@ -28509,7 +28509,7 @@ msgstr "La instal·lació ha fallat"
 #~ "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"
-#~ "Mandrakelinux operating system installation.\n"
+#~ "Mandrivalinux operating system installation.\n"
 #~ "\n"
 #~ "Click on \"%s\" if you wish to select partitions that will be checked "
 #~ "for\n"
@@ -28537,13 +28537,13 @@ msgstr "La instal·lació ha fallat"
 #~ "Feu clic a \"%s\" quan estigueu a punt per formatar les particions.\n"
 #~ "\n"
 #~ "Feu clic a \"%s\" si voleu seleccionar una altra partició per instal·lar\n"
-#~ "el nou sistema Mandrakelinux.\n"
+#~ "el nou sistema Mandrivalinux.\n"
 #~ "\n"
 #~ "Feu clic a \"%s\" si voleu seleccionar particions on cercar-hi blocs "
 #~ "defectuosos."
 
 #~ msgid ""
-#~ "At the time you are installing Mandrakelinux, it is likely that some\n"
+#~ "At the time you are installing Mandrivalinux, 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"
@@ -28558,7 +28558,7 @@ msgstr "La instal·lació ha fallat"
 #~ "the\n"
 #~ "selected package(s), or \"%s\" to abort."
 #~ msgstr ""
-#~ "Ara esteu instal·lant Mandrakelinux, és probable que alguns paquets\n"
+#~ "Ara esteu instal·lant Mandrivalinux, és probable que alguns paquets\n"
 #~ "hagin estat actualitzats desde la data de llançament. Alguns errors "
 #~ "poden\n"
 #~ "haver estat resolts, i altres problemes de seguretat poden estar ja "
@@ -28604,7 +28604,7 @@ msgstr "La instal·lació ha fallat"
 #~ "\n"
 #~ "Si no sabeu quin escollir, deixeu l'opció per defecte.. Podreu canviar\n"
 #~ "el nivell de seguretat més tard amb l'eina draksec del\n"
-#~ "Centre de Control Mandrakelinux.\n"
+#~ "Centre de Control Mandrivalinux.\n"
 #~ "\n"
 #~ "El camp \"%s\" pot informar l'usuari del sistema qui serà el responsable\n"
 #~ "de la seguretat. Els missatges de seguretat s'enviaran a aquesta adreça."
@@ -28628,7 +28628,7 @@ msgstr "La instal·lació ha fallat"
 #~ "\n"
 #~ "DrakX now needs to know if you want to perform a new install or an "
 #~ "upgrade\n"
-#~ "of an existing Mandrakelinux system:\n"
+#~ "of an existing Mandrivalinux system:\n"
 #~ "\n"
 #~ " * \"%s\": For the most part, this completely wipes out the old system. "
 #~ "If\n"
@@ -28640,21 +28640,21 @@ msgstr "La instal·lació ha fallat"
 #~ "written.\n"
 #~ "\n"
 #~ " * \"%s\": this installation class allows you to update the packages\n"
-#~ "currently installed on your Mandrakelinux system. Your current\n"
+#~ "currently installed on your Mandrivalinux 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 Mandrakelinux systems\n"
+#~ "Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 #~ "running version \"8.1\" or later. Performing an Upgrade on versions "
 #~ "prior\n"
-#~ "to Mandrakelinux version \"8.1\" is not recommended."
+#~ "to Mandrivalinux version \"8.1\" is not recommended."
 #~ msgstr ""
 #~ "Aquest pas només s'activa si s'ha trobat una partició GNU/Linux antiga\n"
 #~ "al vostre ordinador.\n"
 #~ "\n"
 #~ "DrakX necessita saber si voleu realitzar una instal·lació nova o\n"
-#~ "una actualització d'un sistema Mandrakelinux existent:\n"
+#~ "una actualització d'un sistema Mandrivalinux existent:\n"
 #~ "\n"
 #~ " * \"%s\": aquesta opció destrueix gairebé del tot el sistema antic. Si\n"
 #~ "voleu canviar les particions dels discs durs, o el sistema de fitxers,\n"
@@ -28666,7 +28666,7 @@ msgstr "La instal·lació ha fallat"
 #~ "\n"
 #~ " * \"%s\": aquest tipus d'instal·lació us permet actualitzar els paquets "
 #~ "que\n"
-#~ "ja estan instal·lats al sistema Mandrakelinux. L'esquema de "
+#~ "ja estan instal·lats al sistema Mandrivalinux. L'esquema de "
 #~ "particionament\n"
 #~ "actual i les dades d'usuari no queden afectades. La majoria de les "
 #~ "altres\n"
@@ -28674,9 +28674,9 @@ msgstr "La instal·lació ha fallat"
 #~ "instal·lació estàndard.\n"
 #~ "\n"
 #~ "L'opció “Actualitza” ha de funcionar correctament en sistemes "
-#~ "Mandrakelinux\n"
+#~ "Mandrivalinux\n"
 #~ "amb la versió \"8.1\" o posteriors. No es recomana realitzar una\n"
-#~ "actualització en versions de Mandrakelinux anteriors a la \"8.1\"."
+#~ "actualització en versions de Mandrivalinux anteriors a la \"8.1\"."
 
 #~ msgid ""
 #~ "Depending on the language you chose in section , DrakX will "
@@ -28743,7 +28743,7 @@ msgstr "La instal·lació ha fallat"
 #~ "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, Mandrakelinux will be using it\n"
+#~ "still under development. For that reason, Mandrivalinux 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"
@@ -28790,7 +28790,7 @@ msgstr "La instal·lació ha fallat"
 #~ "En quant al suport UTF-8 (unicode): Unicode és una nova codificació de\n"
 #~ "caràcters que cobreix tots els idiomes existents. El suport complet a\n"
 #~ "GNU/Linux encara està sota desenvolupament. Per aquesta raó, "
-#~ "Mandrakelinux\n"
+#~ "Mandrivalinux\n"
 #~ "l'usarà o no depenent de les opcions que esculli l'usuari:\n"
 #~ "\n"
 #~ " * Si escolliu un idioma amb una codificació existent forta(idiomes\n"
@@ -29027,7 +29027,7 @@ msgstr "La instal·lació ha fallat"
 #~ "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 Mandrakelinux\n"
+#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"
 #~ "system! Be sure you know what you are doing before changing any of the\n"
 #~ "options. !!\n"
 #~ "\n"
@@ -29067,7 +29067,7 @@ msgstr "La instal·lació ha fallat"
 #~ "\n"
 #~ "!! Tingueu en compte que si escolliu no instal·lar un carregador\n"
 #~ "d'arrencada (seleccionant \"%s\"), heu d'estar segurs que teniu alguna\n"
-#~ "manera d'arrencar el vostre sistema Mandrakelinux! Assegureu-vos de\n"
+#~ "manera d'arrencar el vostre sistema Mandrivalinux! Assegureu-vos de\n"
 #~ "saber què feu abans de canviar alguna de les opcions!!\n"
 #~ "\n"
 #~ "Si feu clic al botó \"%s\" d'aquest diàleg accedireu a algunes opcions\n"
@@ -29172,7 +29172,7 @@ msgstr "La instal·lació ha fallat"
 #~ msgid ""
 #~ "Now, it's time to select a printing system for your computer. Other OSs "
 #~ "may\n"
-#~ "offer you one, but Mandrakelinux offers two. Each of the printing "
+#~ "offer you one, but Mandrivalinux offers two. Each of the printing "
 #~ "systems\n"
 #~ "is best suited to particular types of configuration.\n"
 #~ "\n"
@@ -29208,7 +29208,7 @@ msgstr "La instal·lació ha fallat"
 #~ "Center and clicking the expert button."
 #~ msgstr ""
 #~ "Ara cal seleccionar el sistema d'impressió del vostre ordinador. Altres\n"
-#~ "sistemes operatius us poden oferir un, però el Mandrakelinux n'ofereix\n"
+#~ "sistemes operatius us poden oferir un, però el Mandrivalinux n'ofereix\n"
 #~ "dos. Cada sistema d'impressió és el més convenient per a un tipus de\n"
 #~ "configuració determinat.\n"
 #~ "\n"
@@ -29239,7 +29239,7 @@ msgstr "La instal·lació ha fallat"
 #~ "Si ara feu una tria, i després veieu que el sistema d'impressió no us\n"
 #~ "agrada, podeu canviar-lo executant el PrinterDrake des del Centre de "
 #~ "control\n"
-#~ "de Mandrakelinux i fent clic al botó Expert."
+#~ "de Mandrivalinux i fent clic al botó Expert."
 
 #~ msgid ""
 #~ "You can add additional entries in yaboot for other operating systems,\n"
@@ -29630,7 +29630,7 @@ msgstr "La instal·lació ha fallat"
 #~ msgstr "L'mkraid ha fallat"
 
 #~ msgid "<b>Mandrake Control Center</b>"
-#~ msgstr "<b>Centre de Control Mandrakelinux</b>"
+#~ msgstr "<b>Centre de Control Mandrivalinux</b>"
 
 #~ msgid ""
 #~ "The Mandrake Control Center is an essential collection of Mandrake-"
@@ -29641,10 +29641,10 @@ msgstr "La instal·lació ha fallat"
 #~ "ordinador."
 
 #~ msgid ""
-#~ "Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- "
+#~ "Find all Mandriva products and services at <b>MandrakeStore</b> -- "
 #~ "our full service e-commerce platform."
 #~ msgstr ""
-#~ "Conegui tots els productes i serveis de Mandrakesoft a <b>MandrakeStore</"
+#~ "Conegui tots els productes i serveis de Mandriva a <b>MandrakeStore</"
 #~ "b> -- la nostra plataforma de serveis de comerç electrònic."
 
 #
@@ -29658,15 +29658,15 @@ msgstr "La instal·lació ha fallat"
 #~ msgid "\t* Special discounts for products and services at MandrakeStore"
 #~ msgstr "\t* Descomptes especials en productes i serveis de MandrakeStore"
 
-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandriva Move</b>"
 #~ msgstr ""
-#~ "\t* Conegui Mandrakelinux en un CD autoarrancable amb <b>MandrakeMove</b>"
+#~ "\t* Conegui Mandrivalinux en un CD autoarrancable amb <b>Mandriva Move</b>"
 
 #~ msgid ""
-#~ "Find all Mandrakesoft products at <b>MandrakeStore</b> -- our full "
+#~ "Find all Mandriva products at <b>MandrakeStore</b> -- our full "
 #~ "service e-commerce platform."
 #~ msgstr ""
-#~ "Conegui tots els productes de Mandrakesoft a <b>MandrakeStore</b> -- la "
+#~ "Conegui tots els productes de Mandriva a <b>MandrakeStore</b> -- la "
 #~ "nostra plataforma de serveis de comerç electrònic."
 
 #
@@ -29694,8 +29694,8 @@ msgstr "La instal·lació ha fallat"
 #~ "  --report          - el programa ha de ser una de les eines de Mandrake\n"
 #~ "  --incident        - el programa ha de ser una de les eines de Mandrake"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "This interface has not been configured yet.\n"
diff --git a/perl-install/share/po/cs.po b/perl-install/share/po/cs.po
index ead0be430..4fbf9b567 100644
--- a/perl-install/share/po/cs.po
+++ b/perl-install/share/po/cs.po
@@ -69,7 +69,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Tento USB disk má zřejmě zapnutu ochranu proti zápisu, nelze jej ale\n"
 "nyní bezpečně odpojit.\n"
@@ -77,7 +77,7 @@ msgstr ""
 "\n"
 "Stiskněte tlačítko pro restart počítače, disk vyjměte, odstraňte ochranu "
 "proti\n"
-"zápisu, zasuňte disk zpět a spusťte znovu systém Mandrake Move."
+"zápisu, zasuňte disk zpět a spusťte znovu systém Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -95,7 +95,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Váš USB disk neobsahuje platný oddíl s FAT.\n"
@@ -107,14 +107,14 @@ msgstr ""
 "\n"
 "\n"
 "Můžete také pokračovat bez USB disku - stále pak můžete používat\n"
-"vaši distribuci MandrakeMove jako běžný produkční operační\n"
+"vaši distribuci Mandriva Move jako běžný produkční operační\n"
 "systém."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -122,11 +122,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Na vašem systému nebyl nalezen žádný USB disk. Pokud nyní\n"
-"zasunete USB disk, Mandrake Move bude mít možnost transparentně\n"
+"zasunete USB disk, Mandriva Move bude mít možnost transparentně\n"
 "ukládat data ve vašem domovském adresáři a systémová nastavení,\n"
 "která pak budou dostupná při dalším startu tohoto nebo jiného\n"
 "počítače. Poznámka: pokud disk zasunete teď, počkejte před dalším\n"
@@ -134,7 +134,7 @@ msgstr ""
 "\n"
 "\n"
 "Můžete také pokračovat bez USB disku - stále pak můžete používat\n"
-"vaši distribuci Mandrake Move jako běžný produkční operační\n"
+"vaši distribuci Mandriva Move jako běžný produkční operační\n"
 "systém."
 
 #: ../move/move.pm:494
@@ -260,7 +260,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -277,7 +277,7 @@ msgstr ""
 "Tato chyba může pocházet z narušených systémových\n"
 "souborů s nastavením na USB disku; v tomto případě by problém\n"
 "vyřešilo odstranění těchto souborů a znovuzavedení systému\n"
-"Mandrake Move. Chcete-li tak učinit, stiskněte odpovídající tlačítko.\n"
+"Mandriva Move. Chcete-li tak učinit, stiskněte odpovídající tlačítko.\n"
 "\n"
 "\n"
 "Můžete také systém restartovat a vyjmout USB disk, nebo si\n"
@@ -1312,11 +1312,11 @@ msgstr "Výběr jazyka"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux podporuje více jazyků. Můžete si zvolit další jazyky,\n"
+"Mandrivalinux podporuje více jazyků. Můžete si zvolit další jazyky,\n"
 "které budou dostupné po instalaci a následném restartu systému."
 
 #: any.pm:752 any.pm:773 help.pm:647
@@ -3735,12 +3735,12 @@ msgstr "Zapnout podporu rádia"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Předtím, než budete pokračovat, přečtěte si pozorně licenční podmínky. Ty\n"
-"se vztahují k celé distribuci Mandrakelinux a pokud s nimi souhlasíte,\n"
+"se vztahují k celé distribuci Mandrivalinux a pokud s nimi souhlasíte,\n"
 "klepněte na tlačítko \"%s\". Pokud ne, klepněte na tlačítko \"%s \" a "
 "počítač bude restartován."
 
@@ -3917,13 +3917,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Distribuce Mandrakelinux je složena z několika CD. Instalační program ví,\n"
+"Distribuce Mandrivalinux je složena z několika CD. Instalační program ví,\n"
 "na kterém disku je umístěn jaký balíček a v případě potřeby vysune CD a "
 "vyžádá\n"
 "si výměnu CD za požadované. Pokud nemáte požadované CD po ruce, klikněte\n"
@@ -3933,11 +3933,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3990,7 +3990,7 @@ msgid ""
 msgstr ""
 "V této chvíli je možné vybrat, které programy chcete nainstalovat na váš "
 "systém.\n"
-"Mandrakelinux obsahuje tisíce balíčků s programy a pro snadnější orientaci\n"
+"Mandrivalinux obsahuje tisíce balíčků s programy a pro snadnější orientaci\n"
 "byly rozděleny do skupin, které sdružují podobné aplikace.\n"
 "\n"
 "Balíčky jsou rozděleny do skupin, které odpovídají tomu, jak je nejčastěji\n"
@@ -4101,10 +4101,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4136,7 +4136,7 @@ msgstr ""
 "!! Pokud se nachází mezi vybranými balíčky serverové programy, ať už "
 "vybrané\n"
 "záměrně nebo jako součást skupiny, zobrazí se dotaz na to,\n"
-"zda opravdu chcete tyto servery nainstalovat. V distribuci Mandrakelinux\n"
+"zda opravdu chcete tyto servery nainstalovat. V distribuci Mandrivalinux\n"
 "jsou tyto servery spuštěny při startu systému. I když v době vydání "
 "distribuce\n"
 "nejsou známy žádné bezpečnostní problémy, mohou se vyskytnout později.\n"
@@ -4287,7 +4287,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4343,7 +4343,7 @@ msgid ""
 msgstr ""
 "X (X Window System) je srdcem grafického rozhraní pro GNU/Linux, které\n"
 "využívají dodávané grafické prostředí (KDE, GNOME, AfterStep, WindowMaker) "
-"se systémem Mandrakelinux.\n"
+"se systémem Mandrivalinux.\n"
 "\n"
 "Nyní bude zobrazen seznam různých parametrů, které je možné změnit pro\n"
 "dosažení optimálního grafického zobrazení\n"
@@ -4461,12 +4461,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4493,7 +4493,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4502,7 +4502,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4523,10 +4523,10 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "V tomto bodě si musíte rozhodnout, na které diskové oddíly budete\n"
-"instalovat nový operační systém Mandrakelinux. Pokud je disk prázdný\n"
+"instalovat nový operační systém Mandrivalinux. Pokud je disk prázdný\n"
 "nebo existující operační systém používá celý disk, je nutné ho rozdělit.\n"
 "Rozdělení disku spočívá ve vytvoření volného prostoru pro instalaci\n"
-"systému Mandrakelinux.\n"
+"systému Mandrivalinux.\n"
 "\n"
 "Protože rozdělení disku je nenávratná operace, je to velmi nebezpečná\n"
 "akce pro ty uživatele, kteří nemají žádné zkušenosti.\n"
@@ -4555,7 +4555,7 @@ msgstr ""
 "oddíl ve\n"
 "Windows defragmentovali. Je doporučeno zazálohovat vaše data. Tento postup\n"
 "je doporučený, pokud chcete na disku provozovat současně systém\n"
-"Mandrakelinux i Microsoft Windows.\n"
+"Mandrivalinux i Microsoft Windows.\n"
 "\n"
 "   Před výběrem této volby si prosím uvědomte, že velikost oddílu s "
 "Microsoft\n"
@@ -4563,7 +4563,7 @@ msgstr ""
 "uložení dat nebo instalaci programů do Microsoft Windows.\n"
 "\n"
 " * \"%s\": pokud chcete smazat veškerá data a všechny oddíly na disku\n"
-"a použít je pro instalaci systému Mandrakelinux, vyberte toto řešení.\n"
+"a použít je pro instalaci systému Mandrivalinux, vyberte toto řešení.\n"
 "Zde postupujte opatrně, po výběru již není možné vzít tuto volbu zpět.\n"
 "\n"
 "   !! Pokud zvolíte tuto možnost, všechna data na disku budou ztracena.!!\n"
@@ -4725,7 +4725,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4749,7 +4749,7 @@ msgstr ""
 "\n"
 "Pokud je vše připraveno pro formátování, klepněte na \"%s\".\n"
 "\n"
-"Pokud chcete vybrat jiné oddíly pro instalaci systému Mandrakelinux,\n"
+"Pokud chcete vybrat jiné oddíly pro instalaci systému Mandrivalinux,\n"
 "klepněte na \"%s\" \n"
 "\n"
 "Klepnutím na \"%s\" můžete vybrat, které oddíly budou otestovány\n"
@@ -4767,7 +4767,7 @@ msgstr "Zpět"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4779,7 +4779,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Pokaždé, když instalujete distribuci Mandrakelinux, je možné, že některé\n"
+"Pokaždé, když instalujete distribuci Mandrivalinux, je možné, že některé\n"
 "balíčky byly od vydání distribuce aktualizovány. Mohly to být opravy chyb\n"
 "či řešení možných bezpečnostních problémů. Pokud chcete využít právě\n"
 "této nabídky, je možné tyto balíčky nyní stáhnout z Internetu. Zvolte \"%s"
@@ -4810,7 +4810,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4838,7 +4838,7 @@ msgstr "Správce zabezpečení"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4910,7 +4910,7 @@ msgid ""
 msgstr ""
 "V této chvíli je potřeba určit, který(é) oddíl(y) budou použity pro "
 "instalaci\n"
-"systému Mandrakelinux. Pokud byly oddíly již jednou definovány, buď\n"
+"systému Mandrivalinux. Pokud byly oddíly již jednou definovány, buď\n"
 "z předchozí instalace GNU/Linux nebo jiným programem na rozdělení disku,\n"
 "je možné použít právě tyto oddíly. Jinak musí být oddíly nově definovány.\n"
 "\n"
@@ -4998,7 +4998,7 @@ msgstr "Přepne mezi normální/expertním režimem"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5029,7 +5029,7 @@ msgstr ""
 "Instalační program nalezl na disku více než jeden oddíl s Microsoft "
 "Windows.\n"
 "Prosím vyberte si jeden z nich, který je potřeba pro novu instalaci systému\n"
-"Mandrakelinux zmenšit.\n"
+"Mandrivalinux zmenšit.\n"
 "\n"
 "Každý oddíl je zobrazen následovně: \"Pojmenování v Linuxu\",\n"
 "\"Název ve Windows\", \"Velikost\".\n"
@@ -5078,7 +5078,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5087,19 +5087,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Tento krok se objeví pouze tehdy, pokud je na vašem počítači nalezen starší\n"
 "oddíl GNU/Linuxu.\n"
 "\n"
 "Instalační program potřebuje vědět, zda má provést instalaci nebo pouze\n"
-"aktualizaci existujícího systému Mandrakelinux.\n"
+"aktualizaci existujícího systému Mandrivalinux.\n"
 "\n"
 " * \"%s\": Nejběžnější volba, provede kompletní výmaz starého systému.\n"
 "V závislosti na rozvržení oddílů vašeho starého systému je však možné\n"
@@ -5108,7 +5108,7 @@ msgstr ""
 "souborový systém, použijte tuto volbu.\n"
 "\n"
 " * \"%s\": tato volba provede aktualizaci balíčků instalovaných na vašem\n"
-"systému Mandrakelinux. Aktuální rozmístění diskových oddílů a uživatelská\n"
+"systému Mandrivalinux. Aktuální rozmístění diskových oddílů a uživatelská\n"
 "data zůstanou zachována. Bude ale provedena většina konfiguračních kroků,\n"
 "stejně jako při instalaci.\n"
 "\n"
@@ -5176,7 +5176,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5472,7 +5472,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5493,12 +5493,12 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Zde si můžete vybrat tiskový systém, který budete používat. Jiné OS "
 "nabízejí\n"
-"jeden, Mandrakelinux nabízí dva. Každý z nich je vhodnější pro různé typy\n"
+"jeden, Mandrivalinux nabízí dva. Každý z nich je vhodnější pro různé typy\n"
 "konfigurací.\n"
 "\n"
 " * \"%s\" - což znamená 'print, do not queue' a je vhodný tehdy, pokud máte\n"
@@ -5640,7 +5640,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5657,7 +5657,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5707,7 +5707,7 @@ msgstr ""
 " * \"%s\": pokud chcete nyní nastavit připojení k Internetu nebo k lokální\n"
 "síti, klepnutím na tlačítko se spustí průvodce. Plnou dokumentaci naleznete\n"
 "v tištěné příručce, případně můžete po instalaci využít ovládací centrum\n"
-"Mandrakelinux, kde rovněž naleznete kompletní nápovědu.\n"
+"Mandrivalinux, kde rovněž naleznete kompletní nápovědu.\n"
 "\n"
 " * \"%s\": umožňuje nastavit adresu HTTP a FTP proxy, což je užitečné,\n"
 "pokud se počítač nachází za firewallem.\n"
@@ -5724,7 +5724,7 @@ msgstr ""
 " * \"%s\": pokud chcete změnit nastavení zavaděče, můžete to provést\n"
 "klepnutím na toto tlačítko. Změny by měly provádět pouze zkušení uživatelé.\n"
 "Více informací lze nalézt v tištěné dokumentaci nebo online nápověde\n"
-"v ovládacím centru Mandrakelinux.\n"
+"v ovládacím centru Mandrivalinux.\n"
 "\n"
 " * \"%s\": zde si můžete konkrétně určit, které služby budou na vašem "
 "počítači\n"
@@ -5786,10 +5786,10 @@ msgstr "Služby"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Vyberte disk, který chcete smazat pro instalaci oddílu Mandrakelinux.\n"
+"Vyberte disk, který chcete smazat pro instalaci oddílu Mandrivalinux.\n"
 "Pamatujte na to, že všechna data budou ztracena a nelze je již obnovit!"
 
 #: help.pm:863
@@ -6140,7 +6140,7 @@ msgstr "Počítám volné místo na Windows oddílu"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Váš diskový oddíl s Windows je příliš fragmentován. Restartujte počítač do "
@@ -6261,19 +6261,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6295,7 +6295,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6303,14 +6303,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6320,7 +6320,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6340,10 +6340,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6354,11 +6354,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6374,22 +6374,22 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Úvod\n"
 "\n"
-"Operační systém a různé části dostupné v distribuci Mandrakelinux jsou "
+"Operační systém a různé části dostupné v distribuci Mandrivalinux jsou "
 "nazývány \"Softwarové produkty\" (\"Software Products\"). Softwarové "
 "produkty zahrnují, ale nejsou omezeny, na programy, metody, pravidla a "
 "dokumentaci, vztahující se k operačnímu systému a dalším komponentám "
-"distribuce Mandrakelinux.\n"
+"distribuce Mandrivalinux.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6411,7 +6411,7 @@ msgstr ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6419,14 +6419,14 @@ msgstr ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6436,7 +6436,7 @@ msgstr ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6456,10 +6456,10 @@ msgstr ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6470,11 +6470,11 @@ msgstr ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6490,7 +6490,7 @@ msgstr ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6577,7 +6577,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6585,13 +6585,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Gratulujeme vám, instalace je dokončena.\n"
 "Vyjměte zaváděcí média a stiskněte Return pro restart.\n"
 "\n"
 "\n"
-"Informace o opravách pro tuto verzi systému Mandrakelinux lze\n"
+"Informace o opravách pro tuto verzi systému Mandrivalinux lze\n"
 "nalézt na stránce Errata dostupné na:\n"
 "\n"
 "\n"
@@ -6599,7 +6599,7 @@ msgstr ""
 "\n"
 "\n"
 "Informace o nastavení systému po instalaci jsou dostupné\n"
-"v příslušné kapitole oficiální uživatelské příručky pro Mandrakelinux."
+"v příslušné kapitole oficiální uživatelské příručky pro Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6633,11 +6633,11 @@ msgstr "Začínám '%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Váš systém má málo systémových prostředků. Při instalaci Mandrakelinuxu se\n"
+"Váš systém má málo systémových prostředků. Při instalaci Mandrivalinuxu se\n"
 "můžete setkat s různými problémy. Pokud se tak stane, zkuste textovou\n"
 "verzi instalačního programu. Ta se spouští tak, že při startu\n"
 "z CD mechaniky stisknete 'F1' a poté napíšete 'text'."
@@ -7174,8 +7174,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "Kontaktuji web Mandrakelinux pro získání seznamu dostupných zrcadel..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
+msgstr "Kontaktuji web Mandrivalinux pro získání seznamu dostupných zrcadel..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7399,8 +7399,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux Instalace %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux Instalace %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9989,13 +9989,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Nastavení aplikace drakfirewall\n"
 "\n"
-"Zde je možné nastavit osobní firewall pro tento systém Mandrakelinux.\n"
+"Zde je možné nastavit osobní firewall pro tento systém Mandrivalinux.\n"
 "Pro výkonné řešení vyhrazeného firewallu použijte specializovanou\n"
 "distribuci MandrakeSecurity Firewall."
 
@@ -14033,7 +14033,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -15955,23 +15955,23 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Co je to Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Co je to Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Vítá vás <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Vítá vás <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux ke <b>distribuce Linuxu</b>, která se skládá z jádra systému, "
+"Mandrivalinux ke <b>distribuce Linuxu</b>, která se skládá z jádra systému, "
 "tzv. <b>operačního systému</b> (založeného na jádře zvaném Linux), a "
 "<b>spousty aplikací</b>, které uspokojí každou potřebu, na kterou si jenom "
 "vzpomenete."
@@ -15979,10 +15979,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux je <b>uživatelsky nejpřívětivější</b> distribuce Linuxu "
+"Mandrivalinux je <b>uživatelsky nejpřívětivější</b> distribuce Linuxu "
 "dostupná na trhu. Je také jednou z <b>nejpoužívanějších</b> distribucí "
 "Linuxu na světě!"
 
@@ -15999,15 +15999,15 @@ msgstr "Vítejte do <b>světa Open Source</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux využívá a je plně oddán modelu Open Source. To znamená, že "
+"Mandrivalinux využívá a je plně oddán modelu Open Source. To znamená, že "
 "toto nové vydání je výsledkem <b>spolupráce</b> mezi týmem <b>vývojářů "
-"společnosti Mandrakesoft</b> a <b>celosvětovou komunitou</b> přispěvatelů do "
-"distribuce Mandrakelinux."
+"společnosti Mandriva</b> a <b>celosvětovou komunitou</b> přispěvatelů do "
+"distribuce Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16027,10 +16027,10 @@ msgstr "<b>GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "Většina ze software v této distribuci a všechny nástroje distribuce "
-"Mandrakelinux jsou dostupné pod Obecnou veřejnou licencí (<b>General Public "
+"Mandrivalinux jsou dostupné pod Obecnou veřejnou licencí (<b>General Public "
 "License</b>)."
 
 #: share/advertising/03.pl:17
@@ -16061,15 +16061,15 @@ msgstr "<b>Připojte se ke komunitě</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Distribuce Mandrakelinux má jednu z <b>největších komunit</b> uživatelů a "
+"Distribuce Mandrivalinux má jednu z <b>největších komunit</b> uživatelů a "
 "vývojářů. Role takové komunity jsou velmi rozmanité, od hlášení chyb po "
 "vývoj nových aplikací. Komunita hraje <b>klíčovou roli</b> ve světě "
-"distribuce Mandrakelinux."
+"distribuce Mandrivalinux."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16091,11 +16091,11 @@ msgstr "<b>Download verze</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Právě instalujete <b>Mandrakelinux Download</b>. Jedná se o volnou verzi, "
-"kterou chce společnost Mandrakesoft <b>poskytnout každému</b>."
+"Právě instalujete <b>Mandrivalinux Download</b>. Jedná se o volnou verzi, "
+"kterou chce společnost Mandriva <b>poskytnout každému</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16127,10 +16127,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Nebudete mít také přístup ke <b>službám dostupným</b> v jiných produktech "
-"společnosti Mandrakesoft."
+"společnosti Mandriva."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16139,8 +16139,8 @@ msgstr "<b>Discovery, váš první Linuxový desktop</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Právě instalujete produkt <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Právě instalujete produkt <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16162,18 +16162,18 @@ msgstr "<b>PowerPack, nejpokročilejší Linuxový desktop</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Právě instalujete produkt <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Právě instalujete produkt <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
 "PowerPack je nejlepší <b>Linuxový produkt pro desktop</b> společnosti "
-"Mandrakesoft. Zahrnuje v době <b>tisíce aplikací</b> - všechny od těch "
+"Mandriva. Zahrnuje v době <b>tisíce aplikací</b> - všechny od těch "
 "nejpopulárnějších po ty nejvíce technicky zaměřené."
 
 #: share/advertising/08.pl:13
@@ -16183,8 +16183,8 @@ msgstr "<b>PowerPack+, Linuxové řešení pro desktopy a servery</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Právě instalujete produkt <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Právě instalujete produkt <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16201,22 +16201,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Produkty společnosti Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Produkty společnosti Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"Společnost <b>Mandrakesoft</b> vyvinula širokou řadu produktů "
-"<b>Mandrakelinux</b>."
+"Společnost <b>Mandriva</b> vyvinula širokou řadu produktů "
+"<b>Mandrivalinux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Produkty Mandrakelinux jsou:"
+msgid "The Mandrivalinux products are:"
+msgstr "Produkty Mandrivalinux jsou:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16236,73 +16236,73 @@ msgstr "\t* <b>PowerPack+</b>, Linuxové řešení pro desktop i servery."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux pro x86-64</b>, řešení Mandrakelinux pro co nejlepší "
+"\t* <b>Mandrivalinux pro x86-64</b>, řešení Mandrivalinux pro co nejlepší "
 "využití vašeho 64bitového procesoru."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Produkty společnosti Mandrakesoft (produkty Nomad)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Produkty společnosti Mandriva (produkty Nomad)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Společnost Mandrakesoft vyvinula dva produkty, které vám umožní používat "
-"distribuci Mandrakelinux <b>na každém počítači</b> a bez potřeby tuto "
+"Společnost Mandriva vyvinula dva produkty, které vám umožní používat "
+"distribuci Mandrivalinux <b>na každém počítači</b> a bez potřeby tuto "
 "distribuci na nich instalovat:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, distribuce Mandrakelinux, která se výhradně spouští ze "
+"\t* <b>Move</b>, distribuce Mandrivalinux, která se výhradně spouští ze "
 "spustitelného CD-ROM disku."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, distribuce Mandrakelinux předinstalovaná na ultra "
+"\t* <b>GlobeTrotter</b>, distribuce Mandrivalinux předinstalovaná na ultra "
 "kompaktních mobilních discích “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Produkty společnosti Mandrakesoft (profesionální řešení)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Produkty společnosti Mandriva (profesionální řešení)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Níže uvedené jsou produkty společnosti Mandrakesoft určené pro "
+"Níže uvedené jsou produkty společnosti Mandriva určené pro "
 "<b>profesionální potřeby</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, desktop Mandrakelinux pro společnosti."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, desktop Mandrivalinux pro společnosti."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, serverové řešení Mandrakelinux."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, serverové řešení Mandrivalinux."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b>, bezpečnostní řešení Mandrakelinux."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, bezpečnostní řešení Mandrivalinux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16345,10 +16345,10 @@ msgstr "<b>Vyberte si své oblíbené grafické prostředí</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "S produktem PowerPack si můžete vybrat <b>grafické uživatelské prostředí</"
-"b>. Společnost Mandrakesoft vybrala jako výchozí prostředí <b>KDE</b>."
+"b>. Společnost Mandriva vybrala jako výchozí prostředí <b>KDE</b>."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16372,10 +16372,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "S produktem PowerPack+ si můžete vybrat <b>grafické uživatelské prostředí</"
-"b>. Společnost Mandrakesoft vybrala jako výchozí prostředí <b>KDE</b>."
+"b>. Společnost Mandriva vybrala jako výchozí prostředí <b>KDE</b>."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16505,10 +16505,10 @@ msgstr "<b>Užívejte širokou řadu aplikací</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"V menu Mandrakelinux najdete <b>jednoduše použitelné</b> aplikace pro "
+"V menu Mandrivalinux najdete <b>jednoduše použitelné</b> aplikace pro "
 "<b>všechny typy úloh</b>:"
 
 #: share/advertising/18.pl:16
@@ -16775,18 +16775,18 @@ msgstr "\t* <b>Postfix</b> a <b>Sendmail</b>: Známé a mocné poštovní server
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Ovládací centrum Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Ovládací centrum Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Ovládací centrum Mandrakelinux</b> je nepostradatelná sbírka nástrojů "
-"specifických pro distribuci Mandrakelinux, které zjednoduší nastavení vašeho "
+"<b>Ovládací centrum Mandrivalinux</b> je nepostradatelná sbírka nástrojů "
+"specifických pro distribuci Mandrivalinux, které zjednoduší nastavení vašeho "
 "počítače."
 
 #: share/advertising/25.pl:17
@@ -16810,16 +16810,16 @@ msgstr "<b>Model Open source</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Jako každé jiné počítačové programování, vývoj open source software <b>si "
 "žádá čas a lidi</b>. Aby respektovala filozofii open source, prodává "
-"společnost Mandrakesoft produkty s přidanou hodnotou a služby, díky kterým "
-"<b>vylepšuje distribuci Mandrakelinux</b>. Chcete-li <b>podporovat filozofii "
-"open source</b> a vývoj distribuce Mandrakelinux, <b>zvažte prosím</b> koupi "
+"společnost Mandriva produkty s přidanou hodnotou a služby, díky kterým "
+"<b>vylepšuje distribuci Mandrivalinux</b>. Chcete-li <b>podporovat filozofii "
+"open source</b> a vývoj distribuce Mandrivalinux, <b>zvažte prosím</b> koupi "
 "některého z našich produktů a služeb!"
 
 #: share/advertising/27.pl:13
@@ -16830,10 +16830,10 @@ msgstr "<b>Online obchod</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Všechny produkty a služby společnosti Mandrakesoft najdete na naší "
+"Všechny produkty a služby společnosti Mandriva najdete na naší "
 "<b>platformě pro e-komerci</b>."
 
 #: share/advertising/27.pl:17
@@ -16858,25 +16858,25 @@ msgstr "Navštivte ještě dnes <b>store.mandrakesoft.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> je <b>perfektní doplněk</b> k vašemu produktu "
-"Mandrakelinux."
+"<b>Mandriva Club</b> je <b>perfektní doplněk</b> k vašemu produktu "
+"Mandrivalinux."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 "Využijte <b>cenných výhod</b>, které jsou spojeny s členstvím v klubu "
-"Mandrakeclub, jako například:"
+"Mandriva Club, jako například:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -16898,40 +16898,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Účast v <b>uživatelských fórech</b> distribuce Mandrakelinux."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Účast v <b>uživatelských fórech</b> distribuce Mandrivalinux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Dřívější a privilegovaný přístup</b>, před veřejným vydáním, k <b>ISO "
-"obrazům</b> Mandrakelinux."
+"obrazům</b> Mandrivalinux."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> je nová prvotřídní služba, kterou společnost "
-"Mandrakesoft hrdě nabízí svým zákazníkům!"
+"<b>Mandriva Online</b> je nová prvotřídní služba, kterou společnost "
+"Mandriva hrdě nabízí svým zákazníkům!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline poskytuje širokou řadu cenných služeb pro <b>snadnou "
-"aktualizaci</b> vašich systémů s distribucí Mandrakelinux:"
+"Mandriva Online poskytuje širokou řadu cenných služeb pro <b>snadnou "
+"aktualizaci</b> vašich systémů s distribucí Mandrivalinux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16957,41 +16957,41 @@ msgstr "\t* Flexibilní <b>plánované</b> aktualizace."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* Správa <b>všech vašich Mandrakelinux systémů</b> pomocí jednoho účtu."
+"\t* Správa <b>všech vašich Mandrivalinux systémů</b> pomocí jednoho účtu."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "Potřebujete <b>asistenci</b>? Setkejte se s technickými experty společnosti "
-"Mandrakesoft na naší <b>platformě technické podpory</b> na stránkách www."
+"Mandriva na naší <b>platformě technické podpory</b> na stránkách www."
 "mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Díky pomoci <b>kvalifikovaných expertů společnosti Mandrakesoft</b> ušetříte "
+"Díky pomoci <b>kvalifikovaných expertů společnosti Mandriva</b> ušetříte "
 "spoustu času."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Pro zodpovězení otázek spojených s distribucí Mandrakelinux máte možnost "
+"Pro zodpovězení otázek spojených s distribucí Mandrivalinux máte možnost "
 "zakoupit si incidenty technické podpory na <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17291,8 +17291,8 @@ msgstr "Nástroje pro sledování, evidenci procesů, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Průvodci Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Průvodci Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17440,7 +17440,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17454,7 +17454,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[VOLBY]\n"
-"Nastavení pro Mandrakelinux Terminal Server (MTS)\n"
+"Nastavení pro Mandrivalinux Terminal Server (MTS)\n"
 "--enable         : povolí MTS\n"
 "--disable        : zakáže MTS\n"
 "--start          : spustí MTS\n"
@@ -17511,14 +17511,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[VOLBY]...\n"
-"  -no-confirmation      nepotvrzuje první otázku v režimu MandrakeUpdate\n"
+"  -no-confirmation      nepotvrzuje první otázku v režimu Mandriva Update\n"
 "  --no-verify-rpm       neprovádí ověření podpisu u balíčků\n"
 "  --changelog-first      v okně s popisem nejdříve zobrazí changelog před "
 "seznamem souborů\n"
@@ -20279,13 +20279,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Nástroj distribuce Mandrakelinux pro hlášení chyb"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Nástroj distribuce Mandrivalinux pro hlášení chyb"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Ovládací centrum Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Ovládací centrum Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20305,8 +20305,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20350,8 +20350,8 @@ msgstr "Průvodci nastavením"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Vyberte nástroj Mandrakesoft:"
+msgid "Select Mandriva Tool:"
+msgstr "Vyberte nástroj Mandriva:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20775,19 +20775,19 @@ msgstr "Spustit při startu"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Toto rozhraní ještě nebylo nastaveno.\n"
-"Spusťte průvodce \"Přidat rozhraní\" z Ovládacího centra Mandrakelinux"
+"Spusťte průvodce \"Přidat rozhraní\" z Ovládacího centra Mandrivalinux"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Nemáte nastaveno žádné připojení k Internetu.\n"
-"Spusťte průvodce \"%s\" z Ovládacího centra Mandrakelinux"
+"Spusťte průvodce \"%s\" z Ovládacího centra Mandrivalinux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20837,8 +20837,8 @@ msgstr "KDM (Správce obrazovky KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Správce obrazovky Mandrakelinux)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Správce obrazovky Mandrivalinux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21137,7 +21137,7 @@ msgstr "Import"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21146,7 +21146,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright ©2001-2002 by Mandrakesoft \n"
+"Copyright ©2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (původní verze)\n"
@@ -21686,14 +21686,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright ©2003-2004 Mandrakesoft.\n"
+"Copyright ©2003-2004 Mandriva.\n"
 "Toto je svobodný software a je šířen pod licencí GNU GPL.\n"
 "\n"
 "Použití: \n"
@@ -21722,8 +21722,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Centrum nápovědy Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Centrum nápovědy Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25237,8 +25237,8 @@ msgstr "Změny jsou provedeny, ale pro aktivaci je nutné provést odhlášení"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Záznamy nástrojů Mandrakelinuxu"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Záznamy nástrojů Mandrivalinuxu"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25751,10 +25751,10 @@ msgstr "Připojení ukončeno."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Připojení selhalo.\n"
-"Ověřte nastavení v ovládacím centru Mandrakelinux."
+"Ověřte nastavení v ovládacím centru Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index c976ea79c..213517d95 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -68,14 +68,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Mae'r allwedd USB i weld a'i ddiogelu rhag ysgrifennu ymlaen, ond nid oes.\n"
 "modd ei dynnu'n ddiogel.\n"
 "\n"
 "\n"
 "Cliciwch y botwm i ailgychwyn y peiriant, tynnwch yr allwedd, diffodd y\n"
-"diogelu, ailosod y plwg a chychwyn Mandrake Move eto."
+"diogelu, ailosod y plwg a chychwyn Mandriva Move eto."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -93,7 +93,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Does gan eich allwedd USB raniadau Windows (FAT) dilys\n"
@@ -104,14 +104,14 @@ msgstr ""
 "\n"
 "\n"
 "Mae modd mynd yn eich blaen heb allwedd USB - bydd dal\n"
-"modd i chi ddefnyddio Mandrake Move fel System Weithredu\n"
+"modd i chi ddefnyddio Mandriva Move fel System Weithredu\n"
 "Mandrake hyfyw."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -119,11 +119,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Nid ydym wedi canfod allwedd USB ar eich system Os wnewch\n"
-"rhoi'r allwedd USB yn ei le, mae gan Mandrake Move y gallu i\n"
+"rhoi'r allwedd USB yn ei le, mae gan Mandriva Move y gallu i\n"
 "gadw eich data yn eich cyfeiriadur cartref a ffurfweddiad system\n"
 "gyfan, ar gyfer ail gychwyn y cyfrifiadur hwn neu un arall\n"
 "Sylwch: os wnewch chi roi'r allwedd yn ei le nawr, arhoswch\n"
@@ -131,7 +131,7 @@ msgstr ""
 "\n"
 "\n"
 "Mae modd mynd yn eich blaen heb allwedd USB - bydd dal\n"
-"modd i chi ddefnyddio Mandrake Move fel system weithredu\n"
+"modd i chi ddefnyddio Mandriva Move fel system weithredu\n"
 "Mandrake hyfyw."
 
 #: ../move/move.pm:494
@@ -258,7 +258,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -274,7 +274,7 @@ msgstr ""
 "\n"
 "Gall hyn fod wedi dod o ffeiliau ffurfweddu'r system\n"
 "ar yr allwedd USB, yn yr achos yma bydd eu tynnu ac\n"
-"ailgychwyn Mandrake Move yn datrys y broblem. I wneud\n"
+"ailgychwyn Mandriva Move yn datrys y broblem. I wneud\n"
 "hynny, cliciwch y botwm perthnasol.\n"
 "\n"
 "\n"
@@ -1306,7 +1306,7 @@ msgstr "Dewis iaith"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3729,12 +3729,12 @@ msgstr "galluogi cynnal radio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Cyn parhau dylech ddarllen amodau'r drwydded yn ofalus. Mae'n ymwneud\n"
-"â holl ddosbarthiad Mandrakelinux. Os ydych yn cytuno â'r holl amodau,\n"
+"â holl ddosbarthiad Mandrivalinux. Os ydych yn cytuno â'r holl amodau,\n"
 "cliciwch flwch \"%s\". Os nad, bydd clicio ar y botwm \"%s\" yn\n"
 "ail gychwyn eich cyfrifiadur."
 
@@ -3894,13 +3894,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mae gosodiad Mandrakelinux i'w gael ar nifer o CD-ROMau. Mae DrakX\n"
+"Mae gosodiad Mandrivalinux i'w gael ar nifer o CD-ROMau. Mae DrakX\n"
 "yn gwybod os yw pecyn penodol wedi ei leoli ar CD-ROM arall a bydd yn bwrw\n"
 "allan y CD cyfredol a gofyn am y llall. Os nad yw'r CD angenrheidiol "
 "gennych\n"
@@ -3910,11 +3910,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3966,11 +3966,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "Mae'n amser penderfynu pa raglenni rydych am eu gosod ar eich\n"
-"system. Mae yna filoedd o becynnau ar gael ar gyfer Mandrakelinux, ond\n"
+"system. Mae yna filoedd o becynnau ar gael ar gyfer Mandrivalinux, ond\n"
 "i'w gwneud hi'n haws eu rheoli maent wedi cael eu gosod mewn grwpiau\n"
 "o raglenni tebyg.\n"
 "\n"
-"Mae Mandrakelinux wedi trefnu'r grwpiau pecynnau i bedwar categori. Mae\n"
+"Mae Mandrivalinux wedi trefnu'r grwpiau pecynnau i bedwar categori. Mae\n"
 "modd dewis a dethol rhaglenni o'r categorïau gwahanol, fel bo \"Man Gwaith"
 "\"\n"
 "yn medru cael rhaglenni o'r categori \"Gweinydd\".\n"
@@ -4073,10 +4073,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4106,11 +4106,11 @@ msgstr ""
 "\n"
 "!! Os oes pecyn gweinydd wedi ei ddewis, yn fwriadol neu am ei fod yn rhan\n"
 "o grwp cyfan, bydd angen i chi gadarnhau eich bod eisiau i'r gweinyddion\n"
-"gael eu gosod. Ym Mandrakelinux mae unrhyw weinydd sydd wedi ei\n"
+"gael eu gosod. Ym Mandrivalinux mae unrhyw weinydd sydd wedi ei\n"
 "osod yn cael ei gychwyn fel rhagosodiad wrth gychwyn. Hyd yn oed os ydynt\n"
 "yn ddiogel a doedd dim materion pryder pan gafodd y dosbarthiad ei ryddhau,\n"
 "mae'n bosibl i fylchau diogelwch gael eu darganfod wedi i'r fersiwn hwn o\n"
-"Mandrakelinux gael ei gwblhau. Os nad ydych yn gwybod beth mae\n"
+"Mandrivalinux gael ei gwblhau. Os nad ydych yn gwybod beth mae\n"
 "gwasanaeth arbennig i fod i'w wneud na pham mae wedi ei osod, yna\n"
 "cliciwch\"%s\". Bydd clicio \"%s\" yn gosod y gwasanaethau hynny a\n"
 "byddant yncael eu cychwyn yn awtomatig drwy ragosodiad!!\n"
@@ -4257,7 +4257,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4313,7 +4313,7 @@ msgid ""
 msgstr ""
 "X (sef X Window System) yw calon rhyngwyneb graffigol GNU/Linux a'r\n"
 "hyn mae'r holl amgylcheddau graffigol (KDE, Gnome, AterStep,\n"
-"WindowMaker, etc) sy'n dod gyda Mandrakelinux yn dibynnu arno.\n"
+"WindowMaker, etc) sy'n dod gyda Mandrivalinux yn dibynnu arno.\n"
 "\n"
 "Byddwch yn derbyn rhestr o baramedrau gwahanol i'w newid i gael\n"
 "y dangosiad graffigol gorau:\n"
@@ -4428,12 +4428,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4460,7 +4460,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4469,7 +4469,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4490,7 +4490,7 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Mae angen i chi nawr ddewis lle ar eich disg caled i osod eich system\n"
-"weithredu Mandrakelinux. Os yw eich disg caled yn wag neu os oes\n"
+"weithredu Mandrivalinux. Os yw eich disg caled yn wag neu os oes\n"
 "yna system weithredol eisoes yn cymryd yr holl le sydd ar gael, bydd\n"
 "angen i chi greu rhaniadau arno. Yn y bôn, mae rhannu disg caled yn\n"
 "golygu ei rhannu'n rhesymegol i greu lle i osod eich system Mandrake\n"
@@ -4522,14 +4522,14 @@ msgstr ""
 "Mae modd ail lunio maint y rhaniad heb golli data cyn belled eich bod wedi\n"
 "dad-ddarnio rhaniad Windows ac mae'n defnyddio fformat Windows.\n"
 "Argymhellir cadw data wrth gefn hefyd. Argymhellir gwneud hyn os ydych\n"
-"am ddefnyddio Mandrakelinux a Microsoft Windows ar yr un cyfrifiadur.\n"
+"am ddefnyddio Mandrivalinux a Microsoft Windows ar yr un cyfrifiadur.\n"
 "\n"
 "  Cyn gwneud y dewis hwn, cofiwch y bydd maint eich rhaniad Microsoft\n"
 "Windows yn llai nag yw ar hyn o bryd ar ol dilyn y drefn yma. Bydd gennych\n"
 "llai o le yn Microsoft Windows i gadw data neu i osod meddalwedd newydd\n"
 "\n"
 " * \"%s\" os ydych am ddileu'r holl ddata a rhaniadau presennol ar\n"
-"eich disg caled a'u cyfnewid am system Mandrakelinux, yna dewiswch\n"
+"eich disg caled a'u cyfnewid am system Mandrivalinux, yna dewiswch\n"
 "hwn. Byddwch yn ofalus wrth wneud hyn gan na fydd modd troi nôl\n"
 "ar ôl cadarnhau.\n"
 "\n"
@@ -4687,7 +4687,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4709,7 +4709,7 @@ msgstr ""
 "Cliciwch \"%s\" pan ydych yn barod i fformatio rhaniadau.\n"
 "\n"
 "Cliciwch \"%s\" os ydych am ddewis rhaniad arall ar gyfer eich gosodiad\n"
-"Mandrakelinux newydd\n"
+"Mandrivalinux newydd\n"
 "\n"
 "Cliciwch \"%s\" os ydych am ddewis rhaniadau i'w gwirio am flociau\n"
 "gwallus ar y ddisg."
@@ -4726,7 +4726,7 @@ msgstr "Blaenorol"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4738,7 +4738,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Erbyn i chi osod Mandrakelinux, mae'n debygol y bydd rhai \n"
+"Erbyn i chi osod Mandrivalinux, mae'n debygol y bydd rhai \n"
 "pecynnau wedi eu diweddaru ers y rhyddhad cychwynnol. Bydd rhai \n"
 "gwallau wedi eu cywiro a materion diogelwch wedi eu datrys. I ganiatáu\n"
 "i chi fanteisio ar hyn mae cynnig i chi eu llwytho i lawr o'r rhyngrwyd.\n"
@@ -4766,7 +4766,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4795,7 +4795,7 @@ msgstr "Cyfrinair Gweinyddwr"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4866,7 +4866,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Yn awr mae angen i chi ddewis pa raniadau i'w defnyddio ar gyfer gosodiad\n"
-"eich system Mandrakelinux. Os oes rhaniadau wedi eu diffinio eisoes, un\n"
+"eich system Mandrivalinux. Os oes rhaniadau wedi eu diffinio eisoes, un\n"
 "ai drwy osodiad blaenorol o GNU/Linux neu gan offeryn rhannu arall, mae\n"
 "modd i chi ddefnyddio'r rhaniadau presennol. Os nad, rhaid i' rhaniadau'r\n"
 "ddisg caled gael eu diffinio.\n"
@@ -4951,7 +4951,7 @@ msgstr "Amnewid rhwng modd arferol/arbenigol"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4981,7 +4981,7 @@ msgid ""
 msgstr ""
 "Mae mwy nag un rhaniad Microsoft wedi ei ganfod ar eich disg caled.\n"
 "Dewiswch ba un rydych am newid ei faint er mwyn gosod eich\n"
-"system weithredu Mandrakelinux newydd\n"
+"system weithredu Mandrivalinux newydd\n"
 "\n"
 "Mae pob rhaniad wedi ei restri fel hyn: \"Enw Linux\", \"Enw Windows\",\n"
 "\"Maint\".\n"
@@ -5028,7 +5028,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5037,19 +5037,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Mae'r cam hwn yn cael ei weithredu os oes hen raniad GNU/Linux wedi\n"
 "ei ganfod ar y cyfrifiadur.\n"
 "\n"
 "Bydd DrakX angen gwybod a ydych am osod o'r newydd neu uwchraddio\n"
-"system Mandrakelinux presennol.\n"
+"system Mandrivalinux presennol.\n"
 "\n"
 " *\"%s\" Ar y cyfan, mae hwn yn tynnu'r hen system gyfan oddi ar eich\n"
 "cyfrifiadur. Er hynny, yn ddibynnol ar eich trefn rhannu, mae modd atal\n"
@@ -5059,13 +5059,13 @@ msgstr ""
 "system ffeil, dylech ddewis hwn.\n"
 "\n"
 " *\"%s\": Mae'r dosbarth gosod hwn yn caniatáu i chi ddiweddaru'r\n"
-"pecynnau sydd wedi eu gosod ar eich system Mandrakelinux. Bydd eich\n"
+"pecynnau sydd wedi eu gosod ar eich system Mandrivalinux. Bydd eich\n"
 "rhaniadau presenol a'ch data personol yn cael eu cadw. Bydd y rhan fwyaf\n"
 "o'r camau ffurfweddu ar gael fel gyda'r gosod arferol.\n"
 "\n"
-"Dylai defnyddio \"Diweddaru\" weithio'n iawn ar systemau Mandrakelinux\n"
+"Dylai defnyddio \"Diweddaru\" weithio'n iawn ar systemau Mandrivalinux\n"
 "sy'n rhedeg systemau \"8.1\" neu'n ddiweddarach. Nid yw uwchraddio\n"
-"fersiynau cyn Mandrakelinux \"8.1\" yn cael ei gymeradwyo."
+"fersiynau cyn Mandrivalinux \"8.1\" yn cael ei gymeradwyo."
 
 #: help.pm:591
 #, c-format
@@ -5128,7 +5128,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5169,7 +5169,7 @@ msgstr ""
 "Ynghylch cefnogaeth UTF-8 (unicode): Amgodiad nod newydd yw Unicode\n"
 "sydd i gynnwys pob iaith. Er hynny, mae cefnogaeth i bob iaith o fewn\n"
 "GNU/Linux yn dal yn cael ei ddatblygu Oherwydd hynn mae defnydd\n"
-"Mandrakelinux o UTF-8 yn ddibynnol ar ddewis y defnyddiwr:\n"
+"Mandrivalinux o UTF-8 yn ddibynnol ar ddewis y defnyddiwr:\n"
 "\n"
 " * Os ydych yn dewis iaith gyda hen amgodiad cryf (ieithoedd lladin1\n"
 "Rwsieg, Siapanëeg, Tsieinëeg, Corëeg, Thai, Groeg, Twrceg, y rhan\n"
@@ -5420,7 +5420,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5441,7 +5441,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Yma byddwn yn dewis system argraffu i'ch cyfrifiadur ei ddefnyddio. Efallai\n"
@@ -5590,7 +5590,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5607,7 +5607,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5656,7 +5656,7 @@ msgstr ""
 " \n"
 " * \"%s\": os ydych am ffurfweddu eich mynediad i'r Rhyngrwyd neu\n"
 "eich rhwydwaith lleol, mae modd gwneud hynny. Darllenwch y deunydd\n"
-"ysgrifenedig neu ddefnyddio Canolfan Reoli Mandrakelinux wedi i'r gosod\n"
+"ysgrifenedig neu ddefnyddio Canolfan Reoli Mandrivalinux wedi i'r gosod\n"
 "orffen i fanteisio ar gymorth ar-lein llawn.\n"
 "\n"
 " * \"%s\": os ydych am ffurfweddu cyfeiriadau dirprwyol HTTP ac FTP os\n"
@@ -5673,7 +5673,7 @@ msgstr ""
 " * \"%s\": os hoffech newid ffurfweddiad eich cychwynnwr\n"
 "cliciwch y botwm yma. Ar gyfer defnyddwyr profiadol. Darllenwch y\n"
 "deunydd ysgrifenedig  neu'r cymorth ar-lein am ffurfweddiad\n"
-"cychwynwyr yng Nghanolfan Rheoli Mandrakelinux.\n"
+"cychwynwyr yng Nghanolfan Rheoli Mandrivalinux.\n"
 "\n"
 " *\"%s\": yma bydd modd i chi wneud man newidiadau i'r\n"
 "gwasanaethau sy'n cael eu rhedeg ar eich cyfrifiadur. Os ydych yn\n"
@@ -5735,11 +5735,11 @@ msgstr "Gwasanaethau"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Dewiswch y ddisg galed rydych am ei ddileu er mwy n gosod eich rhaniad\n"
-"Mandrakelinux newydd. Byddwch ofalus, bydd yr holl ddata sydd arno'n\n"
+"Mandrivalinux newydd. Byddwch ofalus, bydd yr holl ddata sydd arno'n\n"
 "cael ei ddileu ac ni fydd modd ei adfer!"
 
 #: help.pm:863
@@ -6091,11 +6091,11 @@ msgstr "Cyfrifo maint rhaniad Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Mae eich rhaniad Windows yn rhy ysgyriog, rhedwch \"defrag\" yn gyntaf o dan "
-"Windows ac yna ailgychwyn gosodi Mandrakelinux."
+"Windows ac yna ailgychwyn gosodi Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6209,19 +6209,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6243,7 +6243,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6251,14 +6251,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6268,7 +6268,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6288,10 +6288,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6302,11 +6302,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6322,25 +6322,25 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Cyflwyniad\n"
 "\n"
 "Bydd y system weithredu a'r cydrannau gwahanol sydd o fewn dosbarthiad "
-"Mandrakelinux yn\n"
+"Mandrivalinux yn\n"
 "cael eu galw yn \"Gynnyrch Meddalwedd\" o hyn ymlaen. Mae'r Cynnyrch "
 "Meddalwedd yn\n"
 "cynnwys, ond heb eu cyfyngu, i'r  casgliad o raglenni , dulliau, rheolau a "
 "dogfennau mewn\n"
 "perthynas â'r system weithredu a chydrannau gwahanol ddosbarthiad "
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 "\n"
 "1. Cytundeb Trwyddedu\n"
 "\n"
 "Darllenwch y ddogfen hon yn ofalus. Mae'r ddogfen hon yn gytundeb trwyddedu "
 "rhyngoch\n"
-"chi â Mandrakesoft S.A,. sy'n berthnasol i'r Cynnyrch Meddalwedd.\n"
+"chi â Mandriva S.A,. sy'n berthnasol i'r Cynnyrch Meddalwedd.\n"
 "\n"
 "Wrth osod, dyblygu neu ddefnyddio'r Cynnyrch Meddalwedd mewn unrhyw fodd, "
 "rydych yn\n"
@@ -6365,7 +6365,7 @@ msgstr ""
 "\"fel ag y maent\",\n"
 "heb ddim gwarant,\n"
 "hyd y mae'r gyfraith yn caniatáu.\n"
-"Ni fydd Mandrakesoft S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd ag "
+"Ni fydd Mandriva S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd ag "
 "y bydd y gyfraith yn\n"
 "caniatáu,  am unrhyw iawn o gwbl,\n"
 "arbennig, damweiniol, uniongyrchol neu anuniongyrchol (gan gynnwys heb "
@@ -6374,14 +6374,14 @@ msgstr ""
 "chosb o ganlyniad i achos llys,\n"
 "neu unrhyw golled o ganlyniad) yn codi o'r defnydd neu'r anallu i "
 "ddefnyddio'r Cynnyrch Meddalwedd,\n"
-"hyd yn oed os yw Mandrakesoft wedi eu cynghori o'r posibilrwydd o'r fath "
+"hyd yn oed os yw Mandriva wedi eu cynghori o'r posibilrwydd o'r fath "
 "iawn.\n"
 "\n"
 "CYFRIFOLDEB CYFYNGEDIG YN GYSYLLTIEDIG GYDA'R MEDDIANT NEU'R DEFNYDD O "
 "FEDDALWEDD\n"
 " GWAHARDDEDIG MEWN RHAI GWLEDYDD\n"
 "\n"
-"Ni fydd Mandrakesoft S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd y "
+"Ni fydd Mandriva S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd y "
 "bydd y gyfraith yn caniatáu,\n"
 "i fod yn atebol am unrhyw iawn o gwbl, arbennig, damweiniol, uniongyrchol "
 "neu anuniongyrchol (gan gynnwys\n"
@@ -6389,7 +6389,7 @@ msgstr ""
 "costau cyfreithiol, a chosb o ganlyniad\n"
 "i achos llys, neu unrhyw golled o ganlyniad) yn codi o lwytho i lawr "
 "cydrannau meddalwedd o un o safleoedd\n"
-" Mandrakelinux, sydd wedi eu gwahardd neu eu hatal mewn rhai gwledydd gan "
+" Mandrivalinux, sydd wedi eu gwahardd neu eu hatal mewn rhai gwledydd gan "
 "gyfreithiau lleol. Mae'r\n"
 "cyfrifoldeb cyfyngedig hwn yn perthyn i , ond heb ei gyfyngu i'r, cydrannau "
 "cryptograffiaeth cryf sy'n cael\n"
@@ -6409,10 +6409,10 @@ msgstr ""
 " ailddosbarthu'r cydrannau maent yn eu cynnwys. Darllenwch delerau ac amodau "
 "trwydded pob cydran cyn\n"
 "eu defnyddio. Dylai pob cwestiwn am drwydded cydran gael ei ofyn i awdur y "
-"gydran ac nid i Mandrakesoft.\n"
-"Mae'r rhaglenni a ddatblygwyd gan Mandrakesoft yn cael eu llywodraethu o dan "
+"gydran ac nid i Mandriva.\n"
+"Mae'r rhaglenni a ddatblygwyd gan Mandriva yn cael eu llywodraethu o dan "
 "Drwydded GLP. Mae'r dogfennau\n"
-" ysgrifennwyd gan Mandrakesoft S.A. yn cael eu llywodraethu gan drwydded "
+" ysgrifennwyd gan Mandriva S.A. yn cael eu llywodraethu gan drwydded "
 "benodol. Darllenwch y dogfennau\n"
 "am fwy o fanylion.\n"
 "\n"
@@ -6422,12 +6422,12 @@ msgstr ""
 "Mae pob hawl cydrannau'r Cynnyrch Meddalwedd yn perthyn i'w hawduron "
 "perthnasol ac wedi eu hamddiffyn\n"
 "gan gyfreithiau eiddo deallusol a hawlfraint sy'n berthnasol i raglenni "
-"meddalwedd. Mae Mandrakesoft yn cadw\n"
+"meddalwedd. Mae Mandriva yn cadw\n"
 "ei hawl i newid neu addasu ei Gynnyrch Meddalwedd, yn rhannol neu yn gyfan, "
 "drwy unrhyw ddull ac ar gyfer\n"
 "unrhyw bwrpas.\n"
-"Mae \"Mandrake\", \"Mandrakelinux\"  a'r logos cysylltiedig yn nodau "
-"masnachol sy'n perthyn i Mandrakesoft S.A.\n"
+"Mae \"Mandriva\", \"Mandrivalinux\"  a'r logos cysylltiedig yn nodau "
+"masnachol sy'n perthyn i Mandriva S.A.\n"
 "\n"
 "\n"
 "5. Cyfreithiau Llywodraethol\n"
@@ -6442,7 +6442,7 @@ msgstr ""
 "bydd pob anghytundeb ar amodau'r drwydded yn cael eu datrys y tu allan i'r "
 "llys. Fel cam olaf, bydd yr anghytundeb yn cael ei drosglwyddo i'r Llysoedd "
 "Barn, Paris - Ffrainc. Am unrhyw gwestiwn ynghylch y ddogfen hon cysylltwch "
-"â Mandrakesoft S.A.  \n"
+"â Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6533,7 +6533,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6541,14 +6541,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Llongyfarchiadau, mae'r gosod wedi ei gwblhau.\n"
 "Tynnwch y cyfrwng cychwyn a chlicio Ailgychwyn.\n"
 "\n"
 "\n"
 "Am wybodaeth am gywiriadau sydd ar gael ar gyfer y rhyddhad hwn o "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "cysylltwch â'r atodiad, sydd i'w gael yn:\n"
 "\n"
 "\n"
@@ -6556,7 +6556,7 @@ msgstr ""
 "\n"
 "\n"
 "Mae gwybodaeth ar ffurfweddu eich system ar gael ym mhenawdau ôl osod\n"
-"yr Official Mandrakelinux User's Guide."
+"yr Official Mandrivalinux User's Guide."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6591,12 +6591,12 @@ msgstr "Cychwyn cam '%s\"\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Mae eich system yn brin o adnoddau. Efallai y cewch anawsterau wrth osod\n"
-"Mandrakelinux. Os bydd hynny'n digwydd, gallwch geisio gwneud gosodiad\n"
+"Mandrivalinux. Os bydd hynny'n digwydd, gallwch geisio gwneud gosodiad\n"
 "testunol. I wneud hynny, gwasgwch F1 wrth gychwyn ar y CD-ROM ac yna rhoi "
 "'text'."
 
@@ -6820,7 +6820,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 "Mae gennych y dewis i gopîo cynnwys y CD ar i'r disg caled cyn gosod "
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "Bydd yna'n parhau o'r disg caled a bydd y pecynnau ar gael unwaith i'r "
 "system gael ei osod yn gyflawn."
 
@@ -7136,8 +7136,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "Cysylltu â safle Mandrakelinux i estyn rhestr o'r drychau sydd ar gael"
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
+msgstr "Cysylltu â safle Mandrivalinux i estyn rhestr o'r drychau sydd ar gael"
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7360,8 +7360,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Gosodiad %s Mandrakelinux"
+msgid "Mandrivalinux Installation %s"
+msgstr "Gosodiad %s Mandrivalinux"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9951,14 +9951,14 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "ffurfweddiadur drakfirewall\n"
 "\n"
 "Mae hwn yn ffurfweddu mur gwarchod personol ar gyfer y peiriant \n"
-"Mandrakelinux hwn. Am fur gwarchod pwrpasol pwerus, \n"
+"Mandrivalinux hwn. Am fur gwarchod pwrpasol pwerus, \n"
 "edrychwch ddosbarthiad arbenigol MandrakeSecurity Firewall."
 
 #: network/drakfirewall.pm:164
@@ -14029,11 +14029,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"Rhedwch Scannerdrake (Caledwedd/Sganiwr yng Nghanolfan Rheoli Mandrakelinux) "
+"Rhedwch Scannerdrake (Caledwedd/Sganiwr yng Nghanolfan Rheoli Mandrivalinux) "
 "i rannu eich sganiwr ar y rhwydwaith.\n"
 "\n"
 
@@ -15972,33 +15972,33 @@ msgstr "Aros"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Beth yw Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Beth yw Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Croeso i <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Croeso i <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mae Mandrakelinux yn <b>ddosbarthiad Linux</b> sy'n cynnwys y system graidd, "
+"Mae Mandrivalinux yn <b>ddosbarthiad Linux</b> sy'n cynnwys y system graidd, "
 "sef, <b>system weithredu</b> (yn seiliedig ar gnewyllyn Linux) ynghyd â <b> "
 "llawer o raglenni</b> sy'n darparu ar gyfer pob angen."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux yw'r dosbarthiad Linux mwyaf <b>cyfeillgar</b> heddiw. Mae'n "
+"Mandrivalinux yw'r dosbarthiad Linux mwyaf <b>cyfeillgar</b> heddiw. Mae'n "
 "un o'r dosbarthiadau mwyaf <b>poblogaidd</b> o Linux ar draws y byd i gyd!"
 
 #: share/advertising/02.pl:13
@@ -16014,15 +16014,15 @@ msgstr "Croeso i <b>fyd Cod Agored</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mae Mandrakelinux yn ymroddedig i fodel cod agored. Mae'n golygu fod y "
+"Mae Mandrivalinux yn ymroddedig i fodel cod agored. Mae'n golygu fod y "
 "rhyddhad newydd yn ganlyniad <b>cydweithrediad</b> rhwng <b>tîm o "
-"ddatblygwyr Mandrakesoft</b> a <b>chyfranwyr cymuned byd eang</b> cyfranwyr "
-"Mandrakelinux."
+"ddatblygwyr Mandriva</b> a <b>chyfranwyr cymuned byd eang</b> cyfranwyr "
+"Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16042,10 +16042,10 @@ msgstr "<b>Y drwydded GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "Mae'r rhan fwyaf o'r feddalwedd sydd wedi ei gynnwys ynghyd â holl offer "
-"Mandrakelinux wedi eu trwyddedu o dan y <b>Drwydded Gyhoeddus Cyffredinol "
+"Mandrivalinux wedi eu trwyddedu o dan y <b>Drwydded Gyhoeddus Cyffredinol "
 "(GPL)</b>"
 
 #: share/advertising/03.pl:17
@@ -16076,15 +16076,15 @@ msgstr "<b>Ymunwch â chymuned</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mae gan Mandrakelinux un o'r <b>cymunedau mwyaf</b> o ddefnyddwyr a "
+"Mae gan Mandrivalinux un o'r <b>cymunedau mwyaf</b> o ddefnyddwyr a "
 "datblygwyr. Mae rôl y gymuned yn eang iawn yn ymestyn o adrodd ar wallau i "
 "ddatblygu rhaglenni newydd. Mae'r gymuned yn chwarae <b>rhan allweddol</b> "
-"ym myd Mandrakelinux."
+"ym myd Mandrivalinux."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16105,11 +16105,11 @@ msgstr "<b>Fersiwn Llwytho</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Rydych yn gosod <b> Mandrakelinux Llwytho i Lawr</b>. Hwn yw'r fersiwn rhydd "
-"mae Mandrakesoft am ei ddarparu <b>ar gael i bawb</b>."
+"Rydych yn gosod <b> Mandrivalinux Llwytho i Lawr</b>. Hwn yw'r fersiwn rhydd "
+"mae Mandriva am ei ddarparu <b>ar gael i bawb</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16139,10 +16139,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Ni fydd gennych fynediad i'r <b>gwasanaethau ynglwm</b> yn y cynnyrch "
-"Mandrakesoft eraill ychwaith."
+"Mandriva eraill ychwaith."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16151,7 +16151,7 @@ msgstr "<b>Discovery, Eich Bwrdd Gwaith Linux Cyntaf</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr "Rydych yn gosod <b>Mandrake Discovery</b>"
 
 #: share/advertising/06.pl:17
@@ -16174,17 +16174,17 @@ msgstr "<b>PowerPack, Y Bwrdd Gwaith Linux Gorau</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Rydych yn gosod <b>Mandrakelinux PowerPack</b>"
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Rydych yn gosod <b>Mandrivalinux PowerPack</b>"
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack yw <b>prif gynnyrch bwrdd gwaith Linux</b> Mandrakesoft. Mae "
+"PowerPack yw <b>prif gynnyrch bwrdd gwaith Linux</b> Mandriva. Mae "
 "PowerPack yn cynnwys <b>miloedd o raglenni</b> - popeth o'r mwyaf poblogaidd "
 "i'r mwyaf technegol."
 
@@ -16195,8 +16195,8 @@ msgstr "<b>PowerPack+, Ateb Linux ar gyfer Byrddau gwaith a Gweinyddion</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Rydych yn gosod <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Rydych yn gosod <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16212,22 +16212,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Cynnyrch Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Cynnyrch Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"Mae <b>Mandrakesoft</b> wedi datblygu ystod eang o gynnyrch "
-"<b>Mandrakelinux</b>."
+"Mae <b>Mandriva</b> wedi datblygu ystod eang o gynnyrch "
+"<b>Mandrivalinux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Cynnyrch Mandrakelinux yw:"
+msgid "The Mandrivalinux products are:"
+msgstr "Cynnyrch Mandrivalinux yw:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16248,73 +16248,73 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux ar gyfer x86-64</b>, Ateb Mandrakelinux i wneud y gorau "
+"\t* <b>Mandrivalinux ar gyfer x86-64</b>, Ateb Mandrivalinux i wneud y gorau "
 "o'ch prosesydd 64-did."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Cynnyrch Mandrakesoft (Cynnyrch Nomad)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Cynnyrch Mandriva (Cynnyrch Nomad)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mae Mandrakelinux wedi datblygu dau gynnyrch sy'n caniatáu i chi ddefnyddio "
-"Mandrakelinux <b>ar unrhyw gyfrifiadur</b> heb fod angen ei osod:"
+"Mae Mandrivalinux wedi datblygu dau gynnyrch sy'n caniatáu i chi ddefnyddio "
+"Mandrivalinux <b>ar unrhyw gyfrifiadur</b> heb fod angen ei osod:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, dosbarthiad Mandrakelinux sy'n rhedeg yn llwyr o CD-ROM byw."
+"\t* <b>Move</b>, dosbarthiad Mandrivalinux sy'n rhedeg yn llwyr o CD-ROM byw."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, dosbarthiad Mandrakelinux sydd wedi ei osod yn "
+"\t* <b>GlobeTrotter</b>, dosbarthiad Mandrivalinux sydd wedi ei osod yn "
 "barod ar “LaCie Mobile Hard Drive” bychan iawn"
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Cynnyrch Mandrakesoft (Atebion Proffesiynol)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Cynnyrch Mandriva (Atebion Proffesiynol)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Isod mae cynnyrch Mandrakesoft sydd wedi eu cynllunio i ateb <b>anghenion "
+"Isod mae cynnyrch Mandriva sydd wedi eu cynllunio i ateb <b>anghenion "
 "proffesiynol</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
-"\t* <b>Y Bwrdd Gwaith Corfforaethol</b>, Bwrdd Gwaith Mandrakelinux ar gyfer "
+"\t* <b>Y Bwrdd Gwaith Corfforaethol</b>, Bwrdd Gwaith Mandrivalinux ar gyfer "
 "Busnesau."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Y Gweinydd Corfforaethol</b>, Ateb Gweinydd Mandrakelinux."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Y Gweinydd Corfforaethol</b>, Ateb Gweinydd Mandrivalinux."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>Mur Cadarn Aml-Rhwydwaith</b>, Ateb Diogelwch Mandrakelinux."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>Mur Cadarn Aml-Rhwydwaith</b>, Ateb Diogelwch Mandrivalinux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16358,10 +16358,10 @@ msgstr "<b>Dewiswch eich Hoff Amgylchedd Bwrdd Gwaith</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Gyda PowerPack, bydd gennych y dewis o <b>amgylchedd bwrdd gwaith graffigol</"
-"b>. Mae Mandrakesoft wedi dewis <b>KDE</b> fel yr un rhagosodedig."
+"b>. Mae Mandriva wedi dewis <b>KDE</b> fel yr un rhagosodedig."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16385,10 +16385,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Gyda PowerPack+, mae gennych y dewis o <b>amgylcheddau bwrdd gwaith "
-"graffigol</b>. Mae Mandrakesoft wedi dewis <b>KDE</b> fel y rhagosodedig."
+"graffigol</b>. Mae Mandriva wedi dewis <b>KDE</b> fel y rhagosodedig."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16513,10 +16513,10 @@ msgstr "<b>Mwynhau'r Ystod Eang o Raglenni</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Yn newislen Mandrakelinux byddwch yn canfod rhaglenni <b>hawdd eu defnyddio</"
+"Yn newislen Mandrivalinux byddwch yn canfod rhaglenni <b>hawdd eu defnyddio</"
 "b> ar gyfer <b>eich holl waith</b>:"
 
 #: share/advertising/18.pl:16
@@ -16781,18 +16781,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Canolfan Rheoli Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Canolfan Rheoli Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"Mae <b>Canolfan Reoli Mandrakelinux</b> yn gasgliad hanfodol o wasanaethau "
-"ar gyfer Mandrakelinux swydd wedi eu cynllunio i symlhau ffurfweddiad eich "
+"Mae <b>Canolfan Reoli Mandrivalinux</b> yn gasgliad hanfodol o wasanaethau "
+"ar gyfer Mandrivalinux swydd wedi eu cynllunio i symlhau ffurfweddiad eich "
 "cyfrifiadur."
 
 #: share/advertising/25.pl:17
@@ -16817,16 +16817,16 @@ msgstr "<b>Y Model Cod Agored</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Fel pob rhaglenni cyfrifiadurol, mae meddalwedd cod agored <b>yn golygu "
 "amser a phobl</b> ar gyfer datblygiad. Er mwyn parchu athroniaeth cod "
-"agored, mae Mandrakesoft yn gwerthu cynnyrch gwerth ychwanegol a "
-"gwasanaethau i <b>barhau i wella Mandrakelinux</b>. Os hoffech chi "
-"<b>gefnogi athroniaeth cod agored</b> a datblygiad Mandrakelinux, <b>os "
+"agored, mae Mandriva yn gwerthu cynnyrch gwerth ychwanegol a "
+"gwasanaethau i <b>barhau i wella Mandrivalinux</b>. Os hoffech chi "
+"<b>gefnogi athroniaeth cod agored</b> a datblygiad Mandrivalinux, <b>os "
 "gwelwch chi'n dda</b> ystyriwch brynu ein cynnyrch neu ein gwasanaethau!"
 
 #: share/advertising/27.pl:13
@@ -16837,10 +16837,10 @@ msgstr "<b>Siop Ar-lein</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"I ddysgu rhagor am gynnyrch a gwasanaethau Mandrakesoft, ewch i'n "
+"I ddysgu rhagor am gynnyrch a gwasanaethau Mandriva, ewch i'n "
 "<b>platfform e-fasnachu</b>."
 
 #: share/advertising/27.pl:17
@@ -16865,24 +16865,24 @@ msgstr "Ewch i <b> store.mandrakesoft.com</b> heddiw."
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> yw'r <b>cydymaith perffaith</b> ar gyfer eich cynnyrch "
-"Mandrakelinux..."
+"<b>Mandriva Club</b> yw'r <b>cydymaith perffaith</b> ar gyfer eich cynnyrch "
+"Mandrivalinux..."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Cewch fanteisio ar <b>freintiau gwerthfawr</b> drwy ymuno â Mandrakeclub, e."
+"Cewch fanteisio ar <b>freintiau gwerthfawr</b> drwy ymuno â Mandriva Club, e."
 "e:"
 
 #: share/advertising/28.pl:20
@@ -16904,40 +16904,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Cymryd rhan mewn <b>fforymau defnyddwyr</b> Mandrakelinux."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Cymryd rhan mewn <b>fforymau defnyddwyr</b> Mandrivalinux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Mynediad cynnar a breintiol</b>, cyn eu rhyddhau'n gyhoeddus, i "
-"<b>ddelweddau ISO</b> Mandrakelinux."
+"<b>ddelweddau ISO</b> Mandrivalinux."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> yw'r gwasanaeth newydd gwerthfawr mae Mandrakesoft yn "
+"<b>Mandriva Online</b> yw'r gwasanaeth newydd gwerthfawr mae Mandriva yn "
 "ei gynnig i 'w gwsmeriaid!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mae Mandrakeonline yn darparu ystod eang o wasanaethau gwerthfawr ar gyfer "
-"<b>diweddaru'n hawdd</b> eich systemau your Mandrakelinux:"
+"Mae Mandriva Online yn darparu ystod eang o wasanaethau gwerthfawr ar gyfer "
+"<b>diweddaru'n hawdd</b> eich systemau your Mandrivalinux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16963,39 +16963,39 @@ msgstr "\t* Hyblyg <b>amserlen</b> diweddariadau."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
-msgstr "\t* Rheolaeth o'ch <b>holl systemau Mandrakelinux</b> gydag un cyfrif."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+msgstr "\t* Rheolaeth o'ch <b>holl systemau Mandrivalinux</b> gydag un cyfrif."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Ydych chi angen <b>cymorth?</b> Mae arbenigwyr technegol Mandrakesoft i'w "
+"Ydych chi angen <b>cymorth?</b> Mae arbenigwyr technegol Mandriva i'w "
 "cael ar  <b>ein platfform cefnogaeth dechnegol </b> www.mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Drwy gymorth <b>arbenigwyr cymwysedig Mandrakelinux</b>, byddwch yn abed "
+"Drwy gymorth <b>arbenigwyr cymwysedig Mandrivalinux</b>, byddwch yn abed "
 "llawer o amser."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Am unrhyw gwestiwn am Mandrakelinux, mae gennych y gallu i brynu cefnogaeth "
+"Am unrhyw gwestiwn am Mandrivalinux, mae gennych y gallu i brynu cefnogaeth "
 "ar gyfer unrhyw ddigwyddiad o <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17295,8 +17295,8 @@ msgstr "Offer monitro, cyfrifo prosesau, tcpdunp, nmap..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Dewiniaid Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Dewiniaid Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17392,8 +17392,8 @@ msgstr ""
 "\n"
 "DEWISIADAU:\n"
 "  --help            - argraffu'r neges cymorth.\n"
-"  --report          - dylai'r rhaglen fod yn un o offer Mandrakelinux\n"
-"  --incident        - ylai'r rhaglen fod yn un o offer Mandrakelinux"
+"  --report          - dylai'r rhaglen fod yn un o offer Mandrivalinux\n"
+"  --incident        - ylai'r rhaglen fod yn un o offer Mandrivalinux"
 
 #: standalone.pm:63
 #, c-format
@@ -17447,7 +17447,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17460,7 +17460,7 @@ msgid ""
 "--delclient      : delete a client machine from MTS (requires MAC address, "
 "IP, nbi image name)"
 msgstr ""
-"Ffurfweddwr Gweinydd Terfynell Mandrakelinux\n"
+"Ffurfweddwr Gweinydd Terfynell Mandrivalinux\n"
 "--enable         : galluogi MTS\n"
 "--disable        : analluogi MTS\n"
 "--start          : cychwyn MTS\n"
@@ -17517,7 +17517,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17525,7 +17525,7 @@ msgid ""
 msgstr ""
 "[DEWIS]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -20302,13 +20302,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Offeryn Cofnodi Gwall Mandrakelinux"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Offeryn Cofnodi Gwall Mandrivalinux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Canolfan Rheoli Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Canolfan Rheoli Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20328,8 +20328,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20373,8 +20373,8 @@ msgstr "Dewin Ffurfweddu"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Dewis Offeryn Mandrakesoft:"
+msgid "Select Mandriva Tool:"
+msgstr "Dewis Offeryn Mandriva:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20800,7 +20800,7 @@ msgstr "Cychwyn y peiriant"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Nid yw'r rhag wyneb hwn wedi ei ffurfweddu eto.\n"
 "Cychwynnwch y cynorthwyydd \"Ychwanegu rhyngwyneb\" o' Ganolfan Rheoli "
@@ -20810,7 +20810,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Nid oes gennych gyswllt wedi ei ffurfweddu â'r Rhyngrwyd.\n"
 "Cychwynnwch gynorthwy-ydd \"%s\" o Ganolfan Rheoli Mandrake"
@@ -20863,8 +20863,8 @@ msgstr "KDM (rheolwr arddangos KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (rheolwr arddangos Mandrakelinux)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (rheolwr arddangos Mandrivalinux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21163,7 +21163,7 @@ msgstr "Mewnforio"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21172,7 +21172,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Hawlfraint (C) 2001-2002  Mandrakesoft \n"
+"Hawlfraint (C) 2001-2002  Mandriva \n"
 "\n"
 "\n"
 "        DUPONT Sebastien sdupont (fersiwn wreiddiol)\n"
@@ -21718,14 +21718,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Hawlfraint (C) 2003-2004 Mandrakesoft.\n"
+"Hawlfraint (C) 2003-2004 Mandriva.\n"
 "Mae hwn yn feddalwedd rhydd ac mae modd ei ailddosbarthu o dan amodau GNU "
 "GPL.\n"
 "\n"
@@ -21755,8 +21755,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Canolfan Gymorth Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Canolfan Gymorth Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25281,8 +25281,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Cofnodion Offer Mandrakelinux"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Cofnodion Offer Mandrivalinux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25796,10 +25796,10 @@ msgstr "Cysylltiad wedi ei gwblhau"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Methodd y cysylltiad.\n"
-"Gwiriwch eich ffurfweddiad yng Nghanolfan Rheoli Mandrakelinux."
+"Gwiriwch eich ffurfweddiad yng Nghanolfan Rheoli Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26684,8 +26684,8 @@ msgstr "Methodd y gosod"
 #~ msgstr "Cadw a chau"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Dewiniaid Mandrakesoft"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Dewiniaid Mandriva"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Dim porwr ar gael! Gosodwch un"
diff --git a/perl-install/share/po/da.po b/perl-install/share/po/da.po
index dac367d81..576243bfc 100644
--- a/perl-install/share/po/da.po
+++ b/perl-install/share/po/da.po
@@ -69,7 +69,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "USB-nøglen ser ud til at have skrivebeskyttelse aktiveret, men vi kan ikke\n"
 "tage den ud på en sikker måde nu.\n"
@@ -77,7 +77,7 @@ msgstr ""
 "\n"
 "Klik på knappen for at genstarte maskinen, tag den ud, fjern "
 "skrivebeskyttelsen,\n"
-"sæt nøglen ind igen, og start Mandrake Move igen."
+"sæt nøglen ind igen, og start Mandriva Move igen."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -95,7 +95,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Din USB-nøgle har ikke nogen gyldige Windows FAT partitioner.\n"
@@ -107,14 +107,14 @@ msgstr ""
 "\n"
 "\n"
 "Du kan også fortsætte uden en USB-nøgle - du vil så stadig\n"
-"kunne bruge Mandrake Move som et normalt levende Mandrake \n"
+"kunne bruge Mandriva Move som et normalt levende Mandrake \n"
 "operativsystem."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -122,11 +122,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Vi fandt ikke nogen USB-nøgle på dit system. Hvis du\n"
-"indsætter en USB-nøgle nu, vil Mandrake Move have mulighed\n"
+"indsætter en USB-nøgle nu, vil Mandriva Move have mulighed\n"
 "for automatisk at gemme dataene fra dit hjemmekatalog og systemets\n"
 "konfiguration, for den næste opstart af denne eller en anden maskine.\n"
 "Bemærk: Hvis du indsætter en nøgle nu skal du vente nogen sekunder\n"
@@ -134,7 +134,7 @@ msgstr ""
 "\n"
 "\n"
 "Du kan også fortsætte uden en USB-nøgle - du vil så stadig\n"
-"kunne bruge Mandrake Move som et normalt levende Mandrake \n"
+"kunne bruge Mandriva Move som et normalt levende Mandrake \n"
 "operativsystem."
 
 #: ../move/move.pm:494
@@ -261,7 +261,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -277,7 +277,7 @@ msgstr ""
 "\n"
 "Dette kan komme fra beskadigede konfigurationsfiler\n"
 "på USB-nøglen, hvis det er tilfældet vil fjernelse af filerne og dernæst\n"
-"genstarte Mandrake Move ordne problemet. Klik på den\n"
+"genstarte Mandriva Move ordne problemet. Klik på den\n"
 "tilsvarende knap for at gøre dette.\n"
 "\n"
 "\n"
@@ -1317,7 +1317,7 @@ msgstr "Sprogvalg"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3736,12 +3736,12 @@ msgstr "aktivér radio-understøttelse"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Før du går videre bør du læse betingelserne i licensen omhyggeligt.  Den "
-"omfatter hele Mandrakelinux distributionen. Hvis du er enig i alle "
+"omfatter hele Mandrivalinux distributionen. Hvis du er enig i alle "
 "betingelserne i den, så klik på '%s'-boksen. Hvis ikke, så vil klikning på "
 "\"%s\"-knappen genstarte din maskine."
 
@@ -3916,13 +3916,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux installationen bliver distribueret på flere cdrom-er. Hvis en "
+"Mandrivalinux installationen bliver distribueret på flere cdrom-er. Hvis en "
 "valgt pakke ligger på en anden cdrom, vil DrakX udskyde den nuværende cd og "
 "bede dig om at isætte den forespurgte cd. Hvis du ikke har den forespurgte "
 "cd ved hånden, så klik bare på '%s' - de tilsvarende pakker vil da ikke "
@@ -3932,11 +3932,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3988,11 +3988,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "Det er nu tid til at angive hvilke pakker du vil installere på dit system. "
-"Der er tusindvis af pakker til dit Mandrakelinux system, og for at gøre det "
+"Der er tusindvis af pakker til dit Mandrivalinux system, og for at gøre det "
 "nemmere at håndtere dem er pakkerne blevet placeret i grupper af lignende "
 "programmer.\n"
 "\n"
-"Mandrakelinux opdeler pakkegrupper i fire kategorier. Du kan vælge og vrage "
+"Mandrivalinux opdeler pakkegrupper i fire kategorier. Du kan vælge og vrage "
 "programmer fra de forskellige grupper, så en installation af "
 "'Arbejdsstation' kan også have programmer fra 'Udvikling'-kategorien "
 "installeret.\n"
@@ -4098,10 +4098,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4132,7 +4132,7 @@ msgstr ""
 "!! Når en server-pakke er blevet valgt, enten fordi du specielt valgte den "
 "individuelle pakke, eller fordi den var en del af en gruppe af pakker, vil "
 "du blive spurgt om at bekræfte at du virkelig ønsker at installere disse "
-"servere. Som standard under Mandrakelinux bliver installerede servere "
+"servere. Som standard under Mandrivalinux bliver installerede servere "
 "startet op ved opstart af maskinen. Selvom de er sikre og ikke har nogen "
 "kendte problemer på udgivelsestidspunktet for distributionen, er det absolut "
 "muligt at sikkerhedshuller blev opdaget efter at denne version af Mandrake "
@@ -4283,7 +4283,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4339,7 +4339,7 @@ msgid ""
 msgstr ""
 "X (for X Window System) er hjertet af GNU/Linux' grafiske grænseflade som "
 "alle de grafiske miljøer (KDE, GNOME, AfterStep, WindowMaker, mv.) der "
-"kommer sammen med Mandrakelinux afhænger af.\n"
+"kommer sammen med Mandrivalinux afhænger af.\n"
 "\n"
 "Du vil se en liste med forskellige parametre der kan ændres for at få den "
 "bedst mulige grafiske fremvisning:\n"
@@ -4455,12 +4455,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4487,7 +4487,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4496,7 +4496,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4516,11 +4516,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 ""
-"Nu skal du vælge hvor på din harddisk du vil installere dit Mandrakelinux-"
+"Nu skal du vælge hvor på din harddisk du vil installere dit Mandrivalinux-"
 "operativsystem. Hvis disken er tom eller et eksisterende operativsystem "
 "bruger alt pladsen på den, bliver du nødt til at partitionere drevet. "
 "Partitionering vil sige at diskdrevet opdeles i logiske dele for at lave den "
-"plads der behøves til at installere dit nye Mandrakelinux-system.\n"
+"plads der behøves til at installere dit nye Mandrivalinux-system.\n"
 "\n"
 "Da partitioneringen af en disk normalt ikke kan fortrydes og kan føre til "
 "tab af data, kan det godt være frustrerende og stressende for uøvede "
@@ -4546,7 +4546,7 @@ msgstr ""
 "Windows-FAT- eller NTFS-partition. Størrelsesændringen kan fortages uden tab "
 "af data, hvis du i forvejen har defragmenteret Windows-partitionen. Det "
 "anbefales på det kraftigste at du laver en sikkerhedskopi først. Denne "
-"mulighed anbefales hvis du vil bruge både Mandrakelinux og Microsoft Windows "
+"mulighed anbefales hvis du vil bruge både Mandrivalinux og Microsoft Windows "
 "på samme maskine.\n"
 "\n"
 "  Før du vælger denne løsning, bør du forstå at størrelsen på din Microsoft "
@@ -4555,7 +4555,7 @@ msgstr ""
 "nyt programmel.\n"
 "\n"
 " * '%s': Hvis du vil slette alle data på alle partitioner på denne disk og "
-"erstatte dem med dit nye Mandrakelinux-system, kan du vælge denne mulighed. "
+"erstatte dem med dit nye Mandrivalinux-system, kan du vælge denne mulighed. "
 "Vær forsigtig, for du vil ikke være i stand til at fortryde denne handling "
 "efter at du har sagt ja.\n"
 "\n"
@@ -4719,7 +4719,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4740,7 +4740,7 @@ msgstr ""
 "Klik på '%s' når du er klar til at formatere partitionerne.\n"
 "\n"
 "Klik på '%s' hvis du ønsker at vælge andre partitioner til at installere dit "
-"nye Mandrakelinux operativsystem.\n"
+"nye Mandrivalinux operativsystem.\n"
 "\n"
 "Klik på '%s' for at vælge partitioner som du ønsker at tjekke for dårlige "
 "blokke."
@@ -4757,7 +4757,7 @@ msgstr "Forrige"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4769,7 +4769,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"På det tidspunkt hvor du installerer Mandrakelinux er det sandsynligt at "
+"På det tidspunkt hvor du installerer Mandrivalinux er det sandsynligt at "
 "nogen af pakkerne er blevet opdaterede siden den oprindelige udgivelse. Fejl "
 "er måske blevet rettet, og sikkerhedsproblemer måske løst. Det er nu muligt "
 "for dig at hente disse ned fra internettet for at disse opdateringer kan "
@@ -4798,7 +4798,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4812,7 +4812,7 @@ msgstr ""
 "\n"
 "Hvis du ikke véd hvad du skal vælge, så behold den foreslåede mulighed. Du "
 "vil kunne ændre det senere med værktøjet draksec som er en del af "
-"Mandrakelinux Kontrolcentret.\n"
+"Mandrivalinux Kontrolcentret.\n"
 "\n"
 "Udfyld '%s'-feltet med epost-adressen på den person, som er ansvarlig for "
 "sikkerhed. Sikkerhedsmeddelelser vil blive sendt til denne adresse."
@@ -4826,7 +4826,7 @@ msgstr "Sikkerhedsadministrator"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4897,7 +4897,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Nu skal du vælge hvilke partitioner som skal bruges til installering af dit "
-"Mandrakelinux system. Hvis partitionerne allerede er blevet defineret, enten "
+"Mandrivalinux system. Hvis partitionerne allerede er blevet defineret, enten "
 "fra en tidligere installation af GNU/Linux eller med et andet "
 "partitioneringsværktøj, kan du bruge de eksisterende partitioner. Ellers "
 "skal disk-partitionerne defineres først.\n"
@@ -4981,7 +4981,7 @@ msgstr "Skift mellem normal og ekspert-tilstand"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5011,7 +5011,7 @@ msgid ""
 msgstr ""
 "Mere end én Microsoft Windows partition er blevet genkendt på dit diskdrev. "
 "Vælg den som du ønsker at ændre størrelse på for at kunne installere dit nye "
-"Mandrakelinux operativsystem.\n"
+"Mandrivalinux operativsystem.\n"
 "\n"
 "Hver partition er listet som følger: 'Linux navn', 'Windows navn', "
 "'Kapacitet'.\n"
@@ -5058,7 +5058,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5067,19 +5067,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Dette trin bliver kun aktiveret hvis der bliver fundet en eksisterende\n"
 "GNU/Linux partition på din maskine.\n"
 "\n"
 "DrakX skal nu vide om du vil udføre en ny installation eller en opgradering\n"
-"af et eksisterende Mandrakelinux-system.\n"
+"af et eksisterende Mandrivalinux-system.\n"
 "\n"
 " * \"%s\": Dette vil stort sét slette hele det gamle system. Dog kan du "
 "afhængigt af din partitionsopsætning forhindre at nogen af dine ekisterende "
@@ -5088,14 +5088,14 @@ msgstr ""
 "bør du bruge denne mulighed.\n"
 "\n"
 " * \"%s\": Denne installationsklasse lader dig opgradere pakkene som er "
-"installeret på dit nuværende Mandrakelinux-system. Din nuværende "
+"installeret på dit nuværende Mandrivalinux-system. Din nuværende "
 "partitionsopsætning og brugerdata bliver ikke berørt. De fleste andre "
 "konfigurationstrin forbliver tilgængelige, i lighed med en "
 "standardinstallation.\n"
 "\n"
-"\"Opgradér\"-valget bør fungere fint på Mandrakelinux-systemer som kører "
+"\"Opgradér\"-valget bør fungere fint på Mandrivalinux-systemer som kører "
 "version '8.1' eller nyere. Udførelse af Opgradér på versioner tidligere end "
-"Mandrakelinux '8.1' er ikke anbefalet."
+"Mandrivalinux '8.1' er ikke anbefalet."
 
 #: help.pm:591
 #, c-format
@@ -5150,7 +5150,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5190,7 +5190,7 @@ msgstr ""
 "\n"
 "Om UTF-8 (ISO 10646)-understøttelse. ISO 10646 er en ny tegnkodning som er "
 "beregnet til at dække alle eksiterende sprog. Dog er fuld understøttelse for "
-"dette i GNU/Linux stadig under udvikling. Af denne årsag vil Mandrakelinux' "
+"dette i GNU/Linux stadig under udvikling. Af denne årsag vil Mandrivalinux' "
 "brug af UTF-8 afhænge af brugerens valg:\n"
 "\n"
 " * Hvis du vælger et sprog som har en lang tradition for tegnkodning (latin1 "
@@ -5430,7 +5430,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5451,7 +5451,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Nu er det tid til at vælge et udskrivningssystem for din maskine. Andre "
@@ -5478,7 +5478,7 @@ msgstr ""
 "\n"
 "Hvis du laver et valg nu og senere finder ud af at du ikke kan lide dit "
 "udskriftssystem, kan du ændre det ved at køre PrinterDrake fra "
-"Mandrakelinuxs Kontrolcenter, og klikke på '%s'-knappen."
+"Mandrivalinuxs Kontrolcenter, og klikke på '%s'-knappen."
 
 #: help.pm:765
 #, c-format
@@ -5594,7 +5594,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5611,7 +5611,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5659,7 +5659,7 @@ msgstr ""
 "\n"
 " * \"%s\": Hvis du ønsker at konfigurere din adgang til internet eller "
 "lokalnet, kan du gøre dette nu. Kig i den trykte dokumentation eller brug "
-"Mandrakelinux Kontrolcenter efter installationen er afsluttet for at drage "
+"Mandrivalinux Kontrolcenter efter installationen er afsluttet for at drage "
 "nytte af den fulde indbyggede vejledning. \n"
 "\n"
 " * \"%s\": lader dig konfigurere HTTP- og FTP-proxyadresser, hvis maskinen, "
@@ -5676,7 +5676,7 @@ msgstr ""
 " * \"%s\": Hvis du vil ændre på konfigurationen for opstartsindlæseren, så "
 "klik på denne knap. Dette bør forbeholdes avancerede brugere. Kig i den "
 "trykte dokumentation eller i den indbyggede hjælp om konfiguration af "
-"opstartsindlæser i Mandrakelinux Kontrolcenter.\n"
+"opstartsindlæser i Mandrivalinux Kontrolcenter.\n"
 "\n"
 " * \"%s\": her kan du fininstille hvilke tjenester som skal startes på din "
 "maskine. Hvis du skal bruge maskinen som server er det en god idé at "
@@ -5737,10 +5737,10 @@ msgstr "Tjenester"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Vælg det diskdrev som du vil slette for at installere din nye Mandrakelinux "
+"Vælg det diskdrev som du vil slette for at installere din nye Mandrivalinux "
 "partition. Vær forsigtig, alle data som er på denne partition vil gå tabt og "
 "vil ikke kunne genskabes!"
 
@@ -6094,7 +6094,7 @@ msgstr "Beregner størrelsen på Windows-partitionen"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr "Din Windows partition er for fragmenteret, kør 'defrag' først"
 
@@ -6211,19 +6211,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6245,7 +6245,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6253,14 +6253,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6270,7 +6270,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6290,10 +6290,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6304,11 +6304,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6324,21 +6324,21 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Introduktion\n"
 "\n"
-"Operativsystemet og de forskellige komponenter tilgængelige i Mandrakelinux "
+"Operativsystemet og de forskellige komponenter tilgængelige i Mandrivalinux "
 "distributionen vil herefter blive kaldt \"programmelprodukter\". "
 "Programmelprodukterne inkluderer, men er ikke begrænset til: samlingen af "
 "værktøjer, metoder, regler og dokumentation relateret til operativsystemet "
-"og de forskellige komponenter i Mandrakelinux-distributionen.\n"
+"og de forskellige komponenter i Mandrivalinux-distributionen.\n"
 "\n"
 "\n"
 "1. Licensaftale\n"
 "\n"
 "Læs venligst dette dokument omhyggeligt. Dette dokument er en licensaftale "
-"mellem dig og Mandrakesoft S.A., som gælder til disse programmelprodukter. "
+"mellem dig og Mandriva S.A., som gælder til disse programmelprodukter. "
 "Ved at installere, kopiere eller bruge disse programmelprodukter accepterer "
 "du udtrykkeligt og fuldt ud at følge denne licensaftale med dens betingelser "
 "og regler. Hvis du er uenig i nogensomhelst del af denne licens, har du ikke "
@@ -6353,27 +6353,27 @@ msgstr ""
 "2. Begrænset garanti\n"
 "\n"
 "Programmelprodukterne og tilhørende dokumentation leveres \"som de er\", "
-"uden nogen form for garanti, i den udstrækning lov tillader. Mandrakesoft S."
+"uden nogen form for garanti, i den udstrækning lov tillader. Mandriva S."
 "A. vil under ingen omstændigheder efter hvad loven foreskriver være "
 "ansvarlig for specielle, tilfældige, direkte eller indirekte tab af nogen "
 "art (inkluderende uden begrænsninger, skader ved tab af forretning, "
 "forstyrrelser af forretning, finansielle tab, advokatbistand, erstatninger "
 "som resultat af en retssag eller nogen anden form for følgetab) opstået "
 "under brugen eller mangel på samme af disse programmelprodukter, selv hvis "
-"Mandrakesoft S.A. er blevet gjort opmærksom på muligheden for eller "
+"Mandriva S.A. er blevet gjort opmærksom på muligheden for eller "
 "indtræffelsen af sådanne skader.\n"
 "\n"
 "BEGRÆNSET ANSVAR MED HENSYN TIL REGLER OM BESIDDELSE ELLER BRUG AF FORBUDT "
 "PROGRAMMEL I VISSE LANDE\n"
 "\n"
-"I den udstrækning som loven tillader vil Mandrakesoft S.A. eller deres "
+"I den udstrækning som loven tillader vil Mandriva S.A. eller deres "
 "distributører under ingen omstændigheder være ansvarlig for specielle, "
 "tilfældige, direkte eller indirekte tab af nogen art (inklusive uden "
 "begrænsninger skader ved tab af forretning, forstyrrelser af forretning, "
 "finansielle tab, advokatbistand, erstatninger som resultat af en retssag "
 "eller nogen anden form for tab) opstået ved besiddelse eller brug af "
 "programmelkomponenter eller opstået ved hentning af programmelkomponenter "
-"fra et af Mandrakelinux-webstederne som er forbudt eller begrænset i visse "
+"fra et af Mandrivalinux-webstederne som er forbudt eller begrænset i visse "
 "lande ved lokal lov. Dette begrænsede ansvar gælder, men er ikke begrænset "
 "til, de stærke krypteringskomponenter inkluderet i programmelprodukterne.\n"
 "\n"
@@ -6387,9 +6387,9 @@ msgstr ""
 "bruge, kopiere, tilpasse eller videredistribuere komponenterne, de dækker. "
 "Læs venligst vilkårene og betingelserne i licensaftalen for hver komponent "
 "omhyggeligt før du bruger den. Alle spørgsmål angående en komponent bedes "
-"adresseret til komponentens forfatter og ikke til Mandrakesoft. Programmerne "
-"udviklet af Mandrakesoft S.A. bliver reguleret efter GPL-licensen. "
-"Dokumentationen skrevet af Mandrakesoft S.A. bliver reguleret efter en "
+"adresseret til komponentens forfatter og ikke til Mandriva. Programmerne "
+"udviklet af Mandriva S.A. bliver reguleret efter GPL-licensen. "
+"Dokumentationen skrevet af Mandriva S.A. bliver reguleret efter en "
 "specifik licens. Referér venligst til dokumentationen for yderligere "
 "detaljer.\n"
 "\n"
@@ -6398,10 +6398,10 @@ msgstr ""
 "\n"
 "Alle rettigheder til komponenterne i programmelproduktet tilhører deres "
 "respektive forfattere, og er beskyttet af intellektuelle rettigheds- og "
-"ophavsretslove, gældende for programmel. Mandrakesoft S.A. forbeholder sine "
+"ophavsretslove, gældende for programmel. Mandriva S.A. forbeholder sine "
 "rettigheder til at ændre eller tilpasse programmelprodukterne, helt eller "
-"delvist, med alle midler og til alle formål. \"Mandrake\", \"Mandrakelinux\" "
-"samt de tilhørende logoer er varemærker for Mandrakesoft S.A.  \n"
+"delvist, med alle midler og til alle formål. \"Mandriva\", \"Mandrivalinux\" "
+"samt de tilhørende logoer er varemærker for Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Styrende love\n"
@@ -6413,7 +6413,7 @@ msgstr ""
 "vedrørende vilkårene i denne licens vil fortrinsvist blive løst udenfor "
 "domstolene. Som en sidste udvej vil uenighederne blive håndteret ved den "
 "rette domstol i Paris, Frankrig. Ved spørgsmål omkring dette dokument, "
-"kontakt venligst Mandrakesoft S.A.  \n"
+"kontakt venligst Mandriva S.A.  \n"
 
 # Mangler
 #: install_messages.pm:90
@@ -6500,7 +6500,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6508,13 +6508,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Tillykke, installationen er færdig.\n"
 "Fjern boot-mediet og tryk retur for at genstarte.\n"
 "\n"
 "\n"
-"For information om rettelser til denne udgivelse af Mandrakelinux, se Errata "
+"For information om rettelser til denne udgivelse af Mandrivalinux, se Errata "
 "på:\n"
 "\n"
 "\n"
@@ -6522,7 +6522,7 @@ msgstr ""
 "\n"
 "\n"
 "Information om konfigurering af dit system kan du finde i kapitlet om efter-"
-"installation i den Officielle Mandrakelinux Brugervejledning."
+"installation i den Officielle Mandrivalinux Brugervejledning."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6557,12 +6557,12 @@ msgstr "Går til trin `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Dit system har kun få resurser. Du kan få problemer med at installere\n"
-"Mandrakelinux. Hvis dette sker, kan du prøve en tekst-baseret installation i "
+"Mandrivalinux. Hvis dette sker, kan du prøve en tekst-baseret installation i "
 "stedet\n"
 "Dette gøres ved at trykke 'F1' ved opstart fra cdrommen, og så skrive 'text'."
 
@@ -7102,9 +7102,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Kontakter Mandrakelinux netsted for at hente listen over tilgængelige spejle"
+"Kontakter Mandrivalinux netsted for at hente listen over tilgængelige spejle"
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7328,8 +7328,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux Installation %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9918,13 +9918,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall-konfigurator\n"
 "\n"
-"Dette konfigurerer en personlig brandmur for denne Mandrakelinux-maskine.\n"
+"Dette konfigurerer en personlig brandmur for denne Mandrivalinux-maskine.\n"
 "For en stærk dedikeret brandmurs-løsning se venligst den specialiserede "
 "MandrakeSecurity Firewall-distribution."
 
@@ -13982,11 +13982,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"Kør Scannerdrake (Udstyr/skanner i Mandrakelinux Kontrolcenter) for at dele "
+"Kør Scannerdrake (Udstyr/skanner i Mandrivalinux Kontrolcenter) for at dele "
 "din skanner på netværket.\n"
 "\n"
 
@@ -15919,33 +15919,33 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Hvad er Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Hvad er Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Velkommen til <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Velkommen til <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux er en <b>Linux-distribution</b> som består af systemkernen, "
+"Mandrivalinux er en <b>Linux-distribution</b> som består af systemkernen, "
 "kaldet <b>operativsystemet</b> (baseret på Linux-kernen) sammen med <b>en "
 "masse programmer</b> som opfylder alle behov som du kan forestille dig."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux er den mest <b>brugervenlige</b> Linux-distribution i dag. Det "
+"Mandrivalinux er den mest <b>brugervenlige</b> Linux-distribution i dag. Det "
 "er også en af de <b>mest brugte</b> Linux-distributioner i verden!"
 
 #: share/advertising/02.pl:13
@@ -15961,15 +15961,15 @@ msgstr "Velkommen til <b>verdenen af åben kildetekst</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux er bundet til Åben Kildettekst-modellen. Dette betyder at "
+"Mandrivalinux er bundet til Åben Kildettekst-modellen. Dette betyder at "
 "denne nye udgave er resultatet af <b>samarbejdet</b> mellem "
-"<b>Mandrakesoft's team af udviklere</b> og det <b>verdensomspændende "
-"fællesskab</b>  af Mandrakelinux-bidragsydere."
+"<b>Mandriva's team af udviklere</b> og det <b>verdensomspændende "
+"fællesskab</b>  af Mandrivalinux-bidragsydere."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -15989,9 +15989,9 @@ msgstr "<b>GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Det meste af programmellet indeholdt i distributionen og alle Mandrakelinux-"
+"Det meste af programmellet indeholdt i distributionen og alle Mandrivalinux-"
 "værktøjerne licensieres under <b>General Public License</b>."
 
 #: share/advertising/03.pl:17
@@ -16022,15 +16022,15 @@ msgstr "<b>Vær med i Fællesskabet</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux har et af de <b>største fællesskaber</b> af brugere og "
+"Mandrivalinux har et af de <b>største fællesskaber</b> af brugere og "
 "udviklere. Sådan et fællesskabs rolle er meget bred, spændende fra "
 "fejlrapportering til udviklingen af nye programmer. Fællesskabet spiller en "
-"<b>nøglerolle</b> i Mandrakelinux-verdenen."
+"<b>nøglerolle</b> i Mandrivalinux-verdenen."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16052,11 +16052,11 @@ msgstr "<b>Download version</b>."
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Du installerer nu <b>Mandrakelinux Download</b>. Dette er den frie og gratis "
-"version som Mandrakesoft ønsker at holde <b>tilgængelig for alle</b>."
+"Du installerer nu <b>Mandrivalinux Download</b>. Dette er den frie og gratis "
+"version som Mandriva ønsker at holde <b>tilgængelig for alle</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16089,10 +16089,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Du vil heller ikke have adgang til <b>tjenester indeholdt</b> i de andre "
-"Mandrakesoft produkter."
+"Mandriva produkter."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16101,8 +16101,8 @@ msgstr "<b>Discovery, dit første Linux-skrivebord</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Du installerer nu <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Du installerer nu <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16124,17 +16124,17 @@ msgstr "<b>PowerPack, Det ultimative Linux-skrivebord</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Du installerer nu <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Du installerer nu <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack er Mandrakesofts <b>toplinje produkt til Linux-skrivebordet</b>. "
+"PowerPack er Mandrivas <b>toplinje produkt til Linux-skrivebordet</b>. "
 "PowerPack indeholder <b>tusindvis af programmer</b> - alt fra det mest "
 "populære til det mest avancerede."
 
@@ -16145,8 +16145,8 @@ msgstr "<b>PowerPack+, Linux-løsningen for skriveborde og servere</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Du installerer nu <b>Mandrakelinux PowerPack+</b>"
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Du installerer nu <b>Mandrivalinux PowerPack+</b>"
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16163,22 +16163,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesofts produkter</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandrivas produkter</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> har udviklet et stort udvalg af <b>Mandrakelinux</b> "
+"<b>Mandriva</b> har udviklet et stort udvalg af <b>Mandrivalinux</b> "
 "produkter."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux produkter er:"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux produkter er:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16198,75 +16198,75 @@ msgstr "\t* <b>PowerPack+</b>, Linux-løsningen for skriveborde og servere."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux for x86-64</b>, Mandrakelinux-løsningen for få mest ud "
+"\t* <b>Mandrivalinux for x86-64</b>, Mandrivalinux-løsningen for få mest ud "
 "af din 64-bit processor."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesofts produkter (Nomad Produkter)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandrivas produkter (Nomad Produkter)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft har udviklet to produkter, som giver dig mulighed for at bruge "
-"Mandrakelinux <b>på enhver maskine</b> og uden noget behov for faktisk at "
+"Mandriva har udviklet to produkter, som giver dig mulighed for at bruge "
+"Mandrivalinux <b>på enhver maskine</b> og uden noget behov for faktisk at "
 "installere det:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, en Mandrakelinux-distribution som kører udelukkende fra en "
+"\t* <b>Move</b>, en Mandrivalinux-distribution som kører udelukkende fra en "
 "opstartelig CD-ROM."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, en Mandrakelinux-distribution præinstalleret på den "
+"\t* <b>GlobeTrotter</b>, en Mandrivalinux-distribution præinstalleret på den "
 "ultra-kompakte “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Mandrakesofts produkter (professionelle løsninger)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Mandrivas produkter (professionelle løsninger)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Nedenfor er Mandrakesoft-produkterne beregnet til at opfylde de "
+"Nedenfor er Mandriva-produkterne beregnet til at opfylde de "
 "<b>professionnelle behov</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
-"\t* <b>Corporate Desktop</b>, Mandrakelinux' skrivebord for "
+"\t* <b>Corporate Desktop</b>, Mandrivalinux' skrivebord for "
 "forretningsverdenen."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Mandrakelinux' serverløsning."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandrivalinux' serverløsning."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b>, Mandrakelinux' sikkerhedsløsning."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, Mandrivalinux' sikkerhedsløsning."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16309,10 +16309,10 @@ msgstr "<b>Vælg dit foretrukne skrivebordsmiljø</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Med PowerPack vil du kunne vælge det <b>grafiske skrivebordsmiljø</b>. "
-"Mandrakesoft har valgt <b>KDE</b> som standard."
+"Mandriva har valgt <b>KDE</b> som standard."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16337,10 +16337,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Med PowerPack+ vil du kunne vælge det <b>grafiske skrivebordsmiljø</b>. "
-"Mandrakesoft har valgt <b>KDE</b> som standard."
+"Mandriva har valgt <b>KDE</b> som standard."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16466,10 +16466,10 @@ msgstr "<b>Nyd det store udvalg af programmer</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"I Mandrakelinux-menuen vil du finde applikationer som er <b>nemme</b> at "
+"I Mandrivalinux-menuen vil du finde applikationer som er <b>nemme</b> at "
 "bruge til <b>alle dine opgaver</b>:"
 
 #: share/advertising/18.pl:16
@@ -16736,17 +16736,17 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux Kontrolcenter</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux Kontrolcenter</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrakelinux Kontrolcenter</b> er en essentiel samling af Mandrake-"
+"<b>Mandrivalinux Kontrolcenter</b> er en essentiel samling af Mandrake-"
 "specifikke værktøjer beregnet til at forenkle konfigurationen af din maskine,"
 
 #: share/advertising/25.pl:17
@@ -16770,16 +16770,16 @@ msgstr "<b>Modellen for Åben Kildetekst</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Som al anden edb-programmering kræver åben kildetekst-programmel <b>tid og "
 "folk</b> til udvikling. For at respektere filosofien i åben kildetekst "
-"sælger Mandrakesoft added-value produkter og tjenester for at <b>fortsat "
-"forbedre Mandrakelinux</b>. Hvis du ønsker at <b>støtte åben kildetekst-"
-"filosofien</b> og udviklingen af Mandrakelinux, så <b>vær sød</b> at "
+"sælger Mandriva added-value produkter og tjenester for at <b>fortsat "
+"forbedre Mandrivalinux</b>. Hvis du ønsker at <b>støtte åben kildetekst-"
+"filosofien</b> og udviklingen af Mandrivalinux, så <b>vær sød</b> at "
 "overveje køb af et af vores produkter eller tjenester!"
 
 #: share/advertising/27.pl:13
@@ -16790,10 +16790,10 @@ msgstr "<b>OnlineStore</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Besøg vores <b>e-handelsplatform</b> for at lære mere om Mandrakesofts "
+"Besøg vores <b>e-handelsplatform</b> for at lære mere om Mandrivas "
 "produkter og tjenester."
 
 #: share/advertising/27.pl:17
@@ -16817,24 +16817,24 @@ msgstr "Kig forbi i dag på <b>store.mandrakesoft.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> er den <b>perfekte følgesvend</b> til dit Mandrakelinux "
+"<b>Mandriva Club</b> er den <b>perfekte følgesvend</b> til dit Mandrivalinux "
 "produkt.."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Drag nytte af <b>værdifulde fordele</b> ved at være med i Mandrakeclub, med:"
+"Drag nytte af <b>værdifulde fordele</b> ved at være med i Mandriva Club, med:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -16856,40 +16856,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Deltagelse i Mandrakelinux <b>brugerfora</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Deltagelse i Mandrivalinux <b>brugerfora</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t*<b>Tidlig og priviligeret adgang</b>, før offentlige udgivelser, til "
-"Mandrakelinux-<b>ISO-aftryk</b>."
+"Mandrivalinux-<b>ISO-aftryk</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> er en ny førsteklasses tjeneste som Mandrakesoft er "
+"<b>Mandriva Online</b> er en ny førsteklasses tjeneste som Mandriva er "
 "stolt af at tilbyde sine kunder!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline giver et bredt udvalg af værdifulde tjenester for <b>nem "
-"opdatering</b> af dine Mandrakelinux-systemer:"
+"Mandriva Online giver et bredt udvalg af værdifulde tjenester for <b>nem "
+"opdatering</b> af dine Mandrivalinux-systemer:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16913,39 +16913,39 @@ msgstr "\t* Fleksible <b>planlagte</b> opdateringer."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
-msgstr "\t* Styring af <b>alle dine Mandrakelinux-systemer</b> via én konto."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+msgstr "\t* Styring af <b>alle dine Mandrivalinux-systemer</b> via én konto."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Har du behov for <b>assistance?</b> Mød Mandrakesofts tekniske eksperter på "
+"Har du behov for <b>assistance?</b> Mød Mandrivas tekniske eksperter på "
 "<b>vores tekniske kundestøtteplatform</b> www.mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Takket være hjælpen fra <b>kvalificerede Mandrakelinux-eksperter</b>, så vil "
+"Takket være hjælpen fra <b>kvalificerede Mandrivalinux-eksperter</b>, så vil "
 "du spare en masse tid."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"For alle spørgsmål relateret til Mandrakelinux så har du muligheden for at "
+"For alle spørgsmål relateret til Mandrivalinux så har du muligheden for at "
 "købe kundestøttehjælp på <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17243,8 +17243,8 @@ msgstr "Overvågningsværktøjer, proceskontering, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesoft konfigurationsprogrammer"
+msgid "Mandriva Wizards"
+msgstr "Mandriva konfigurationsprogrammer"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17341,8 +17341,8 @@ msgstr ""
 "\n"
 "VALGMULIGHEDER:\n"
 "  --help            - udskriv denne hjælpebesked.\n"
-"  --report          - program bær være én af Mandrakelinux' værktøjer\n"
-"  --incident        - program bær være én af Mandrakelinux' værktøjer"
+"  --report          - program bær være én af Mandrivalinux' værktøjer\n"
+"  --incident        - program bær være én af Mandrivalinux' værktøjer"
 
 #: standalone.pm:63
 #, c-format
@@ -17395,7 +17395,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17409,7 +17409,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Mandrakelinux TerminalServer konfigureringsprogram\n"
+"Mandrivalinux TerminalServer konfigureringsprogram\n"
 "--enable         : aktivér MTS\n"
 "--disable        : deaktivér MTS\n"
 "--start          : start MTS\n"
@@ -17466,7 +17466,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17474,7 +17474,7 @@ msgid ""
 msgstr ""
 "[OPTION]...\n"
 "  --no-confirmation      spørg ikke det første bekræftelsesspørgsmål i "
-"MandrakeUpdate-tilstand\n"
+"Mandriva Update-tilstand\n"
 "  --no-verify-rpm        efterprøv ikke pakke-signaturer\n"
 "  --changelog-first      vís changelog før filliste i beskrivelsesvinduet\n"
 "  --merge-all-rpmnew     foreslå at flette alle .rpmnew/.rpmsave filer fundet"
@@ -20243,13 +20243,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux' værktøj til fejlrapportering"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux' værktøj til fejlrapportering"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Kontrolcenter"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux Kontrolcenter"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20269,8 +20269,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20314,8 +20314,8 @@ msgstr "Vejledere til konfiguration"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Vælg Mandrakesoft-værktøj:"
+msgid "Select Mandriva Tool:"
+msgstr "Vælg Mandriva-værktøj:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20740,19 +20740,19 @@ msgstr "Startede med opstart"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Dette grænsesnit er ikke blevet konfigureret endnu.\n"
-"Kør 'Tilføj et grænsesnit'-hjælperen fra Mandrakelinux Kontrolcentret"
+"Kør 'Tilføj et grænsesnit'-hjælperen fra Mandrivalinux Kontrolcentret"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Du har ikke konfigureret nogen internetforbindelser.\n"
-"Kør '%s'-hjælperen fra Mandrakelinux Kontrolcentret"
+"Kør '%s'-hjælperen fra Mandrivalinux Kontrolcentret"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20802,8 +20802,8 @@ msgstr "KDM (KDE Indlogningshåndterer)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux Indlogningshåndterer)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux Indlogningshåndterer)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21102,7 +21102,7 @@ msgstr "Importér"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21111,7 +21111,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 ved Mandrakesoft \n"
+"Copyright (C) 2001-2002 ved Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (oprindelig version)\n"
@@ -21654,14 +21654,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright © 2003-2004 Mandrakesoft.\n"
+"Copyright © 2003-2004 Mandriva.\n"
 "Dette er frit programmel og kan redistribueres under betingelserne i GNU "
 "GPL.\n"
 "\n"
@@ -21690,8 +21690,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux hjælpecentral"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux hjælpecentral"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25211,8 +25211,8 @@ msgstr "Ændringen er fortaget, men for at være effektiv skal du logge ud"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinux' værktøj-logger"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinux' værktøj-logger"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25726,7 +25726,7 @@ msgstr "Opkobling fuldført."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Tilslutning mislykkedes.\n"
 "Kontrollér konfigurationen i Mandrakes kontrolcentral."
@@ -26751,13 +26751,13 @@ msgstr "Installation mislykkedes"
 #~ msgstr "Fejl ved åbning af %s for skrivning: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Dette er HardDrake, et Mandrakelinux-værktøj for konfigurering af "
+#~ "Dette er HardDrake, et Mandrivalinux-værktøj for konfigurering af "
 #~ "maskinel.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span>  %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
@@ -27187,16 +27187,16 @@ msgstr "Installation mislykkedes"
 #~ "Kunne ikke fjerne printeren \"%s\" fra Star Office/OpenOffice.org/GIMP."
 #~ "org."
 
-#~ msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
-#~ msgstr "<b>Tillykke med valget af Mandrakelinux!</b>"
+#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
+#~ msgstr "<b>Tillykke med valget af Mandrivalinux!</b>"
 
 #~ 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."
+#~ "Your new Mandrivalinux operating system and its many applications is the "
+#~ "result of collaborative efforts between Mandriva developers and "
+#~ "Mandrivalinux contributors throughout the world."
 #~ msgstr ""
-#~ "Dit nye Mandrakelinux-operativsystem og dets mange programmer er "
-#~ "resultatet af samarbejde mellem Mandrakesoft-udviklere og Mandrakelinux-"
+#~ "Dit nye Mandrivalinux-operativsystem og dets mange programmer er "
+#~ "resultatet af samarbejde mellem Mandriva-udviklere og Mandrivalinux-"
 #~ "bidragsydere fra hele verden."
 
 #~ msgid ""
@@ -27296,27 +27296,27 @@ msgstr "Installation mislykkedes"
 #~ msgstr ""
 #~ "Vís og redigér billeder og fotografier med <b>GQview</b> og <b>Gimp</b>!"
 
-#~ msgid "Become a <b>Mandrakeclub</b> member!"
-#~ msgstr "Bliv medlem af <b>Mandrakeclub</b>!"
+#~ msgid "Become a <b>Mandriva Club</b> member!"
+#~ msgstr "Bliv medlem af <b>Mandriva Club</b>!"
 
 #~ msgid ""
 #~ "Take advantage of valuable benefits, products and services by joining "
-#~ "Mandrakeclub, such as:"
+#~ "Mandriva Club, such as:"
 #~ msgstr ""
 #~ "Drag nytte af værdifulde fordele, produkter og tjenester ved at være med "
-#~ "i Mandrake Club, med:"
+#~ "i Mandriva Club, med:"
 
 #~ msgid "\t* Full access to commercial applications"
 #~ msgstr "\t* Fuld adgang til kommercielle programmer"
 
 #~ msgid ""
-#~ "\t* Special download mirror list exclusively for Mandrakeclub Members"
+#~ "\t* Special download mirror list exclusively for Mandriva Club Members"
 #~ msgstr ""
-#~ "\t* Speciel liste over filhentningsspejle, udelukkende for Mandrakeclub-"
+#~ "\t* Speciel liste over filhentningsspejle, udelukkende for Mandriva Club-"
 #~ "medlemmer"
 
-#~ msgid "\t* Voting for software to put in Mandrakelinux"
-#~ msgstr "\t* Stem på programmel som skal være med i Mandrakelinux"
+#~ msgid "\t* Voting for software to put in Mandrivalinux"
+#~ msgstr "\t* Stem på programmel som skal være med i Mandrivalinux"
 
 #~ msgid "\t* Plus much more"
 #~ msgstr "\t* Plus meget mere"
@@ -27328,14 +27328,14 @@ msgstr "Installation mislykkedes"
 #~ msgid "Do you require assistance?"
 #~ msgstr "Har du brug for hjælp?"
 
-#~ msgid "<b>Mandrakeexpert</b> is the primary source for technical support."
-#~ msgstr "<b>Mandrakeexpert</b> er den bedste kilde til teknisk hjælp."
+#~ msgid "<b>Mandriva Expert</b> is the primary source for technical support."
+#~ msgstr "<b>Mandriva Expert</b> er den bedste kilde til teknisk hjælp."
 
 #~ msgid ""
-#~ "If you have Linux questions, subscribe to Mandrakeexpert at <b>www."
+#~ "If you have Linux questions, subscribe to Mandriva Expert at <b>www."
 #~ "mandrakeexpert.com</b>"
 #~ msgstr ""
-#~ "Hvis du har Linux-spørgsmål, så abonnér på Mandrakeexpert hos <b>www."
+#~ "Hvis du har Linux-spørgsmål, så abonnér på Mandriva Expert hos <b>www."
 #~ "mandrakeexpert.com</b>"
 
 #~ msgid ""
@@ -27353,23 +27353,23 @@ msgstr "Installation mislykkedes"
 #~ "<b>www.mandrake-linux.com</b>!"
 
 #~ msgid ""
-#~ "Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus "
+#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "
 #~ "the latest versions of the most popular Open Source applications."
 #~ msgstr ""
-#~ "Mandrakelinux indeholder de berømte grafiske skriveborde KDE og GNOME, "
+#~ "Mandrivalinux indeholder de berømte grafiske skriveborde KDE og GNOME, "
 #~ "plus den nyeste version af de mest populære Frit Programmel-applikationer."
 
 #~ msgid ""
-#~ "Mandrakelinux is widely known as the most user-friendly and the easiest "
+#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "
 #~ "to install and easy to use Linux distribution."
 #~ msgstr ""
-#~ "Mandrakelinux er videnom kendt for at være den mest brugervenlige, "
+#~ "Mandrivalinux er videnom kendt for at være den mest brugervenlige, "
 #~ "nemmeste at installere og letteste at bruge Linux-distribution, som "
 #~ "findes."
 
-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with <b>Mandrakemove</b>"
+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandrakemove</b>"
 #~ msgstr ""
-#~ "\t* Find ud af mere om vor Mandrakelinux på en opstartelig CD med "
+#~ "\t* Find ud af mere om vor Mandrivalinux på en opstartelig CD med "
 #~ "Mandrakemove"
 
 #~ msgid ""
@@ -27417,12 +27417,12 @@ msgstr "Installation mislykkedes"
 #~ 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 "
+#~ "Mandrivalinux distribution. A unique blend for incomparable HPC "
 #~ "performance."
 #~ msgstr ""
 #~ "<b>MandrakeClustering</b>: styrken og hastigheden af en Linux-klynge "
 #~ "kombineret med stabiliteten og brugervenligheden af den verdensberømte "
-#~ "Mandrakelinux-distribution. En unik sammensætning for enestående HPC-"
+#~ "Mandrivalinux-distribution. En unik sammensætning for enestående HPC-"
 #~ "ydelse."
 
 #~ msgid ""
@@ -27434,14 +27434,14 @@ msgstr "Installation mislykkedes"
 #~ "problemer, fra standard til professionel kundestøtte, pakker fra 1 til 50 "
 #~ "tilfælder, vælg den som møder dine behov bedst!"
 
-#~ msgid "<b>Become a Mandrakeclub member!</b>"
-#~ msgstr "<b>Bliv medlem af Mandrakeclub!</b>"
+#~ msgid "<b>Become a Mandriva Club member!</b>"
+#~ msgstr "<b>Bliv medlem af Mandriva Club!</b>"
 
 #~ msgid "<b>Do you require assistance?</b>"
 #~ msgstr "<b>Har du brug for hjælp?</b>"
 
-#~ msgid "This is the Mandrakelinux <b>Download version</b>."
-#~ msgstr "Dette er Mandrakelinux <b>Download Edition</b>."
+#~ msgid "This is the Mandrivalinux <b>Download version</b>."
+#~ msgstr "Dette er Mandrivalinux <b>Download Edition</b>."
 
 #~ msgid ""
 #~ "The free download version does not include commercial software, and "
@@ -27453,12 +27453,12 @@ msgstr "Installation mislykkedes"
 #~ "RTC) og skærmkort (såsom ATI® og NVIDIA®)."
 
 #~ msgid ""
-#~ "Your new Mandrakelinux distribution and its many applications are the "
-#~ "result of collaborative efforts between Mandrakesoft developers and "
-#~ "Mandrakelinux contributors throughout the world."
+#~ "Your new Mandrivalinux distribution and its many applications are the "
+#~ "result of collaborative efforts between Mandriva developers and "
+#~ "Mandrivalinux contributors throughout the world."
 #~ msgstr ""
-#~ "Din nye Mandrakelinux-distribution og dets mange programmer er resultatet "
-#~ "af samarbejde mellem Mandrakesoft-udviklere og Mandrakelinux-bidragsydere "
+#~ "Din nye Mandrivalinux-distribution og dets mange programmer er resultatet "
+#~ "af samarbejde mellem Mandriva-udviklere og Mandrivalinux-bidragsydere "
 #~ "rundtom i hele verden."
 
 #~ msgid "<b>PowerPack+</b>"
@@ -27474,25 +27474,25 @@ msgstr "Installation mislykkedes"
 #~ "et stort udvalg af serverapplikationer i verdensklasse."
 
 #~ msgid ""
-#~ "It is the only Mandrakelinux product that includes the groupware solution."
+#~ "It is the only Mandrivalinux product that includes the groupware solution."
 #~ msgstr ""
-#~ "Det er den eneste Mandrakelinux-produkt som inkluderer "
+#~ "Det er den eneste Mandrivalinux-produkt som inkluderer "
 #~ "gruppevareløsningen."
 
 #~ msgid ""
-#~ "When you log into your Mandrakelinux system for the first time, you can "
+#~ "When you log into your Mandrivalinux system for the first time, you can "
 #~ "choose between several popular graphical desktops environments, "
 #~ "including: KDE, GNOME, WindowMaker, IceWM, and others."
 #~ msgstr ""
-#~ "Når du logger ind på dit Mandrakelinux-system for første gang, så kan du "
+#~ "Når du logger ind på dit Mandrivalinux-system for første gang, så kan du "
 #~ "vælge mellem en række populære grafiske skrivebordsmiljøer, inklusive "
 #~ "KDE, GNOME, WindowMaker, IceWM og andre."
 
 #~ msgid ""
-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "
+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
 #~ "of your tasks:"
 #~ msgstr ""
-#~ "I Mandrakelinux-menuen vil du finde applikationer som er nemme at bruge "
+#~ "I Mandrivalinux-menuen vil du finde applikationer som er nemme at bruge "
 #~ "til alle dine opgaver:"
 
 #~ msgid ""
@@ -27536,12 +27536,12 @@ msgstr "Installation mislykkedes"
 #~ msgstr "\t* Addressebog (server og klient)"
 
 #~ msgid ""
-#~ "Your new Mandrakelinux distribution is the result of collaborative "
-#~ "efforts between Mandrakesoft developers and Mandrakelinux contributors "
+#~ "Your new Mandrivalinux distribution is the result of collaborative "
+#~ "efforts between Mandriva developers and Mandrivalinux contributors "
 #~ "throughout the world."
 #~ msgstr ""
-#~ "Din nye Mandrakelinux-distribution er et resultat af samarbejde mellem "
-#~ "Mandrakesoft-udviklere og Mandrakelinux-bidragsydere rundt omkring i hele "
+#~ "Din nye Mandrivalinux-distribution er et resultat af samarbejde mellem "
+#~ "Mandriva-udviklere og Mandrivalinux-bidragsydere rundt omkring i hele "
 #~ "verden."
 
 #~ msgid ""
@@ -27610,13 +27610,13 @@ msgstr "Installation mislykkedes"
 #~ msgid ""
 #~ "Before continuing, you should carefully read the terms of the license. "
 #~ "It\n"
-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "
+#~ "covers the entire Mandrivalinux 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 ""
 #~ "Før du går videre bør du læse betingelserne i licensen omhyggeligt.  Den "
-#~ "omfatter hele Mandrakelinux distributionen. Hvis du er enig i alle "
+#~ "omfatter hele Mandrivalinux distributionen. Hvis du er enig i alle "
 #~ "betingelserne i den, så klik på '%s'-boksen. Hvis ikke, så vil klikning "
 #~ "på \"%s\"-knappen genstarte din maskine."
 
@@ -27718,25 +27718,25 @@ msgstr "Installation mislykkedes"
 #~ "facilitet, så afmarkér boksen med '%s'."
 
 #~ msgid ""
-#~ "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+#~ "The Mandrivalinux 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 ""
-#~ "Mandrakelinux installationen bliver distribueret på flere cdrom-er. Hvis "
+#~ "Mandrivalinux installationen bliver distribueret på flere cdrom-er. Hvis "
 #~ "en valgt pakke ligger på en anden cdrom, vil DrakX udskyde den nuværende "
 #~ "cd og bede dig om at isætte den rigtige CD, om nødvendigt."
 
 #~ msgid ""
 #~ "It is now time to specify which programs you wish to install on your\n"
-#~ "system. There are thousands of packages available for Mandrakelinux, and\n"
+#~ "system. There are thousands of packages available for Mandrivalinux, 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. Mandrakelinux sorts packages groups in four categories. You can\n"
+#~ "machine. Mandrivalinux 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"
@@ -27789,12 +27789,12 @@ msgstr "Installation mislykkedes"
 #~ "updating an existing system."
 #~ msgstr ""
 #~ "Det er nu tid til at angive hvilke pakker du vil installere på dit "
-#~ "system. Der er tusindvis af pakker til dit Mandrakelinux system, og for "
+#~ "system. Der er tusindvis af pakker til dit Mandrivalinux system, og for "
 #~ "at gøre det nemmere at håndtere dem er pakker blevet placeret i grupper "
 #~ "af lignende programmer.\n"
 #~ "\n"
 #~ "Pakkerne er ordnet i grupper svarende til en bestemt anvendelse af din "
-#~ "maskine. Mandrakelinux opdeler pakkegrupper i fire kategorier. Du kan "
+#~ "maskine. Mandrivalinux opdeler pakkegrupper i fire kategorier. Du kan "
 #~ "vælge og vrage programmer fra de forskellige grupper, så en installation "
 #~ "af 'Arbejdsstation' kan også have programmer fra 'Udvikling'-kategorien "
 #~ "installeret.\n"
@@ -27852,11 +27852,11 @@ msgstr "Installation mislykkedes"
 #~ "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 Mandrakelinux will automatically start any "
+#~ "installed. By default Mandrivalinux 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 Mandrakelinux was\n"
+#~ "security holes were discovered after this version of Mandrivalinux 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"
@@ -27894,11 +27894,11 @@ msgstr "Installation mislykkedes"
 #~ "!! Når en server-pakke er blevet valgt, enten fordi du specielt valgte "
 #~ "den individuelle pakke, eller fordi den var en del af en gruppe af "
 #~ "pakker, vil du blive spurgt om at bekræfte at du virkelig ønsker at "
-#~ "installere disse servere. Som standard under Mandrakelinux bliver "
+#~ "installere disse servere. Som standard under Mandrivalinux bliver "
 #~ "installerede servere startet op ved opstart af maskinen. Selvom de er "
 #~ "sikre og ikke har nogen kendte problemer på udgivelsestidspunktet for "
 #~ "distributionen, er det absolut muligt at sikkerhedshuller blev opdaget "
-#~ "efter at denne version af Mandrakelinux blev færdiggjort. Hvis du ikke "
+#~ "efter at denne version af Mandrivalinux blev færdiggjort. Hvis du ikke "
 #~ "véd hvad en bestemt tjeneste vil gøre eller hvorfor den skal installeres, "
 #~ "så klik '%s' her. Et klik med '%s' her vil installere de nævnte servere "
 #~ "og de vil som standard blive startet automatisk under opstarten!!\n"
@@ -27922,7 +27922,7 @@ msgstr "Installation mislykkedes"
 #~ "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"
-#~ "Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
+#~ "Mandrivalinux 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"
@@ -27943,7 +27943,7 @@ msgstr "Installation mislykkedes"
 #~ "modems\n"
 #~ "that require additional software to work compared to Normal modems. Some "
 #~ "of\n"
-#~ "those modems actually work under Mandrakelinux, some others do not. You\n"
+#~ "those modems actually work under Mandrivalinux, 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"
@@ -27954,7 +27954,7 @@ msgstr "Installation mislykkedes"
 #~ "Du vil nu kunne opsætte din internet- eller netværksopkobling. Hvis du "
 #~ "ønsker at forbinde din maskine til internettet eller til et lokalnetværk "
 #~ "så klik på '%s'.\n"
-#~ "Mandrakelinux vil prøve at automatisk finde netværksenheder og modemer. "
+#~ "Mandrivalinux vil prøve at automatisk finde netværksenheder og modemer. "
 #~ "Hvis denne søgning mislykkes så fjern markeringen i boksen '%s'. Du kan "
 #~ "også vælge at ikke konfigurere netværket, eller gøre det senere; i så "
 #~ "tilfælde vil klik på '%s'-knappen føre dig til næste trin.\n"
@@ -28089,7 +28089,7 @@ msgstr "Installation mislykkedes"
 #~ "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 Mandrakelinux rely upon.\n"
+#~ "WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 #~ "\n"
 #~ "You will be presented with a list of different parameters to change to "
 #~ "get\n"
@@ -28152,7 +28152,7 @@ msgstr "Installation mislykkedes"
 #~ msgstr ""
 #~ "X (for X Window System) er hjertet af GNU/Linux' grafiske grænseflade som "
 #~ "alle de grafiske miljøer (KDE, GNOME, AfterStep, WindowMaker, mv.) der "
-#~ "kommer sammen med Mandrakelinux afhænger af.\n"
+#~ "kommer sammen med Mandrivalinux afhænger af.\n"
 #~ "\n"
 #~ "Du vil blive vist en liste med forskellige parametre der kan ændres for "
 #~ "at få den bedst mulige grafiske fremvisning:\n"
@@ -28275,7 +28275,7 @@ msgstr "Installation mislykkedes"
 #~ "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"
-#~ "Mandrakelinux system.\n"
+#~ "Mandrivalinux 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 "
@@ -28314,7 +28314,7 @@ msgstr "Installation mislykkedes"
 #~ "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 Mandrakelinux and Microsoft Windows "
+#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "
 #~ "on\n"
 #~ "the same computer.\n"
 #~ "\n"
@@ -28324,7 +28324,7 @@ msgstr "Installation mislykkedes"
 #~ "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 Mandrakelinux system,\n"
+#~ "your hard drive and replace them with your new Mandrivalinux system,\n"
 #~ "choose this option. Be careful, because you will not be able to undo "
 #~ "your\n"
 #~ "choice after you confirm.\n"
@@ -28349,11 +28349,11 @@ msgstr "Installation mislykkedes"
 #~ "refer to the ``Managing Your Partitions'' section in the ``Starter "
 #~ "Guide''."
 #~ msgstr ""
-#~ "Nu skal du vælge hvor på din harddisk du vil installere dit Mandrakelinux-"
+#~ "Nu skal du vælge hvor på din harddisk du vil installere dit Mandrivalinux-"
 #~ "operativsystem. Hvis disken er tom eller et eksisterende operativsystem "
 #~ "bruger alt pladsen på den, bliver du nødt til at partitionere drevet. "
 #~ "Partitionering vil sige at diskdrevet opdeles i logiske dele for at lave "
-#~ "den plads der behøves til at installere dit nye Mandrakelinux-system.\n"
+#~ "den plads der behøves til at installere dit nye Mandrivalinux-system.\n"
 #~ "\n"
 #~ "Da partitioneringen af en disk normalt ikke kan fortrydes og kan føre til "
 #~ "tab af data, hvis der allerede er et eksisterende operativsystem "
@@ -28381,7 +28381,7 @@ msgstr "Installation mislykkedes"
 #~ "Windows-FAT- eller NTFS-partition. Størrelsesændringen kan fortages uden "
 #~ "tab af data, hvis du i forvejen har defragmenteret Windows-partitionen. "
 #~ "Det anbefales på det kraftigste at du laver en sikkerhedskopi først. "
-#~ "Denne mulighed anbefales hvis du vil bruge både Mandrakelinux og "
+#~ "Denne mulighed anbefales hvis du vil bruge både Mandrivalinux og "
 #~ "Microsoft Windows på samme maskine.\n"
 #~ "\n"
 #~ "  Før du vælger denne løsning, bør du forstå at størrelsen på din "
@@ -28390,7 +28390,7 @@ msgstr "Installation mislykkedes"
 #~ "eller installere nyt programmel.\n"
 #~ "\n"
 #~ " * '%s': hvis du vil slette alle data på alle partitioner på denne disk "
-#~ "og erstatte dem med dit nye Mandrakelinux-system, kan du vælge denne "
+#~ "og erstatte dem med dit nye Mandrivalinux-system, kan du vælge denne "
 #~ "mulighed. Vær forsigtig, for du vil ikke være i stand til at fortryde "
 #~ "dine ændringer efter at du har sagt ja.\n"
 #~ "\n"
@@ -28500,7 +28500,7 @@ msgstr "Installation mislykkedes"
 #~ "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"
-#~ "Mandrakelinux operating system installation.\n"
+#~ "Mandrivalinux operating system installation.\n"
 #~ "\n"
 #~ "Click on \"%s\" if you wish to select partitions that will be checked "
 #~ "for\n"
@@ -28526,13 +28526,13 @@ msgstr "Installation mislykkedes"
 #~ "Klik på '%s' når du er klar til at formatere partitionerne.\n"
 #~ "\n"
 #~ "Klik på '%s' hvis du ønsker at vælge andre partitioner til at installere "
-#~ "dit nye Mandrakelinux operativsystem.\n"
+#~ "dit nye Mandrivalinux operativsystem.\n"
 #~ "\n"
 #~ "Klik på '%s' for at vælge partitioner som du ønsker at tjekke for dårlige "
 #~ "blokke."
 
 #~ msgid ""
-#~ "At the time you are installing Mandrakelinux, it is likely that some\n"
+#~ "At the time you are installing Mandrivalinux, 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"
@@ -28547,7 +28547,7 @@ msgstr "Installation mislykkedes"
 #~ "the\n"
 #~ "selected package(s), or \"%s\" to abort."
 #~ msgstr ""
-#~ "På det tidspunkt hvor du installerer Mandrakelinux er det sandsynligt at "
+#~ "På det tidspunkt hvor du installerer Mandrivalinux er det sandsynligt at "
 #~ "nogen af pakkerne er blevet opdaterede siden den oprindelige udgivelse. "
 #~ "Fejl er måske blevet rettet, og sikkerhedsproblemer måske løst. Det er nu "
 #~ "muligt for dig at hente disse ned fra internettet for at disse "
@@ -28611,7 +28611,7 @@ msgstr "Installation mislykkedes"
 #~ "\n"
 #~ "DrakX now needs to know if you want to perform a new install or an "
 #~ "upgrade\n"
-#~ "of an existing Mandrakelinux system:\n"
+#~ "of an existing Mandrivalinux system:\n"
 #~ "\n"
 #~ " * \"%s\": For the most part, this completely wipes out the old system. "
 #~ "If\n"
@@ -28623,22 +28623,22 @@ msgstr "Installation mislykkedes"
 #~ "written.\n"
 #~ "\n"
 #~ " * \"%s\": this installation class allows you to update the packages\n"
-#~ "currently installed on your Mandrakelinux system. Your current\n"
+#~ "currently installed on your Mandrivalinux 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 Mandrakelinux systems\n"
+#~ "Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 #~ "running version \"8.1\" or later. Performing an Upgrade on versions "
 #~ "prior\n"
-#~ "to Mandrakelinux version \"8.1\" is not recommended."
+#~ "to Mandrivalinux version \"8.1\" is not recommended."
 #~ msgstr ""
 #~ "Dette trin bliver kun aktiveret hvis der bliver fundet en eksisterende\n"
 #~ "GNU/Linux partition på din maskine.\n"
 #~ "\n"
 #~ "DrakX skal nu vide om du vil udføre en ny installation eller en "
 #~ "opgradering\n"
-#~ "af et eksisterende Mandrakelinux-system.\n"
+#~ "af et eksisterende Mandrivalinux-system.\n"
 #~ "\n"
 #~ " * \"%s\": Dette vil stort sét slette hele det gamle system. Hvis du "
 #~ "ønsker at ændre hvordan diskene bliver partitioneret, eller ændre på "
@@ -28647,14 +28647,14 @@ msgstr "Installation mislykkedes"
 #~ "blive overskrevne. \n"
 #~ "\n"
 #~ " * \"%s\": Denne installationsklasse lader dig opgradere pakkene som er "
-#~ "installeret på dit nuværende Mandrakelinux-system. Din nuværende "
+#~ "installeret på dit nuværende Mandrivalinux-system. Din nuværende "
 #~ "partitionsopsætning og brugerdata bliver ikke berørt. De fleste andre "
 #~ "konfigurationstrin forbliver tilgængelige, i lighed med en "
 #~ "standardinstallation.\n"
 #~ "\n"
-#~ "\"Opgradér\"-valget bør fungere på Mandrakelinux-systemer som kører "
+#~ "\"Opgradér\"-valget bør fungere på Mandrivalinux-systemer som kører "
 #~ "version 8.1 eller nyere. Udførelse af Opgradér på versioner tidligere end "
-#~ "Mandrakelinux 8.1 er ikke anbefalet."
+#~ "Mandrivalinux 8.1 er ikke anbefalet."
 
 #~ msgid ""
 #~ "Depending on the language you chose in section , DrakX will "
@@ -28714,7 +28714,7 @@ msgstr "Installation mislykkedes"
 #~ "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, Mandrakelinux will be using it\n"
+#~ "still under development. For that reason, Mandrivalinux 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"
@@ -28963,7 +28963,7 @@ msgstr "Installation mislykkedes"
 #~ "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 Mandrakelinux\n"
+#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"
 #~ "system! Be sure you know what you are doing before changing any of the\n"
 #~ "options. !!\n"
 #~ "\n"
@@ -29001,7 +29001,7 @@ msgstr "Installation mislykkedes"
 #~ "\n"
 #~ "Vær opmærksom på at hvis du vælger ikke at installere en opstartsindlæser "
 #~ "(ved at vælge '%s'), skal du være sikker på at du har en anden måde at "
-#~ "starte dit Mandrakelinux-system op på! Vær sikker på hvad du gør hvis du "
+#~ "starte dit Mandrivalinux-system op på! Vær sikker på hvad du gør hvis du "
 #~ "ændrer nogen af tilvalgene her!\n"
 #~ "\n"
 #~ "Et klik på '%s'-knappen i denne dialog vil tilbyde avancerede muligheder "
@@ -29094,7 +29094,7 @@ msgstr "Installation mislykkedes"
 #~ msgid ""
 #~ "Now, it's time to select a printing system for your computer. Other OSs "
 #~ "may\n"
-#~ "offer you one, but Mandrakelinux offers two. Each of the printing "
+#~ "offer you one, but Mandrivalinux offers two. Each of the printing "
 #~ "systems\n"
 #~ "is best suited to particular types of configuration.\n"
 #~ "\n"
@@ -29628,10 +29628,10 @@ msgstr "Installation mislykkedes"
 #~ "værktøjer til at forenkle konfigurationen af din maskine,"
 
 #~ msgid ""
-#~ "Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- "
+#~ "Find all Mandriva products and services at <b>MandrakeStore</b> -- "
 #~ "our full service e-commerce platform."
 #~ msgstr ""
-#~ "Find alle Mandrakesoft-produkter og -tjenester på <b>MandrakeStore</b> -- "
+#~ "Find alle Mandriva-produkter og -tjenester på <b>MandrakeStore</b> -- "
 #~ "vor fuldstændige e-handelsplatform."
 
 #~ msgid "Become a <b>MandrakeClub</b> member!"
@@ -29642,7 +29642,7 @@ msgstr "Installation mislykkedes"
 #~ "MandrakeClub, such as:"
 #~ msgstr ""
 #~ "Drag nytte af værdifulde fordele, produkter og tjenester ved at være med "
-#~ "i Mandrake Club, med:"
+#~ "i Mandriva Club, med:"
 
 #~ msgid ""
 #~ "\t* Special download mirror list exclusively for MandrakeClub Members"
@@ -29653,26 +29653,26 @@ msgstr "Installation mislykkedes"
 #~ msgid "\t* Special discounts for products and services at MandrakeStore"
 #~ msgstr "\t* Specielle rabatter for produkter og tjenester hos MandrakeStore"
 
-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandriva Move</b>"
 #~ msgstr ""
-#~ "\t* Find ud af mere om vor Mandrakelinux på en opstartelig CD med "
-#~ "MandrakeMove"
+#~ "\t* Find ud af mere om vor Mandrivalinux på en opstartelig CD med "
+#~ "Mandriva Move"
 
 #~ msgid ""
-#~ "Find all Mandrakesoft products at <b>MandrakeStore</b> -- our full "
+#~ "Find all Mandriva products at <b>MandrakeStore</b> -- our full "
 #~ "service e-commerce platform."
 #~ msgstr ""
-#~ "Find alle Mandrakesoft-produkter hos <b>MandrakeStore</b> - vores "
+#~ "Find alle Mandriva-produkter hos <b>MandrakeStore</b> - vores "
 #~ "fuldstændige e-handelplatform."
 
 #~ msgid "<b>Become a MandrakeClub member!</b>"
 #~ msgstr "<b>Bliv medlem af MandrakeClub!</b>"
 
 #~ msgid ""
-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "
+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
 #~ "tasks:"
 #~ msgstr ""
-#~ "I Mandrakelinux-menuen vil du finde nemme applikationer for alle opgaver:"
+#~ "I Mandrivalinux-menuen vil du finde nemme applikationer for alle opgaver:"
 
 #~ msgid ""
 #~ "\t* Take charge of your personal data with the integrated personal "
@@ -29709,8 +29709,8 @@ msgstr "Installation mislykkedes"
 #~ "  --report          - program bær være én af Mandrakes værktøjer\n"
 #~ "  --incident        - program bær være én af Mandrakes værktøjer"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "This interface has not been configured yet.\n"
@@ -29830,10 +29830,10 @@ msgstr "Installation mislykkedes"
 
 #~ msgid ""
 #~ "Take advantage of valuable benefits, products and services by joining "
-#~ "Mandrake Club, such as:"
+#~ "Mandriva Club, such as:"
 #~ msgstr ""
 #~ "Drag nytte af værdifulde fordele, produkter og tjenester ved at være med "
-#~ "i Mandrake Club, med:"
+#~ "i Mandriva Club, med:"
 
 #~ msgid "TCP/IP"
 #~ msgstr "TCP/IP"
diff --git a/perl-install/share/po/de.po b/perl-install/share/po/de.po
index e0cb61ed4..ab646b84e 100644
--- a/perl-install/share/po/de.po
+++ b/perl-install/share/po/de.po
@@ -5,7 +5,7 @@
 # translation of de.po to Deutsch
 # translation of DrakX-de.po to german
 # german translation of the MandrakeInstaller.
-# Copyright (C) 2000-2003 Mandrakesoft S.A.
+# Copyright (C) 2000-2003 Mandriva S.A.
 # Stefan Siegel <siegel@linux-mandrake.com>, 2000, 2001, 2002, 2003.
 # Sebastian Deutscher <sebastian_deutscher@web.de>, 2003,2004.
 # Gerhard Ortner <gerhard.ortner@aon.at>, 2003, 2004.
@@ -80,14 +80,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Der Schreibschutz des USB-Sticks scheint aktiv zu sein, aber das sichere\n"
 "Entfernen ist jetzt nicht möglich.\n"
 "\n"
 "\n"
 "Starten Sie den Rechner neu, entfernen Sie den USB-Stick, deaktivieren Sie\n"
-"den Schreibschutz und starten Sie Mandrake Move erneut."
+"den Schreibschutz und starten Sie Mandriva Move erneut."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -105,7 +105,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Ihr USB-Stick enthält keine gültige Windows(FAT)-Partition.\n"
@@ -116,14 +116,14 @@ msgstr ""
 "\n"
 "\n"
 "Sie können auch ohne einen USB-Stick weitermachen - \n"
-"Sie können dann Mandrake Move immernoch als normales\n"
+"Sie können dann Mandriva Move immernoch als normales\n"
 "Mandrake Betriebssystem nutzen."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -131,19 +131,19 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Es wurde kein USB-Stick an Ihrem System gefunden.\n"
 "Wenn Sie jetzt einen USB-Stick anschließen, kann\n"
-"Mandrake Move transparent die Daten in Ihrem Persönlichen\n"
+"Mandriva Move transparent die Daten in Ihrem Persönlichen\n"
 "Verzeichnis und die systemweite Konfiguration speichern.\n"
 "Diese stehen dann beim nächsten Booten zur Verfügung.\n"
 "Wenn Sie jetzt einen USB-Stick anschließen, warten Sie bitte\n"
 "mehrere Sekunden, bevor sie die Erkennung nochmals\n"
 "starten.\n"
 "Sie können auch ohne einen USB-Stick weitermachen - \n"
-"Sie können dann Mandrake Move immernoch als normales\n"
+"Sie können dann Mandriva Move immernoch als normales\n"
 "Mandrake Betriebssystem nutzen."
 
 #: ../move/move.pm:494
@@ -270,7 +270,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -286,7 +286,7 @@ msgstr ""
 "\n"
 "Das kann durch defekte System-Konfigurations-Dateien\n"
 "auf dem USB-Stick passieren. Entfernen Sie die Dateien\n"
-"und starten Sie Mandrake Move neu. Um das zu machen,\n"
+"und starten Sie Mandriva Move neu. Um das zu machen,\n"
 "klicken Sie auf die entsprechende Schaltfläche.\n"
 "\n"
 "\n"
@@ -1328,11 +1328,11 @@ msgstr "Sprachauswahl"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux unterstützt verschiedene Sprachen. Wählen\n"
+"Mandrivalinux unterstützt verschiedene Sprachen. Wählen\n"
 "Sie die Sprachen, die Sie installieren wollen.Diese stehen Ihnen zur\n"
 "Verfügung, nachdem die Installation fertig ist und Sie einen Neustart\n"
 "durchgeführt haben."
@@ -1676,12 +1676,12 @@ msgstr ""
 "Administrator wahrscheinlich folgendes ausführen: „C:\\>net localgroup \"Pre-"
 "Windows 2000 Compatible Access\" everyone /add“. Anschließend muss der "
 "Server neu gestartet werden.\n"
-"Damit Sie Ihren Mandrakelinux-Rechner zur Windows™-Domäne hinzufügen können, "
+"Damit Sie Ihren Mandrivalinux-Rechner zur Windows™-Domäne hinzufügen können, "
 "benötigen Sie noch Benutzername und Passwort eines Domänen-Administrators.\n"
 "Sollte das Netzwerk noch nicht aktiv sein, wird DrakX nach der "
 "Netzwerkkonfiguration versuchen, sich in die Domäne zu integrieren.\n"
 "Sollte dies schief gehen, und die Domänenauthentifizierung funktioniert "
-"nicht, verwenden Sie nach der Installation von Mandrakelinux folgenden "
+"nicht, verwenden Sie nach der Installation von Mandrivalinux folgenden "
 "Befehl: „smbpasswd -j DOMÄNE -U BENUTZER%%PASSWORT“, wobei „DOMÄNE“ die "
 "Windows™-Domäne ist, „BENUTZER“ und „PASSWORT“ der Benutzername und das "
 "Passwort des Domänen-Administrators.\n"
@@ -3781,12 +3781,12 @@ msgstr "Radio Unterstützung aktivieren"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Lesen Sie bitte aufmerksam die Lizenz, bevor Sie fortfahren. Sie umfasst\n"
-"die gesamte Mandrakelinux Distribution. Sollten Sie nicht in allen Punkten\n"
+"die gesamte Mandrivalinux 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“."
@@ -3969,13 +3969,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Die Mandrakelinux-Distribution wird auf mehreren CD-ROMs ausgeliefert. Es\n"
+"Die Mandrivalinux-Distribution wird auf mehreren CD-ROMs ausgeliefert. Es\n"
 "kann daher vorkommen, dass DrakX Pakete von anderen, als der\n"
 "Installations-CD-ROM installieren will. In diesem Fall wird es die aktuelle\n"
 "CD auswerfen und nach einer anderen fragen. Wenn Sie dieses CD nicht haben,\n"
@@ -3988,11 +3988,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4044,7 +4044,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Nun ist es Zeit sich zu entscheiden, welche Programme Sie auf Ihrem Rechner\n"
-"installieren wollen. Es gibt tausende von Paketen für Mandrakelinux, und\n"
+"installieren wollen. Es gibt tausende von Paketen für Mandrivalinux, und\n"
 "Sie müssen sie nicht alle auswendig kennen.\n"
 "\n"
 "Die Pakete sind nach ihrer Verwendung in vier Kategorien eingeteilt. Sie\n"
@@ -4155,10 +4155,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4190,7 +4190,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 Mandrakelinux werden installierte Server und Dienste automatisch beim\n"
+"Unter Mandrivalinux werden installierte Server und Dienste automatisch beim\n"
 "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"
@@ -4356,7 +4356,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4412,7 +4412,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 Mandrakelinux Ihnen anbietet (wie etwa KDE, GNOME,\n"
+"Benutzerumgebungen, die Mandrivalinux Ihnen anbietet (wie etwa KDE, GNOME,\n"
 "AfterStep oder WindowMaker).\n"
 "\n"
 "Sie erhalten eine Liste möglicher Parameter, mit deren Hilfe Sie die\n"
@@ -4539,12 +4539,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4571,7 +4571,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4580,7 +4580,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4600,11 +4600,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 Mandrakelinux\n"
+"Sie müssen nun entscheiden, wo auf Ihrer/n Festplatte(n) Ihr Mandrivalinux\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 Mandrakelinux darauf installiert\n"
+"Plattenplatz so aufzuteilen, dass Ihr Mandrivalinux darauf installiert\n"
 "werden kann.\n"
 "\n"
 "Da dieser Schritt normalerweise irreversibel ist und auch zu Datenverlusten\n"
@@ -4635,7 +4635,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 Mandrakelinux) nebeneinander nutzen\n"
+"Betriebssysteme (Microsoft Windows und Mandrivalinux) nebeneinander nutzen\n"
 "wollen.\n"
 "\n"
 "   Bevor Sie sich für diese Variante entscheiden, sei hier noch einmal\n"
@@ -4643,7 +4643,7 @@ msgstr ""
 "als momentan.\n"
 "\n"
 " * „%s“: Falls Sie alle Daten Ihrer Platte verlieren, und sie durch Ihr\n"
-"neues Mandrakelinux System ersetzen wollen, wählen Sie diese Schaltfläche.\n"
+"neues Mandrivalinux 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"
@@ -4813,7 +4813,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4835,7 +4835,7 @@ msgstr ""
 "Schaltfläche „%s“, um mit dem Formatieren der Partitionen zu beginnen.\n"
 "\n"
 "Betätigen Sie „%s“, wenn Sie eine andere Partition für Ihr neues\n"
-"Mandrakelinux vorgesehen haben.\n"
+"Mandrivalinux vorgesehen haben.\n"
 "\n"
 "Betätigen Sie die Schaltfläche „%s“, falls Sie Partitionen auf defekte\n"
 "Blöcke untersuchen wollen."
@@ -4854,7 +4854,7 @@ msgstr "Zurück"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4866,7 +4866,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandrakelinux\n"
+"Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandrivalinux\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"
@@ -4901,7 +4901,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4915,7 +4915,7 @@ msgstr ""
 "\n"
 "Sollten Sie sich an dieser Stelle nicht sicher sein, so behalten Sie die\n"
 "Standardeinstellung bei. Sie können die Ebene später noch mittels draksec\n"
-"im Mandrakelinux Control Center anpassen.\n"
+"im Mandrivalinux Control Center anpassen.\n"
 "\n"
 "Das Feld „%s“ dient dazu, dem System mitzuteilen, wer für die Sicherheit\n"
 "dieses Rechners verantwortlich ist. An dieses Kennzeichen/diese E-Mail\n"
@@ -4932,7 +4932,7 @@ msgstr "Sicherheitsadministrator:"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -5096,7 +5096,7 @@ msgstr "In den Normal-Modus wechseln"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5125,7 +5125,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 Mandrakelinux zu schaffen.\n"
+"Sie verkleinern wollen, um Platz für Ihr neues Mandrivalinux zu schaffen.\n"
 "\n"
 "Die Partitionen werden folgendermaßen aufgelistet: „Linux-Name“,\n"
 "„Windows-Name“, „Kapazität“.\n"
@@ -5177,7 +5177,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5186,35 +5186,35 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux 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"
 "\n"
 "DrakX fragt Sie nun nach der gewünschten Installationsart. Sie haben die\n"
 "Wahl zwischen einer Aktualisierung einer bereits vorhandenen\n"
-"Mandrakelinux-Version oder einer kompletten Neuinstallation:\n"
+"Mandrivalinux-Version oder einer kompletten Neuinstallation:\n"
 "\n"
-" * „%s“: Entfernt komplett ältere Versionen von Mandrakelinux, die noch\n"
+" * „%s“: Entfernt komplett ältere Versionen von Mandrivalinux, 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. Diese Installationsart ist gut, wenn Sie die\n"
 "Partitionseinteilung auf Ihrer Festplatte sowieso ändern oder das benutzte\n"
 "Dateisystem austauschen wollen\n"
 "\n"
-" * „%s“: Mit dieser Variante können Sie eine existierende Mandrakelinux\n"
+" * „%s“: Mit dieser Variante können Sie eine existierende Mandrivalinux\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 Mandrakelinux „8.1“ oder neueren Systemen sollten\n"
-"problemlos funktionieren. Ältere Versionen von Mandrakelinux sollten Sie\n"
+"Aktualisierungen von Mandrivalinux „8.1“ oder neueren Systemen sollten\n"
+"problemlos funktionieren. Ältere Versionen von Mandrivalinux sollten Sie\n"
 "nicht zu aktualisieren versuchen."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -5276,7 +5276,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5317,7 +5317,7 @@ msgstr ""
 "Zur 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 Mandrakelinux diese\n"
+"leider immer noch nicht gegeben. Daher verwendet Mandrivalinux diese\n"
 "Kodierung nur auf Wunsch des Anwenders:\n"
 "\n"
 " * Falls Sie eine Sprache nutzen, die eine gut unterstütztes Kodierung\n"
@@ -5575,7 +5575,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5596,11 +5596,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Hier können Sie das Drucksystem für Ihren Rechner wählen. Andere\n"
-"Betriebssysteme bieten Ihnen nur eines, bei Mandrakelinux können Sie\n"
+"Betriebssysteme bieten Ihnen nur eines, bei Mandrivalinux können Sie\n"
 "zwischen zwei verschiedenen wählen. jedes dieser Systeme ist für eine\n"
 "bestimmte Konfiguration des Systems am besten geeignet.\n"
 "\n"
@@ -5623,7 +5623,7 @@ msgstr ""
 "starten. „%s“ bietet grafische Konfigurations- und Druckmenüs.\n"
 "\n"
 "Sie können diese Wahl später immer wieder ändern, indem Sie PrinterDrake\n"
-"aus dem Mandrakelinux Control Center starten und dort die Schaltfläche „%s“\n"
+"aus dem Mandrivalinux Control Center starten und dort die Schaltfläche „%s“\n"
 "betätigen."
 
 #: help.pm:765
@@ -5750,7 +5750,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5767,7 +5767,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5818,7 +5818,7 @@ msgstr ""
 "\n"
 " * „%s“: Falls Sie Ihren Internetzugang oder Ihr lokales Netzwerk nun\n"
 "einrichten wollen, können Sie das hier tun. Lesen Sie sich dazu die\n"
-"gedruckte Dokumentation durch oder benutzen Sie das Mandrakelinux Control\n"
+"gedruckte Dokumentation durch oder benutzen Sie das Mandrivalinux Control\n"
 "Center nachdem die Installation beendet ist.\n"
 "\n"
 " * „%s“: Hier können Sie HTTP- und FTP-Proxyadressen eintragen falls Ihre\n"
@@ -5837,10 +5837,10 @@ msgstr ""
 "(„Bootloader“) ändern wollen, wählen Sie diese Schaltfläche. Es sei\n"
 "angemerkt, dass dieser Punkt sich an fortgeschrittenere Nutzer richtet.\n"
 "Hilfe finden Sie in der gedruckten Dokumentation oder im integrierten\n"
-"Hilfeteil des Mandrakelinux Control Center.\n"
+"Hilfeteil des Mandrivalinux Control Center.\n"
 "\n"
 " * „%s“: Sie können hier die Dienste wählen, die ab dem Start von\n"
-"Mandrakelinux zur Verfügung gestellt werden sollen. Wollen Sie den Rechner\n"
+"Mandrivalinux zur Verfügung gestellt werden sollen. Wollen Sie den Rechner\n"
 "als Server verwenden, sollten Sie unbedingt einen Blick auf diese Liste\n"
 "werfen."
 
@@ -5901,11 +5901,11 @@ msgstr "Dienste"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux 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"
-"Mandrakelinux zu installieren. Bedenken Sie dabei, dass alle Daten auf\n"
+"Mandrivalinux 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:
@@ -6262,7 +6262,7 @@ msgstr "Berechne die Größe der Windows-Partition"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Ihre Windows-Partition ist zu sehr fragmentiert.\n"
@@ -6390,19 +6390,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6424,7 +6424,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6432,14 +6432,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6449,7 +6449,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6469,10 +6469,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6483,11 +6483,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6503,31 +6503,31 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Bei dieser Übersetzung handelt es sich um eine inoffizielle Übersetzung\n"
-"der Mandrakelinux-Lizenz in die deutsche Sprache. Sie ist keine\n"
+"der Mandrivalinux-Lizenz in die deutsche Sprache. Sie ist keine\n"
 "rechtsverbindliche Darstellung der Lizenzbedingungen der Software in\n"
 "dieser Distribution - nur der ursprüngliche französische Text der\n"
-"Mandrakelinux-Lizenz ist rechtsverbindlich. Wir hoffen aber, dass diese\n"
+"Mandrivalinux-Lizenz ist rechtsverbindlich. Wir hoffen aber, dass diese\n"
 "Übersetzung den deutschsprechenden Benutzern das Verständnis dieser\n"
 "Lizenz erleichtert.\n"
 "\n"
 "\n"
 "Einführung\n"
 "\n"
-"Das Betriebssystem und die anderen Komponenten, die in Mandrakelinux\n"
+"Das Betriebssystem und die anderen Komponenten, die in Mandrivalinux\n"
 "enthalten sind, werden hier „Software-Produkte“ genannt. Die\n"
 "Software-Produkte umfassen, aber sind nicht beschränkt auf, die\n"
 "Gesamtheit der Programme, Methoden, Regeln, und Dokumentation, welche\n"
-"zum Betriebssystem und den anderen Komponenten der Mandrakelinux\n"
+"zum Betriebssystem und den anderen Komponenten der Mandrivalinux\n"
 "Distribution gehören.\n"
 "\n"
 "\n"
 "1. Lizenzabkommen\n"
 "\n"
 "Bitte lesen Sie dieses Dokument sorgfältig. Dieses Dokument ist ein\n"
-"Lizenzabkommen zwischen Ihnen und Mandrakesoft S. A. welches sich auf\n"
+"Lizenzabkommen zwischen Ihnen und Mandriva S. A. welches sich auf\n"
 "die Software-Produkte bezieht.\n"
 "Durch Installation, Duplizierung oder Benutzung der Software-Produkte in\n"
 "irgendeiner Art und Weise erklären Sie sich mit den Bedingungen dieser\n"
@@ -6546,14 +6546,14 @@ msgstr ""
 "Die Software-Produkte und die beigefügte Dokumentation werden dem\n"
 "Benutzer lediglich zur Verfügung gestellt, es wird keinerlei Garantie\n"
 "gegeben soweit es gesetzlich zulässig ist.\n"
-"Mandrakesoft S. A. haftet unter keinen Umständen, soweit gesetzlich\n"
+"Mandriva S. A. haftet unter keinen Umständen, soweit gesetzlich\n"
 "zulässig, für direkte oder indirekte Schäden irgendwelcher Art,\n"
 "(inklusive uneingeschränkten Schäden aufgrund Verlust von\n"
 "Geschäftsbeziehungen, Unterbrechung von Geschäftsvorgängen,\n"
 "finanziellen Verlust, Gebühren oder Strafen aufgrund gerichtlicher\n"
 "Entscheide, oder jegliche Folgeschäden) die aufgrund der Benutzung oder\n"
 "der Unmöglichkeit der Benutzung der Software-Produkte entstehen, auch\n"
-"wenn Mandrakesoft S. A. über die Möglichkeit und das Auftreten\n"
+"wenn Mandriva S. A. über die Möglichkeit und das Auftreten\n"
 "derartiger Schäden unterrichtet wurde.\n"
 "\n"
 "\n"
@@ -6561,14 +6561,14 @@ msgstr ""
 "BENUTZUNG VON SOFTWARE, DIE IN EINIGEN LÄNDERN VERBOTEN IST.\n"
 "\n"
 "\n"
-"Soweit gesetzlich zulässig, haften Mandrakesoft S. A. und deren\n"
+"Soweit gesetzlich zulässig, haften Mandriva S. A. und deren\n"
 "Vertreiber unter keinen Umständen für direkte oder indirekte Schäden\n"
 "irgendwelcher Art, (inklusive uneingeschränkten Schäden aufgrund Verlust\n"
 "von Geschäftsbeziehungen, Unterbrechung von Geschäftsvorgängen,\n"
 "finanziellen Verlust, Gebühren oder Strafen aufgrund gerichtlicher\n"
 "Entscheide, oder jegliche Folgeschäden) die aufgrund des Besitzes und\n"
 "der Benutzung von Software-Komponenten oder aufgrund des Ladens von\n"
-"Software-Komponenten von den Internet-Servern von Mandrakesoft S. A.,\n"
+"Software-Komponenten von den Internet-Servern von Mandriva S. A.,\n"
 "deren Besitz und Benutzung in einigen Ländern aufgrund lokaler Gesetze\n"
 "nicht gestattet ist, entstehen.\n"
 "Diese Einschränkung der Verantwortlichkeit bezieht sich auch, aber nicht\n"
@@ -6586,9 +6586,9 @@ msgstr ""
 "benutzen, zu duplizieren, anzupassen, und weiterzugeben. Bitte lesen sie\n"
 "sorgfältig die Bedingungen der Lizenzabkommen von jeder Komponente,\n"
 "bevor Sie sie benutzen. Jegliche Frage zur Lizenz einer Komponente ist an\n"
-"den Autor der Komponente und nicht an Mandrakesoft S. A. zu richten. Die\n"
-"von Mandrakesoft S. A. erstellten Programme unterliegen der GPL.\n"
-"Von Mandrakesoft S. A. geschriebene Dokumentation unterliegt einer\n"
+"den Autor der Komponente und nicht an Mandriva S. A. zu richten. Die\n"
+"von Mandriva S. A. erstellten Programme unterliegen der GPL.\n"
+"Von Mandriva S. A. geschriebene Dokumentation unterliegt einer\n"
 "spezifischen Lizenz. Bitte lesen Sie die Dokumentation für weitere\n"
 "Details.\n"
 "\n"
@@ -6598,10 +6598,10 @@ msgstr ""
 "Alle Rechte an den Komponenten der Software-Produkte liegen bei den\n"
 "entsprechenden Autoren und sind durch die Urheberrechtsgesetze für\n"
 "Softwareprodukte geschützt.\n"
-"Mandrakesoft S. A. behält sich das Recht vor, die Software-Produkte zu\n"
+"Mandriva S. A. behält sich das Recht vor, die Software-Produkte zu\n"
 "modifizieren und anzupassen.\n"
-"„Mandrake“, „Mandrakelinux“ und entsprechende Logos sind eingetragene\n"
-"Warenzeichen der Mandrakesoft S. A..\n"
+"„Mandrake“, „Mandrivalinux“ und entsprechende Logos sind eingetragene\n"
+"Warenzeichen der Mandriva S. A..\n"
 "\n"
 "\n"
 "5. Gesetzliche Bestimmungen\n"
@@ -6615,7 +6615,7 @@ msgstr ""
 "werden vorzugsweise außergerichtlich beigelegt. Letztes Mittel ist das\n"
 "zuständige Gericht in Paris, Frankreich.\n"
 "Zu jeglicher Frage zu diesem Dokument kontaktieren Sie bitte\n"
-"Mandrakesoft S. A.\n"
+"Mandriva S. A.\n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6709,7 +6709,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6717,7 +6717,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Herzlichen Glückwunsch, die Installation ist abgeschlossen.\n"
 "Entfernen Sie die Startmedien (CD-ROMs / Disketten) und drücken Sie die "
@@ -6729,7 +6729,7 @@ msgstr ""
 "%s\n"
 "\n"
 "Wie Sie Ihr System warten können, erfahren Sie im Kapitel „Nach der "
-"Installation“ im offiziellen Benutzerhandbuch von Mandrakelinux."
+"Installation“ im offiziellen Benutzerhandbuch von Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6764,7 +6764,7 @@ msgstr "Beginn von Schritt „%s“\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -7317,9 +7317,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Kontaktiere Mandrakelinux Web-Server, um eine Liste verfügbarer Pakete zu "
+"Kontaktiere Mandrivalinux Web-Server, um eine Liste verfügbarer Pakete zu "
 "erhalten..."
 
 #: install_steps_interactive.pm:840
@@ -7549,8 +7549,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux-Installation %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux-Installation %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10138,14 +10138,14 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "DrakFirewall-Konfigurator\n"
 "\n"
 "Hiermit konfigurieren Sie eine persönliche Firewall für diesen\n"
-"Mandrakelinux-Rechner. Sollten Sie an einer speziellen ausgereiften\n"
+"Mandrivalinux-Rechner. Sollten Sie an einer speziellen ausgereiften\n"
 "Firewall-Lösung interessiert sein, schauen Sie sich nach der speziell\n"
 "dafür entwickelten MandrakeSecurity-Firewall-Distribution um."
 
@@ -14237,11 +14237,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"Starten Sie Scannerdrake (Hardware/Scanner im Mandrakelinux "
+"Starten Sie Scannerdrake (Hardware/Scanner im Mandrivalinux "
 "Kontrollzentrum), um Ihren Scanner im Netzwerk freizugeben.\n"
 "\n"
 
@@ -16239,23 +16239,23 @@ msgstr "Stopp"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Was ist Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Was ist Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Willkommen zu <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Willkommen zu <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux ist eine <b>Linuxdistribution</b>, die sowohl den Kern des "
+"Mandrivalinux ist eine <b>Linuxdistribution</b>, die sowohl den Kern des "
 "Systems umfasst, der <b>Betriebssystem</b> (basierend auf dem Linux-Kernel) "
 "genannt wird, als auch <b>eine Menge Anwendungen</b>, die jeden Bedarf "
 "abdecken, den Sie sich vorstellen können."
@@ -16263,10 +16263,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux ist die <b>benutzerfreundlichste</b> Linuxdistribution "
+"Mandrivalinux ist die <b>benutzerfreundlichste</b> Linuxdistribution "
 "heutzutage. Sie ist außerdem eine der <b>am weitesten verbreiteten</b> "
 "Linuxdistributionen weltweit!"
 
@@ -16283,14 +16283,14 @@ msgstr "Willkommen in der <b>Open Source Welt</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux verpflichtet sich dem Open-Source-Modell. Das bedeutet, dass "
+"Mandrivalinux verpflichtet sich dem Open-Source-Modell. Das bedeutet, dass "
 "diese neue Ausgabe das Resultat der <b>Zusammenarbeit</b> zwischen "
-"<b>Mandrakesofts Entwicklern</b> und der <b>weltweiten Gemeinschaft</b> von "
+"<b>Mandrivas Entwicklern</b> und der <b>weltweiten Gemeinschaft</b> von "
 "Mitwirkenden ist."
 
 #: share/advertising/02.pl:19
@@ -16311,10 +16311,10 @@ msgstr "<b>Die GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "Ein Großteil der in der Distribution enthaltenen Programme und alle "
-"Mandrakelinux-Werkzeuge sind unter der <b>General Public License</b> "
+"Mandrivalinux-Werkzeuge sind unter der <b>General Public License</b> "
 "lizensiert."
 
 #: share/advertising/03.pl:17
@@ -16346,15 +16346,15 @@ msgstr "<b>Treten Sie der Gemeinschaft bei</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux hat eine der <b>größten Gemeinschaften</b> von Nutzern und "
+"Mandrivalinux hat eine der <b>größten Gemeinschaften</b> von Nutzern und "
 "Entwicklern. Die Rolle dieser Gemeinschaft ist sehr umfassend und erstreckt "
 "sich von Fehlerberichten bis zur Entwicklung neuer Anwendungen. Die "
-"Gemeinschaft spielt eine <b>Schlüsselrolle</b> in der Mandrakelinux-Welt."
+"Gemeinschaft spielt eine <b>Schlüsselrolle</b> in der Mandrivalinux-Welt."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16376,11 +16376,11 @@ msgstr "<b>Download-Version</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Sie installieren <b>Mandrakelinux Download</b>. Das ist die freie Version, "
-"die Mandrakesoft <b>für jeden zur Verfügung</b> stellt."
+"Sie installieren <b>Mandrivalinux Download</b>. Das ist die freie Version, "
+"die Mandriva <b>für jeden zur Verfügung</b> stellt."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16413,9 +16413,9 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
-"Sie werden auch keinen Zugriff auf die in den anderen Mandrakesoft-Produkten "
+"Sie werden auch keinen Zugriff auf die in den anderen Mandriva-Produkten "
 "<b>inbegriffenen Dienstleistungen</b> haben."
 
 #: share/advertising/06.pl:13
@@ -16425,8 +16425,8 @@ msgstr "<b>Discovery, Ihr erster Linux-Desktop</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Sie installieren <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Sie installieren <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16448,17 +16448,17 @@ msgstr "<b>PowerPack, der ultimative Linux-Desktop</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Sie installieren <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Sie installieren <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack ist Mandrakesofts <b>erstklassiger Linux-Desktop</b>. PowerPack "
+"PowerPack ist Mandrivas <b>erstklassiger Linux-Desktop</b>. PowerPack "
 "beinhaltet <b>tausende Anwendungen</b> -- alles vom Beliebtesten bis zum "
 "Fortschrittlichsten."
 
@@ -16469,8 +16469,8 @@ msgstr "<b>PowerPack+, die Linuxlösung für Desktops und Server</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Sie installieren <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Sie installieren <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16487,22 +16487,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesoft Produkte</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva Produkte</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> hat eine breite Auswahl an <b>Mandrakelinux</b>-"
+"<b>Mandriva</b> hat eine breite Auswahl an <b>Mandrivalinux</b>-"
 "Produkten entwickelt."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Die Mandrakelinux Produkte sind:"
+msgid "The Mandrivalinux products are:"
+msgstr "Die Mandrivalinux Produkte sind:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16522,74 +16522,74 @@ msgstr "\t* <b>PowerPack+</b>, die Linuxlösung für Desktops und Server."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux für x86-64</b>, die Mandrakelinux-Lösung, um das Beste "
+"\t* <b>Mandrivalinux für x86-64</b>, die Mandrivalinux-Lösung, um das Beste "
 "aus Ihrem 64-Bit-Prozessor zu machen."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesoft Produkte (Nomaden-Produkte)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandriva Produkte (Nomaden-Produkte)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft hat zwei Produkte entwickelt, die es Ihnen erlauben, "
-"Mandrakelinux <b>auf jedem Rechner</b> ohne vorherige Installation zu "
+"Mandriva hat zwei Produkte entwickelt, die es Ihnen erlauben, "
+"Mandrivalinux <b>auf jedem Rechner</b> ohne vorherige Installation zu "
 "verwenden:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, eine Mandrakelinux-Distribution, die komplett von einer "
+"\t* <b>Move</b>, eine Mandrivalinux-Distribution, die komplett von einer "
 "startbaren CD-ROM läuft."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, eine Mandrakelinux-Distribution vorinstalliert auf "
+"\t* <b>GlobeTrotter</b>, eine Mandrivalinux-Distribution vorinstalliert auf "
 "der ultra-kompakten „LaCie Mobilen Festplatte“."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Mandrakesoft Produkte (Professionelle Lösungen)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Mandriva Produkte (Professionelle Lösungen)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Unten aufgeführt sind die Mandrakesoft-Produkte für die <b>professionellen "
+"Unten aufgeführt sind die Mandriva-Produkte für die <b>professionellen "
 "Bedürfnisse</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, der Mandrakelinux-Desktop für Geschäfte."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, der Mandrivalinux-Desktop für Geschäfte."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, die Mandrakelinux-Serverlösung."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, die Mandrivalinux-Serverlösung."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
-"\t* <b>Multi-Network-Firewall</b>, die Mandrakelinux-Sicherheitslösung."
+"\t* <b>Multi-Network-Firewall</b>, die Mandrivalinux-Sicherheitslösung."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16633,10 +16633,10 @@ msgstr "<b>Wählen Sie Ihre Desktop-Umgebung</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Mit PowerPack werden Sie die Auswahl der <b>grafischen Desktop-Umgebung</b> "
-"haben.  Mandrakesoft hat <b>KDE</b> als Voreinstellung gewählt."
+"haben.  Mandriva hat <b>KDE</b> als Voreinstellung gewählt."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16661,10 +16661,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Mit PowerPack+ werden Sie die Auswahl der <b>grafischen Desktop-Umgebung</b> "
-"haben.  Mandrakesoft hat <b>KDE</b> als Voreinstellung gewählt."
+"haben.  Mandriva hat <b>KDE</b> als Voreinstellung gewählt."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16793,10 +16793,10 @@ msgstr "<b>Genießen Sie die breite Auswahl an Anwendungen</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Im Mandrakelinux-Menü finden Sie <b>einfach zu bedienende</b> Anwendungen "
+"Im Mandrivalinux-Menü finden Sie <b>einfach zu bedienende</b> Anwendungen "
 "für <b>alle Ihre Aufgaben</b>:"
 
 #: share/advertising/18.pl:16
@@ -17069,18 +17069,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux Kontrollzentrum</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux Kontrollzentrum</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"Das <b>Mandrakelinux-Kontrollzentrum</b> ist eine wesentliche Sammlung der "
-"Mandrakelinux-spezifischen Werkzeuge um die Einrichtung des Computers zu "
+"Das <b>Mandrivalinux-Kontrollzentrum</b> ist eine wesentliche Sammlung der "
+"Mandrivalinux-spezifischen Werkzeuge um die Einrichtung des Computers zu "
 "vereinfachen."
 
 #: share/advertising/25.pl:17
@@ -17105,16 +17105,16 @@ msgstr "<b>Das Open-Source-Modell</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Wie jede andere Software, benötigt auch Open Source Software <b>Zeit und "
 "Leute</b> für ihre Entwicklung. Um die Open Source Philosophie anzuerkennen, "
-"verkauft Mandrakesoft Mehrwertprodukte und Dienstleistungen, um "
-"<b>Mandrakelinux zu verbessern</b>. Wenn Sie die Open Source Philosophy und "
-"die Entwicklung von Mandrakelinux <b>unterstützen</b> wollen, ziehen Sie "
+"verkauft Mandriva Mehrwertprodukte und Dienstleistungen, um "
+"<b>Mandrivalinux zu verbessern</b>. Wenn Sie die Open Source Philosophy und "
+"die Entwicklung von Mandrivalinux <b>unterstützen</b> wollen, ziehen Sie "
 "<b>bitte</b> den Kauf eines unserer Produkte oder Dienstleistungen in "
 "Betracht!"
 
@@ -17126,10 +17126,10 @@ msgstr "<b>Online Warenhaus</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Um mehr über Mandrakesoft-Produkte und -dienstleistungen zu erfahren, können "
+"Um mehr über Mandriva-Produkte und -dienstleistungen zu erfahren, können "
 "Sie unsere <b>e-commerce Plattform</b> besuchen."
 
 #: share/advertising/27.pl:17
@@ -17154,24 +17154,24 @@ msgstr "Schauen Sie noch heute unter <b>store.mandrakesoft.com</b> rein!"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> ist der <b>perfekte Begleiter</b> für Ihr Mandrakelinux-"
+"<b>Mandriva Club</b> ist der <b>perfekte Begleiter</b> für Ihr Mandrivalinux-"
 "Produkt."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Profitieren Sie durch einen Beitritt in den Mandrakeclub von <b>wertvollen "
+"Profitieren Sie durch einen Beitritt in den Mandriva Club von <b>wertvollen "
 "Vorteilen</b>, wie beispielsweise:"
 
 #: share/advertising/28.pl:20
@@ -17194,40 +17194,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Teilnahme an Mandrakelinux <b>Nutzerforen</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Teilnahme an Mandrivalinux <b>Nutzerforen</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Früher und privilegierter Zugriff</b>, vor der öffentlichen Ausgabe, "
-"auf Mandrakelinux <b>ISO-Abbilder</b>."
+"auf Mandrivalinux <b>ISO-Abbilder</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> ist eine neue Premiumdienstleistung, die Mandrakesoft "
+"<b>Mandriva Online</b> ist eine neue Premiumdienstleistung, die Mandriva "
 "stolz seinen Kunden anbietet!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline bietet eine breite Palette wertvoller Dienstleistungen zur "
-"<b>einfachen Aktualisierung</b> Ihres Mandrakelinux-Systems:"
+"Mandriva Online bietet eine breite Palette wertvoller Dienstleistungen zur "
+"<b>einfachen Aktualisierung</b> Ihres Mandrivalinux-Systems:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17252,40 +17252,40 @@ msgstr "\t* Flexible <b>planmäßige</b> Aktualisierungen."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
-msgstr "\t* Verwaltung <b>all Ihrer Mandrakelinux-Systeme</b> mit einem Konto."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+msgstr "\t* Verwaltung <b>all Ihrer Mandrivalinux-Systeme</b> mit einem Konto."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Benötigen Sie <b>Unterstützung?</b> Treffen Sie Mandrakesofts "
+"Benötigen Sie <b>Unterstützung?</b> Treffen Sie Mandrivas "
 "Technikexperten auf <b>unserer technischen Supportplattform</b> www."
 "mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Dank der <b>qualifzierten Mandrakelinux-Experten</b> werden Sie eine Menge "
+"Dank der <b>qualifzierten Mandrivalinux-Experten</b> werden Sie eine Menge "
 "Zeit sparen."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Zu jeder Frage bezüglich Mandrakelinux können Sie Support unter <b>store."
+"Zu jeder Frage bezüglich Mandrivalinux können Sie Support unter <b>store."
 "mandrakesoft.com</b> kaufen."
 
 #: share/compssUsers.pl:25
@@ -17586,8 +17586,8 @@ msgstr "Überwachungswerkzeuge, Prozessverwaltung, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesoft-Assistenten"
+msgid "Mandriva Wizards"
+msgstr "Mandriva-Assistenten"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17681,8 +17681,8 @@ msgstr ""
 "\n"
 "OPTIONEN:\n"
 "  --help            - Asgabe dieses Hilfetextes.\n"
-"  --report          - Name eines Mandrakelinux-Werkzeuges.\n"
-"  --incident        - Name eines Mandrakelinux-Werkzeuges."
+"  --report          - Name eines Mandrivalinux-Werkzeuges.\n"
+"  --incident        - Name eines Mandrivalinux-Werkzeuges."
 
 #: standalone.pm:63
 #, c-format
@@ -17738,7 +17738,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17809,14 +17809,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPTION]...\n"
-"  --no-confirmation      keine Fragen im MandrakeUpdate-Modus stellen\n"
+"  --no-confirmation      keine Fragen im Mandriva Update-Modus stellen\n"
 "  --no-verify-rpm        Paketsignaturen nicht überprüfen\n"
 "  --changelog-first      Änderungsprotokoll vor Dateiliste anzeigen\n"
 "  --merge-all-rpmnew     Zusammenlegen aller .rpmnew/.rpmsave-Dateien "
@@ -20635,13 +20635,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux Fehlerberichte"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux Fehlerberichte"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Kontrollzentrum"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux Kontrollzentrum"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20661,8 +20661,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20706,8 +20706,8 @@ msgstr "Konfigurationsassistenten"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Wählen Sie ein Mandrakesoft-Werkzeug:"
+msgid "Select Mandriva Tool:"
+msgstr "Wählen Sie ein Mandriva-Werkzeug:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -21134,20 +21134,20 @@ msgstr "Beim Hochfahren gestartet"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Diese Schnittstelle wurde noch nicht eingerichtet.\n"
-"Starten Sie den Assistenten „Schnittstelle hinzufügen“ im Mandrakelinux "
+"Starten Sie den Assistenten „Schnittstelle hinzufügen“ im Mandrivalinux "
 "Kontrollzentrum."
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Sie haben noch keine eingerichtete Internetverbindung.\n"
-"Starten Sie den Assistenten „%s“ im Mandrakelinux Kontrollzentrum."
+"Starten Sie den Assistenten „%s“ im Mandrivalinux Kontrollzentrum."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21197,8 +21197,8 @@ msgstr "KDM (KDE Display Manager)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux Display Manager)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21497,7 +21497,7 @@ msgstr "Importieren"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21506,7 +21506,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright © 2001-2002 by Mandrakesoft \n"
+"Copyright © 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (Orginalversion)\n"
@@ -22059,14 +22059,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright © 2003-2004 Mandrakesoft.\n"
+"Copyright © 2003-2004 Mandriva.\n"
 "Dies ist freie Software und kann unter der den Bedingungen der GNU GPL "
 "weitergegeben werden.\n"
 "\n"
@@ -22096,8 +22096,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux Hilfezentrum"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux Hilfezentrum"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25649,8 +25649,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinux Werkzeugprotokolle"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinux Werkzeugprotokolle"
 
 #: standalone/logdrake:51
 #, c-format
@@ -26167,10 +26167,10 @@ msgstr "Verbindung fertiggestellt."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Verbinden fehlgeschlagen.\n"
-"Überprüfen Sie Ihre Konfiguration im Mandrakelinux Kontrollzentrum."
+"Überprüfen Sie Ihre Konfiguration im Mandrivalinux Kontrollzentrum."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/el.po b/perl-install/share/po/el.po
index 62d73b948..edd371902 100644
--- a/perl-install/share/po/el.po
+++ b/perl-install/share/po/el.po
@@ -61,7 +61,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -80,7 +80,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -96,7 +96,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -222,7 +222,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1260,11 +1260,11 @@ msgstr "χειροκίνητα"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Το Mandrakelinux υποστηρίζει πολλαπλές γλώσσες.Επιλέξτε \n"
+"Το Mandrivalinux υποστηρίζει πολλαπλές γλώσσες.Επιλέξτε \n"
 "τις άλλες γλώσσες που θα είναι διαθέσιμες μετά το πέρας της \n"
 "εγκατάστασης και την επανεκκίνηση του συστήματός σας."
 
@@ -3639,7 +3639,7 @@ msgstr "ενεργοποίηση ραδιοφώνου"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3819,13 +3819,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Η εγκατάσταση του Mandrakelinux είναι μοιρασμένο σε αρκετά CD-ROM. Το \n"
+"Η εγκατάσταση του Mandrivalinux είναι μοιρασμένο σε αρκετά CD-ROM. Το \n"
 "DrakX ξέρει αν ένα επιλεγμένο πακέτο υπάρχει σε άλλο CD-ROM, θα εξάγει το \n"
 "τρέχον CD και θα ζητήσει να εισάγετε ένα άλλο όταν αυτό θα χρειαστεί."
 
@@ -3833,11 +3833,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3994,10 +3994,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4179,7 +4179,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4347,12 +4347,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4379,7 +4379,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4388,7 +4388,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4607,7 +4607,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4649,7 +4649,7 @@ msgstr "Προηγούμενο"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4689,7 +4689,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4714,7 +4714,7 @@ msgstr "Διαχειριστής Ασφαλείας:"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4873,7 +4873,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4950,7 +4950,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4959,13 +4959,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "ενεργοποίηση τώρα Linux\n"
 "\n"
@@ -5041,7 +5041,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5277,7 +5277,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5298,7 +5298,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Άλλο\n"
@@ -5447,7 +5447,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5464,7 +5464,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5526,11 +5526,11 @@ msgstr "Υπηρεσίες"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Επιλέξτε τον δίσκο που θέλετε να διαγράψετε για να εγκαταστήσετε \n"
-"την νέα κατάτμηση Mandrakelinux. ΠΡΟΣΟΧΗ: Όλα τα δεδομένα θα διαγραφούν\n"
+"την νέα κατάτμηση Mandrivalinux. ΠΡΟΣΟΧΗ: Όλα τα δεδομένα θα διαγραφούν\n"
 "και θα είναι αδύνατη η επαναφορά τους!"
 
 #: help.pm:863
@@ -5883,12 +5883,12 @@ msgstr "Υπολογίζεται το μέγεθος της κατάτμησης
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Η κατάτμηση των Windows είναι πολύ κατακερματισμένη, παρακαλώ τρέξτε πρώτα "
 "το ``defrag'' μέσα από τα Windows και ξεκινήστε ξανά την εγκατάσταση του  "
-"Mandrakelinux "
+"Mandrivalinux "
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6005,19 +6005,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6039,7 +6039,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6047,14 +6047,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6064,7 +6064,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6084,10 +6084,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6098,11 +6098,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6118,7 +6118,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "\n"
 "\n"
@@ -6277,7 +6277,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6285,14 +6285,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Συγχαρητήρια, η εγκατάσταση ολοκληρώθηκε.\n"
 "Αφαιρέστε την δισκέτα ή το CD εκκίνησης και πατήστε return για "
 "επανεκκίνηση.\n"
 "\n"
 "\n"
-"Για πληροφορίες σχετικά με διορθώσεις αυτής της έκδοσης του Mandrakelinux,\n"
+"Για πληροφορίες σχετικά με διορθώσεις αυτής της έκδοσης του Mandrivalinux,\n"
 "συμβουλευτείτε την σελίδα: \n"
 "\n"
 "\n"
@@ -6301,7 +6301,7 @@ msgstr ""
 "\n"
 "Πληροφορίες σχετικά με τις ρυθμίσεις του συστήματός σας υπάρχουν στο "
 "σχετικό\n"
-"κεφάλαιο του επίσημου οδηγού χρήσης του Mandrakelinux."
+"κεφάλαιο του επίσημου οδηγού χρήσης του Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6336,13 +6336,13 @@ msgstr "Βήμα `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Το σύστημά σας δεν έχει αρκετούς πόρους. Μπορεί να αντιμετωπίσετε "
 "προβλήματα\n"
-"στην εγκατάσταση του Mandrakelinux. Εάν συμβεί αυτό, μπορείτε να δοκιμάσετε "
+"στην εγκατάσταση του Mandrivalinux. Εάν συμβεί αυτό, μπορείτε να δοκιμάσετε "
 "εγκατάσταση κειμένου.\n"
 "Πατήστε F1 κατά την εκκίνηση από CDROM, μετά γράψτε `text'."
 
@@ -6883,9 +6883,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Σύνδεση με την τοποθεσία της Mandrakelinux για λήψη των διαθέσιμων τόπων "
+"Σύνδεση με την τοποθεσία της Mandrivalinux για λήψη των διαθέσιμων τόπων "
 "λήψης..."
 
 #: install_steps_interactive.pm:840
@@ -7107,8 +7107,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Εγκατάσταση Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Εγκατάσταση Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9692,7 +9692,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -13573,7 +13573,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -15487,18 +15487,18 @@ msgstr "Τερματισμός"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Καλώς Ορίσατε στο <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Καλώς Ορίσατε στο <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -15507,7 +15507,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -15524,9 +15524,9 @@ msgstr "Καλώς ορίσατε στον κόσμο του Ανοιχτού Κ
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -15546,7 +15546,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -15572,10 +15572,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -15594,8 +15594,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -15622,7 +15622,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -15632,7 +15632,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15651,13 +15651,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -15669,7 +15669,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15683,19 +15683,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "Κέντρο Ελέγχου Mandrakelinux"
+msgid "<b>Mandriva Products</b>"
+msgstr "Κέντρο Ελέγχου Mandrivalinux"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -15716,61 +15716,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -15808,7 +15808,7 @@ msgstr "Επιλέξτε το κλειδί κρυπτογράφησης του �
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -15829,7 +15829,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -15946,7 +15946,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -16181,14 +16181,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Κέντρο Ελέγχου Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Κέντρο Ελέγχου Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -16210,21 +16210,21 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
 #: share/advertising/27.pl:13
 #, fuzzy, c-format
 msgid "<b>Online Store</b>"
-msgstr "Κέντρο Ελέγχου Mandrakelinux"
+msgstr "Κέντρο Ελέγχου Mandrivalinux"
 
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -16247,20 +16247,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -16279,33 +16279,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -16328,32 +16328,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -16651,8 +16651,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Κέντρο Ελέγχου Mandrakelinux"
+msgid "Mandriva Wizards"
+msgstr "Κέντρο Ελέγχου Mandrivalinux"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -16779,7 +16779,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16846,7 +16846,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -19442,13 +19442,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "Εργαλείο Αναφοράς Σφαλμάτων Mandrake"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Κέντρο Ελέγχου Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Κέντρο Ελέγχου Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19468,8 +19468,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -19513,7 +19513,7 @@ msgstr "Οδηγοί Ρύθμισης"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -19926,7 +19926,7 @@ msgstr "Ξεκίνησαν στην εκκίνηση"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Η διεπαφή δεν έχει ρυθμιστή ακόμα. \n"
 "Εκτελέστε τον οδηγό ρύθμισης στην κυρίως οθόνη"
@@ -19935,7 +19935,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Η διεπαφή δεν έχει ρυθμιστή ακόμα. \n"
 "Εκτελέστε τον οδηγό ρύθμισης στην κυρίως οθόνη"
@@ -19988,7 +19988,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20287,7 +20287,7 @@ msgstr "Εισαγωγή"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -20815,7 +20815,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -20842,7 +20842,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Κέντρο Ελέγχου Mandrake"
 
 #: standalone/drakhelp:36
@@ -23797,7 +23797,7 @@ msgid ""
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
-"Αυτό είναι το HardDrake, ένα εργαλείο ρύθμισης της Mandrakelinux\n"
+"Αυτό είναι το HardDrake, ένα εργαλείο ρύθμισης της Mandrivalinux\n"
 "<span foreground=\"royalblue3\">Έκδοση:</span> %s\n"
 "<span foreground=\"royalblue3\">Δημιουργός:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
@@ -23910,7 +23910,7 @@ msgstr "Η αλλαγή έγινε, αλλά για να ισχύσει θα π�
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Επεξήγηση Εργαλείων της Mandrake"
 
 #: standalone/logdrake:51
@@ -24420,10 +24420,10 @@ msgstr "Η σύνδεση έγινε."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Η σύνδεση απέτυχε.\n"
-"Επαληθεύστε τις ρυθμίσεις σας στο Κέντρο Ελέγχου Mandrakelinux."
+"Επαληθεύστε τις ρυθμίσεις σας στο Κέντρο Ελέγχου Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -24658,7 +24658,7 @@ msgstr "Επαναδημιουργία λίστας με τους ρυθμισμ
 #: standalone/scannerdrake:101
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "Το %s δεν υποστηρίζεται από αυτή την έκδοση του Mandrakelinux."
+msgstr "Το %s δεν υποστηρίζεται από αυτή την έκδοση του Mandrivalinux."
 
 #: standalone/scannerdrake:104
 #, c-format
@@ -24699,7 +24699,7 @@ msgstr ""
 #: standalone/scannerdrake:144
 #, fuzzy, c-format
 msgid "The %s is not supported under Linux."
-msgstr "Το %s δεν υποστηρίζεται από αυτή την έκδοση του Mandrakelinux."
+msgstr "Το %s δεν υποστηρίζεται από αυτή την έκδοση του Mandrivalinux."
 
 #: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
@@ -25283,8 +25283,8 @@ msgstr "Η εγκατάσταση απέτυχε"
 #~ msgstr "δεν βρέθηκε καμία γραμματοσειρά\n"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Κέντρο Ελέγχου Mandrakelinux"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Κέντρο Ελέγχου Mandrivalinux"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Δεν βρέθηκε περιηγητής! Παρακαλώ εγκαταστήστε τον"
@@ -25784,8 +25784,8 @@ msgstr "Η εγκατάσταση απέτυχε"
 #~ msgid "mkraid failed"
 #~ msgstr "αποτυχία mkraid"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "Connection failed.\n"
diff --git a/perl-install/share/po/eo.po b/perl-install/share/po/eo.po
index 3e3027485..3f7eeeda9 100644
--- a/perl-install/share/po/eo.po
+++ b/perl-install/share/po/eo.po
@@ -1,5 +1,5 @@
 # Esperanto drakbootdisk
-# Copyright (C) 2000, 2001 Mandrakesoft
+# Copyright (C) 2000, 2001 Mandriva
 # D. Dale Gulledge <dsplat@rochester.rr.com>, 2000.
 #
 msgid ""
@@ -59,7 +59,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -78,7 +78,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -86,7 +86,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -94,7 +94,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -220,7 +220,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1238,7 +1238,7 @@ msgstr "Mianmaro"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3558,7 +3558,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3668,7 +3668,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3679,11 +3679,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3790,10 +3790,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3918,7 +3918,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4016,12 +4016,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4048,7 +4048,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4057,7 +4057,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4186,7 +4186,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4204,7 +4204,7 @@ msgstr "Antaŭa"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4233,7 +4233,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4249,7 +4249,7 @@ msgstr "Malproksimaj lpd Printilaj Opcioj"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4335,7 +4335,7 @@ msgstr "Ŝanĝu al Normala reĝimo"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4380,7 +4380,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4389,13 +4389,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4436,7 +4436,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4614,7 +4614,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4635,7 +4635,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Nun estas tempo por elekti pressistemon por via komputilo. Aliaj mastrum-"
@@ -4784,7 +4784,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4801,7 +4801,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4863,7 +4863,7 @@ msgstr "Servoj"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -5191,7 +5191,7 @@ msgstr "Kalkulante la liberan spacon sur la Vindoza subdisko"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Via Vindoza subdisko estas tro fragmentigata, bonvole uzu ``defrag'' antaŭe"
@@ -5310,19 +5310,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5344,7 +5344,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5352,14 +5352,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5369,7 +5369,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5389,10 +5389,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5403,11 +5403,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5423,7 +5423,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Enkonduko\n"
 "\n"
@@ -5439,7 +5439,7 @@ msgstr ""
 "1. Licenckonsento \n"
 "Bonvole legu tiun ĉi dokumenton zorge. Tiu ĉi dokumento estas licenckonsento "
 "inter vi kaj\n"
-"Mandrakesoft S.A. kiu aplikiĝas al la softvarproduktoj.\n"
+"Mandriva S.A. kiu aplikiĝas al la softvarproduktoj.\n"
 "Per instalado, duobligado aŭ uzado de la softvarproduktoj en ajna maniero, "
 "vi eksplicite\n"
 "akceptas kaj plene konsentas agi konforme al la teksto kaj kondiĉoj de tiu "
@@ -5532,7 +5532,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5540,7 +5540,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5576,7 +5576,7 @@ msgstr "Eniras paŝon `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -6117,7 +6117,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
 "Mi kontaktas la Linuks-Mandrakan retpaĝon por havigi la liston de "
 "disponeblaj speguloj..."
@@ -6333,7 +6333,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
 msgstr "Linuks-Mandrejka Instalado %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -8907,7 +8907,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12532,7 +12532,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14284,18 +14284,18 @@ msgstr "Haltu"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Bonvenon ĉe <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Bonvenon ĉe <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14304,7 +14304,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -14321,9 +14321,9 @@ msgstr "Provu konfiguraĵon"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -14343,7 +14343,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14369,10 +14369,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14391,8 +14391,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14419,7 +14419,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14429,7 +14429,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14448,13 +14448,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14466,7 +14466,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14480,19 +14480,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr "Konekti al la interreto"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -14513,61 +14513,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14605,7 +14605,7 @@ msgstr "<b>Programaj medioj</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14626,7 +14626,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -14656,7 +14656,7 @@ msgstr ""
 #: share/advertising/15.pl:13
 #, fuzzy, c-format
 msgid "<b>Kontact</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/15.pl:15
 #, c-format
@@ -14743,7 +14743,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -14978,14 +14978,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux-Regejo</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux-Regejo</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -15007,9 +15007,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -15021,7 +15021,7 @@ msgstr "Konekti al la interreto"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -15044,20 +15044,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -15076,33 +15076,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -15125,32 +15125,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15441,7 +15441,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr "Konekti al la interreto"
 
 #: share/compssUsers.pl:197
@@ -15531,8 +15531,8 @@ msgstr ""
 "\n"
 "OPCIOJ:\n"
 "  --help            - montru tiun help-mesaĝon.\n"
-"  --report          - programo estu iu de Mandrakelinux iloj\n"
-"  --incident        - programo estu iu de Mandrakelinux iloj"
+"  --report          - programo estu iu de Mandrivalinux iloj\n"
+"  --incident        - programo estu iu de Mandrivalinux iloj"
 
 #: standalone.pm:63
 #, c-format
@@ -15579,7 +15579,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15650,14 +15650,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPCIO]...\n"
-"  --no-confirmation      ne postulu unue konfirmadon en MandrakeUpdate mode\n"
+"  --no-confirmation      ne postulu unue konfirmadon en Mandriva Update mode\n"
 "  --no-verify-rpm       ne kontrolu la pakaĵ-subskribojn\n"
 "  --changelog-first      afiŝu changelog antaŭ dosierliston en la priskribo-"
 "fenestro\n"
@@ -18114,13 +18114,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "Konekti al la interreto"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux-Regejo"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux-Regejo"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18140,8 +18140,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, fuzzy, c-format
@@ -18185,7 +18185,7 @@ msgstr "ISDN-a Konfiguraĵon"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -18594,14 +18594,14 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18652,7 +18652,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18944,7 +18944,7 @@ msgstr "Importu"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19429,7 +19429,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -19456,7 +19456,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Irigilo por la Mandrajka helpo"
 
 #: standalone/drakhelp:36
@@ -22438,7 +22438,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Konekti al la interreto"
 
 #: standalone/logdrake:51
@@ -22942,7 +22942,7 @@ msgstr "Speco de konekto"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
@@ -23773,7 +23773,7 @@ msgstr "Instalado malsukcesis"
 #~ msgstr "Malinstalu printvicon"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
+#~ msgid "Mandriva Wizards"
 #~ msgstr "Konekti al la interreto"
 
 #, fuzzy
diff --git a/perl-install/share/po/es.po b/perl-install/share/po/es.po
index df441a12d..30397fc24 100644
--- a/perl-install/share/po/es.po
+++ b/perl-install/share/po/es.po
@@ -2,7 +2,7 @@
 # translation of DrakX-es.po to Español
 # translation of DrakX-es.po to Spanish
 # spanish translation of DrakX
-# Copyright (C) 2000, 2001,2002 Mandrakesoft S.A.
+# Copyright (C) 2000, 2001,2002 Mandriva S.A.
 # Fabian Mandelbaum <fabman@mandrakesoft.com>, 2000, 2001, 2002,2003, 2004.
 # Fabian Mandelbaum <fmandelbaum@hotmail.com>, 2003, 2004.
 # Pablo Saratxaga <pablo@mandrakesoft.com>, 2004.
@@ -75,7 +75,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "La llave USB parece tener habilitada la protección contra escritura, pero "
 "ahora\n"
@@ -83,7 +83,7 @@ msgstr ""
 "\n"
 "\n"
 "Haga clic sobre el botón para reiniciar la máquina, desconéctela, quite\n"
-"dicha protección, vuelva a conectarla y lance Mandrake Move otra vez."
+"dicha protección, vuelva a conectarla y lance Mandriva Move otra vez."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -101,7 +101,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Su llave USB no tiene particiones Windows (FAT) válidas.\n"
@@ -112,14 +112,14 @@ msgstr ""
 "\n"
 "\n"
 "También puede continuar sin una llave USB - todavía podrá\n"
-"utilizar Mandrake Move como un Sistema Operativo\n"
-"Mandrakelinux \"en vivo\" normal."
+"utilizar Mandriva Move como un Sistema Operativo\n"
+"Mandrivalinux \"en vivo\" normal."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -127,11 +127,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "No detectamos llave USB alguna en su sistema. Si conecta\n"
-"una llave USB ahora, Mandrake Move podrá guardar los datos\n"
+"una llave USB ahora, Mandriva Move podrá guardar los datos\n"
 "en su directorio personal de manera transparente y también\n"
 "la configuración del sistema, para el próximo arranque en esta\n"
 "computadora o en otra. Nota: si conecta una llave ahora, espere\n"
@@ -139,7 +139,7 @@ msgstr ""
 "\n"
 "\n"
 "También puede continuar sin una llave USB - todavía podrá\n"
-"utilizar Mandrake Move como un Sistema Operativo Mandrakelinux \"en vivo\" "
+"utilizar Mandriva Move como un Sistema Operativo Mandrivalinux \"en vivo\" "
 "normal."
 
 #: ../move/move.pm:494
@@ -268,7 +268,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -284,7 +284,7 @@ msgstr ""
 "\n"
 "Se puede deber a archivos de configuración del sistema corruptos\n"
 "en la llave USB, en este caso quitarlos y luego volver a iniciar\n"
-"Mandrake Move debería solucionar el problema. Para hacerlo,\n"
+"Mandriva Move debería solucionar el problema. Para hacerlo,\n"
 "haga clic sobre el botón correspondiente.\n"
 "\n"
 "\n"
@@ -1326,11 +1326,11 @@ msgstr "Selección del idioma"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux puede soportar múltiples idiomas. Seleccione\n"
+"Mandrivalinux puede soportar múltiples idiomas. Seleccione\n"
 "los que desea instalar. Los mismos estarán disponibles cuando\n"
 "su instalación esté completa y Usted reinicie su sistema."
 
@@ -3765,12 +3765,12 @@ msgstr "habilitar el soporte para radio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button 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 Mandrakelinux. Si está de\n"
+"licencia. La misma cubre a toda la distribución Mandrivalinux. Si está de\n"
 "acuerdo con todos los términos en la misma, haga clic en el botón \"%s\".\n"
 "Si no, haga clic en el botón \"%s\" lo que reiniciará su computadora."
 
@@ -3960,13 +3960,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"La instalación de Mandrakelinux se distribuye en varios CD-ROM. Si un\n"
+"La instalación de Mandrivalinux 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 necesario. Si no tiene el CD necesario\n"
 "a mano, simplemente haga clic sobre \"%s\", no se instalarán los paquetes\n"
@@ -3978,11 +3978,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4034,11 +4034,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "Ahora es el momento de especificar los programas que desea instalar en su\n"
-"sistema. Hay miles de paquetes disponibles para Mandrakelinux, y para hacer\n"
+"sistema. Hay miles de paquetes disponibles para Mandrivalinux, y para hacer\n"
 "más simple el manejo de los paquetes, los mismos se han puesto en grupos de\n"
 "aplicaciones similares.\n"
 "\n"
-"Mandrakelinux clasifica los grupos de paquetes en cuatro categorías. Puede\n"
+"Mandrivalinux clasifica los grupos de paquetes en cuatro categorías. Puede\n"
 "mezclar y hacer coincidir aplicaciones de varias categorías, por lo que una\n"
 "instalación de \"Estación de trabajo\" puede tener instaladas aplicaciones\n"
 "de la categoría \"Desarrollo\".\n"
@@ -4146,10 +4146,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4184,11 +4184,11 @@ msgstr ""
 "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. De manera predeterminada,\n"
-"Mandrakelinux iniciará automáticamente todos los servicios instalados al\n"
+"Mandrivalinux iniciará automáticamente todos los servicios instalados al\n"
 "momento del arranque. Aunque estos son seguros y no tienen problemas\n"
 "conocidos al momento en que se publicó la distribución, es muy posible que\n"
 "se descubran vulnerabilidades en la seguridad luego que se terminó con esta\n"
-"versión de Mandrakelinux. Si no sabe que es lo que se supone que hace un\n"
+"versión de Mandrivalinux. Si no sabe que es lo que se supone que hace un\n"
 "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 los mismos se iniciarán automáticamente al momento del arranque.\n"
@@ -4350,7 +4350,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4406,7 +4406,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 Mandrakelinux.\n"
+"AfterStep, WindowMaker, etc.) que se incluyen con Mandrivalinux.\n"
 "\n"
 "Se le presentará la lista de parámetros diferentes a cambiar para obtener\n"
 "una presentación gráfica óptima.\n"
@@ -4534,12 +4534,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4566,7 +4566,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4575,7 +4575,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4596,11 +4596,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 Mandrakelinux. Si su disco rígido está vacío o si un\n"
+"sistema operativo Mandrivalinux. 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 Mandrakelinux nuevo.\n"
+"sistema Mandrivalinux 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, el particionado puede\n"
@@ -4630,7 +4630,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 Mandrakelinux como Microsoft Windows\n"
+"esta solución si desea utilizar tanto Mandrivalinux 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"
@@ -4640,7 +4640,7 @@ msgstr ""
 "\n"
 " * \"%s\". Si desea borrar todos los datos y todas las particiones\n"
 "presentes en su disco rígido y reemplazarlos con su nuevo sistema\n"
-"Mandrakelinux, seleccione esta opción. Tenga cuidado con esta solución ya\n"
+"Mandrivalinux, seleccione esta opción. Tenga cuidado con esta solución ya\n"
 "que no podrá revertir su elección después de confirmarla.\n"
 "\n"
 "   !! Si elige esta opción, se perderán todos los datos en su disco. !!\n"
@@ -4805,7 +4805,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4828,7 +4828,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 Mandrakelinux nuevo.\n"
+"de su sistema operativo Mandrivalinux nuevo.\n"
 "\n"
 "Haga clic sobre \"%s\" si desea seleccionar las particiones del disco en\n"
 "las que se buscarán bloques defectuosos."
@@ -4847,7 +4847,7 @@ msgstr "Anterior"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4859,7 +4859,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Es probable que cuando instale Mandrakelinux algunos paquetes se hayan\n"
+"Es probable que cuando instale Mandrivalinux algunos paquetes se hayan\n"
 "actualizado desde la publicación inicial. Se pueden haber corregido errores\n"
 "y solucionado problemas de seguridad. Para permitir que Usted se beneficie\n"
 "de estas actualizaciones, ahora las puede descargar desde la Internet.\n"
@@ -4890,7 +4890,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4904,7 +4904,7 @@ msgstr ""
 "\n"
 "Si no sabe cual elegir, mantenga la opción predeterminada. Podrá cambiarla\n"
 "más adelante con la herramienta draksec, que es parte del Centro de Control\n"
-"de Mandrakelinux.\n"
+"de Mandrivalinux.\n"
 "\n"
 "Complete el campo \"%s\" con la dirección de correo electrónico de la\n"
 "persona responsable de la seguridad. Los mensajes relativos a la seguridad\n"
@@ -4921,7 +4921,7 @@ msgstr "Administrador de seguridad"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4992,7 +4992,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Ahora necesita elegir qué particiones se utilizarán para la instalación de\n"
-"su sistema Mandrakelinux. Si ya se han definido particiones, ya sea por\n"
+"su sistema Mandrivalinux. 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"
@@ -5086,7 +5086,7 @@ msgstr "Cambiar entre el modo normal/experto"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5116,7 +5116,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 Mandrakelinux nuevo.\n"
+"instalar su sistema operativo Mandrivalinux nuevo.\n"
 "\n"
 "Cada partición se lista como sigue: \"Nombre Linux\", \"Nombre Windows\",\n"
 "\"Capacidad\".\n"
@@ -5172,7 +5172,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5181,19 +5181,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Este paso se activa sólo si se encontró una partición GNU/Linux existente\n"
 "en su máquina.\n"
 "\n"
 "DrakX ahora necesita saber si desea realizar una instalación nueva o una\n"
-"actualización de un sistema Mandrakelinux existente:\n"
+"actualización de un sistema Mandrivalinux existente:\n"
 "\n"
 " * \"%s\". En gran parte, esta opción borrará por completo el sistema\n"
 "anterior. Sin embargo, dependiendo de su esquema de particiones, puede\n"
@@ -5202,15 +5202,15 @@ msgstr ""
 "particionan sus discos, debería usar esta opción.\n"
 "\n"
 " * \"%s\": Esta clase de instalación le permite actualizar los paquetes que\n"
-"en este momento están instalados en su sistema Mandrakelinux. No se alteran\n"
+"en este momento están instalados en su sistema Mandrivalinux. No se alteran\n"
 "las particiones corrientes de sus discos ni los datos de los usuarios. La\n"
 "mayoría de los otros pasos de configuración permanecen disponibles y son\n"
 "similares a una instalación estándar.\n"
 "\n"
 "El uso de la opción \"Actualizar\" debería funcionar sin problemas para los\n"
-"sistemas Mandrakelinux que corren la versión \"8.1\" o una posterior. No se\n"
+"sistemas Mandrivalinux que corren la versión \"8.1\" o una posterior. No se\n"
 "recomienda realizar una actualización sobre versiones anteriores a\n"
-"Mandrakelinux versión \"8.1\"."
+"Mandrivalinux versión \"8.1\"."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
@@ -5271,7 +5271,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5312,7 +5312,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, Mandrakelinux lo usará o no dependiendo de las elecciones\n"
+"Por esta razón, Mandrivalinux 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"
@@ -5572,7 +5572,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5593,12 +5593,12 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Ahora es el momento de seleccionar un sistema de impresión para su\n"
 "computadora. Otros sistemas operativos pueden ofrecerle uno, pero\n"
-"Mandrakelinux le ofrece dos. Cada uno de los sistemas de impresión es más\n"
+"Mandrivalinux le ofrece dos. Cada uno de los sistemas de impresión es más\n"
 "adecuado para tipos de configuración particulares.\n"
 "\n"
 " * \"%s\" - \"print, do not queue\" (imprimir sin poner en cola) es la\n"
@@ -5621,7 +5621,7 @@ msgstr ""
 "\n"
 "Si hace una elección ahora y más tarde encuentra que a Usted no le gusta su\n"
 "sistema de impresión, puede cambiarlo ejecutando PrinterDrake desde el\n"
-"Centro de Control de Mandrakelinux y haciendo clic sobre el botón \"%s\"."
+"Centro de Control de Mandrivalinux y haciendo clic sobre el botón \"%s\"."
 
 #: help.pm:765
 #, c-format
@@ -5747,7 +5747,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5764,7 +5764,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5816,7 +5816,7 @@ msgstr ""
 "\n"
 " * \"%s\": si desea configurar ahora el acceso a la Internet o a su red\n"
 "local, puede hacerlo ahora. Consulte la documentación impresa o utilice el\n"
-"Centro de Control de Mandrakelinux luego que finalizó la instalación para\n"
+"Centro de Control de Mandrivalinux luego que finalizó la instalación para\n"
 "aprovechar la ayuda en línea completa.\n"
 "\n"
 " * \"%s\": permite configurar las direcciones de los proxy HTTP y FTP si la\n"
@@ -5835,7 +5835,7 @@ msgstr ""
 "haga clic sobre este botón. Esto debería estar reservado para los usuarios\n"
 "avanzados. Consulte la documentación impresa o la ayuda en línea acerca de\n"
 "la configuración del cargador de arranque en el Centro de Control de\n"
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 " * \"%s\": por medio de esta entrada podrá tener un control fino sobre qué\n"
 "servicios correrán en su máquina. Si planifica utilizar esta máquina como\n"
@@ -5898,11 +5898,11 @@ msgstr "Servicios"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux 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"
-"Mandrakelinux nueva. Tenga cuidado, ¡se perderán todos los datos presentes\n"
+"Mandrivalinux 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:
@@ -6261,7 +6261,7 @@ msgstr "Calculando el espacio de la partición Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Su partición Windows está muy fragmentada, por favor primero ejecute \"defrag"
@@ -6385,19 +6385,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6419,7 +6419,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6427,14 +6427,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6444,7 +6444,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6464,10 +6464,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6478,11 +6478,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6498,7 +6498,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "EL PRESENTE TEXTO ES UNA TRADUCCIÓN A PROPÓSITO EXCLUSIVAMENTE\n"
 "INFORMATIVO DE LOS TÉRMINOS DE LA LICENCIA DE MANDRAKELINUX. EN\n"
@@ -6511,18 +6511,18 @@ msgstr ""
 "Introducción\n"
 "\n"
 "El sistema operativo y los diferentes componentes disponibles en\n"
-"la distribución Mandrakelinux se denominarán \"Productos Software\"\n"
+"la distribución Mandrivalinux se denominarán \"Productos Software\"\n"
 "en adelante.\n"
 "Los Productos Software incluyen, pero no están restringidos a,\n"
 "el conjunto de programas, métodos, reglas y documentación\n"
 "relativas al sistema operativo y a los diferentes componentes de la\n"
-"distribución Mandrakelinux.\n"
+"distribución Mandrivalinux.\n"
 "\n"
 "\n"
 "1. Acuerdo de Licencia\n"
 "\n"
 "Por favor, lea con cuidado este documento. El mismo constituye un\n"
-"contrato de licencia entre Usted y Mandrakesoft S.A. que se aplica\n"
+"contrato de licencia entre Usted y Mandriva S.A. que se aplica\n"
 " a los Productos Software.\n"
 "El hecho de instalar, duplicar o usar los Productos Software de\n"
 "cualquier manera, indica que acepta explícitamente, y está de acuerdo\n"
@@ -6542,7 +6542,7 @@ msgstr ""
 "Los Productos Software y la documentación que los acompaña se\n"
 "proporcionan \"tal cual\", sin garantía alguna hasta donde lo permita la "
 "ley.\n"
-"Mandrakesoft S.A. no se responsabilizará, bajo circunstancia alguna,\n"
+"Mandriva S.A. no se responsabilizará, bajo circunstancia alguna,\n"
 "y hasta donde lo permita la ley, por cualquier daño directo o indirecto,\n"
 "especial o accesorio, de cualquier naturaleza (incluyendo\n"
 "sin limitación daños por pérdidas de beneficios, interrupción de\n"
@@ -6550,13 +6550,13 @@ msgstr ""
 "costas legales y penalidades resultantes de un juicio en la corte,\n"
 " o cualquier pérdida consecuente)\n"
 "que resulte del uso o de la incapacidad de uso de los\n"
-"Productos Software, incluso si Mandrakesoft S.A. hubiera sido informada\n"
+"Productos Software, incluso si Mandriva S.A. hubiera sido informada\n"
 "de la posibilidad de ocurrencia de tales daños.\n"
 "\n"
 "ADVERTENCIA EN CUANTO A LA POSESIÓN O USO DE PROGRAMAS PROHIBIDOS\n"
 "EN CIERTOS PAÍSES\n"
 "\n"
-"Dentro de lo que permita la ley, Mandrakesoft S.A. ni sus proveedores\n"
+"Dentro de lo que permita la ley, Mandriva S.A. ni sus proveedores\n"
 "podrán ser responsabilizados en circunstancia alguna por un perjuicio\n"
 "especial, directo, indirecto o accesorio, de cualquier naturaleza\n"
 "(incluyendo sin limitación daños por pérdidas de beneficio, interrupción\n"
@@ -6565,7 +6565,7 @@ msgstr ""
 "de un juicio en la corte, o cualquier pérdida consecuente) como\n"
 "consecuencia de la posesión y el uso de los componentes software\n"
 "o como consecuencia de la descarga de los componentes\n"
-"software desde alguno de los sitios Mandrakelinux, los cuales están\n"
+"software desde alguno de los sitios Mandrivalinux, los cuales están\n"
 "prohibidos o restringidos en algunos países por las leyes locales.\n"
 "Esta responsabilidad limitada se aplica, pero no esta limitada, a los\n"
 "componentes de criptografía fuerte incluídos en los Productos Software.\n"
@@ -6584,9 +6584,9 @@ msgstr ""
 "términos y condiciones de las licencias que acompañan a cada uno de\n"
 "ellos antes de usarlos. Toda pregunta relativa a la licencia de un\n"
 "componente se debe dirigir al autor (o su representante) de dicho\n"
-"componente, y no a Mandrakesoft.  Los programas desarrollados\n"
-"por Mandrakesoft están sometidos a la licencia GPL.  La documentación\n"
-"escrita por Mandrakesoft está sometida a una licencia especifica.\n"
+"componente, y no a Mandriva.  Los programas desarrollados\n"
+"por Mandriva están sometidos a la licencia GPL.  La documentación\n"
+"escrita por Mandriva está sometida a una licencia especifica.\n"
 "Por favor, consulte la documentación para obtener más detalles.\n"
 "\n"
 "\n"
@@ -6596,11 +6596,11 @@ msgstr ""
 "pertenecen a sus autores respectivos y están protegidos por la ley\n"
 "de propiedad intelectual y de copyright aplicables a los programas\n"
 "de software.\n"
-"Mandrakesoft S.A. se reserva el derecho de modificar o adaptar los\n"
+"Mandriva S.A. se reserva el derecho de modificar o adaptar los\n"
 "Productos Software, como un todo o en parte, por todos los medios\n"
 "y para cualquier propósito.\n"
-"\"Mandrake\", \"Mandrakelinux\" y los logos asociados están registrados\n"
-"por Mandrakesoft S.A.\n"
+"\"Mandriva\", \"Mandrivalinux\" y los logos asociados están registrados\n"
+"por Mandriva S.A.\n"
 "\n"
 "\n"
 "5. Disposiciones diversas\n"
@@ -6616,7 +6616,7 @@ msgstr ""
 "la disputa será tramitada en la Corte de Ley correspondiente de\n"
 "París, Francia.\n"
 "Para cualquier pregunta relacionada con este documento, por favor,\n"
-"póngase en contacto con Mandrakesoft S.A.\n"
+"póngase en contacto con Mandriva S.A.\n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6715,7 +6715,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6723,14 +6723,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Felicidades, la instalación está completa.\n"
 "Extraiga el soporte de arranque y presione Intro para reiniciar.\n"
 "\n"
 "\n"
 "Para obtener información sobre correcciones disponibles para esta versión\n"
-"de Mandrakelinux, consulte el archivo de erratas disponible en\n"
+"de Mandrivalinux, consulte el archivo de erratas disponible en\n"
 "\n"
 "\n"
 "%s\n"
@@ -6738,7 +6738,7 @@ msgstr ""
 "\n"
 "Hay información disponible sobre cómo configurar su sistema en el capítulo "
 "de\n"
-"configuración tras la instalación de la Guía del Usuario de Mandrakelinux "
+"configuración tras la instalación de la Guía del Usuario de Mandrivalinux "
 "oficial."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6774,12 +6774,12 @@ msgstr "Entrando en la etapa '%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Su sistema tiene pocos recursos. Puede tener algún problema instalando\n"
-"Mandrakelinux. Si eso ocurre, puede intentar una instalación tipo texto.\n"
+"Mandrivalinux. Si eso ocurre, puede intentar una instalación tipo texto.\n"
 "Para ello, presione 'F1' cuando arranque desde el CDROM, e introduzca 'text'."
 
 #: install_steps_gtk.pm:228 install_steps_interactive.pm:624
@@ -7323,9 +7323,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Contactando con el sitio web de Mandrakelinux para obtener la lista de las "
+"Contactando con el sitio web de Mandrivalinux para obtener la lista de las "
 "réplicas disponibles"
 
 #: install_steps_interactive.pm:840
@@ -7553,8 +7553,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Instalación %s de Mandrakelinux"
+msgid "Mandrivalinux Installation %s"
+msgstr "Instalación %s de Mandrivalinux"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10143,13 +10143,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "configurador de drakfirewall\n"
 "\n"
-"Esto configura un cortafuegos personal para esta máquina Mandrakelinux.\n"
+"Esto configura un cortafuegos personal para esta máquina Mandrivalinux.\n"
 "Para una solución potente de cortafuegos dedicada, por favor eche un "
 "vistazo\n"
 "a la distribución especializada MandrakeSecurity Firewall."
@@ -14253,12 +14253,12 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
 "Ejecute Scannerdrake (Hardware/Escáner en en Centro de Control de "
-"Mandrakelinux) para compartir su escáner en la red.\n"
+"Mandrivalinux) para compartir su escáner en la red.\n"
 "\n"
 
 #: printer/printerdrake.pm:3933
@@ -16230,23 +16230,23 @@ msgstr "Parar"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>¿Qué es Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>¿Qué es Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "¡Bienvenido a <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "¡Bienvenido a <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux es una <b>distribución Linux</b> que incluye la base del "
+"Mandrivalinux es una <b>distribución Linux</b> que incluye la base del "
 "sistema, llamado el <b>sistema operativo</b> (basado en el núcleo Linux) así "
 "como <b>una gran cantidad de programas</b> que cubren todas las cosas que le "
 "gustaría hacer."
@@ -16254,11 +16254,11 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux es la distribución más <b>amigable</b> hoy en día. "
-"¡Mandrakelinux es también una de las distribuciones Linux <b>más usadas</b> "
+"Mandrivalinux es la distribución más <b>amigable</b> hoy en día. "
+"¡Mandrivalinux es también una de las distribuciones Linux <b>más usadas</b> "
 "en todo el mundo!"
 
 #: share/advertising/02.pl:13
@@ -16274,15 +16274,15 @@ msgstr "¡Bienvenido al <b>mundo del Código Abierto</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux está comprometido con el modelo Open Source. Ello significa "
+"Mandrivalinux está comprometido con el modelo Open Source. Ello significa "
 "que esta nueva versión es el resultado de la <b>colaboración</b> entre el "
-"<b>equipo de desarrolladores de Mandrakesoft</b> y la <b>comunidad mundial</"
-"b> de contribuyentes de Mandrakelinux."
+"<b>equipo de desarrolladores de Mandriva</b> y la <b>comunidad mundial</"
+"b> de contribuyentes de Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16302,10 +16302,10 @@ msgstr "<b>La GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "La mayoría de los programas incluidos en esta distribución, así como todas "
-"las herramientas de Mandrakelinux están bajo la <b>Licencia Pública General "
+"las herramientas de Mandrivalinux están bajo la <b>Licencia Pública General "
 "(GPL)</b>."
 
 #: share/advertising/03.pl:17
@@ -16338,15 +16338,15 @@ msgstr "<b>¡Únase a la comunidad!</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux posee una de las <b>mayores comunidades</b> de usuarios y "
+"Mandrivalinux posee una de las <b>mayores comunidades</b> de usuarios y "
 "desarrolladores. El rol de dicha comunidad es muy amplio, yendo de las "
 "notificaciones de errores al desarrollo de nuevos programas. La comunidad "
-"juega un <b>papel clave</b> en el mundo de Mandrakelinux."
+"juega un <b>papel clave</b> en el mundo de Mandrivalinux."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16367,11 +16367,11 @@ msgstr "<b>Versión de descarga</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Instalando <b>Mandrakelinux \"Download\"</b>. Esta es la versión gratuita "
-"que Mandrakesoft desea mantener <b>disponible a todo el mundo</b>."
+"Instalando <b>Mandrivalinux \"Download\"</b>. Esta es la versión gratuita "
+"que Mandriva desea mantener <b>disponible a todo el mundo</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16403,10 +16403,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Tampoco tendrá acceso a los <b>servicios incluidos</b> en los otros "
-"productos de Mandrakesoft."
+"productos de Mandriva."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16415,8 +16415,8 @@ msgstr "<b>Discovery, Su primer escritorio Linux</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Instalando <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Instalando <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16438,13 +16438,13 @@ msgstr "<b>PowerPack, lo último en el escritorio Linux</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Instalando <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Instalando <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -16459,8 +16459,8 @@ msgstr "<b>PowerPack+, La solución Linux para escritorios y servidores</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Ya está instalando <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Ya está instalando <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16476,22 +16476,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Productos Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Productos Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> ha desarrollado una amplia gama de productos "
-"<b>Mandrakelinux</b>."
+"<b>Mandriva</b> ha desarrollado una amplia gama de productos "
+"<b>Mandrivalinux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Los productos Mandrakelinux son:"
+msgid "The Mandrivalinux products are:"
+msgstr "Los productos Mandrivalinux son:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16511,76 +16511,76 @@ msgstr "\t* <b>PowerPack+</b>, La solución Linux para escritorio y servidor."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux para x86-64</b>, La solución de Mandrakelinux para dar "
+"\t* <b>Mandrivalinux para x86-64</b>, La solución de Mandrivalinux para dar "
 "lo mejor de su procesador de 64 bits."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Productos Mandrakesoft (Productos Nómada)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Productos Mandriva (Productos Nómada)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft ha desarrollado dos productos que le permiten usar "
-"Mandrakelinux <b>en cualquier ordenador</b> sin necesidad de instalación."
+"Mandriva ha desarrollado dos productos que le permiten usar "
+"Mandrivalinux <b>en cualquier ordenador</b> sin necesidad de instalación."
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, una distribución de Mandrakelinux que se ejecuta de forma "
+"\t* <b>Move</b>, una distribución de Mandrivalinux que se ejecuta de forma "
 "completa desde una CD-ROM autoarrancable."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>Trotamundo («GlobeTrotter»)</b>, es una distribución Mandrakelinux "
+"\t* <b>Trotamundo («GlobeTrotter»)</b>, es una distribución Mandrivalinux "
 "preinstalada en el disco duro ultra-compacto  “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Productos Mandrakesoft (Soluciones Profesionales)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Productos Mandriva (Soluciones Profesionales)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Abajo están los productos de Mandrakesoft diseñados para cubrir las "
+"Abajo están los productos de Mandriva diseñados para cubrir las "
 "<b>necesidades profesionales</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
-"\t* <b>Corporate Desktop</b>, El escritorio empresarial de Mandrakelinux."
+"\t* <b>Corporate Desktop</b>, El escritorio empresarial de Mandrivalinux."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
-"\t* <b>Corporate Server</b>, La solución para servidor de Mandrakelinux."
+"\t* <b>Corporate Server</b>, La solución para servidor de Mandrivalinux."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 "\t* <b>Multi-Network Firewall</b>, La solución para la seguridad de "
-"Mandrakelinux."
+"Mandrivalinux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16624,10 +16624,10 @@ msgstr "<b>¡Elija su entorno gráfico de escritorio favorito!</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Con PowerPack+, tendrá la oportunidad de un <b>entorno gráfico de "
-"escritorio</b>. Mandrakesoft ha elegido <b>KDE</b> como predeterminado."
+"escritorio</b>. Mandriva ha elegido <b>KDE</b> como predeterminado."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16652,10 +16652,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Con PowerPack+, tendrá la oportunidad de un <b>entorno gráfico de "
-"escritorio</b>. Mandrakesoft ha elegido <b>KDE</b> como predeterminado."
+"escritorio</b>. Mandriva ha elegido <b>KDE</b> como predeterminado."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16783,10 +16783,10 @@ msgstr "<b>Aprecie la amplia gama de programas</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"En el menú Mandrakelinux encontrará aplicaciones <b>fáciles de usar</b> para "
+"En el menú Mandrivalinux encontrará aplicaciones <b>fáciles de usar</b> para "
 "<b>todas sus tareas</b>:"
 
 #: share/advertising/18.pl:16
@@ -17056,18 +17056,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Centro de control de Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Centro de control de Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"El <b>Centro de Control de Mandrakelinux</b> es una colección esencial de "
-"utilitarios específicos de Mandrakelinux para simplificar la configuración "
+"El <b>Centro de Control de Mandrivalinux</b> es una colección esencial de "
+"utilitarios específicos de Mandrivalinux para simplificar la configuración "
 "de su computadora."
 
 #: share/advertising/25.pl:17
@@ -17092,16 +17092,16 @@ msgstr "<b>El modelo de Código Abierto</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Como todos los programas de ordenador, el software de código abierto "
 "<b>requiere tiempo y personas</b> para su desarrollo. Para continuar la "
-"filosofía del código abierto, Mandrakesoft vende productos de valor añadido "
-"y servicios para <b>seguir mejorando Mandrakelinux</b>. Si desea <b>apoyar a "
-"la filosofía de código abierto</b> y al desarrollo de Mandrakelinux, <b>por "
+"filosofía del código abierto, Mandriva vende productos de valor añadido "
+"y servicios para <b>seguir mejorando Mandrivalinux</b>. Si desea <b>apoyar a "
+"la filosofía de código abierto</b> y al desarrollo de Mandrivalinux, <b>por "
 "favor</b>, ¡considere el comprar uno de nuestros productos o servicios!"
 
 #: share/advertising/27.pl:13
@@ -17112,11 +17112,11 @@ msgstr "<b>Tienda en línea</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Para saber más sobre todos los productos y servicios Mandrakesoft, visite "
-"<b>Mandrakestore</b>, nuestra plataforma completa de servicios e-commerce."
+"Para saber más sobre todos los productos y servicios Mandriva, visite "
+"<b>Mandriva Store</b>, nuestra plataforma completa de servicios e-commerce."
 
 #: share/advertising/27.pl:17
 #, c-format
@@ -17140,25 +17140,25 @@ msgstr "Visítela hoy mismo en <b>store.mandrakesoft.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> es el <b>compañero perfecto</b> de su producto "
-"Mandrakelinux ..."
+"<b>Mandriva Club</b> es el <b>compañero perfecto</b> de su producto "
+"Mandrivalinux ..."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 "Aproveche <b>beneficios, productos y servicios valiosos</b> uniéndose a "
-"Mandrakeclub, tales como:"
+"Mandriva Club, tales como:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -17180,40 +17180,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Participar en los <b>foros de usuarios</b> de Mandrakelinux."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Participar en los <b>foros de usuarios</b> de Mandrivalinux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Acceso privilegiado y con anterioridad</b>, antes del lanzamiento "
-"público, de las <b>imágenes ISO</b> de Mandrakelinux ."
+"público, de las <b>imágenes ISO</b> de Mandrivalinux ."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"¡<b>Mandrakeonline</b> es un nuevo servicio premium que Mandrakesoft está "
+"¡<b>Mandriva Online</b> es un nuevo servicio premium que Mandriva está "
 "orgulloso de ofrecer a sus clientes!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline aporta un amplio espectro de valiosos servicios para la "
-"<b>fácil actualización</b> de sus sistemas Mandrakelinux:"
+"Mandriva Online aporta un amplio espectro de valiosos servicios para la "
+"<b>fácil actualización</b> de sus sistemas Mandrivalinux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17239,40 +17239,40 @@ msgstr "\t* Flexibilidad en la <b>programación</b>de actualizaciones."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* Gestión de <b>todos sus sistemas Mandrakelinux</b> con una única cuenta."
+"\t* Gestión de <b>todos sus sistemas Mandrivalinux</b> con una única cuenta."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"¿Necesita <b>ayuda?</b> Encuentre técnicos expertos de Mandrakesoft "
+"¿Necesita <b>ayuda?</b> Encuentre técnicos expertos de Mandriva "
 "en<b>nuestra plataforma de soporte técnico</b> www.mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Gracias a la ayuda de <b>expertos cualificado en Mandrakelinux</b>, ahorrará "
+"Gracias a la ayuda de <b>expertos cualificado en Mandrivalinux</b>, ahorrará "
 "mucho tiempo."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Para cualquier pregunta relacionada con Mandrakelinux, tiene la posibilidad "
+"Para cualquier pregunta relacionada con Mandrivalinux, tiene la posibilidad "
 "de adquirir soporte de incidentes en <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17573,8 +17573,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Asistentes de Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Asistentes de Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17727,7 +17727,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17741,7 +17741,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPCIONES]...\n"
-"Configurador del Servidor de Terminales de Mandrakelinux\n"
+"Configurador del Servidor de Terminales de Mandrivalinux\n"
 "--enable         : habilitar MTS\n"
 "--disable        : deshabilitar MTS\n"
 "--start          : iniciar MTS\n"
@@ -17799,14 +17799,14 @@ msgstr "[--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPCIÓN]...\n"
-"  --no-confirmation     no pedir confirmación en modo MandrakeUpdate\n"
+"  --no-confirmation     no pedir confirmación en modo Mandriva Update\n"
 "  --no-verify-rpm       no verificar firmas de los paquetes\n"
 "  --changelog-first     mostrar changelog antes de lista de archivos en "
 "ventana de descripción\n"
@@ -20599,13 +20599,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Herramienta de Reporte de Errores de Mandrakelinux"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Herramienta de Reporte de Errores de Mandrivalinux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centro de control de Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Centro de control de Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20625,8 +20625,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20670,8 +20670,8 @@ msgstr "Asistentes de configuración"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Seleccione la herramienta Mandrakesoft:"
+msgid "Select Mandriva Tool:"
+msgstr "Seleccione la herramienta Mandriva:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -21098,20 +21098,20 @@ msgstr "Iniciado al arranque"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Todavía no se ha configurado esta interfaz.\n"
 "Lance el asistente \"Añadir una interfaz\" desde el Centro de Control de "
-"Mandrakelinux"
+"Mandrivalinux"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Todavía no tiene ninguna conexión a Internet configurada.\n"
-"Lance el asistente \"%s\" desde el Centro de Control de Mandrakelinux"
+"Lance el asistente \"%s\" desde el Centro de Control de Mandrivalinux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21161,8 +21161,8 @@ msgstr "XDM (administrador de conexión KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "XDM (administrador de conexión Mandrakelinux)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "XDM (administrador de conexión Mandrivalinux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21463,7 +21463,7 @@ msgstr "Importar"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21472,7 +21472,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 por Mandrakesoft \n"
+"Copyright (C) 2001-2002 por Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versión original)\n"
@@ -22025,14 +22025,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 "drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "Esto es software libre y puede redistribuirse bajo los términos de la GNU "
 "GPL.\n"
 "\n"
@@ -22062,8 +22062,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Centro de ayuda de Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Centro de ayuda de Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25607,8 +25607,8 @@ msgstr "Se ha realizado el cambio, pero no se hará efectivo hasta que salga"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Registros de las Herramientas Mandrakelinux"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Registros de las Herramientas Mandrivalinux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -26131,10 +26131,10 @@ msgstr "Conexión completa."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Falló la conexión.\n"
-"Verifique su configuración en el Centro de Control de Mandrakelinux."
+"Verifique su configuración en el Centro de Control de Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po
index e30a7dad6..3d4181888 100644
--- a/perl-install/share/po/et.po
+++ b/perl-install/share/po/et.po
@@ -68,7 +68,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "USB mälupulk paistab olevat kirjutuskaitsega, kuid praegu ei tundu\n"
 "olevat turvalist võimalust seda lahti ühendada.\n"
@@ -94,7 +94,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Teie USB mälupulgal pole ühtki sobivat Windows (FAT) partitsiooni.\n"
@@ -105,14 +105,14 @@ msgstr ""
 "\n"
 "\n"
 "Võite muidugi jätkata ka ilma USB mälupulgata - ka sel\n"
-"juhul on Teil võimalik kasutada Mandrake Move'i kui\n"
+"juhul on Teil võimalik kasutada Mandriva Move'i kui\n"
 "tavalist Mandrake operatsioonisüsteemi."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -120,11 +120,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Teie süsteemist ei suudetud leida ühtki USB mälupulka.\n"
-"Kui ühendate USB mälupulga nüüd, võib Mandrake Move\n"
+"Kui ühendate USB mälupulga nüüd, võib Mandriva Move\n"
 "salvestada läbipaistvalt Teie kodukataloogi andmed ning\n"
 "süsteemse seadistuse järgmiseks alglaadimiseks selles\n"
 "või mõnes muus arvutis. Märkus: kui ühendate mälupulga\n"
@@ -133,7 +133,7 @@ msgstr ""
 "\n"
 "\n"
 "Võite muidugi jätkata ka ilma USB mälupulgata - ka sel\n"
-"juhul on Teil võimalik kasutada Mandrake Move'i kui\n"
+"juhul on Teil võimalik kasutada Mandriva Move'i kui\n"
 "tavalist Mandrake operatsioonisüsteemi."
 
 #: ../move/move.pm:494
@@ -258,7 +258,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -274,7 +274,7 @@ msgstr ""
 "\n"
 "Selle põhjus võib olla vigaste süsteemsete seadistusfailide\n"
 "olemasolu USB mälupulgal, millisel juhul eemaldage failid ja\n"
-"taaskäivitage Mandrake Move, mis peaks asjad korda tegema.\n"
+"taaskäivitage Mandriva Move, mis peaks asjad korda tegema.\n"
 "Selleks klõpsake vastaval nupul.\n"
 "\n"
 "\n"
@@ -1307,11 +1307,11 @@ msgstr "Keelevalik"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux toetab paljusid keeli. Valige keeled, mida\n"
+"Mandrivalinux toetab paljusid keeli. Valige keeled, mida\n"
 "soovite paigaldada. Kui paigaldamine on lõpetatud ja Te teete\n"
 "süsteemile taaskäivituse, saate neid kasutada."
 
@@ -3715,12 +3715,12 @@ msgstr "raadiotoe lubamine"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Enne jätkamist lugege hoolikalt läbi litsentsileping. See kehtib kogu\n"
-"Mandrakelinuxi distributsiooni kohta. Kui Te kõigi selle tingimustega\n"
+"Mandrivalinuxi distributsiooni kohta. Kui Te kõigi selle tingimustega\n"
 "nõus olete, märkige ära kast \"%s\". Kui Teile aga miski ei meeldi, siis\n"
 "klõps nupule \"%s\" sooritab arvuti taaskäivitamise."
 
@@ -3898,13 +3898,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinuxi paigalduspaketid on jagatud mitme CD vahel.\n"
+"Mandrivalinuxi paigalduspaketid on jagatud mitme CD vahel.\n"
 "DrakX suudab ära tunda, kui valitud pakett asub muul CD-l,\n"
 "ning väljastab siis seesoleva CD ja palub sisestada selle,\n"
 "mida parajasti vaja läheb.\n"
@@ -3915,11 +3915,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3971,7 +3971,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Nüüd on aeg valida rakendused, mida soovite oma süsteemi paigaldada.\n"
-"Mandrakelinux pakub tuhandeid pakette ja mõistagi ei eelda keegi,\n"
+"Mandrivalinux pakub tuhandeid pakette ja mõistagi ei eelda keegi,\n"
 "et Te neid kõiki juba ette tunneksite.\n"
 "\n"
 "Paketid on rühmitatud gruppidesse vastavalt nende kasutusalale.\n"
@@ -4082,10 +4082,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4116,11 +4116,11 @@ msgstr ""
 "!! Kui tahtlikult või seetõttu, et asi kuulus gruppi,\n"
 "on valitud mõni serveripakett, palutakse Teilt kinnitust,\n"
 "et Te ikka tõesti soovite neid servereid paigaldada.\n"
-"Mandrakelinux käivitab kõik paigaldatud serverid vaikimisi alglaadimise "
+"Mandrivalinux käivitab kõik paigaldatud serverid vaikimisi alglaadimise "
 "ajal.\n"
 "Isegi kui nad olid turvalised ja teadaolevalt probleemivabad ajal,\n"
 "mis valmis distributsioon, võib kergesti juhtuda,\n"
-"et pärast Mandrakelinuxi praeguse versiooni valmimist leiti neist "
+"et pärast Mandrivalinuxi praeguse versiooni valmimist leiti neist "
 "turvaauke.\n"
 "Kui Te ei tea, mida konkreetne teenus pakub või miks see üldse "
 "paigaldatakse,\n"
@@ -4273,7 +4273,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4329,7 +4329,7 @@ msgid ""
 msgstr ""
 "X (ehk X Window System) kujutab endast GNU/Linuxi graafilise "
 "kasutajaliidese\n"
-"tuuma ja südant, millele toetuvad kõik Mandrakelinuxiga kaasas käivad\n"
+"tuuma ja südant, millele toetuvad kõik Mandrivalinuxiga kaasas käivad\n"
 "graafilised töökeskkonnad (KDE, GNOME, AfterStep, WindowMaker jne).\n"
 "\n"
 "Siin näidatakse Teile tervet nimekirja parameetreid, mida saab muuta,\n"
@@ -4452,12 +4452,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4484,7 +4484,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4493,7 +4493,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4513,12 +4513,12 @@ 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 ""
-"Olete jõudnud punkti, kus peate otsustama, kuhu täpselt Mandrakelinux\n"
+"Olete jõudnud punkti, kus peate otsustama, kuhu täpselt Mandrivalinux\n"
 "oma kõvakettal paigaldada. Kui kõvaketas on tühi või mõni muu\n"
 "operatsioonisüsteem seda täielikult kasutab, on vaja see osadeks jagada\n"
 "ehk partitsioneerida.\n"
 "Partitsioneerimine on tegevus, mille käigus tekitatakse kettale loogilised\n"
-"piirkonnad Teie uue Mandrakelinuxi süsteemi paigaldamiseks.\n"
+"piirkonnad Teie uue Mandrivalinuxi süsteemi paigaldamiseks.\n"
 "\n"
 "Kuna kõvaketta jagamine on pöördumatu protsess, siis peab kogemusteta\n"
 "kasutaja olema iseäranis ettevaatlik! Selle tegevuse lihtsustamiseks ja\n"
@@ -4548,7 +4548,7 @@ msgstr ""
 "defragmenteerinud. Siiski ei tule kindlasti kahjuks ka andmetest varukoopia\n"
 "valmistamine... See lahendus on soovitatav, kui tahate kasutada ühes "
 "arvutis\n"
-"nii Mandrakelinuxit kui Microsoft Windowsit.\n"
+"nii Mandrivalinuxit kui Microsoft Windowsit.\n"
 "\n"
 "   Enne selle valiku kasuks otsustamist pidage silmas, et kirjeldatud "
 "protseduuri\n"
@@ -4558,7 +4558,7 @@ msgstr ""
 "paigaldamiseks.\n"
 "\n"
 " * \"%s\": kui soovite kustutada kõik andmed ja partitsioonid, mis\n"
-"kõvakettal parajasti on, ning asendada need uue Mandrakelinuxi süsteemiga, "
+"kõvakettal parajasti on, ning asendada need uue Mandrivalinuxi süsteemiga, "
 "on\n"
 "see õige valik. Aga tasub olla ettevaatlik, sest pärast selle valiku "
 "langetamist\n"
@@ -4725,7 +4725,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4747,7 +4747,7 @@ msgstr ""
 "\n"
 "Klõpsake \"%s\", kui olete vormindamiseks valmis.\n"
 "\n"
-"Klõpsake \"%s\", kui soovite valida oma uue Mandrakelinuxi süsteemi\n"
+"Klõpsake \"%s\", kui soovite valida oma uue Mandrivalinuxi süsteemi\n"
 "paigaldamiseks mõne muu partitsiooni.\n"
 "\n"
 "Klõpsake \"%s\", kui soovite valida partitsioone, millel kontrollitaks\n"
@@ -4765,7 +4765,7 @@ msgstr "Eelmine"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4777,7 +4777,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"On tõenäoline, et praegu, kui Te paigaldate Mandrakelinuxit, on mõned\n"
+"On tõenäoline, et praegu, kui Te paigaldate Mandrivalinuxit, on mõned\n"
 "paketid jõudnud pärast väljalaset juba uuenduskuuri üle elada. Mõnes on ära\n"
 "parandatud paar väiksemat viga, mõnes turvaprobleemid. Et võiksite neist\n"
 "uuendustest tulu lõigata, on Teil nüüd võimalik need Internetist alla "
@@ -4810,7 +4810,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4823,7 +4823,7 @@ msgstr ""
 "enamasti kasutamise mõnevõrra keerukamaks.\n"
 "\n"
 "Kui Te ei tea, mida valida, jätke kehtima vaikimisi pakutud valik. Hiljem\n"
-"saate turvataset muuta Mandrakelinuxi juhtimiskeskuses abivahendiga "
+"saate turvataset muuta Mandrivalinuxi juhtimiskeskuses abivahendiga "
 "Draksec.\n"
 "\n"
 "Väli \"%s\" on mõeldud süsteemi turvalisuse eest vastutava kasutaja\n"
@@ -4838,7 +4838,7 @@ msgstr "Turvaadministraator"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4908,7 +4908,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Nüüd peate valima partitsiooni(d), kuhu soovite Mandrakelinuxi paigaldada.\n"
+"Nüüd peate valima partitsiooni(d), kuhu soovite Mandrivalinuxi paigaldada.\n"
 "Kui need on juba olemas kas GNU/Linuxi varasema paigalduse või mõne muu\n"
 "kettajagamisvahendi tegevuse tulemusena, võite kasutada olemasolevaid\n"
 "partitsioone. Vastasel juhul tuleb need luua.\n"
@@ -5000,7 +5000,7 @@ msgstr "Tava- ja ekspertrežiimi lülitamine"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5029,7 +5029,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Teie arvuti kõvakettal on rohkem kui üks Microsoft Windowsi partitsioon.\n"
-"Palun valige välja see, mille suurust soovite Mandrakelinuxi jaoks muuta.\n"
+"Palun valige välja see, mille suurust soovite Mandrivalinuxi jaoks muuta.\n"
 "\n"
 "Teie abistamiseks on igal partitsioonil näidatud \"Nimi Linuxis\", \"Nimi "
 "Windowsis\" ja \"Mahutavus\".\n"
@@ -5076,7 +5076,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5085,19 +5085,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Seda sammu on vaja ainult siis, kui masinas leiti varasem\n"
 "GNU/Linuxi partitsioon.\n"
 "\n"
 "DrakX soovib nüüd teada, kas tahate paigaldada uue süsteemi või uuendada\n"
-"olemasolevat Mandrakelinuxi süsteemi:\n"
+"olemasolevat Mandrivalinuxi süsteemi:\n"
 "\n"
 " * \"%s\": üldiselt pühib see vana süsteemi täielikult minema. Kui\n"
 "soovite muuta praeguseid partitsioone või failisüsteemi, siis võiks seda "
@@ -5106,13 +5106,13 @@ msgstr ""
 "ülekirjutamise eest päästa.\n"
 "\n"
 " * \"%s\": see paigaldamisviis võimaldab uuendada praegu olemasolevasse\n"
-"Mandrakelinuxi süsteemi paigaldatud pakette. Kettajagamisskeemi ega "
+"Mandrivalinuxi süsteemi paigaldatud pakette. Kettajagamisskeemi ega "
 "kasutajate\n"
 "andmeid ei muudeta. Enamik seadistussamme on kasutatavad sarnaselt "
 "tavapärasele\n"
 "paigaldamisele.\n"
 "\n"
-"Võimalus \"Uuendus\" peaks toimima edukalt Mandrakelinuxi süsteemides\n"
+"Võimalus \"Uuendus\" peaks toimima edukalt Mandrivalinuxi süsteemides\n"
 "alates versioonist 8.1. Uuenduse proovimist varasemate versioonide peal\n"
 "me siiski ei soovita."
 
@@ -5168,7 +5168,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5206,7 +5206,7 @@ msgstr ""
 "\n"
 "Mõni sõna UTF-8 (unicode) toetuse kohta. Unicode on uus kodeering, mis\n"
 "peaks hõlmama kõiki keeli. Selle täielik toetus ei ole GNU/Linuxis\n"
-"siiski veel täielikult teostatud. Seetõttu lähtub Mandrakelinux selle\n"
+"siiski veel täielikult teostatud. Seetõttu lähtub Mandrivalinux selle\n"
 "kasutamisel või mittekasutamisel järgmistest asjaoludest:\n"
 "\n"
 " * Kui valite keele, mis üldreeglina kasutab muud kodeeringut (latin1 \n"
@@ -5447,7 +5447,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5468,12 +5468,12 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Siin saate valida oma arvuti trükkimissüsteemi. Teised "
 "operatsioonisüsteemid\n"
-"võivad Teile pakkuda vaid üht süsteemi, kuid Mandrakelinuxi puhul saate\n"
+"võivad Teile pakkuda vaid üht süsteemi, kuid Mandrivalinuxi puhul saate\n"
 "valida tervelt kahe seast.\n"
 "\n"
 " * \"%s\" - mis tähendab \"trüki kohe\" (\"print, do not queue\") - tuleks "
@@ -5498,7 +5498,7 @@ msgstr ""
 "trükkimiseks või printeri seadistamiseks.\n"
 "\n"
 "Kui leiate hiljem, et siinkohal langetatud valik polnud vahest kõige parem,\n"
-"siis saate seda muuta Mandrakelinuxi juhtimiskeskuses PrinterDrake abil,\n"
+"siis saate seda muuta Mandrivalinuxi juhtimiskeskuses PrinterDrake abil,\n"
 "klõpsates seal nupule \"%s\"."
 
 #: help.pm:765
@@ -5620,7 +5620,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5637,7 +5637,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5698,7 +5698,7 @@ msgstr ""
 "\n"
 " * \"%s\": kui soovite muuta alglaaduri seadistusi, klõpsake\n"
 "sellele nupule. See on mõeldud siiski vaid kogenud kasutajatele.\n"
-"Täpsemat infot leiab käsiraamatust või Mandrakelinuxi juhtimiskeskusest.\n"
+"Täpsemat infot leiab käsiraamatust või Mandrivalinuxi juhtimiskeskusest.\n"
 "\n"
 " * \"%s\": saate täpselt kontrollida, millised teenused Teie\n"
 "süsteemis töötavad. Kui kavatsete kasutada oma masinat serverina, kuluks\n"
@@ -5759,10 +5759,10 @@ msgstr "Teenused"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Valige kõvaketas, mida soovite puhastada oma uue Mandrakelinuxi\n"
+"Valige kõvaketas, mida soovite puhastada oma uue Mandrivalinuxi\n"
 "paigaldamiseks. Ettevaatust, kõik sellel leiduvad andmed hävitatakse\n"
 "ja neid ei saa enam taastada."
 
@@ -6116,12 +6116,12 @@ msgstr "Vaba ruumi arvutamine Windowsi partitsioonil"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Teie Windowsi partitsioon on fragmenteerunud. Palun tehke arvutile uus "
 "alglaadimine, käivitage Windows ja seejärel utiliit \"defrag\" ning tulge "
-"siis Mandrakelinuxi paigaldamise juurde tagasi."
+"siis Mandrivalinuxi paigaldamise juurde tagasi."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6237,19 +6237,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6271,7 +6271,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6279,14 +6279,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6296,7 +6296,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6316,10 +6316,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6330,11 +6330,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6350,7 +6350,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Järgnev lõppkasutaja litsents on eksimuste vältimiseks originaalkeeles!\n"
 "\n"
@@ -6358,19 +6358,19 @@ msgstr ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6392,7 +6392,7 @@ msgstr ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6400,14 +6400,14 @@ msgstr ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6417,7 +6417,7 @@ msgstr ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6437,10 +6437,10 @@ msgstr ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6451,11 +6451,11 @@ msgstr ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6471,7 +6471,7 @@ msgstr ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6565,7 +6565,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6573,21 +6573,21 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Õnnitleme, paigaldamine on edukalt lõpetatud.\n"
 "Võtke palun välja diskett ja/või CD ja vajutage Enter alglaadimiseks.\n"
 "\n"
 "\n"
 "Informatsiooni selle distributsiooni paranduste kohta (Errata) saab\n"
-"Mandrakelinuxi koduleheküljelt:\n"
+"Mandrivalinuxi koduleheküljelt:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Abi süsteemi edasiseks seadistamiseks saab eelkõige\n"
-"Mandrakelinuxi kasutaja käsiraamatust."
+"Mandrivalinuxi kasutaja käsiraamatust."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6621,7 +6621,7 @@ msgstr "Järgmine samm: %s\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -7151,7 +7151,7 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 "Teil on nüüd võimalus alla laadida uuendatud pakette. Need on välja lastud\n"
-"pärast Mandrakelinuxi distributsiooni ilmumist ja võivad sisaldada vigade\n"
+"pärast Mandrivalinuxi distributsiooni ilmumist ja võivad sisaldada vigade\n"
 "parandusi või turvauuendusi.\n"
 "\n"
 "Allalaadimiseks peab Teil olema töötav internetiühendus.\n"
@@ -7161,9 +7161,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Mandrakelinuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."
+"Mandrivalinuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7386,8 +7386,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinuxi paigaldamine %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinuxi paigaldamine %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9973,7 +9973,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -14021,11 +14021,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"Oma skänneri väljajagamiseks võrgus käivitage Scannerdrake (Mandrakelinuxi "
+"Oma skänneri väljajagamiseks võrgus käivitage Scannerdrake (Mandrivalinuxi "
 "juhtimiskeskuses rubriik Riistvara/Skänner).\n"
 "\n"
 
@@ -15933,23 +15933,23 @@ msgstr "Peata"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mis on Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Mis on Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Tere tulemast <b>Mandrakelinuxisse</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Tere tulemast <b>Mandrivalinuxisse</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux on <b>Linuxi distributsioon</b>, mis koosneb süsteemi "
+"Mandrivalinux on <b>Linuxi distributsioon</b>, mis koosneb süsteemi "
 "tuumikust ehk <b>operatsioonisüsteemist</b> (selle aluseks on Linuxi kernel) "
 "ning <b>paljudest rakendustest</b>, mis rahuldavad ilmselt küll kõik Teie "
 "vajadused."
@@ -15957,10 +15957,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux on kõige <b>kasutajasõbralikum</b> Linuxi distributsioon. See "
+"Mandrivalinux on kõige <b>kasutajasõbralikum</b> Linuxi distributsioon. See "
 "on üks maailma <b>kõige kasutatavamaid</b> distributsioone!"
 
 #: share/advertising/02.pl:13
@@ -15976,13 +15976,13 @@ msgstr "Tere tulemast <b>vaba tarkvara maailma</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux toetab kõigiti vaba tarkvara. Ka praegune väljalase on "
-"<b>Mandrakesofti arendajate meeskonna</b> ja Mandrakelinuxi <b>üleilmse "
+"Mandrivalinux toetab kõigiti vaba tarkvara. Ka praegune väljalase on "
+"<b>Mandrivai arendajate meeskonna</b> ja Mandrivalinuxi <b>üleilmse "
 "kaasautorite kogukonna</b> <b>ühise koostöö</b> vili."
 
 #: share/advertising/02.pl:19
@@ -16003,9 +16003,9 @@ msgstr "<b>GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Suuremat osa distributsiooni kaasatud tarkvara ja kõiki Mandrakelinuxi "
+"Suuremat osa distributsiooni kaasatud tarkvara ja kõiki Mandrivalinuxi "
 "abivahendeid levitatakse <b>Üldise Avaliku Litsentsi</b> (GPL) alusel."
 
 #: share/advertising/03.pl:17
@@ -16031,20 +16031,20 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Liituge Mandrakelinuxi kogukonnaga</b>"
+msgstr "<b>Liituge Mandrivalinuxi kogukonnaga</b>"
 
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinuxi kasutajad ja arendajad moodustavad <b>väga suure kogukonna</"
+"Mandrivalinuxi kasutajad ja arendajad moodustavad <b>väga suure kogukonna</"
 "b>. Selle liikmete tegevusvaldkond on äärmiselt lai, ulatudes vigade "
 "teatamisest kuni uute rakenduste väljatöötamiseni. Kogukonnal on "
-"Mandrakelinuxi maailmas lausa <b>võtmeroll</b>."
+"Mandrivalinuxi maailmas lausa <b>võtmeroll</b>."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16066,11 +16066,11 @@ msgstr "<b>Allatõmmatav versioon</b> (\"Download version\")"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Paigaldate praegu <b>Mandrakelinuxi allatõmmatavat</b> versiooni. See on "
-"vaba versioon, mis Mandrakesofti tahtmist mööda on <b>kättesaadav kõigile</"
+"Paigaldate praegu <b>Mandrivalinuxi allatõmmatavat</b> versiooni. See on "
+"vaba versioon, mis Mandrivai tahtmist mööda on <b>kättesaadav kõigile</"
 "b>."
 
 #: share/advertising/05.pl:19
@@ -16103,9 +16103,9 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
-"Teil puudub ligipääs ka muudesse Mandrakesofti toodetesse <b>lisatud "
+"Teil puudub ligipääs ka muudesse Mandrivai toodetesse <b>lisatud "
 "teenustele</b>."
 
 #: share/advertising/06.pl:13
@@ -16115,8 +16115,8 @@ msgstr "<b>Discovery - Teie esimene Linuxi töölaud</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Paigaldate praegu <b>Mandrakelinuxi Discovery</b> versiooni."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Paigaldate praegu <b>Mandrivalinuxi Discovery</b> versiooni."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16138,17 +16138,17 @@ msgstr "<b>PowerPack - tipptasemel Linuxi töölaud</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Paigaldate praegu <b>Mandrakelinuxi PowerPack</b> versiooni."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Paigaldate praegu <b>Mandrivalinuxi PowerPack</b> versiooni."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack on Mandrakesofti <b>tipptasemega Linuxi töölaua lahendus</b>. "
+"PowerPack on Mandrivai <b>tipptasemega Linuxi töölaua lahendus</b>. "
 "PowerPack pakub <b>tuhandeid rakendusi</b> alates kõige populaarsematest "
 "kuni kõige spetsiifilisemateni."
 
@@ -16159,8 +16159,8 @@ msgstr "<b>PowerPack+ - Linuxi lahendus töölaudadele ja serveritele</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Paigaldate praegu <b>Mandrakelinuxi PowerPack+</b> versiooni."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Paigaldate praegu <b>Mandrivalinuxi PowerPack+</b> versiooni."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16177,22 +16177,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesofti tooted</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandrivai tooted</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> on välja töötanud terve rea <b>Mandrakelinuxi</b> "
+"<b>Mandriva</b> on välja töötanud terve rea <b>Mandrivalinuxi</b> "
 "tooteid."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux koosseisu kuuluvad järgmised tooted:"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux koosseisu kuuluvad järgmised tooted:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16212,73 +16212,73 @@ msgstr "\t* <b>PowerPack+</b> - Linuxi lahendus töölaudadele ja serveritele."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux for x86-64</b> - Mandrakelinuxi lahendus, mis sobib "
+"\t* <b>Mandrivalinux for x86-64</b> - Mandrivalinuxi lahendus, mis sobib "
 "kõige paremini Teie 64-bitisele protsessorile."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesofti tooted (kaasaskantavad)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandrivai tooted (kaasaskantavad)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft on välja töötanud kaks toodet, mis lubavad Teil kasutada "
-"Mandrakelinuxit <b>suvalises arvutis</b>, ilma et peaksite seda tegelikult "
+"Mandriva on välja töötanud kaks toodet, mis lubavad Teil kasutada "
+"Mandrivalinuxit <b>suvalises arvutis</b>, ilma et peaksite seda tegelikult "
 "arvutisse paigaldamagi:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b> - Mandrakelinuxi distributsioon, mis töötab täielikult "
+"\t* <b>Move</b> - Mandrivalinuxi distributsioon, mis töötab täielikult "
 "alglaaditava CD pealt."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b> - Mandrakelinuxi distributsioon, mis on juba "
+"\t* <b>GlobeTrotter</b> - Mandrivalinuxi distributsioon, mis on juba "
 "paigaldatud ülikompaktsele LaCie välisele kõvakettale."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Mandrakesofti tooted (professonaalsed lahendused)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Mandrivai tooted (professonaalsed lahendused)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Toome siin ära Mandrakesofti tooted, mis peavad rahuldama ka kõige "
+"Toome siin ära Mandrivai tooted, mis peavad rahuldama ka kõige "
 "nõudlikumaid <b>professionaalseid vajadusi</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b> - Mandrakelinuxi töölaud firmadele."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b> - Mandrivalinuxi töölaud firmadele."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b> - Mandrakelinuxi serverilahendus."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b> - Mandrivalinuxi serverilahendus."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b> - Mandrakelinuxi turvalahendus."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b> - Mandrivalinuxi turvalahendus."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16322,10 +16322,10 @@ msgstr "<b>Valige meelepärane graafiline töökeskkond</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "PowerPack võimaldab teil valida meelepärase <b>graafilise töökeskkonna</b>. "
-"Mandrakesoft on selleks vaikimisi valinud <b>KDE</b>."
+"Mandriva on selleks vaikimisi valinud <b>KDE</b>."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16350,10 +16350,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "PowerPack+ võimaldab teil valida meelepärase <b>graafilise töökeskkonna</b>. "
-"Mandrakesoft on selleks vaikimisi valinud <b>KDE</b>."
+"Mandriva on selleks vaikimisi valinud <b>KDE</b>."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16480,10 +16480,10 @@ msgstr "<b>Ääretu valik rakendusi igaks vajaduseks</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Mandrakelinuxi menüüst leiab <b>hõlpsasti kasutatavad</b> rakendused "
+"Mandrivalinuxi menüüst leiab <b>hõlpsasti kasutatavad</b> rakendused "
 "<b>igaks vajaduseks</b>:"
 
 #: share/advertising/18.pl:16
@@ -16746,18 +16746,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinuxi juhtimiskeskus</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinuxi juhtimiskeskus</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrakelinuxi juhtimiskeskus</b> koondab ühtekokku olulised, "
-"Mandrakelinuxile spetsiifilised tööriistad, et Te saaksite oma arvutit "
+"<b>Mandrivalinuxi juhtimiskeskus</b> koondab ühtekokku olulised, "
+"Mandrivalinuxile spetsiifilised tööriistad, et Te saaksite oma arvutit "
 "lihtsamalt ja mugavamalt seadistada."
 
 #: share/advertising/25.pl:17
@@ -16781,15 +16781,15 @@ msgstr "<b>Vaba tarkvara mudel</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Nagu programmeerimine üldse, nõuab ka vaba tarkvara arendamiseks <b>aega ja "
-"inimesi</b>. Vaba tarkvara põhimõtete vaimu elushoidmiseks müüb Mandrakesoft "
-"oma tooteid ja teenuseid, et <b>aidata arendada Mandrakelinuxit</b>. Kui ka "
-"Teie soovite <b>toetada vaba tarkvara põhimõtteid</b> ning Mandrakelinuxi "
+"inimesi</b>. Vaba tarkvara põhimõtete vaimu elushoidmiseks müüb Mandriva "
+"oma tooteid ja teenuseid, et <b>aidata arendada Mandrivalinuxit</b>. Kui ka "
+"Teie soovite <b>toetada vaba tarkvara põhimõtteid</b> ning Mandrivalinuxi "
 "arendustegevust, kaaluge <b>palun</b> mõtet osta mõni meie toode või teenus!"
 
 #: share/advertising/27.pl:13
@@ -16800,10 +16800,10 @@ msgstr "<b>Internetikauplus</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Mandrakesofti toodete ja teenustega põhjalikumaks tutvumiseks võite "
+"Mandrivai toodete ja teenustega põhjalikumaks tutvumiseks võite "
 "külastada meie <b>e-kaubanduse keskust</b>."
 
 #: share/advertising/27.pl:17
@@ -16828,25 +16828,25 @@ msgstr "Astuge juba täna läbi aadressilt <b>store.mandrakesoft.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> on <b>suurepärane kaaslane</b> Teie Mandrakelinuxi "
+"<b>Mandriva Club</b> on <b>suurepärane kaaslane</b> Teie Mandrivalinuxi "
 "tootele."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 "Saage kasu <b>hinnalistest eelistest</b>, mida pakub ühinemine "
-"Mandrakeclub'iga:"
+"Mandriva Club'iga:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -16868,39 +16868,39 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Osalemine Mandrakelinuxi <b>kasutajate foorumitel</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Osalemine Mandrivalinuxi <b>kasutajate foorumitel</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Varane ja privilegeeritud ligipääs</b> juba enne ametlikku väljalaset "
-"Mandrakelinuxi <b>ISO-tõmmistele</b>."
+"Mandrivalinuxi <b>ISO-tõmmistele</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> on uus suurepärane teenus, mida Mandrakesoft uhkusega "
+"<b>Mandriva Online</b> on uus suurepärane teenus, mida Mandriva uhkusega "
 "oma klientidele pakub!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline tähendab mitmeid hinnalisi teenuseid oma Mandrakelinuxi "
+"Mandriva Online tähendab mitmeid hinnalisi teenuseid oma Mandrivalinuxi "
 "süsteemi <b>hõlpsaks uuendamiseks</b>:"
 
 #: share/advertising/29.pl:18
@@ -16926,40 +16926,40 @@ msgstr "\t* Paindlik uuenduste <b>ajastamine</b>."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* <b>Kõigi oma Mandrakelinuxi süsteemide</b> haldamine ühe konto alt."
+"\t* <b>Kõigi oma Mandrivalinuxi süsteemide</b> haldamine ühe konto alt."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Läheb Teil vaja <b>veidi abi</b>? Mandrakesofti asjatundjad on valmis seda "
+"Läheb Teil vaja <b>veidi abi</b>? Mandrivai asjatundjad on valmis seda "
 "Teile osutama <b>meie tehnilise toe keskkonnas</b> www.mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"<b>Kvalifitseeritud Mandrakelinuxi ekspertide</b> abiga võite kokku hoida "
+"<b>Kvalifitseeritud Mandrivalinuxi ekspertide</b> abiga võite kokku hoida "
 "hulganisti aega ja vaeva."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Iga Mandrakelinuxiga seotud küsimuse puhul on Teil võimalik osta konkreetne "
+"Iga Mandrivalinuxiga seotud küsimuse puhul on Teil võimalik osta konkreetne "
 "tugiteenus meie Internetikaupluses <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17255,8 +17255,8 @@ msgstr "Jälgimisvahendid, protsesside jälgimine, tcpdump, nmap..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesofti nõustajad"
+msgid "Mandriva Wizards"
+msgstr "Mandrivai nõustajad"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17351,8 +17351,8 @@ msgstr ""
 "\n"
 "VÕTMED:\n"
 "  --help            - näitab käesolevat abiteadet.\n"
-"  -report           - rakendus peab olema üks Mandrakelinuxi tööriistadest\n"
-"  -incident         - rakendus peab olema üks Mandrakelinuxi tööriistadest"
+"  -report           - rakendus peab olema üks Mandrivalinuxi tööriistadest\n"
+"  -incident         - rakendus peab olema üks Mandrivalinuxi tööriistadest"
 
 #: standalone.pm:63
 #, c-format
@@ -17407,7 +17407,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17421,7 +17421,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[VÕTMED]...\n"
-"Mandrakelinuxi terminaliserveri seadistaja\n"
+"Mandrivalinuxi terminaliserveri seadistaja\n"
 "--enable         : lubab MTSi\n"
 "--disable        : keelab MTSi\n"
 "--start          : käivitab MTSi\n"
@@ -17479,14 +17479,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[VÕTI]...\n"
-"  --no-confirmation      ei küsita esimest kinnitust MandrakeUpdate "
+"  --no-confirmation      ei küsita esimest kinnitust Mandriva Update "
 "režiimis\n"
 "  -no-verify-rpm        pakettide signatuure ei kontrollita\n"
 "  --changelog-first      näitab kirjelduse aknas enne failinimekirja "
@@ -20257,13 +20257,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinuxi vigadest teatamise vahend"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinuxi vigadest teatamise vahend"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinuxi juhtimiskeskus"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinuxi juhtimiskeskus"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20283,8 +20283,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20328,8 +20328,8 @@ msgstr "Seadistamise nõustajad"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Valige Mandrakesofti tööriist:"
+msgid "Select Mandriva Tool:"
+msgstr "Valige Mandrivai tööriist:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20754,19 +20754,19 @@ msgstr "Käivitub laadimisel"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Seda liidest ei ole veel seadistatud.\n"
-"Käivitage Mandrakelinuxi juhtimiskeskuses nõustaja \"Liidese lisamine\""
+"Käivitage Mandrivalinuxi juhtimiskeskuses nõustaja \"Liidese lisamine\""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Internetiühendust ei ole veel seadistatud.\n"
-"Käivitage Mandrakelinuxi juhtimiskeskuses nõustaja \"%s\""
+"Käivitage Mandrivalinuxi juhtimiskeskuses nõustaja \"%s\""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20816,8 +20816,8 @@ msgstr "KDM (KDE kuvahaldur)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MkdKDM (Mandrakelinuxi kuvahaldur)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MkdKDM (Mandrivalinuxi kuvahaldur)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21116,7 +21116,7 @@ msgstr "Import"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21125,7 +21125,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Autoriõigus (C) 2001-2002: Mandrakesoft \n"
+"Autoriõigus (C) 2001-2002: Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (algversioon)\n"
@@ -21666,7 +21666,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -21702,8 +21702,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinuxi abikeskus"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinuxi abikeskus"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25210,8 +25210,8 @@ msgstr "Muudatus on tehtud, aga selle rakendamiseks tuleb välja logida"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinuxi vahendite logi"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinuxi vahendite logi"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25723,10 +25723,10 @@ msgstr "Ühendus on loodud."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Ühenduse loomine ebaõnnestus.\n"
-"Kontrollige palun seadistusi Mandrakelinuxi juhtimiskeskuse abil."
+"Kontrollige palun seadistusi Mandrivalinuxi juhtimiskeskuse abil."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26615,8 +26615,8 @@ msgstr "Paigaldamine ebaõnnestus!"
 #~ msgid "Save and close"
 #~ msgstr "Salvesta ja sulge"
 
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Mandrakesofti nõustajad"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Mandrivai nõustajad"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Brauserit ei leitud! Palun paigaldage mõni"
diff --git a/perl-install/share/po/eu.po b/perl-install/share/po/eu.po
index df63e5093..7c20ba07b 100644
--- a/perl-install/share/po/eu.po
+++ b/perl-install/share/po/eu.po
@@ -69,14 +69,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Badirudi USB gakoak idazkea babesa daukala, baina orain ezin dugu modu\n"
 "seguruan deskonektatu.\n"
 "\n"
 "\n"
 "Klikatu makina berrabiarazteko botoia, desentxufatu, kendu idazketa\n"
-"babesa, gakoa berriro konektatu, eta berriro abiarazi Mandrake Move."
+"babesa, gakoa berriro konektatu, eta berriro abiarazi Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -94,7 +94,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Zure USB gakoak ez du baliozko Windows (FAT) partiziorik.\n"
@@ -105,14 +105,14 @@ msgstr ""
 "\n"
 "\n"
 "USB gakorik gabe ere aurrera egin dezakezu - gai izango\n"
-"zara Mandrake Move erabiltzeko, Mandrake sistema eragile\n"
+"zara Mandriva Move erabiltzeko, Mandrake sistema eragile\n"
 "normal gisa."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -120,11 +120,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Ez dugu USB gakorik detektatu zure sisteman. USB gako\n"
-"bat konektatzen baduzu, Mandrake Move gai izango da datuak\n"
+"bat konektatzen baduzu, Mandriva Move gai izango da datuak\n"
 "zure etxeko direktorioan eta sistema-konfigurazioan gardenki\n"
 "gordetzeko, ordenagailu honetan edo beste batean berriro \n"
 "abiarazten denean. Oharra: gako bat konektatzen baduzu, itxaron\n"
@@ -132,7 +132,7 @@ msgstr ""
 "\n"
 "\n"
 "USB gakorik gabe ere aurrera egin dezakezu - gai izango\n"
-"zara Mandrake Move erabiltzeko, Mandrake sistema eragile\n"
+"zara Mandriva Move erabiltzeko, Mandrake sistema eragile\n"
 "normal gisa."
 
 #: ../move/move.pm:494
@@ -258,7 +258,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -274,7 +274,7 @@ msgstr ""
 "\n"
 "Horren jatorria izan litezke USB gakoko sistema-konfigurazioko\n"
 "fitxategiak hondatuta egotea. Hala bada, fitxategi horiek kendu eta \n"
-"Mandrake Move berrabiaraziz konponduko da arazoa. Horretarako,\n"
+"Mandriva Move berrabiaraziz konponduko da arazoa. Horretarako,\n"
 "egin klik berrabiarazteko botoian.\n"
 "\n"
 "\n"
@@ -1313,11 +1313,11 @@ msgstr "Hizkuntza aukera"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux-ek hainbat hizkuntza onar ditzake. Hautatu\n"
+"Mandrivalinux-ek hainbat hizkuntza onar ditzake. Hautatu\n"
 "instalatu nahi dituzun hizkuntzak. Instalazioa osatzean eta\n"
 "sistema berrabiaraztean, erabilgarri egongo dira."
 
@@ -3738,12 +3738,12 @@ msgstr "gaitu irrati-euskarria"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Aurrera jarraitu aurretik lizentziaren baldintzak arretaz irakurri. \n"
-"Mandrakelinux banaketa osoa hartzen du. Baldintza guztiekin ados \n"
+"Mandrivalinux banaketa osoa hartzen du. Baldintza guztiekin ados \n"
 "bazaude, hautatu \"%s\" laukia. Onartzen ez badituzu, \"%s\" botoian klik\n"
 "egin eta ordenagailua berrabiaraziko da."
 
@@ -3929,13 +3929,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux instalazioa zenbait CD-ROMetan banatuta dago. \n"
+"Mandrivalinux instalazioa zenbait CD-ROMetan banatuta dago. \n"
 "Hautatutako pakete bat beste CD-ROM batean badago, DrakX-k du\n"
 "uneko CDa egotziko eta behar den CDa sartzeko eskatuko dizu.\n"
 "Eskatzen zaizun CDa ez badaukazu eskura, sakatu \"%s\",\n"
@@ -3947,11 +3947,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4003,10 +4003,10 @@ msgid ""
 "megabytes."
 msgstr ""
 "Sisteman zein programa instalatu nahi dituzun zehazteko garaia da.\n"
-"Mandrakelinux-erako milaka pakete dituzu erabilgarri, eta kudeaketa\n"
+"Mandrivalinux-erako milaka pakete dituzu erabilgarri, eta kudeaketa\n"
 "errazteko, antzeko aplikazioen multzotan kokatu dira.\n"
 "\n"
-"Mandrakelinux-ek pakete multzoak lau kategoriatan antolatzen ditu.\n"
+"Mandrivalinux-ek pakete multzoak lau kategoriatan antolatzen ditu.\n"
 "Kategoria anitzetako aplikazioak nahastu eta bateratu ditzakezu, honela\n"
 "\"Lanpostua\" instalazio batek \"Zerbitzari\" kategoriako aplikazioak\n"
 "instalatuta izan ditzake.\n"
@@ -4114,10 +4114,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4149,10 +4149,10 @@ msgstr ""
 "Zerbitzari pakete bat hautatu bada, pakete hori zehazki hautatu duzulako\n"
 "edo pakete-talde bateko zati zelako, zerbitzari horiek instalatu nahi "
 "dituzula\n"
-" berresteko eskatuko zaizu. Lehenespenez Mandrakelinux-ek instalatutako\n"
+" berresteko eskatuko zaizu. Lehenespenez Mandrivalinux-ek instalatutako\n"
 "edozein zerbitzu abioan automatikoki abiaraziko du. Nahiz eta seguruak\n"
 " diren eta arazo ezagunik ez duten banaketa kaleratzeko garaian, guztiz\n"
-" posible da Mandrakelinux bertsio hau amaitu eta gero segurtasun zuloak\n"
+" posible da Mandrivalinux bertsio hau amaitu eta gero segurtasun zuloak\n"
 " aurkitu izana. Ez badakizu zerbitzu zehatz batek zer egiten duen edo "
 "zergatik\n"
 " instalatu den, klikatu \"%s\". \"%s \" klikatzeak zerrendatutako "
@@ -4307,7 +4307,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4362,7 +4362,7 @@ msgid ""
 "not successful in getting the display configured."
 msgstr ""
 "X (X Window sistema) GNU/Linux-en interfaze grafikoaren bihotza da,\n"
-" Mandrakelinux-ekin bildutako ingurune grafiko guztiek (KDE, Gnome,\n"
+" Mandrivalinux-ekin bildutako ingurune grafiko guztiek (KDE, Gnome,\n"
 "Afterstep, WindowMaker...) erabiltzen dutena.\n"
 "\n"
 "Bistaratze grafiko optimoa lortzeko aldatu daitekeen parametro zerrenda\n"
@@ -4485,12 +4485,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4517,7 +4517,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4526,7 +4526,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4546,11 +4546,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 ""
-"Hona iritsita, Mandrakelinux sistema eragilea disko zurrunean non\n"
+"Hona iritsita, Mandrivalinux sistema eragilea disko zurrunean non\n"
 "instalatu aukeratu behar duzu. Zure disko zurruna hutsik badago edo\n"
 "lehendik dagoen sistema eragile batek leku erabilgarri guztia betetzen\n"
 "badu, diska zatikatu beharko duzu. Disko zurruna zatikatzea, funtsean,  \n"
-"diskoa logikoki zatitzea da, Mandrakelinux sistema berria instalatzeko\n"
+"diskoa logikoki zatitzea da, Mandrivalinux sistema berria instalatzeko\n"
 "behar den lekua sortzeko.\n"
 "\n"
 "Disko zurruna zatikatzeko prozesua normalean itzulbiderik gabea denez\n"
@@ -4581,7 +4581,7 @@ msgstr ""
 " edo NTFS partizioei neurria aldatu. Neurri aldaketa datu galerarik gabe\n"
 "gauzatu daiteke baldin eta aurretik Windows partizioa desfragmentatu\n"
 " baduzu. Oso gomendagarria da datuen babeskopiak egitea. Aukera hau\n"
-" erabiltzea gomendatzen da Mandrakelinux eta Microsoft Windows, biak,\n"
+" erabiltzea gomendatzen da Mandrivalinux eta Microsoft Windows, biak,\n"
 " konputagailu berean erabili nahi badituzu.\n"
 "\n"
 "   Aukera hau hautatu aurretik, ulertu ezazu prozedura honen ondoren,\n"
@@ -4590,7 +4590,7 @@ msgstr ""
 "zure datuak gorde edo software berria instalatzeko.\n"
 "\n"
 " * \"%s\": Disko zurrunean dauden datu eta partizio guztiak ezabatu eta \n"
-"Mandrakelinux sistema berriarekin ordeztu nahi badituzu, hautatu aukera\n"
+"Mandrivalinux sistema berriarekin ordeztu nahi badituzu, hautatu aukera\n"
 " hau. Kontuz, berretsi ondoren ezingo baituzu eragiketa desegin.\n"
 "\n"
 "   !! Aukera hau hautatzen baduzu, diskoko datu guztiak ezabatuko dira. !!\n"
@@ -4757,7 +4757,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4778,7 +4778,7 @@ msgstr ""
 "\n"
 "Klikatu \"%s\" partizioak eratzeko prest zaudenean.\n"
 "\n"
-"Klikatu \"%s\" Mandrakelinux sistema eragile berria instalatzeko beste "
+"Klikatu \"%s\" Mandrivalinux sistema eragile berria instalatzeko beste "
 "partizio\n"
 " bat aukeratu nahi baduzu.\n"
 "\n"
@@ -4799,7 +4799,7 @@ msgstr "Aurrekoa"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4811,7 +4811,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Mandrakelinux instalatzen duzunerako, litekeena da pakete batzuk\n"
+"Mandrivalinux instalatzen duzunerako, litekeena da pakete batzuk\n"
 "hasierako argitalpenetik aldatu izana. Baliteke akatsak zuzendu eta \n"
 "segurtasun arazoak konpondu izatea. Eguneratzeez baliatu ahal izan\n"
 "zaitezen, orain, Internetetik jaitsi ditzakezu. Markatu \"%s\" dabilen "
@@ -4842,7 +4842,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4855,7 +4855,7 @@ msgstr ""
 "ezartzean, normalean erabilera erraztasuna galtzen da.\n"
 "\n"
 "Zer aukeratu ez badakizu, hautatu aukera lehenetsia. Gero aldatu \n"
-"ahal izango duzu draksec tresnarekin, Mandrakelinux Aginte Gunearen\n"
+"ahal izango duzu draksec tresnarekin, Mandrivalinux Aginte Gunearen\n"
 "zati bat.\n"
 "\n"
 "Bete \"%s\" eremua segurtasun arduradunaren postaE helbidearekin.\n"
@@ -4872,7 +4872,7 @@ msgstr "Segurtasun-administratzailea"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4942,7 +4942,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Orain, Mandrakelinux sistema instalatzeko zein partizio erabiliko\n"
+"Orain, Mandrivalinux sistema instalatzeko zein partizio erabiliko\n"
 "d(ir)en aukeratu behar duzu. Partizioak jadanik definituta badaude,\n"
 "(GNU/Linux-en aurreko instalazio batek edo beste partizio-tresna batek\n"
 "definituta), lehendik dauden partizioak erabil ditzakezu. Bestela, disko \n"
@@ -5036,7 +5036,7 @@ msgstr "Aldatu modu normalera/aditu modura"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5065,7 +5065,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Microsoft partizio bat baino gehiago aurkitu dira zure disko zurrunean.\n"
-"Hautatu zeinen tamaina aldatu nahi duzun, Mandrakelinux sistema\n"
+"Hautatu zeinen tamaina aldatu nahi duzun, Mandrivalinux sistema\n"
 "berria instalatu ahal izateko.\n"
 "\n"
 "Partizioak honela azaltzen dira: \"Linux izena\", \"Windows izena\"\n"
@@ -5119,7 +5119,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5128,33 +5128,33 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Zure makinan GNU/Linux partizio zahar bat aurkitzen bada bakarrik\n"
 "aktibatzen da urrats hau.\n"
 "\n"
 "DrakX-k orain jakin behar du instalazio berri bat egin behar duzun edo\n"
-"lehendik dagoen Mandrakelinux sistema baten bertsioa berritu nahi duzun:\n"
+"lehendik dagoen Mandrivalinux sistema baten bertsioa berritu nahi duzun:\n"
 "\n"
 " * \"%s\": Zatirik handienean, sistema zaharra guztiz ezabatzen du. \n"
 "Disko zurruneko partizio-banaketa aldatu nahi baduzu, edo fitxategi-sistema\n"
 "aldatu, erabili aukera hau. Nolanahi ere, zure partizio-eskemaren arabera,\n"
 "lehendik dauden datu batzuk gainidaztea saihestu dezakezu.\n"
 "\n"
-" * \"%s\" instalazio-mota honek unean Mandrakelinux sisteman \n"
+" * \"%s\" instalazio-mota honek unean Mandrivalinux sisteman \n"
 "instalatuta dituzun paketeak eguneratzeko aukera ematen du. Uneko \n"
 "partizio-eskema eta erabiltzaile-datuak ez dira aldatzen. Bestelako \n"
 "konfigurazio-urrats gehienak erabilgarri mantentzen dira, instalazio\n"
 "estandarretan bezalatsu.\n"
 "\n"
-"``Bertsio-berritu'' aukerak ondo funtzionatu behar luke Mandrakelinux\n"
-"sistemaren \"8.1\" bertsioetan edo berriagoetan. Mandrakelinux-en \"8.1\" \n"
+"``Bertsio-berritu'' aukerak ondo funtzionatu behar luke Mandrivalinux\n"
+"sistemaren \"8.1\" bertsioetan edo berriagoetan. Mandrivalinux-en \"8.1\" \n"
 "baino bertsio zaharragoetan ez da gomendatzen Bertsio-berritzea."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -5217,7 +5217,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5259,7 +5259,7 @@ msgstr ""
 "UTF-8 (unicode) euskarriari buruz: Unicode karaktere kodeketa berri bat da,\n"
 "existitzen diren hizkuntza guztiak hartu nahi dituena. Hala ere, "
 "berarentzako\n"
-"erabateko euskarria oraindik garatzen ari da GNU/Linux-en, Mandrakelinux-en\n"
+"erabateko euskarria oraindik garatzen ari da GNU/Linux-en, Mandrivalinux-en\n"
 "UTF-8 erabilera erabiltzailearen hautaketen araberakoa da:\n"
 "\n"
 " * Jatorrizko kodeketa ahaltsua duen hizkuntza bat aukeratzen baduzu \n"
@@ -5511,7 +5511,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5532,11 +5532,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Inprimatzeko sistema bat hautatzeko unea da orain.Eeste sistema eragile \n"
-"batzuk bakarra eskainiko dizute, baina Mandrakelinux-ek bi eskaintzen ditu.\n"
+"batzuk bakarra eskainiko dizute, baina Mandrivalinux-ek bi eskaintzen ditu.\n"
 "Inprimaketa sistema bakoitza egokiago da konfigurazio mota batzuetarako.\n"
 "\n"
 " * \"%s\" -- ``print, do not queue'' esapidearen akronimoa da, eta aukera\n"
@@ -5557,7 +5557,7 @@ msgstr ""
 "hautatzeko eta inprimagailua kudeatzeko interfaze grafikoak ditu.\n"
 "\n"
 "Hautapena orain egiten baduzu, eta beranduago ohartzen bazara zure\n"
-" inprimaketa sistema ez zaizula guztoko Mandrakelinux Aginte Guneko\n"
+" inprimaketa sistema ez zaizula guztoko Mandrivalinux Aginte Guneko\n"
 " PrintDrake exekutatuz eta \"%s\" botoian klik eginez alda zenezake."
 
 #: help.pm:765
@@ -5679,7 +5679,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5696,7 +5696,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5764,7 +5764,7 @@ msgstr ""
 "\n"
 " * \"%s\": abio zamatzailearen konfigurazioa aldatu nahi baduzu, klikatu\n"
 "botoi hontan. Erabiltzaile aurreratuek bakarrik erabili behar lukete. Jo\n"
-"inprimatutako dokumentaziora edo Mandrakelinux Aginte Guneko\n"
+"inprimatutako dokumentaziora edo Mandrivalinux Aginte Guneko\n"
 " abio-zamatzailearen konfigurazioari buruzko lerroko laguntzara.\n"
 "\n"
 " * \"%s\": sarrera honen bitartez zehatz doitu dezakezu zure makinan\n"
@@ -5831,10 +5831,10 @@ msgstr "Zerbitzuak"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Hautatu Mandrakelinux partizio berria instalatu ahal izateko ezabatu nahi\n"
+"Hautatu Mandrivalinux partizio berria instalatu ahal izateko ezabatu nahi\n"
 "duzun disko zurruna. Kontuz ibili, unitate horretako datu guztiak galdu\n"
 "egingo dira eta ezin izango dira berreskuratu!"
 
@@ -6191,11 +6191,11 @@ msgstr "Windows-en partizioaren tamaina kalkulatzen"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6310,19 +6310,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6344,7 +6344,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6352,14 +6352,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6369,7 +6369,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6389,10 +6389,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6403,11 +6403,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6423,14 +6423,14 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Sarrera\n"
 "\n"
-"Mandrakelinux banaketako sistema eragileari eta erabilgarri dauden osagaiei"
+"Mandrivalinux banaketako sistema eragileari eta erabilgarri dauden osagaiei"
 "\"Software-produktuak\"\n"
 "deituko zaie aurrerantzean. Software-produktuetan sartzen dira, besteak \n"
-"beste, Mandrakelinux banaketako sistema eragileari eta osagaiei "
+"beste, Mandrivalinux banaketako sistema eragileari eta osagaiei "
 "dagozkienprogramak, \n"
 "metodoak, arauak eta dokumentazioa.\n"
 "\n"
@@ -6438,7 +6438,7 @@ msgstr ""
 "1. Lizentzia-kontratua\n"
 "\n"
 "Irakurri arretaz dokumentu hau. Software produktuei buruz zuk eta "
-"Mandrakesoft S.A.k adostutako lizentzia-kontratu bat da.\n"
+"Mandriva S.A.k adostutako lizentzia-kontratu bat da.\n"
 "\n"
 "Software-produktuak instalatu, bikoiztu edo era batean edo bestean erabiliz, "
 "esplizituki \n"
@@ -6461,7 +6461,7 @@ msgstr ""
 "Software-produktuak eta erantsitako dokumentuak \"dauden-daudenean\"ematen "
 "dira, bermerik gabe, \n"
 "legeak onartzen duen neurrian.\n"
-"Mandrakesoft S.A.k ez du, ezein kasutan eta legeak onartzen duen neurrian "
+"Mandriva S.A.k ez du, ezein kasutan eta legeak onartzen duen neurrian "
 "erantzukizunik izango,\n"
 "Software-produktuen erabileraren edo erabiltzeko ezgaitasunaren ondorioz "
 "sortutako kalte berezi, ustekabeko \n"
@@ -6469,17 +6469,17 @@ msgstr ""
 "epai baten ondorioz ordaindu \n"
 "beharreko kuotak eta zigorrak edo beste edozein ondoriozko galera barne, "
 "mugarik gabe), \n"
-"Mandrakesoft S.A. jakinaren gainean egon arren halako kalteak gerta \n"
+"Mandriva S.A. jakinaren gainean egon arren halako kalteak gerta \n"
 "litezkeela.\n"
 "\n"
 "HERRIALDE BATZUETAN SOFTWARE DEBEKATUA EDUKITZEARI EDO ERABILTZEARI "
 "LOTUTAKOERANTZUKIZUN MUGATUA\n"
 "\n"
-"Legeak onartzen duen neurrian, Mandrakesoft S.Ak. edo bere banatzaileek, ez "
+"Legeak onartzen duen neurrian, Mandriva S.Ak. edo bere banatzaileek, ez "
 "dute, ezein kasutan, \n"
 "erantzukizunik izango herrialde batzuetan, bertako legeek debekatutako edo "
 "mugatutako software-osagaiak edo\n"
-"Mandrakelinux-en guneetatik deskargatutako software-osagaiak eduki eta "
+"Mandrivalinux-en guneetatik deskargatutako software-osagaiak eduki eta "
 "erabiltzearen ondorioz \n"
 "sortutako kalte berezi ustekabeko, zuzeneko edo zeharkakoengatik (lana "
 "galtzea, lana etetea \n"
@@ -6504,9 +6504,9 @@ msgstr ""
 "arretaz osagai horren lizentzia-kontratuko baldintzak.  Osagaiaren "
 "lizentziari \n"
 "buruzko galdera oro osagaiaren egileari egin beharko zaio, eta ez "
-"Mandrakesoft-i.\n"
-"Mandrakesoft S.A.k garatutako programak GPL Lizentziak eaenduak dira. "
-"Mandrakesoft S.A.k\n"
+"Mandriva-i.\n"
+"Mandriva S.A.k garatutako programak GPL Lizentziak eaenduak dira. "
+"Mandriva S.A.k\n"
 "idatzitako dokumentazioa lizentzia zehatz baten araberakoa da. Xehetasun "
 "gehiago nahi izanez gero \n"
 "jo dokumentaziora.\n"
@@ -6518,10 +6518,10 @@ msgstr ""
 "eta software-programei \n"
 "aplikatzen zaizkien jabetza intelektualaren eta copyriht-aren legeen babesa "
 "dute.\n"
-"Mandrakesoft S.A.k eskubidea du Software-produktuak bere osotasunean edo "
+"Mandriva S.A.k eskubidea du Software-produktuak bere osotasunean edo "
 "zatika aldatzeko, \n"
 "edozein bide erabiliz eta helburu guztietarako.\n"
-"\"Mandrake\", \"Mandrakelinux\" eta asoziatutako logotipoak Mandrakesoft S.A."
+"\"Mandriva\", \"Mandrivalinux\" eta asoziatutako logotipoak Mandriva S.A."
 "ren marka erregistratuak dira.  \n"
 "\n"
 "\n"
@@ -6537,7 +6537,7 @@ msgstr ""
 "konpontzea hobesten da. Azken baliabide gisa, \n"
 "Parisko edo Frantziako epaitegietara eramango da gatazka.\n"
 "Dokumentu honi buruzko edozein zalantza argitzeko, jarri harremanetan\n"
-"Mandrakesoft S.A.rekin.  \n"
+"Mandriva S.A.rekin.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6631,7 +6631,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6639,20 +6639,20 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Zorionak, instalazioa burutu da.\n"
 "Atera abioko diskoa eta sakatu itzulera-tekla berrabiarazteko.\n"
 "\n"
 "\n"
-"Mandrakelinux-en bertsio honetarako erabilgarri dauden konponbideen \n"
+"Mandrivalinux-en bertsio honetarako erabilgarri dauden konponbideen \n"
 "informaziorako, kontsultatu Erratak helbide honetan:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"Zure sistema konfiguratzeko informazioa Mandrakelinux-en Erabiltzailearen\n"
+"Zure sistema konfiguratzeko informazioa Mandrivalinux-en Erabiltzailearen\n"
 "Gida Ofizialeko instalatu ondorengo azalpenei buruzko kapituluan duzu."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6688,11 +6688,11 @@ msgstr "`%s'. urratsean sartzen\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Sistemak baliabide gutxi ditu. Arazoak izan ditzakezu Mandrakelinux \n"
+"Sistemak baliabide gutxi ditu. Arazoak izan ditzakezu Mandrivalinux \n"
 "instalatzeko. Horrela bada, testu-instalazioa egiten saia zaitezke. \n"
 "Horretarako, sakatu `F1' CD-ROMetik abiaraztean, eta idatzi `text'."
 
@@ -7232,9 +7232,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Mandrakelinux web gunearekin konektatzen, ispilu erabilgarrien zerrenda "
+"Mandrivalinux web gunearekin konektatzen, ispilu erabilgarrien zerrenda "
 "lortzeko..."
 
 #: install_steps_interactive.pm:840
@@ -7459,8 +7459,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux %s instalazioa"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux %s instalazioa"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10048,13 +10048,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall konfiguratzailea\n"
 "\n"
-"Mandrakelinux makinarako suebaki pertsonal bat konfiguratzen du.\n"
+"Mandrivalinux makinarako suebaki pertsonal bat konfiguratzen du.\n"
 "Suebaki-soluzio ahaltsua eskuratu ahal izateko, kontsultatu\n"
 "MandrakeSecurity suebaki banaketa espezializatua."
 
@@ -14128,11 +14128,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"Exekutatu Scandrake (Hardwarea/Eskanerra Mandrakelinux-en Aginte Gunean) "
+"Exekutatu Scandrake (Hardwarea/Eskanerra Mandrivalinux-en Aginte Gunean) "
 "zure eskanerra sarean partekatzeko\n"
 "\n"
 
@@ -16085,33 +16085,33 @@ msgstr "Gelditu"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Zer da Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Zer da Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Ongi etorri <b>Mandrakelinux</b>-era!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Ongi etorri <b>Mandrivalinux</b>-era!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux <b>Linux banaketa</b> bat da sistemaren bihotza duena, "
+"Mandrivalinux <b>Linux banaketa</b> bat da sistemaren bihotza duena, "
 "<b>sistema eragilea</b> deitua (Linux nukleoan oinarritua) <b>aplikazio pila "
 "batekin</b> batera, izan ditzakezun behar guztiak hasetuko dituena."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux gaur egun Linux banaketa <b>lagunkoiena</b> da. Gainera "
+"Mandrivalinux gaur egun Linux banaketa <b>lagunkoiena</b> da. Gainera "
 "munduan zehar <b>gehien erabilitakonux</b> banaketen an artean dago!"
 
 #: share/advertising/02.pl:13
@@ -16127,14 +16127,14 @@ msgstr "Ongi etorri <b>Iturburu Irekiaren mundura</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux iturburu irekiko ereduari herabat atsekitzen zaio. Honek esan "
-"nahi du bertsio berri hau <b>Mandrakesoft-eko garatzaile taldearen</b> eta "
-"Mandrakelinux-en <b>mundu zabaleko</b> komunitatearen arteko "
+"Mandrivalinux iturburu irekiko ereduari herabat atsekitzen zaio. Honek esan "
+"nahi du bertsio berri hau <b>Mandriva-eko garatzaile taldearen</b> eta "
+"Mandrivalinux-en <b>mundu zabaleko</b> komunitatearen arteko "
 "<b>lankidetzaren</b> emaitza dela."
 
 #: share/advertising/02.pl:19
@@ -16155,9 +16155,9 @@ msgstr "<b>GPLa</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Banaketa honetan sartutako software gehiena eta Mandrakelinux tresna guztiak "
+"Banaketa honetan sartutako software gehiena eta Mandrivalinux tresna guztiak "
 "<b>Lizentzia Publiko Orokorra</b>ren babesean lizentziatuta daude."
 
 #: share/advertising/03.pl:17
@@ -16183,20 +16183,20 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Elkartu Mandrakelinux komunitatera</b>"
+msgstr "<b>Elkartu Mandrivalinux komunitatera</b>"
 
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux-ek erabitzaile eta garatzaile <b>komunitate handienetako</b> "
+"Mandrivalinux-ek erabitzaile eta garatzaile <b>komunitate handienetako</b> "
 "bat dauka. Horrelako komunitate baten eginkizuna oso zabala da, akatsak "
 "jakinaraztetik aplikazio berrien garapenera. Komunitateak <b>funtsezko "
-"eginkizuna</b> betetzen du Mandrakelinux munduan."
+"eginkizuna</b> betetzen du Mandrivalinux munduan."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16217,10 +16217,10 @@ msgstr "<b>Deskargatzeko bertsioa</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Orain <b>Mandrakelinux Download</b> instalatzen ari zara. Hau Mandrakesoftek "
+"Orain <b>Mandrivalinux Download</b> instalatzen ari zara. Hau Mandrivaek "
 "<b>guztientzako eskuragarri</b> mantendu nahi duen doako bertsioa da."
 
 #: share/advertising/05.pl:19
@@ -16252,9 +16252,9 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
-"Beste Mandrakesoft produktuetan <b>ematen diren zerbitzuetara</b> ere ezingo "
+"Beste Mandriva produktuetan <b>ematen diren zerbitzuetara</b> ere ezingo "
 "duzu sarbiderik eduki."
 
 #: share/advertising/06.pl:13
@@ -16264,8 +16264,8 @@ msgstr "<b>Discovery, Zure Lehenengo Linux Idaztegia</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Orain <b>Mandrakelinux Discovery</b> instalatzen ari zara."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Orain <b>Mandrivalinux Discovery</b> instalatzen ari zara."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16287,17 +16287,17 @@ msgstr "<b>PowerPack, Linux Idaztegia Gorena</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "<b>Mandrakelinux PowerPack</b> instalatzen ari zara."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "<b>Mandrivalinux PowerPack</b> instalatzen ari zara."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack Mandrakesoft-en <b>lehen mailako idaztegi</b> produktua da. "
+"PowerPack Mandriva-en <b>lehen mailako idaztegi</b> produktua da. "
 "PowerPack-ek <b>milaka aplikazio</b> dakartza - guztia ospetsuenetatik "
 "aurreratuenetara."
 
@@ -16308,8 +16308,8 @@ msgstr "<b>PowerPack+, Idaztegi eta Zerbitzarietarako Linux Soluzioa</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "<b>Mandrakelinux PowerPack+</b> instalatzen ari zara."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "<b>Mandrivalinux PowerPack+</b> instalatzen ari zara."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16325,21 +16325,21 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesoft Produktuak</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva Produktuak</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b>ek <b>Mandrakelinux</b> produktu eremu zabala garatudu."
+"<b>Mandriva</b>ek <b>Mandrivalinux</b> produktu eremu zabala garatudu."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux produktuak dira:"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux produktuak dira:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16359,72 +16359,72 @@ msgstr "\t* <b>PowerPack+</b>, Idaztegi eta Zerbitzarietarako Linux Soluzioa."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux x86-64-rako</b>, zure 64-biteko prozesatzaileari onena "
-"ateratzeko Mandrakelinux soluzioa."
+"\t* <b>Mandrivalinux x86-64-rako</b>, zure 64-biteko prozesatzaileari onena "
+"ateratzeko Mandrivalinux soluzioa."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesoft Produktuak (Nomada Produktuak)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandriva Produktuak (Nomada Produktuak)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft-ek bi produktu garatu ditu Mandrakelinux <b>edozein "
+"Mandriva-ek bi produktu garatu ditu Mandrivalinux <b>edozein "
 "konputagailutan</b> erabili ahal izateko berau instalatu beharrik gabe:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 "\t* <b>Move</b>, osorik CD-ROM abiarazle batetik exekutatzen den "
-"Mandrakelinux banaketa bat."
+"Mandrivalinux banaketa bat."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 "\t* <b>GlobeTrotter</b>, “LaCie Mobile Hard Drive” ultra-konpaktoan aurre-"
-"instalatutako Mandrakelinux banaketa bat."
+"instalatutako Mandrivalinux banaketa bat."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Mandrakesoft Produktuak (Soluzio Profesionalak)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Mandriva Produktuak (Soluzio Profesionalak)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 "Azpian daude <b>behar profesionalei</b> erantzuteko diseinatutako "
-"Mandrakesoft produktuak:"
+"Mandriva produktuak:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, Enpresentzako Mandrakelinux Idaztegia."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Enpresentzako Mandrivalinux Idaztegia."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Mandrakelinux Zerbitzari Soluzioa."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandrivalinux Zerbitzari Soluzioa."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b>, Mandrakelinux Segurtasun Soluzioa."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, Mandrivalinux Segurtasun Soluzioa."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16468,10 +16468,10 @@ msgstr "<b>Hautatu zure Idaztegi Ingurune Gogokoena</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "PowerPack-ekin <b>idaztegi ingurune grafikoaren</b> aukera izango duzu. "
-"Mandrakesoft-ek <b>KDE<b> aukeratu du lehetsi gisa."
+"Mandriva-ek <b>KDE<b> aukeratu du lehetsi gisa."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16495,10 +16495,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "PowerPack+-ekin <b>idaztegi ingurune grafikoaren</b> aukera izango duzu. "
-"Mandrakesoft-ek <b>KDE<b> aukeratu du lehetsi gisa."
+"Mandriva-ek <b>KDE<b> aukeratu du lehetsi gisa."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16626,10 +16626,10 @@ msgstr "<b>Gozatu ezazu Aplikazio Eremu Zabala</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Mandrakelinux menuan zure eginbehar guztientzako aplikazio erabilerrazak "
+"Mandrivalinux menuan zure eginbehar guztientzako aplikazio erabilerrazak "
 "aurkituko dituzu:"
 
 #: share/advertising/18.pl:16
@@ -16899,18 +16899,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux kontrol-zentroa</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux kontrol-zentroa</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrakelinux Aginte Gunea</b> zure konputagailuaren konfigurazioa "
-"errazteko diseinatutako Mandrakelinux-en ezinbesteko utilitate espezifikoen "
+"<b>Mandrivalinux Aginte Gunea</b> zure konputagailuaren konfigurazioa "
+"errazteko diseinatutako Mandrivalinux-en ezinbesteko utilitate espezifikoen "
 "bilduma bat da."
 
 #: share/advertising/25.pl:17
@@ -16934,16 +16934,16 @@ msgstr "<b>Iturburu Irekidun Eredua</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Konputagailu programaketa guztiak bezala, iturburu irekiko softwareak "
 "<b>denbora eta jendea</b> behar du garapenerako. Iturburu irekiko filosofia "
-"errespetatzeko asmoz, Mandrakesoft-ek balio erantsidun produktu eta "
-"zerbitzuak saltzen ditu <b>Mandrakelinux hobetzen jarraitzeko</b>. "
-"<b>Iturburu irekiko filosofiari</b> eta Mandrakelinux-en garapenari laguntza "
+"errespetatzeko asmoz, Mandriva-ek balio erantsidun produktu eta "
+"zerbitzuak saltzen ditu <b>Mandrivalinux hobetzen jarraitzeko</b>. "
+"<b>Iturburu irekiko filosofiari</b> eta Mandrivalinux-en garapenari laguntza "
 "eman nahi badiezu, <b>mesedez</b> gogoan hartu gure produktu edo "
 "zerbitzuetako baten erosketa!"
 
@@ -16955,10 +16955,10 @@ msgstr "<b>Lerroko Denda</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Mandrakesoft produktu eta zerbitzuei buruz gehiago ikasteko, gure <b>e-"
+"Mandriva produktu eta zerbitzuei buruz gehiago ikasteko, gure <b>e-"
 "commece plataforma</b> bisitatu dezakezu."
 
 #: share/advertising/27.pl:17
@@ -16984,23 +16984,23 @@ msgstr "Joan gaur bertan <b>store.mandrakesoft.com</b> gunera"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> zure Mandrakelinux produktuen <b>lagunperfektua</b> da..."
+"<b>Mandriva Club</b> zure Mandrivalinux produktuen <b>lagunperfektua</b> da..."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Baliatu Mandrakeclub-eko kide eginez eskuratuko dituzun onurez, hala nola:"
+"Baliatu Mandriva Club-eko kide eginez eskuratuko dituzun onurez, hala nola:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -17022,40 +17022,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Parte-hartzea Mandrakelinux <b>erabiltzaile foruetan</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Parte-hartzea Mandrivalinux <b>erabiltzaile foruetan</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* Askapen publikoaren aurretik <b>sarbide goiztiar eta pribilegiatua</b>, "
-"Mandrakelinux <b>ISO irudietara</b>."
+"Mandrivalinux <b>ISO irudietara</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> Mandrakesoft bere bezeroei erabil dezaten eskaintzeaz "
+"<b>Mandriva Online</b> Mandriva bere bezeroei erabil dezaten eskaintzeaz "
 "harro dagoen premium zerbitzu berria da!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline-k zerbitzu baliogarrien aukera zabala eskaintzen du zure "
-"Mandrakelinux sistema <b>erraz eguneratzeko</b>:"
+"Mandriva Online-k zerbitzu baliogarrien aukera zabala eskaintzen du zure "
+"Mandrivalinux sistema <b>erraz eguneratzeko</b>:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17081,40 +17081,40 @@ msgstr "\t* Eguneraketa <b>programazio</b> malgua."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* Zure <b>Mandrakelinux sistema guztien</b> kudeaketa kontu bakarrarekin."
+"\t* Zure <b>Mandrivalinux sistema guztien</b> kudeaketa kontu bakarrarekin."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"<b>Laguntza</b> behar duzu? Mandrakesoft-en aditu teknikoak aurkituko dituzu "
+"<b>Laguntza</b> behar duzu? Mandriva-en aditu teknikoak aurkituko dituzu "
 "www.mandrakeexpert.com <b>gure euskarri teknikoaren plataforman</b>."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"<b>Mandrakelinux aditu gaituen</b> laguntzari esker, denbora asko aurreztuko "
+"<b>Mandrivalinux aditu gaituen</b> laguntzari esker, denbora asko aurreztuko "
 "duzu."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Mandrakelinux-ekin zerikusia duten galderak erantzuteko, <b>store."
+"Mandrivalinux-ekin zerikusia duten galderak erantzuteko, <b>store."
 "mandrakesoft.com</b>-en euskarri gertakariak erosteko aukera daukazu."
 
 #: share/compssUsers.pl:25
@@ -17414,8 +17414,8 @@ msgstr "Gainbegiraketa tresnak, prozesuen kotabilitatea, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesoft Morroiak"
+msgid "Mandriva Wizards"
+msgstr "Mandriva Morroiak"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17568,7 +17568,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17639,14 +17639,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPTION]...\n"
-"  --no-confirmation      ez eskatu berrespenik MandrakeUpdate moduan\n"
+"  --no-confirmation      ez eskatu berrespenik Mandriva Update moduan\n"
 "  --no-verify-rpm        ez egiaztatu paketeen sinadurak\n"
 "  --changelog-first      bistaratu changelog fitxategi-zerrendaren aurretik "
 "azalpenen leihoan\n"
@@ -20444,13 +20444,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux-en programa-erroreen berri emateko tresna"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux-en programa-erroreen berri emateko tresna"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux-en kontrol-zentroa"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux-en kontrol-zentroa"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20470,8 +20470,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20515,8 +20515,8 @@ msgstr "Konfigurazio-morroiak"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Aukeratu Mandrakesoft Tresna:"
+msgid "Select Mandriva Tool:"
+msgstr "Aukeratu Mandriva Tresna:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20943,20 +20943,20 @@ msgstr "Abioan abiaraztekoa"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Interfaze hau ez da oraindik konfiguratu.\n"
-"Exekutatu Mandrakelinux kontrol-zentroko \"Gehitu interfaze bat\" "
+"Exekutatu Mandrivalinux kontrol-zentroko \"Gehitu interfaze bat\" "
 "laguntzailea"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Ez daukazu konfiguratutako Internet loturarik.\n"
-"Exekutatu Mandrakelinux Aginte Guneko \"%s\" morroia"
+"Exekutatu Mandrivalinux Aginte Guneko \"%s\" morroia"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21006,8 +21006,8 @@ msgstr "KDM (KDE konexioen kudeatzailea)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux konexioen kudeatzailea)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux konexioen kudeatzailea)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21306,7 +21306,7 @@ msgstr "Inportatu"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21315,7 +21315,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 Mandrakesoft \n"
+"Copyright (C) 2001-2002 Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (jatorrizko bertsioa)\n"
@@ -21860,14 +21860,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 "drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "Software librea da, eta birbana daiteke GNU GPL lizentziaren baldintzak "
 "betetzen badira.\n"
 "\n"
@@ -21895,8 +21895,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux Laguntza Gunea"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux Laguntza Gunea"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25428,8 +25428,8 @@ msgstr "Aldaketa egin da, baina, eragina izan dezan, saioa amaitu behar duzu"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinux Tresnen Erregistroak"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinux Tresnen Erregistroak"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25942,7 +25942,7 @@ msgstr "Konexioa osatu da."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Konexioak huts egin du.\n"
 "Egiaztatu zure konfigurazioa Mandrake-ren kontrol-zentroan."
diff --git a/perl-install/share/po/fa.po b/perl-install/share/po/fa.po
index 0cd56213d..4cacbf188 100644
--- a/perl-install/share/po/fa.po
+++ b/perl-install/share/po/fa.po
@@ -66,7 +66,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "کلید USB بنظر می‌رسد که حفاظت نگارش را بکار گرفته باشد، ولی اکنون نمی‌توانیم\n"
 "آن را بسلامتی خارج کنیم.\n"
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "دکمه را برای آغازگری مجدد کلیک کنید، آن را خارج کرده، حفاظت نگارش را "
 "بردارید،\n"
-"کلید را دوباره وصل کرده، و Mandrake Move را دوباره راه‌اندازی کنید."
+"کلید را دوباره وصل کرده، و Mandriva Move را دوباره راه‌اندازی کنید."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -92,7 +92,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "کلید USB شما هیچ قسمت‌بندی معتبر (FAT) ویندوز ندارد.\n"
@@ -103,14 +103,14 @@ msgstr ""
 "\n"
 "\n"
 "شما می‌توانید بدون یک کلید USB نیز پیشروی کنید - هنوز\n"
-"قادر خواهید بود از Mandrake Move مانند یک سیستم عامل\n"
+"قادر خواهید بود از Mandriva Move مانند یک سیستم عامل\n"
 "ماندرایک زنده‌ی عادی استفاده کنید."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -118,7 +118,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "ما هیچ کلید USB را بر سیستم‌تان شناسائی نکردیم. اگر شما\n"
@@ -255,7 +255,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1308,7 +1308,7 @@ msgstr "گزینش زبان"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3730,7 +3730,7 @@ msgstr "بکار انداختن پشتیبانی رادیو"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3915,7 +3915,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3931,11 +3931,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4100,10 +4100,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4291,7 +4291,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4466,12 +4466,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4498,7 +4498,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4507,7 +4507,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4725,7 +4725,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4765,7 +4765,7 @@ msgstr "پیشین"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4806,7 +4806,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4835,7 +4835,7 @@ msgstr "مدیر امنیت"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4992,7 +4992,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5071,7 +5071,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5080,13 +5080,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "این گام فقط در صورتی که یک قسمت‌بندی قدیمی لینوکس/گنو بر ماشین شما پیدا شود\n"
 "فعال می‌گردد. \n"
@@ -5161,7 +5161,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5446,7 +5446,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5467,7 +5467,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "اکنون زمان آن رسیده است که سیستم چاپ را بر روی رایانه خود انتخاب کنید. "
@@ -5620,7 +5620,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5637,7 +5637,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5767,7 +5767,7 @@ msgstr "سرویس‌ها"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "دستگاه دیسکی را که می‌خواهید برای نصب قسمت‌بندی جدید لینوکس ماندرایک\n"
@@ -6122,7 +6122,7 @@ msgstr "حساب کردن اندازه‌ی قسمت‌بندی ویندوز"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "قسمت‌بندی ویندوز شما خیلی درهم ریخته است. لطفا رایانه‌ی خود را با ویندوز "
@@ -6244,19 +6244,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6278,7 +6278,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6286,14 +6286,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6303,7 +6303,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6323,10 +6323,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6337,11 +6337,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6357,7 +6357,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "معرفی\n"
 "\n"
@@ -6370,7 +6370,7 @@ msgstr ""
 "۱. توافق‌نامه‌ی مجوز\n"
 "\n"
 "لطفاً این نوشتار را با دقت بخوانید. این نوشتار یک توافق‌نامه‌ی مجوز بین شما و \n"
-"شرکت Mandrakesoft S.A می‌باشد که شامل محصولات نرم‌افزاری می‌شود.\n"
+"شرکت Mandriva S.A می‌باشد که شامل محصولات نرم‌افزاری می‌شود.\n"
 "با نصب کردن، تکثیر یا استفاده از محصولات نرم‌افزاری به هر طریق، شما شروط\n"
 "این مجوز را صریحاُ پذیرفته و قبول کرده‌اید. اگر موافق با هر قسمت از مجوز "
 "نیستید،\n"
@@ -6385,18 +6385,18 @@ msgstr ""
 "\n"
 "محصولات نرم‌افزاری و نوشتار همراه بطور \"همینطوری\"، بدون هیچ ضمانتی\n"
 "و تا جایی که قانون اجازه می‌دهد، عرضه شده‌اند.\n"
-"شرکت Mandrakesoft S.A. در هیچ شرایطی و تا جایی که قانون اجازه می‌دهد،\n"
+"شرکت Mandriva S.A. در هیچ شرایطی و تا جایی که قانون اجازه می‌دهد،\n"
 "مسئول هر اتفاق مخصوص، هر خرابی مستقیم یا غیر مستقیم (شامل خرابی‌های نامحدود\n"
 "برای از دست دادن شغل، اشکالات شغلی، ضرر مالی و جریمه‌های از طرف یک دادگاه\n"
 "یا هر ضرر متعاقب دیگر) در پی‌ استفاده یا ناتوانی در استفاده از محصولات "
 "نرم‌افزاری،\n"
-"حتی اگر Mandrakesoft S.A.از احتمال یا پیش‌آمد چنین خرابی‌هایی مطلع شده باشد\n"
+"حتی اگر Mandriva S.A.از احتمال یا پیش‌آمد چنین خرابی‌هایی مطلع شده باشد\n"
 "نخواهد بود.\n"
 "\n"
 "مسئولیت محدود مربوط به داشتن یا استفاده از نرم‌افزار ممنوعه در بعضی از "
 "کشورها\n"
 "\n"
-"شرکت Mandrakesoft S.A. یا توزیع کنندگان آن در هیچ شرایطی و تا جایی که قانون "
+"شرکت Mandriva S.A. یا توزیع کنندگان آن در هیچ شرایطی و تا جایی که قانون "
 "اجازه می‌دهد،\n"
 "مسئول هر اتفاق مخصوص، هر خرابی مستقیم یا غیر مستقیم (شامل خرابی‌های نامحدود\n"
 "برای از دست دادن شغل، اشکالات شغلی، ضرر مالی و جریمه‌های از طرف یک دادگاه\n"
@@ -6423,7 +6423,7 @@ msgstr ""
 "مربوط به مجوز \n"
 "نرم‌افزار بایستی به نویسنده‌ی آن نرم‌افزار ونه به ماندرایک فرستاده شوند. "
 "برنامه‌های تهیه شده بوسیله \n"
-"ماندرایک توسط مجوز GPL اداره می‌شوند. نوشتارهای نوشته شده توسط Mandrakesoft S."
+"ماندرایک توسط مجوز GPL اداره می‌شوند. نوشتارهای نوشته شده توسط Mandriva S."
 "A. تحت \n"
 "مجوز مخصوص اداره می‌شوند. لطفاً به این نوشتارها برای توضیحات بیشتر مراجعه "
 "کنید.\n"
@@ -6433,10 +6433,10 @@ msgstr ""
 "تمام حقوق برنامه‌های محصولات نرم‌افزاری به نویسندگان هر یک از آنها تعلق داشته "
 "و بوسیله \n"
 "مالکیت نبوغی و قوانین حق امتیاز برنامه‌های نرم‌افزاری حفاظت می‌شوند. \n"
-"شرکت Mandrakesoft S.A.حقوق امتیازی خود را برای تغییر یا وفق دادن محصولات "
+"شرکت Mandriva S.A.حقوق امتیازی خود را برای تغییر یا وفق دادن محصولات "
 "نرم‌افزاری \n"
 "بطور کامل یا قسمت‌هایی از آنها، در هر صورت و برای هر منظور محفوظ می‌دارد. \n"
-"\"Mandrake\", \"Mandrakelinux\" و علائم مربوطه آرم‌های بازرگانی Mandrakesoft "
+"\"Mandriva\", \"Mandrivalinux\" و علائم مربوطه آرم‌های بازرگانی Mandriva "
 "S.A. می باشند.\n"
 "\n"
 "\n"
@@ -6450,7 +6450,7 @@ msgstr ""
 "شروط این مجوز توسط قوانین کشور فرانسه تصویب و اجرا می‌شوند. \n"
 "هر اختلافی در شروط این مجوز ترجیحاً توسط دادگاه حل خواهد گردید. در آخرین \n"
 "مرحله، اختلاف به دادسرای قانون پاریس - فرانسه ارجاع داده خواهد شد. \n"
-"برای هر سؤالی درباره این نوشتار لطفاً با Mandrakesoft S.A. تماس بگیرید.\n"
+"برای هر سؤالی درباره این نوشتار لطفاً با Mandriva S.A. تماس بگیرید.\n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6536,7 +6536,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6544,7 +6544,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "تبریک میگوییم، نصب تکمیل شده است.\n"
 "رسانه‌ی آغازگر را برداشته و برگشت را برای آغازگری مجدد فشار دهید.\n"
@@ -6593,7 +6593,7 @@ msgstr "ورود به مرحله‌ی `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -7137,7 +7137,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
 "در حال تماس گرفتن با وب‌گاه لینوکس ماندرایک برای دریافت لیست پایگاه‌های "
 "آینه‌های موجود..."
@@ -7362,7 +7362,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
 msgstr "نصب لینوکس ماندرایک %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -9949,7 +9949,7 @@ msgstr "بیت‌تورنت"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -13981,7 +13981,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -15900,18 +15900,18 @@ msgstr "ایست"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr "<b>لینوکس ماندرایک چیست؟</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
 msgstr "به <b>ماندرایک</b> خوش آمدید!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -15923,7 +15923,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 "لینوکس ماندرایک <b>کاربر دوستانه‌ترین</b> پخش لینوکس امروز است.  لینوکس "
@@ -15942,9 +15942,9 @@ msgstr "به <b>دنیای منبع باز</b> خوش آمدید!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 "لینوکس ماندرایک به مدل منبع باز متعهد است. این بدین معنی است که این توزیع "
@@ -15968,7 +15968,7 @@ msgstr "<b>The GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "بسیاری از نرم افزارهای ضمیمه در این پخش و همه ابزار لینوکس ماندرایک تحت مجوز "
 "<b>General Public License</b> هستند."
@@ -16001,10 +16001,10 @@ msgstr "<b>به جامعه بپیوندید</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 "لینوکس ماندرایک یکی از <b>بزرگترین جوامع</b> کاربران و توسعه دهندگان است. "
 "نقش چنین جامعه‌ای بسیار پهناور، از گزارش اشکال تا توسعه برنامه های جدید است. "
@@ -16029,8 +16029,8 @@ msgstr "<b>نسخه‌ی بارگیری</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 "شما اکنون در حال نصب <b>لینوکس ماندرایک نسخه بارگیری</b> هستید. این نسخه "
 "آزاد نرم افزار ماندرایک است که در <b>دسترس همگان</b> قرار میگیرد."
@@ -16064,7 +16064,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "شما دستیابی به <b>خدمات ضمیمه</b> در محصولات دیگر نرم افزار ماندرایک نیز "
 "نخواهید داشت."
@@ -16076,7 +16076,7 @@ msgstr "<b>اکتشاف, اولین رومیزی لینوکس خود</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr "شما اکنون در حال نصب <b>لینوکس ماندرایک اکتشافی</b> هستید."
 
 #: share/advertising/06.pl:17
@@ -16098,13 +16098,13 @@ msgstr "<b>بسته قدرتی، رومیزی لینوکس نهایی</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr "شما اکنون در حال نصب <b>بسته قدرتی لینوکس ماندرایک</b>"
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -16118,7 +16118,7 @@ msgstr "<b>بسته قدرتی+، راه حل لینوکس برای رومیزی
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr "شما اکنون در حال نصب <b>بسته قدرتی+ لینوکس ماندرایک</b> هستید."
 
 #: share/advertising/08.pl:17
@@ -16135,13 +16135,13 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr "<b>محصولات نرم افزار ماندرایک</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 "<b>نرم افزار ماندرایک</b> گستره پهناوری از محصولات <b>لینوکس ماندرایک</b> را "
@@ -16149,7 +16149,7 @@ msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr "محصولات لینوکس ماندرایک عبارتند از:"
 
 #: share/advertising/09.pl:18
@@ -16170,20 +16170,20 @@ msgstr "\t* <b>بسته قدرتی+</b>, راه حل لینوکس برای رو�
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 "\t* <b>لینوکس ماندرایک x86-64</b>, راه حل لینوکس ماندرایک برای پردازه ۶۴-بیت."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr "<b>محصولات نرم افزار ماندرایک (محصولات بدوی)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 "نرم افزار ماندرایک دو محصول را که به شما اجازه میدهد تا از لینوکس ماندرایک "
@@ -16193,7 +16193,7 @@ msgstr ""
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 "\t* <b>انتقال</b>, پخش لینوکس ماندرایک که کاملا از یک سی دی قابل آغازگری "
@@ -16202,7 +16202,7 @@ msgstr ""
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 "\t* <b>GlobeTrotter</b>, پخش لینوکس ماندرایکی که بر دیسک همراه بسیار کوچک "
@@ -16210,13 +16210,13 @@ msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr "<b>محصولات نرم افزار ماندرایک (راه حلهای حرفه ای)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 "در زیر محصولات نرم افزار ماندرایک که برای <b>نیازهای حرفه‌ای</b> طراحی شده‌اند "
@@ -16224,17 +16224,17 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr "\t* <b>رومیزی چندشرکتی</b>, رومیزی لینوکس ماندرایک برای شرکتها."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr "\t* <b>کارگزار چندشرکتی</b>, راه حل کارگزاری لینوکس ماندرایک.."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr "\t* <b>دیوار آتش چند-شبکه‌ای</b>, راه حل امنیتی لینوکس ماندرایک."
 
 #: share/advertising/12.pl:13
@@ -16278,7 +16278,7 @@ msgstr "<b>محیط رومیزی محبوبتان را انتخاب کنید!</b
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "با بسته قدرتی، شما گزینه <b>محیط رومیزی گرافیکی</b> را دارید. نرم افزار "
 "ماندرایک <b>کدئی</b> را مانند یک پیش‌فرض انتخاب کرده است."
@@ -16305,7 +16305,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "با بسته قدرتی+ شما گزینه <b>محیط رومیزی گرافیکی</b> را دارید. نرم افزار "
 "ماندرایک <b>کدئی</b> را مانند پیش‌فرض انتخاب کرده است."
@@ -16431,7 +16431,7 @@ msgstr "<b>از گستره‌ی پهناوری از برنامه‌های کار
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 "در منوی لینوکس ماندرایک برای <b>همه کارهایتان</b> برنامه های <b>آسان</b> "
@@ -16687,14 +16687,14 @@ msgstr "\t* <b>Postfix</b> و <b>Sendmail</b>: کارگزاران قدرتمند
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr "<b>مرکز کنترل ماندرایک</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 "<b>مرکز کنترل لینوکس ماندرایک<b> مجموعه اساسی از وسایل مخصوص لینوکس ماندرایک "
@@ -16721,9 +16721,9 @@ msgstr "<b>مدل منبع باز</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "مانند هر برنامه ریزی رایانه‌ای، نرم افزار منبع باز <b> به زمان و مردم </b> "
@@ -16740,7 +16740,7 @@ msgstr "<b>فروشگاه اینترنتی</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 "برای یادگیری درباره محصولات و خدمات نرم افزار ماندرایک میتوانید از <b>پایگاه "
@@ -16767,13 +16767,13 @@ msgstr "امروز به <b>store.mandrakesoft.com</b> سری بزنید"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 "<b>باشگاه ماندرایک</b> کاملترین <b>همراه</b> برای محصول لینوکس ماندرایک است.."
@@ -16781,7 +16781,7 @@ msgstr ""
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 "با پیوستن به باشگاه ماندرایک از خدمات، محصولات و <b>منافع با ارزش</b> بهره "
 "ببرید، مانند:"
@@ -16805,27 +16805,27 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr "\t* شرکت کردن در <b>انجمنهای کاربری</b> لینوکس ماندرایک."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>دستیابی زودتر و مخصوص</b>، قبل از پخش عمومی، به <b>تصاویر ISO</b> "
 "لینوکس ماندرایک."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr "<b>ماندرایک بر اینترنت</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 "<b>ماندرایک در اینترنت</b> سرویس اولیه‌ای جدیدی است که نرم افزار ماندرایک "
@@ -16834,8 +16834,8 @@ msgstr ""
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 "ماندرایک در انیترنت گستره‌ی پهناوری از خدمات باارزش را برای <b>بروزسازی آسان</"
 "b> سیستمهای لینوکس ماندرایکتان عرضه میدارد:"
@@ -16862,18 +16862,18 @@ msgstr "\t* بروزسازیهای متغیر <b>زمان بندی شده</b>."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr "\t* سازماندهی <b>همگی سیستمهای لینوکس ماندرایکتان</b> با یک حساب."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "آیا نیاز به <b>دستیار</b> دارید؟ کارشناسان فنی نرم افزار ماندرایک را در "
@@ -16882,7 +16882,7 @@ msgstr ""
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 "با سپاس از کمک <b>کارشناسان لینوکس ماندرایک</b>، زمان زیادی را ذخیره خواهید "
@@ -16891,7 +16891,7 @@ msgstr ""
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 "برای هر پرسش مربوط به لینوکس ماندرایک، شما امکان خرید پشتیبانی را در "
@@ -17188,7 +17188,7 @@ msgstr "ابزار پایشگری، پروسه های حسابداری، tcpdump
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr "جادوگران نرم افزار ماندرایک"
 
 #: share/compssUsers.pl:197
@@ -17338,7 +17338,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17408,7 +17408,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -20186,12 +20186,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "ابزار گزارش اشکال لینوکس ماندرایک"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
 msgstr "مرکز کنترل ماندرایک"
 
 #: standalone/drakbug:48
@@ -20212,7 +20212,7 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "ماندرایک بر اینترنت"
 
 #: standalone/drakbug:52
@@ -20257,7 +20257,7 @@ msgstr "جادوگرهای پیکربندی"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr "ابزار نرم‌افزار ماندرایک را انتخاب کنید:"
 
 #: standalone/drakbug:82
@@ -20683,7 +20683,7 @@ msgstr "راه‌اندازی شده در آغازگری"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "این واسط هنوز پیکربندی نشده است.\n"
 "دستیار \"افزودن واسطی\" را از مرکز کنترل ماندرایک اجرا کنید"
@@ -20692,7 +20692,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "شما هیچ اتصال اینترنتی پیکربندی شده ندارید.\n"
 "دستیار \"%s\" را از مرکز کنترل لینوکس ماندرایک اجرا کنید"
@@ -20745,7 +20745,7 @@ msgstr "KDM (مدیر نمایش کدئی)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr "MdkKDM (مدیر نمایش لینوکس ماندرایک)"
 
 #: standalone/drakedm:37
@@ -21045,7 +21045,7 @@ msgstr "واردات"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21054,7 +21054,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21597,14 +21597,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "این یک نرم‌افزار آزاد بوده و ممکن است تحت شروط GNU GPL انتشار مجدد گردد.\n"
 "\n"
 "طرز استفاده: \n"
@@ -21633,7 +21633,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "مرکز راهنمای لینوکس ماندرایک"
 
 #: standalone/drakhelp:36
@@ -25151,7 +25151,7 @@ msgstr "تغییر انجام شده است، ولی برای مؤثر واقع
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "ثبتهای ابزارهای لینوکس ماندرایک"
 
 #: standalone/logdrake:51
@@ -25667,7 +25667,7 @@ msgstr "اتصال برقرار شد."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "اتصال شکست خورد.\n"
 "پیکربندی خود را در مرکز کنترل ماندرایک تصدیق کنید."
@@ -26552,7 +26552,7 @@ msgstr "نصب شکست خورد"
 #~ msgstr "شما هیچ قلمی را انتخاب نکرده‌اید"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
+#~ msgid "Mandriva Wizards"
 #~ msgstr "جادوگران نرم افزار ماندرایک"
 
 #~ msgid "No browser available! Please install one"
diff --git a/perl-install/share/po/fi.po b/perl-install/share/po/fi.po
index 53c328293..1d9f5df1a 100644
--- a/perl-install/share/po/fi.po
+++ b/perl-install/share/po/fi.po
@@ -1,7 +1,7 @@
 # DrakX-fi - Finnish Translation
 #
 # Copyright (C) 2002,2003, 2004, 2005 Free Software Foundation, Inc.
-# Copyright (C) 2002 Mandrakesoft
+# Copyright (C) 2002 Mandriva
 # Matias Griese <mahagr@utu.fi>, 2001.
 # Taisto Kuikka <69319@batman.jypoly.fi>, 2003,2004.
 # Esa Linna <denzo@mbnet.fi>, 2004.
@@ -70,14 +70,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "USB-avaimessa vaikuttaa olevan kirjoitussuoja päällä, mutta sitä ei\n"
 "voi nyt turvallisesti irrottaa.\n"
 "\n"
 "\n"
 "Käynnistä koneesi uudelleen, irrota USB-avain, poista kirjoitussuoja,\n"
-"kytke USB-avain takaisin ja käynnistä Mandrake Move uudelleen."
+"kytke USB-avain takaisin ja käynnistä Mandriva Move uudelleen."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -95,7 +95,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "USB-avaimessasi ei ole yhtään kunnollista Windows- (FAT)\n"
@@ -106,14 +106,14 @@ msgstr ""
 "\n"
 "\n"
 "Voit myös jatkaa ilman USB-avainta - voit silti käyttää\n"
-"Mandrake Move -järjestelmää normaalin Mandrakelinux\n"
+"Mandriva Move -järjestelmää normaalin Mandrivalinux\n"
 "-käyttöjärjestelmän tapaan."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -121,11 +121,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Yhtäkään USB-avainta ei tunnistettu koneessasi. Mikäli\n"
-"kytket USB-avaimen nyt, Mandrake Move voi tallentaa\n"
+"kytket USB-avaimen nyt, Mandriva Move voi tallentaa\n"
 "kotihakemistossasi olevat tiedot ja järjestelmäasetukset\n"
 "seuraavaa käynnistystä varten joko tässä tai jossain toisessa\n"
 "koneessa. HUOM: jos kytket avaimen nyt, odota muutamia\n"
@@ -133,7 +133,7 @@ msgstr ""
 "\n"
 "\n"
 "Voit myös jatkaa ilman USB-avainta - voit silti käyttää\n"
-"Mandrake Move -järjestelmää normaalin Mandrakelinux\n"
+"Mandriva Move -järjestelmää normaalin Mandrivalinux\n"
 "-käyttöjärjestelmän tapaan."
 
 #: ../move/move.pm:494
@@ -258,7 +258,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -274,7 +274,7 @@ msgstr ""
 "\n"
 "Tämä saattaa johtua viottuneista järjestelmän asetustiedostoista\n"
 "USB-avaimessa, siinä tapauksessa poista ne ja käynnistä kone\n"
-"uudelleen, jolloin Mandrake Move korjaa ongelman. Tehdäksesi\n"
+"uudelleen, jolloin Mandriva Move korjaa ongelman. Tehdäksesi\n"
 "tämän klikkaa vastaavaa nappia.\n"
 "\n"
 "\n"
@@ -1314,11 +1314,11 @@ msgstr "Kielivalinta"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux tukee useita kieliä. Valitse kielet jotka\n"
+"Mandrivalinux tukee useita kieliä. Valitse kielet jotka\n"
 "haluat asentaa. Ne ovat käytettävissä asennuksen jälkeen\n"
 "kun olet käynnistänyt koneesi uudelleen."
 
@@ -3741,12 +3741,12 @@ msgstr "ota radio-tuki käyttöön"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Ennen jatkamista sinun pitäisi lukea huolellisesti lisenssin ehdot.\n"
-"Lisenssi kattaa koko Mandrakelinux jakelun. Jos hyväksyt kaikki\n"
+"Lisenssi kattaa koko Mandrivalinux jakelun. Jos hyväksyt kaikki\n"
 "ehdot, valitse \"%s\" valinta. Jos et hyväksy ehtoja, painamalla \n"
 "\"%s\" painiketta tietokoneesi käynnistyy uudestaan."
 
@@ -3922,13 +3922,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinuxin asennus koostuu useasta CD-ROM-levystä. DrakX tietää,\n"
+"Mandrivalinuxin asennus koostuu useasta CD-ROM-levystä. DrakX tietää,\n"
 "onko valittu paketti toisella CD:llä ja osaa syöttää nykyisen levyn ulos\n"
 "ja pyytää sinua asettamaan oikean levyn tarvittaessa. Jos sinulla ei ole\n"
 "kyseistä CD-levyä käytettävissä, klikkaa vain \"%s\", ja kyseiset paketit\n"
@@ -3938,11 +3938,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3994,12 +3994,12 @@ msgid ""
 "megabytes."
 msgstr ""
 "Nyt on aika valita mitä ohjelmia haluat asentaa järjestelmääsi. Tarjolla\n"
-"on tuhansia paketteja Mandrakelinux jakelussa, ja pakettien\n"
+"on tuhansia paketteja Mandrivalinux jakelussa, ja pakettien\n"
 "hallinnan helpottamiseksi ne on koottu samanlaisten ohjelmistojen\n"
 "ryhmiin.\n"
 "\n"
 "Paketit on ryhmitelty ryhmiin koneesi käyttötarkoituksen mukaisesti.\n"
-"Mandrakelinux sisältää neljä eri ennakkoon määriteltyä asennustapaa.\n"
+"Mandrivalinux sisältää neljä eri ennakkoon määriteltyä asennustapaa.\n"
 "Voit verrata asennustapoja pakettiryhmiin. Voit tietysti asentaa paketteja\n"
 "eri ryhmistä niin halutessasi, joten ``Työasema''-asennus voi sisältää\n"
 "ohjelmia esimerkiksi ``Kehitysympäristö''-ryhmästä.\n"
@@ -4108,10 +4108,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4141,7 +4141,7 @@ msgstr ""
 "\n"
 "!! Jos palvelinpaketti on valittu, joko tarkoituksella tai koska se kuului\n"
 "johonkin valitsemaasi ryhmään, sinulta pyydetään vahvistusta,\n"
-"haluatko varmasti asentaa palvelimen. Oletuksena Mandrakelinux\n"
+"haluatko varmasti asentaa palvelimen. Oletuksena Mandrivalinux\n"
 "käynnistää jokaisen asennetun palvelin koneen käynnistyksen\n"
 "yhteydessä. Vaikka ne ovat turvallisia eikä niillä ole tunnettuja\n"
 "ongelmia jakelun julkaisuajankohtana, niistä voi löytyä turvallisuus-\n"
@@ -4295,7 +4295,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4351,7 +4351,7 @@ msgid ""
 msgstr ""
 "X (eli X Ikkunointijärjestelmä) on GNU/Linuxin graafisen käyttöliittymän\n"
 "sydän jota kaikki graafiset ympäristöt (KDE, Gnome, AfterStep,\n"
-"WindowMaker jne.), jotka seuraavat Mandrakelinuxin mukana,\n"
+"WindowMaker jne.), jotka seuraavat Mandrivalinuxin mukana,\n"
 "käyttävät alustanaan.\n"
 "\n"
 "Sinulle näytetään lista eri parametreista joita voit asettaa saadaksesi\n"
@@ -4462,12 +4462,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4494,7 +4494,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4503,7 +4503,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4523,11 +4523,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 ""
-"Nyt sinun pitää valita miten haluat asentaa Mandrakelinux käyttö-\n"
+"Nyt sinun pitää valita miten haluat asentaa Mandrivalinux käyttö-\n"
 "järjestelmän kiintolevyllesi. Jos kiintolevysi on tyhjä, tai nykyinen\n"
 "käyttöjärjestelmäsi käyttää siltä kaiken vapaan tilan, sinun pitää osioida\n"
 "se. Käytännössä osiointi tarkoittaa kiintolevyn loogista jakamista\n"
-"osiin tehdäksesi tilaa Mandrakelinux-järjestelmän asennukselle.\n"
+"osiin tehdäksesi tilaa Mandrivalinux-järjestelmän asennukselle.\n"
 "\n"
 "Koska osiointiprosessin muutoksia ei yleensä voi peruuttaa, ja se voi\n"
 "johtaa tietojen häviämiseen jos toinen käyttöjärjestelmä on jo asennettuna,\n"
@@ -4553,7 +4553,7 @@ msgstr ""
 "koon muuttaminen voidaan tehdä ilman tietojen hävittämistä, kunhan olet\n"
 "eheyttänyt sen ja se käyttää FAT-tiedostojärjestelmää. Tietojen varmistus\n"
 "on kuitenkin suotavaa. Tämä vaihtoehto on suositeltu jos haluat käyttää\n"
-"Mandrakelinuxia ja Microsoft Windowsia samassa koneessa.\n"
+"Mandrivalinuxia ja Microsoft Windowsia samassa koneessa.\n"
 "\n"
 "   Ennen kuin valitset tämän vaihtoehdon, sinun pitää ymmärtää että tämän\n"
 "toimenpiteen jälkeen Windows-osiosi on pienempi kuin tällä hetkellä.\n"
@@ -4561,7 +4561,7 @@ msgstr ""
 "tallentaa tietojasi tai asentaa uusia ohjelmia.\n"
 "\n"
 " * \"%s\": valitse tämä jos haluat poistaa kaikki tiedot\n"
-"ja osiot ja asentaa Mandrakelinux -järjestelmäsi niiden tilalle. Ole\n"
+"ja osiot ja asentaa Mandrivalinux -järjestelmäsi niiden tilalle. Ole\n"
 "varovainen tämän valinnan kanssa, koska et pysty peruuttamaan\n"
 "valintaasi kun olet hyväksynyt tämän toimenpiteen.\n"
 "\n"
@@ -4723,7 +4723,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4745,7 +4745,7 @@ msgstr ""
 "\n"
 "Valitse \"%s\" kun olet valmis alustamaan osiot.\n"
 "\n"
-"Valitse \"%s\", jos haluat valita toisen osion Mandrakelinuxin\n"
+"Valitse \"%s\", jos haluat valita toisen osion Mandrivalinuxin\n"
 "asentamiseen.\n"
 "\n"
 "Valitse \"%s\", jos haluat valita osiot, jotka tarkistetaan\n"
@@ -4763,7 +4763,7 @@ msgstr "Edellinen"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4775,7 +4775,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Tässä vaiheessa, kun asennat Mandrakelinuxia, on todennäköistä että\n"
+"Tässä vaiheessa, kun asennat Mandrivalinuxia, on todennäköistä että\n"
 "jotkut paketit on päivitetty alkujulkaisun jälkeen. Joitakin virheitä voi "
 "olla\n"
 "korjattu ja turvallisuusaukkoja paikattu. Hyödyntääksesi näitä päivityksiä,\n"
@@ -4804,7 +4804,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4833,7 +4833,7 @@ msgstr "Tietoturvan ylläpitäjä:"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4903,7 +4903,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Tässä vaiheessa sinun pitää määrittää mitkä osiot käytetään Mandrakelinux\n"
+"Tässä vaiheessa sinun pitää määrittää mitkä osiot käytetään Mandrivalinux\n"
 "-järjestelmäsi asennuksessa. Jos osioita on jo määritelty, joko\n"
 "edellisestä GNU/Linux-asennuksesta tai jonkun toisen osiointityökalun\n"
 "tekeminä, niin voit käyttää olemassa olevia osioita. Muussa tapauksissa\n"
@@ -4990,7 +4990,7 @@ msgstr "Vaihda vakio-/asiantuntijatilan välillä"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5020,7 +5020,7 @@ msgid ""
 msgstr ""
 "Useampi kuin yksi Microsoft-osio on löydetty kiintolevyltäsi. Ole hyvä\n"
 "ja valitse osio jonka kokoa haluat muuttaa asentaaksesi uuden\n"
-"Mandrakelinux -käyttöjärjestelmäsi.\n"
+"Mandrivalinux -käyttöjärjestelmäsi.\n"
 "\n"
 "Jokainen osio on lueteltu seuraavasti: \"Linux nimi\", Windows nimi\", \"Koko"
 "\".\n"
@@ -5069,7 +5069,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5078,19 +5078,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Tämä vaihe asennuksesta näytetään ainoastaan jos vanha GNU/Linux-\n"
 "osio on löydetty koneestasi.\n"
 "\n"
 "DrakX haluaa nyt tietää, haluatko suorittaa uuden asennuksen vai vanhan\n"
-"Mandrakelinux -järjestelmän päivityksen:\n"
+"Mandrivalinux -järjestelmän päivityksen:\n"
 "\n"
 " * \"%s\": oletuksena tämä tapa poistaa vanhan asennuksen. Jos haluat\n"
 "muuttaa miten kiintolevysi on osioitu tai vaihtaa tiedostojärjestelmää, "
@@ -5099,11 +5099,11 @@ msgstr ""
 "ehkä valita niin ettei kaikkia tietojasi hävitetä.\n"
 "\n"
 " * \"%s\": tämä vaihtoehto sallii sinun päivittää paketteja\n"
-"nykyisessä Mandrakelinux -järjestelmässäsi. Nykyistä osiointiasi\n"
+"nykyisessä Mandrivalinux -järjestelmässäsi. Nykyistä osiointiasi\n"
 "eikä käyttäjien tietoja muuteta. Suurin osa muista asennuksen\n"
 "vaiheista on käytössäsi niin kuin ne ovat vakioasennuksessa.\n"
 "\n"
-"``Päivitä''-ominaisuuden pitäisi toimia Mandrakelinux\n"
+"``Päivitä''-ominaisuuden pitäisi toimia Mandrivalinux\n"
 "-järjestelmän versiosta \"8.1\" eteenpäin. Vanhemman version\n"
 "kuin \"8.1\" päivittämistä ei suositella."
 
@@ -5164,7 +5164,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5206,7 +5206,7 @@ msgstr ""
 "Tietoja UTF-8 (unicode) tuesta: Unicode on uusi kirjasinten \n"
 "määrittelytapa joka on määrä kattaa kaikki olemassa olevat kielet.\n"
 "Huomaa etttä täysi tuki GNU/Linuxissa on viellä työn alla. Tästä syystä\n"
-"Mandrakelinuxin UTF-8 käyttö riippuu käyttäjän valinnasta:\n"
+"Mandrivalinuxin UTF-8 käyttö riippuu käyttäjän valinnasta:\n"
 "\n"
 " * Jos valitset kielen jossa on vahva \"vanhanaikainen\" kirjasinmäärittely\n"
 "(latin1 kielet, Venäjä, Japani, Kiina, Korea, Thai, Kreikka, Turkki, suurin "
@@ -5438,7 +5438,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5459,12 +5459,12 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Nyt on aika valita tulostusjärjestelmä tietokoneellesi. Muut "
 "käyttöjärjestelmät\n"
-"saattavat tarjota sinulle yhden järjestelmän, mutta Mandrakelinux tarjoaa\n"
+"saattavat tarjota sinulle yhden järjestelmän, mutta Mandrivalinux tarjoaa\n"
 "kaksi. Kukin tulostusjärjestelmä sopii parhaiten tietyille asetuksille.\n"
 "\n"
 " *  \"%s\" -- joka tarkoittaa ``tulosta, älä jonota'' (print, do not "
@@ -5607,7 +5607,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5624,7 +5624,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5671,7 +5671,7 @@ msgstr ""
 "Jos tämä ei sovi sinulle, paina \"%s\" muuttaaksesi asetuksia.\n"
 "\n"
 " * \"%s\": jos haluat asettaa Internet- tai paikallisverkkoasetuksesi,\n"
-"voit tehdä sen nyt. Katso ohjekirjasta, tai käytä Mandrakelinux\n"
+"voit tehdä sen nyt. Katso ohjekirjasta, tai käytä Mandrivalinux\n"
 "Ohjauskeskus asennuksen jälkeen hyödyntääksesi sisäiset ohjeet.\n"
 "\n"
 " * \"%s\": sallii sinua asettamaan HTTP ja FTP välityspalvelimia jos\n"
@@ -5747,10 +5747,10 @@ msgstr "Palvelut"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Valitse kiintolevy, jonka haluat tyhjentää uudelle Mandrakelinux\n"
+"Valitse kiintolevy, jonka haluat tyhjentää uudelle Mandrivalinux\n"
 "-asennusosiolle. Ole varovainen, koska kaikki asemalla oleva tieto\n"
 "tuhoutuu eikä ole enää palautettavissa!"
 
@@ -6104,11 +6104,11 @@ msgstr "Lasken Windows-osion kokoa"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Windows-osiosi on liian pirstoutunut, käynnistä koneesi uudelleen, mene "
-"Windowsiin ja aja \"Levyn eheytys\" ensin, ja aloita Mandrakelinuxin asennus "
+"Windowsiin ja aja \"Levyn eheytys\" ensin, ja aloita Mandrivalinuxin asennus "
 "uudestaan sen jälkeen."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6228,19 +6228,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6262,7 +6262,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6270,14 +6270,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6287,7 +6287,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6307,10 +6307,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6321,11 +6321,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6341,19 +6341,19 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Johdanto\n"
 "\n"
 "\n"
-"HUOM!! Tämä on vapaasti suomennettu teksti Mandrakelinux -jakelun\n"
+"HUOM!! Tämä on vapaasti suomennettu teksti Mandrivalinux -jakelun\n"
 "lisenssiehdoista. Alkuperäinen teksti löytyy tämän sivun lopusta.\n"
 "\n"
-"Käyttöjärjestelmään ja muihin Mandrakelinux jakelun eri osiin viitataan\n"
+"Käyttöjärjestelmään ja muihin Mandrivalinux jakelun eri osiin viitataan\n"
 "tästä eteenpäin nimellä \"Ohjelmisto\". Ohjelmisto sisältää, mutta ei "
 "rajoitu\n"
 "ainoastaan niihin, pakettien yhdistelmät, menetelmät, säännöt ja\n"
-"dokumentaation jotka kuuluvat käyttöjärjestelmään sekä Mandrakelinux\n"
+"dokumentaation jotka kuuluvat käyttöjärjestelmään sekä Mandrivalinux\n"
 "-jakeluun kuuluvat komponentit.\n"
 "\n"
 "\n"
@@ -6362,7 +6362,7 @@ msgstr ""
 "\n"
 "\n"
 "Ole hyvä ja lue tämä dokumentti huolellisesti. Tämä dokumentti on Lisenssi-\n"
-"sopimus sinun ja Mandrakesoft S.A.:n välillä ja koskee Ohjelmistoa.\n"
+"sopimus sinun ja Mandriva S.A.:n välillä ja koskee Ohjelmistoa.\n"
 "Asentamalla, kopioimalla tai käyttämällä Ohjelmistoa millä tavalla tahansa,\n"
 "annat nimenomaisen hyväksynnän ja suostut noudattamaan tämän Lisenssin\n"
 "sääntöjä ja ehtoja. Jos et suostu johonkin osaan tästä Lisenssistä,\n"
@@ -6382,14 +6382,14 @@ msgstr ""
 "ilman\n"
 "mitään takuita, voimassa olevan lain rajojen sisällä. Sikäli kuin takuuta "
 "ei\n"
-"voimassa olevan lain mukaan voi kiistää tai rajoittaa, Mandrakesoft S.A. ei\n"
+"voimassa olevan lain mukaan voi kiistää tai rajoittaa, Mandriva S.A. ei\n"
 "missään nimessä ole vastuussa erikoisista, odottamattomista, välittömistä "
 "tai\n"
 "välillisistä vahingoista (sisältäen ilman rajoituksia vahingot menetetystä\n"
 "työstä, työn keskeytyksestä, taloudellisesta tappiosta, laillisista\n"
 "kustannuksista ja sakoista johtuen tuomioistuimen päätöksestä, tai minkä\n"
 "tahansa muun merkittävän tappion takia) jotka syntyvät käytöstä tai\n"
-"kyvyttömyydestä käyttää Ohjelmistoa, vaikka Mandrakesoft S.A.:lle olisi\n"
+"kyvyttömyydestä käyttää Ohjelmistoa, vaikka Mandriva S.A.:lle olisi\n"
 " tiedotettu tällaisen vahingon mahdollisuuden tai tapahtuman "
 "olemassaolosta.\n"
 "\n"
@@ -6400,7 +6400,7 @@ msgstr ""
 "\n"
 "Sikäli kuin takuuta ei voimassa olevan lain mukaan voi kiistää tai "
 "rajoittaa,\n"
-"Mandrakesoft S.A. tai sen jakelijat eivät missään nimessä ole vastuussa\n"
+"Mandriva S.A. tai sen jakelijat eivät missään nimessä ole vastuussa\n"
 "erikoisista, odottamattomista, välittömistä tai välillisistä vahingoista\n"
 "(sisältäen ilman rajoituksia vahingot menetetystä työstä, työn "
 "keskeytyksestä,\n"
@@ -6409,7 +6409,7 @@ msgstr ""
 "takia)\n"
 "jotka johtuvat ohjelmistokomponenttien hallussapidosta tai käytöstä tai\n"
 "jotka johtuvat ohjelmistokomponenttien lataamisesta joltakin "
-"Mandrakelinuxin\n"
+"Mandrivalinuxin\n"
 "sivustolta, jotka ovat kiellettyjä tai rajoitettuja joissakin maissa\n"
 "paikallisen lain voimalla.\n"
 "\n"
@@ -6431,8 +6431,8 @@ msgstr ""
 "koskevat. Ole hyvä ja lue jokaisen komponentin lisenssin ehdot ja säännöt\n"
 "ennen kuin käytät sitä. Jokainen kysymys koskien komponentin lisenssiä "
 "tulisi\n"
-"ohjata komponentin tekijälle Mandrakesoftin sijasta. Mandrakesoft S.A.:n\n"
-"tekemiin ohjelmiin sovelletaan GPL-lisenssiä. Mandrakesoft S.A.:n tekemiin\n"
+"ohjata komponentin tekijälle Mandrivain sijasta. Mandrakesoft S.A.:n\n"
+"tekemiin ohjelmiin sovelletaan GPL-lisenssiä. Mandriva S.A.:n tekemiin\n"
 "dokumentaatioihin sovelletaan erillistä lisenssiä. Lue dokumentaatiota\n"
 "saadaksesi lisää tietoa.\n"
 "\n"
@@ -6443,11 +6443,11 @@ msgstr ""
 "\n"
 "Kaikki oikeudet Ohjelmiston komponentteihin kuuluvat niiden tekijöille,\n"
 "ja ne ovat suojattuja älyllisten omaisuuksien- ja kopiointisuojalailla,\n"
-"jotka koskevat ohjelmistoja. Mandrakesoft S.A. pidättää oikeuden muokata\n"
+"jotka koskevat ohjelmistoja. Mandriva S.A. pidättää oikeuden muokata\n"
 "tai sovittaa Ohjelmistoa, joko kokonaan tai osittain, kaikilla tavoilla\n"
 "jokaiseen tarpeeseen.\n"
-"\"Mandrake\", \"Mandrakelinux\" ja kaikki niihin liittyvät logot ovat\n"
-"Mandrakesoft S.A.:n rekisteröityjä tavaramerkkejä.\n"
+"\"Mandriva\", \"Mandrivalinux\" ja kaikki niihin liittyvät logot ovat\n"
+"Mandriva S.A.:n rekisteröityjä tavaramerkkejä.\n"
 "\n"
 "\n"
 "\n"
@@ -6466,7 +6466,7 @@ msgstr ""
 "ratkaistavaksi Pariisissa, Ranskassa.\n"
 "\n"
 "Jos teillä on kysymyksiä tästä sopimuksesta, olkaa hyvä ja ottakaa yhteyttä\n"
-"Mandrakesoft S.A.:iin.\n"
+"Mandriva S.A.:iin.\n"
 "\n"
 "\n"
 "\n"
@@ -6483,14 +6483,14 @@ msgstr ""
 "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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6512,7 +6512,7 @@ msgstr ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6520,14 +6520,14 @@ msgstr ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6537,7 +6537,7 @@ msgstr ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6557,10 +6557,10 @@ msgstr ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6571,11 +6571,11 @@ msgstr ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6591,7 +6591,7 @@ msgstr ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6693,7 +6693,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6701,20 +6701,20 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Onnittelut, asennus on valmis.\n"
 "Poista käynnistyslevyke ja paina Enter käynnistääksesi koneesi uudelleen.\n"
 "\n"
 "\n"
-"Löydät tähän Mandrakelinuxin versioon saatavilla olevat korjaukset ja\n"
+"Löydät tähän Mandrivalinuxin versioon saatavilla olevat korjaukset ja\n"
 "korjattujen virheiden listan osoitteesta:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"Järjestelmän asettamisesta saat tietoja virallisen Mandrakelinuxin\n"
+"Järjestelmän asettamisesta saat tietoja virallisen Mandrivalinuxin\n"
 "käyttäjäoppaan jälkiasennuskappaleesta."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6749,11 +6749,11 @@ msgstr "Siirryn vaiheeseen `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Järjestelmäsi resurssit ovat lopussa. Voit kohdata ongelmia Mandrakelinuxia\n"
+"Järjestelmäsi resurssit ovat lopussa. Voit kohdata ongelmia Mandrivalinuxia\n"
 "asentaessasi. Jos näin tapahtuu, voit kokeilla tekstipohjaista asennusta.\n"
 "Tehdäksesi niin paina `F1' kun käynnistät asennusohjelmaa CD-ROM:lta.\n"
 "Tämän jälkeen kirjoita `text'."
@@ -7301,9 +7301,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Otetaan yhteys Mandrakelinuxin sivustolle peilipalvelinlistan saamiseksi..."
+"Otetaan yhteys Mandrivalinuxin sivustolle peilipalvelinlistan saamiseksi..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7528,8 +7528,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux asennus %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux asennus %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10116,13 +10116,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall asetustyökalu\n"
 "\n"
-"Tämä asettaa henkilökohtaisen palomuurin tähän Mandrakelinux koneeseen.\n"
+"Tämä asettaa henkilökohtaisen palomuurin tähän Mandrivalinux koneeseen.\n"
 "Jos haluat vahvan omistetun palomuuriratkaisun, tutustu räätälöityyn\n"
 "MandrakeSecurity Firewall -jakeluun."
 
@@ -14174,11 +14174,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"Suorita Scannerdrake (Laitteisto/Kuvanlukija Mandrakelinux "
+"Suorita Scannerdrake (Laitteisto/Kuvanlukija Mandrivalinux "
 "ohjauskeskuksessa) jaaksesi kuvalnukijasi verkkoon.\n"
 "\n"
 
@@ -16123,23 +16123,23 @@ msgstr "Pysäytä"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mitä Mandrakelinux on?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Mitä Mandrivalinux on?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Tervetuloa <b>Mandrakelinux</b>iin!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Tervetuloa <b>Mandrivalinux</b>iin!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux on <b>Linuxjakelu</b> joka yhdistää järjestelmän ydintä, niin "
+"Mandrivalinux on <b>Linuxjakelu</b> joka yhdistää järjestelmän ydintä, niin "
 "kutsuttu <b>käyttöjärjestelmä</b> (perustuu Linux ytimeen), ja <b>suuren "
 "sovellusmäärään</b> kokonaisuuteen joka kattaa kaikki tarpeet joita tulee "
 "mieleen."
@@ -16147,10 +16147,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux on <b>käyttäjäystävällisin</b> Linux-jakelu tänään. Se on myös "
+"Mandrivalinux on <b>käyttäjäystävällisin</b> Linux-jakelu tänään. Se on myös "
 "<b>eräs käytetyimmistä</b> Linux-jakeluista ympäri maailman!"
 
 #: share/advertising/02.pl:13
@@ -16166,13 +16166,13 @@ msgstr "Tervetuloa <b>Avoimen Lähdekoodin maailmaan</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux on sitoutunut Open Source (vapaa lähdekoodi) -malliin. Tämä "
-"tarkoittaa että tämä uusi julkaisu on tulosta <b>Mandrakesoftin "
+"Mandrivalinux on sitoutunut Open Source (vapaa lähdekoodi) -malliin. Tämä "
+"tarkoittaa että tämä uusi julkaisu on tulosta <b>Mandrivain "
 "kehittäjätiimin</b> ja <b>maailmanlaajuisen vapaaehtoisten avustajien "
 "yhteisön</b> välisestä <b>yhteistyöstä</b>."
 
@@ -16194,9 +16194,9 @@ msgstr "<b>GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Suurin osa jakelussa olevista ohjelmista ja kaikki Mandrakelinux työkalut "
+"Suurin osa jakelussa olevista ohjelmista ja kaikki Mandrivalinux työkalut "
 "ovat julkistettu <b>GPL</b> lisenssin ehtojen mukaisesti."
 
 #: share/advertising/03.pl:17
@@ -16222,19 +16222,19 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Liity Mandrakelinux yhteisöön!</b>"
+msgstr "<b>Liity Mandrivalinux yhteisöön!</b>"
 
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinuxilla on yksi <b>suurimmista yhteisöstä</b> käyttäjiä ja "
+"Mandrivalinuxilla on yksi <b>suurimmista yhteisöstä</b> käyttäjiä ja "
 "kehittäjiä. Tämän yhteisön rooli on erittäin laaja, virheiden etsijöistä "
-"uusiin ohjemien kehittäjiin. Yhteisö  on <b>avainasemassa</b> Mandrakelinux "
+"uusiin ohjemien kehittäjiin. Yhteisö  on <b>avainasemassa</b> Mandrivalinux "
 "maailmassa."
 
 #: share/advertising/04.pl:17
@@ -16256,11 +16256,11 @@ msgstr "<b>Download Versio</b>."
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Olet nyt asentamassa <b>Mandrakelinux Download</b>. Tämä on ilmainen versio "
-"joka Mandrakesoft haluaa pitää <b>kaikkien käytettävissä</b>."
+"Olet nyt asentamassa <b>Mandrivalinux Download</b>. Tämä on ilmainen versio "
+"joka Mandriva haluaa pitää <b>kaikkien käytettävissä</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16290,10 +16290,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Sinulla ei ole pääsyä <b>lisäpalveluihin</b> joita ovat mukana muissa "
-"Mandrakesoft tuotteissa."
+"Mandriva tuotteissa."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16302,8 +16302,8 @@ msgstr "<b>Discovery, Ensimmäinen Linux työpöytäsi</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Olet nyt asentamassa <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Olet nyt asentamassa <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16325,17 +16325,17 @@ msgstr "<b>PowerPack, Tehokäyttäjän Linux työpöytä</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Olet nyt asentamassa <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Olet nyt asentamassa <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack on Mandrakesoftin <b>hienoin työpöytä-Linux</b>. Sen lisäksi että "
+"PowerPack on Mandrivain <b>hienoin työpöytä-Linux</b>. Sen lisäksi että "
 "se on helppokäyttöisin ja käyttäjäystävällisin Linux-jakelu, PowerPack "
 "sisältää <b>tuhansia sovelluksia</b> - kaikkea suosituimmista teknisimpiin "
 "sovelluksiin."
@@ -16347,8 +16347,8 @@ msgstr "<b>PowerPack+, Linux Ratkaisu Työpöydälle ja Palvelimille</b>."
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Olet nyt asentamassa <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Olet nyt asentamassa <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16364,22 +16364,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesoft tuotteita</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva tuotteita</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> on luonut laajan valkoiman <b>Mandrakelinux</b> "
+"<b>Mandriva</b> on luonut laajan valkoiman <b>Mandrivalinux</b> "
 "tuotteita."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux tuotteet ovat:"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux tuotteet ovat:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16399,72 +16399,72 @@ msgstr "\t* <b>PowerPack+</b>, Linux Ratkaisu Työpöydälle ja Palvelimille."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux x86-64</b>, Mandrakelinuxin ratkaisu 64 bittisen "
+"\t* <b>Mandrivalinux x86-64</b>, Mandrivalinuxin ratkaisu 64 bittisen "
 "prosessorin hyödyntämiselle."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesoft tuotteita (Nomad tuotteita)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandriva tuotteita (Nomad tuotteita)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft on luonut kaksi tuotetta joka salli sinua käyttämään "
-"Mandrakelinux <b>missä koneessa tahansa</b> ilman tarvetta asentaa sitä:"
+"Mandriva on luonut kaksi tuotetta joka salli sinua käyttämään "
+"Mandrivalinux <b>missä koneessa tahansa</b> ilman tarvetta asentaa sitä:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, Mandrakelinux jakelu joka toimii suoraan käynnistettävästä "
+"\t* <b>Move</b>, Mandrivalinux jakelu joka toimii suoraan käynnistettävästä "
 "CD-levystä."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, Mandrakelinux jakelu joka on esiasennettu ultra-"
+"\t* <b>GlobeTrotter</b>, Mandrivalinux jakelu joka on esiasennettu ultra-"
 "kompaktiin “LaCie Mobile Hard Drive” levylle."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Mandrakesoft tuotteita (Ammattimaiset ratkaisut)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Mandriva tuotteita (Ammattimaiset ratkaisut)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Alla on Mandrakesoft tuotteita suunniteltu vastaamaan <b>ammattillisin "
+"Alla on Mandriva tuotteita suunniteltu vastaamaan <b>ammattillisin "
 "tarpeisiin</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, Mandrakelinux työpöytä yrityksille."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Mandrivalinux työpöytä yrityksille."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Mandrakelinux Palvelinratkaisu."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandrivalinux Palvelinratkaisu."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b>, Mandrakelinux turvallisuusratkaisu."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, Mandrivalinux turvallisuusratkaisu."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16507,10 +16507,10 @@ msgstr "<b>Valitse graafinen suosikki työpöytäympäristösi!</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Käyttämällä Powerpack, sinulla on valinnanvaraa <b>grafisissa "
-"käyttölittymissä</b>. Mandrakesoft on valinnut </b>KDE</b> oletukseksi."
+"käyttölittymissä</b>. Mandriva on valinnut </b>KDE</b> oletukseksi."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16535,10 +16535,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Käyttämällä Powerpack+, sinulla on valinnanvaraa <b>grafisissa "
-"käyttölittymissä</b>. Mandrakesoft on valinnut </b>KDE</b> oletukseksi."
+"käyttölittymissä</b>. Mandriva on valinnut </b>KDE</b> oletukseksi."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16661,10 +16661,10 @@ msgstr "<b>Nauti laajasta ohjelmien valikoimasta</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Mandrakelinux valikosta löydät <b>helppokäyttöiset</b> sovellukset "
+"Mandrivalinux valikosta löydät <b>helppokäyttöiset</b> sovellukset "
 "<b>kaikkiin tehtäviin</b>:"
 
 #: share/advertising/18.pl:16
@@ -16930,17 +16930,17 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux Ohjauskeskus</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux Ohjauskeskus</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrakelinux Ohjauskeskus</b> on oleellinen kokoelma Mandrakelinux-"
+"<b>Mandrivalinux Ohjauskeskus</b> on oleellinen kokoelma Mandrivalinux-"
 "sidonnaisia työkaluja helpottamaan tietokoneesi asetusten muokkaamista."
 
 #: share/advertising/25.pl:17
@@ -16965,16 +16965,16 @@ msgstr "<b>Avoin Lähdekoodi malli</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Kuten kaikki ohjelmointityöt. avoimen lädekoodin ohjelmat <b>vaatii aikaa ja "
 "ihmisiä</b> kehitykseen. Kunnioittaakseen avoimen lädekoodin filosofiaa, "
-"Mandrakesoft myy lisäarvotuotteita ja palveluja jotta <b>Mandrakelinuxin "
+"Mandriva myy lisäarvotuotteita ja palveluja jotta <b>Mandrivalinuxin "
 "kehitys voi jatkua</b>. Jos haluat <b>tukea avoimen lädekoodin filosofiaa</"
-"b>, ja Mandrakelinuxin tuotteiden kehitystä, <b>ole hyvä</b> ja mieti jos "
+"b>, ja Mandrivalinuxin tuotteiden kehitystä, <b>ole hyvä</b> ja mieti jos "
 "haluat ostaa jonkun meidän tuotteista tai palveluista!"
 
 #: share/advertising/27.pl:13
@@ -16985,10 +16985,10 @@ msgstr "<b>Online kauppa</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Tutustuaaksesi kaikkiin Mandrakesoftin tuotteisiin ja palveluihin, voit "
+"Tutustuaaksesi kaikkiin Mandrivain tuotteisiin ja palveluihin, voit "
 "vierailla meidän <b>e-commerce alustassa</b>."
 
 #: share/advertising/27.pl:17
@@ -17014,23 +17014,23 @@ msgstr "Käy jo tänään osoitteessa <b>www.mandrakestore.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> on <b>täydellinen kumppani</b> Mandrakelinux tuotellesi."
+"<b>Mandriva Club</b> on <b>täydellinen kumppani</b> Mandrivalinux tuotellesi."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Hyödynnä <b>arvokkaista etuista</b> liittymällä Mandrakeclubiin, kuten:"
+"Hyödynnä <b>arvokkaista etuista</b> liittymällä Mandriva Clubiin, kuten:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -17051,39 +17051,39 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Osallistu Mandrakelinux <b>käyttäjien keskusteluihin</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Osallistu Mandrivalinux <b>käyttäjien keskusteluihin</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Aikainen ja etuoikeutettu pääsy</b>, ennen julkinen levitys, "
-"Mandrakelinux <b>ISO tiedostoille</b>.."
+"Mandrivalinux <b>ISO tiedostoille</b>.."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> on uusi erikoispalvelu joka Mandrakesoft ylpeänä "
+"<b>Mandriva Online</b> on uusi erikoispalvelu joka Mandriva ylpeänä "
 "esittää asiakkailleen!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline tarjoaa laajan valikoiman hyödyllisiä palveluja Mandrakelinux "
+"Mandriva Online tarjoaa laajan valikoiman hyödyllisiä palveluja Mandrivalinux "
 "järjestelmiäsi <b>helposti päivittämiseen</b>."
 
 #: share/advertising/29.pl:18
@@ -17108,39 +17108,39 @@ msgstr "\t* Joustavaa <b>ajastettu</b> päivitys."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* <b>Kaikki Mandrakelinux järjestelmiäsi</b> hallinta yhdellä tilillä."
+"\t* <b>Kaikki Mandrivalinux järjestelmiäsi</b> hallinta yhdellä tilillä."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Tarvitetko <b>apua?</b> Tapaa Mandrakesoftin tekniset asiantuntijat "
+"Tarvitetko <b>apua?</b> Tapaa Mandrivain tekniset asiantuntijat "
 "<b>meidän teknisessä tukialustassa</b> www.mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Kiitos <b>pätevistä Mandrakelinux asiantuntijoista</b>, säästät paljon aikaa."
+"Kiitos <b>pätevistä Mandrivalinux asiantuntijoista</b>, säästät paljon aikaa."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Mille Mandrakelinuxia koskevia kysymyksille tahansa voit ostaa aputapahtuman "
+"Mille Mandrivalinuxia koskevia kysymyksille tahansa voit ostaa aputapahtuman "
 "osoitteessa <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17440,8 +17440,8 @@ msgstr "Valvontatyökalut, prosessihallinta, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesoft Velhoja"
+msgid "Mandriva Wizards"
+msgstr "Mandriva Velhoja"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17538,9 +17538,9 @@ msgstr ""
 "\n"
 "OPTIOT:\n"
 "  --help            - tulosta tämä viesti.\n"
-"  --report          - ohjelman pitäisi olla yksi Mandrakelinuxin "
+"  --report          - ohjelman pitäisi olla yksi Mandrivalinuxin "
 "työkaluista\n"
-"  --incident        - ohjelman pitäisi olla yksi Mandrakelinuxin työkaluista"
+"  --incident        - ohjelman pitäisi olla yksi Mandrivalinuxin työkaluista"
 
 #: standalone.pm:63
 #, c-format
@@ -17594,7 +17594,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17608,7 +17608,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIOT]...\n"
-"Mandrakelinux Terminal Server asetustyökalu\n"
+"Mandrivalinux Terminal Server asetustyökalu\n"
 "--enable      : ota MTS käyttöön.\n"
 "--disable     : poista MTS käytöstä.\n"
 "--start       : käynnistä MTS\n"
@@ -17663,14 +17663,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPTIO]...\n"
-" --no-confirmation   älä pyydä varmistusta MandrakeUpdate tilassa.\n"
+" --no-confirmation   älä pyydä varmistusta Mandriva Update tilassa.\n"
 " --no-verify-rpm     älä tarkista pakettien allekirjoitusta\n"
 " --changelog-first   näytä muutosloki ennen tiedostolistausta "
 "kuvausikkunassa\n"
@@ -20474,13 +20474,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux virheenraportointityökalu"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux virheenraportointityökalu"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Ohjauskeskus"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux Ohjauskeskus"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20500,8 +20500,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20545,8 +20545,8 @@ msgstr "Asetusvelhot"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Valitse Mandrakesoft työkalu:"
+msgid "Select Mandriva Tool:"
+msgstr "Valitse Mandriva työkalu:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20973,19 +20973,19 @@ msgstr "Käynnistetty koneen käynnistämisen yhteydessä"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Tätä liitäntää ei ole vielä asetettu.\n"
-"Suorita Mandrakelinux Ohjauskeskuksesta \"Lisää liitäntä\"."
+"Suorita Mandrivalinux Ohjauskeskuksesta \"Lisää liitäntä\"."
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Tätä liitäntää ei ole vielä asetettu.\n"
-"Suorita Mandrakelinux Ohjauskeskuksesta \"%s\"."
+"Suorita Mandrivalinux Ohjauskeskuksesta \"%s\"."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21035,8 +21035,8 @@ msgstr "KDM (KDE Näytönhallinta)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDDM (Mandrakelinux Näytönhallinta)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDDM (Mandrivalinux Näytönhallinta)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21338,7 +21338,7 @@ msgstr "Tuo"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21347,7 +21347,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (alkuperäinen versio)\n"
@@ -21897,14 +21897,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "Tämä on vapaa ohjelmisto ja voit levittää sitä GNU GPL -lisenssin "
 "mukaisesti.\n"
 "\n"
@@ -21932,8 +21932,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux Apukeskus"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux Apukeskus"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25446,8 +25446,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinux työkalujen lokit"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinux työkalujen lokit"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25961,10 +25961,10 @@ msgstr "Yhteys valmis."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Yhteys epäonnistui.\n"
-"Tarkista asetukset Mandrakelinux Ohjauskeskuksessa."
+"Tarkista asetukset Mandrivalinux Ohjauskeskuksessa."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26870,8 +26870,8 @@ msgstr "Asennus epäonnistui"
 #~ msgstr "Tallenna ja Sulje"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Mandrakesoft Velhoja"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Mandriva Velhoja"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Ei selainta käytettävissä! Ole hyvä ja asenna jokin"
@@ -27014,13 +27014,13 @@ msgstr "Asennus epäonnistui"
 #~ msgstr "Virhe avattaessa %s kirjoitusta varten: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Tämä on HardDrake, Mandrakelinuxin laitteistonasetustyökalu.\n"
+#~ "Tämä on HardDrake, Mandrivalinuxin laitteistonasetustyökalu.\n"
 #~ "<span foreground=\"royalblue3\">Versio:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Tekijä:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
@@ -27346,7 +27346,7 @@ msgstr "Asennus epäonnistui"
 #~ "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"
-#~ "Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
+#~ "Mandrivalinux 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"
@@ -27367,7 +27367,7 @@ msgstr "Asennus epäonnistui"
 #~ "modems\n"
 #~ "that require additional software to work compared to Normal modems. Some "
 #~ "of\n"
-#~ "those modems actually work under Mandrakelinux, some others do not. You\n"
+#~ "those modems actually work under Mandrivalinux, 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"
@@ -27377,7 +27377,7 @@ msgstr "Asennus epäonnistui"
 #~ msgstr ""
 #~ "Sinulla on nyt mahdollisuus asettaa Internet-/verkkoyhteytesi. Jos\n"
 #~ "haluat yhdistää tietokoneesi Internetiin tai lähiverkkoon, valitse\n"
-#~ "\"%s\". Mandrakelinux yrittää tunnistaa verkkolaitteet ja\n"
+#~ "\"%s\". Mandrivalinux yrittää tunnistaa verkkolaitteet ja\n"
 #~ "modeemit automaattisesti. Jos tämä tunnistus epäonnistuu, poista\n"
 #~ "valinta kohdasta \"%s\" seuraavalla kerralla.\n"
 #~ "Voit myös jättää verkon asettamisen tekemättä, tai tehdä sen\n"
@@ -27397,7 +27397,7 @@ msgstr "Asennus epäonnistui"
 #~ "Winmodeemiyhteyksistä: Winmodeemit ovat erityisiä integroituja\n"
 #~ "halpamallimodeemeja (tai softamodeemeja) jotka vaativat lisäohjelmia\n"
 #~ "toimiakseen verrattuna tavallisiin modeemeihin. Jotkin softamodeemit\n"
-#~ "todellakin toimivat Mandrakelinuxin kanssa, toiset eivät. Voit\n"
+#~ "todellakin toimivat Mandrivalinuxin kanssa, toiset eivät. Voit\n"
 #~ "tarkistaa tuetut modeemit LinModems-sivustolta\n"
 #~ "\n"
 #~ "Voit katsoa ``Starter Guidesta'' Internetyhteyksiä koskevia tietoja\n"
@@ -27438,7 +27438,7 @@ msgstr "Asennus epäonnistui"
 #~ "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 Mandrakelinux\n"
+#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"
 #~ "system! Be sure you know what you are doing before changing any of the\n"
 #~ "options. !!\n"
 #~ "\n"
@@ -27475,7 +27475,7 @@ msgstr "Asennus epäonnistui"
 #~ "\n"
 #~ "!! Huom! Jos jätät käynnistyslataajan asentamatta (valitsemalla\n"
 #~ "\"%s\"), sinun pitää varmistaa, että sinulla on keino käynnistää\n"
-#~ "Mandrakelinux -järjestelmäsi! Varmista myös, että tiedät mitä olet\n"
+#~ "Mandrivalinux -järjestelmäsi! Varmista myös, että tiedät mitä olet\n"
 #~ "tekemässä ennen kuin muutat näitä asetuksia !!\n"
 #~ "\n"
 #~ "\"%s\"-painike tässä valikossa mahdollistaa useat\n"
@@ -27789,16 +27789,16 @@ msgstr "Asennus epäonnistui"
 #~ "Tulostimen \"%s\" poistaminen Star Office/OpenOffice.org/GIMP käytöstä "
 #~ "epäonnistui."
 
-#~ msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
-#~ msgstr "<b>Onnittelut Mandrakelinuxin valinnasta!</b>"
+#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
+#~ msgstr "<b>Onnittelut Mandrivalinuxin valinnasta!</b>"
 
 #~ 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."
+#~ "Your new Mandrivalinux operating system and its many applications is the "
+#~ "result of collaborative efforts between Mandriva developers and "
+#~ "Mandrivalinux contributors throughout the world."
 #~ msgstr ""
-#~ "Mandrakelinux käyttöjärjestelmäsi ja sen monet sovellukset ovat tulosta "
-#~ "yhteistyöstä Mandrakesoftin kehittäjien sekä Mandrakelinuxin kehityksessä "
+#~ "Mandrivalinux käyttöjärjestelmäsi ja sen monet sovellukset ovat tulosta "
+#~ "yhteistyöstä Mandrivain kehittäjien sekä Mandrivalinuxin kehityksessä "
 #~ "avustaneiden välillä ympäri maailman."
 
 #~ msgid ""
@@ -27882,12 +27882,12 @@ msgstr "Asennus epäonnistui"
 #~ msgstr "\t- Täydet oikeudet kaupallisiin sovelluksiin"
 
 #~ msgid ""
-#~ "\t- Special download mirror list exclusively for Mandrakeclub Members"
-#~ msgstr "\t- Erityinen Mandrakeclubin jäsenille tarkoitettu palvelinlista"
+#~ "\t- Special download mirror list exclusively for Mandriva Club Members"
+#~ msgstr "\t- Erityinen Mandriva Clubin jäsenille tarkoitettu palvelinlista"
 
-#~ msgid "\t- Voting for software to put in Mandrakelinux"
+#~ msgid "\t- Voting for software to put in Mandrivalinux"
 #~ msgstr ""
-#~ "\t- Äänestysmahdollisuus Mandrakelinuxin mukana toimitettavista ohjelmista"
+#~ "\t- Äänestysmahdollisuus Mandrivalinuxin mukana toimitettavista ohjelmista"
 
 #~ msgid "\t- Plus much more"
 #~ msgstr "\t- Ja paljon muuta"
@@ -27923,23 +27923,23 @@ msgstr "Asennus epäonnistui"
 #~ "mandrake-linux.com</b>!"
 
 #~ msgid ""
-#~ "Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus "
+#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "
 #~ "the latest versions of the most popular Open Source applications."
 #~ msgstr ""
-#~ "Mandrakelinuxin mukana tulee kuuluisat työpöytäympäristöt KDE ja GNOME "
+#~ "Mandrivalinuxin mukana tulee kuuluisat työpöytäympäristöt KDE ja GNOME "
 #~ "sekä uusimmat versiot suosituimmista Avoimen Lähdekoodin sovelluksista."
 
 #~ msgid ""
-#~ "Mandrakelinux is widely known as the most user-friendly and the easiest "
+#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "
 #~ "to install and easy to use Linux distribution."
 #~ msgstr ""
-#~ "Mandrakelinux tunnetaan laajalti käyttäjäystävällisimpänä ja "
+#~ "Mandrivalinux tunnetaan laajalti käyttäjäystävällisimpänä ja "
 #~ "helppokäyttöisimpänä Linux-jakeluna."
 
-#~ msgid "\t- Find out Mandrakelinux on a bootable CD with <b>Mandrakemove</b>"
+#~ msgid "\t- Find out Mandrivalinux on a bootable CD with <b>Mandrakemove</b>"
 #~ msgstr ""
 #~ "\t- Tutustu <b>Mandrakemove</b>-jakeluun, CD:ltä toimivaan "
-#~ "Mandrakelinuxiin"
+#~ "Mandrivalinuxiin"
 
 #~ msgid ""
 #~ "\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
@@ -27986,11 +27986,11 @@ msgstr "Asennus epäonnistui"
 #~ 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 "
+#~ "Mandrivalinux distribution. A unique blend for incomparable HPC "
 #~ "performance."
 #~ msgstr ""
 #~ "<b>MandrakeClustering</b>: Linux-clusterin tehokkuus ja nopeus "
-#~ "yhdistettynä maailmankuuluun Mandrakelinux-jakelun vakauteen ja "
+#~ "yhdistettynä maailmankuuluun Mandrivalinux-jakelun vakauteen ja "
 #~ "helppokäyttöisyyteen. Ainutlaatuinen yhdistelmä verratonta HPC tehoa."
 
 #~ msgid ""
@@ -28002,8 +28002,8 @@ msgstr "Asennus epäonnistui"
 #~ "tavallisesta ammattilaistukeen, 1-50 tapahtumaan, valitse se joka "
 #~ "parhaiten täyttää tarpeesi!"
 
-#~ msgid "<b>Become a Mandrakeclub member!</b>"
-#~ msgstr "<b>Tule Mandrakeclubin jäseneksi!</b>"
+#~ msgid "<b>Become a Mandriva Club member!</b>"
+#~ msgstr "<b>Tule Mandriva Clubin jäseneksi!</b>"
 
 #~ msgid "<b>Do you require assistance?</b>"
 #~ msgstr "<b>Tarvitsetko apua?</b>"
@@ -28018,28 +28018,28 @@ msgstr "Asennus epäonnistui"
 #~ "näytönohjainkorttien (kuten ATI® ja NVIDIA®) kanssa."
 
 #~ msgid ""
-#~ "Your new Mandrakelinux distribution and its many applications are the "
-#~ "result of collaborative efforts between Mandrakesoft developers and "
-#~ "Mandrakelinux contributors throughout the world."
+#~ "Your new Mandrivalinux distribution and its many applications are the "
+#~ "result of collaborative efforts between Mandriva developers and "
+#~ "Mandrivalinux contributors throughout the world."
 #~ msgstr ""
-#~ "Uusi Mandrakelinux-jakelusi ja sen mukana tulevat sovellukset ovat "
-#~ "Mandrakesoftin kehittäjien ja ympäri maailman Mandrakelinuxin "
+#~ "Uusi Mandrivalinux-jakelusi ja sen mukana tulevat sovellukset ovat "
+#~ "Mandrivain kehittäjien ja ympäri maailman Mandrivalinuxin "
 #~ "kehityksessä avustaneiden välisen yhteistyön tulosta."
 
 #~ msgid "<b>PowerPack+</b>"
 #~ msgstr "<b>PowerPack+</b>"
 
 #~ msgid ""
-#~ "It is the only Mandrakelinux product that includes the groupware solution."
+#~ "It is the only Mandrivalinux product that includes the groupware solution."
 #~ msgstr ""
-#~ "Se on ainoa Mandrakelinux tuote johon sisältyy ryhmätyöohjelmistoratkaisu."
+#~ "Se on ainoa Mandrivalinux tuote johon sisältyy ryhmätyöohjelmistoratkaisu."
 
 #~ msgid ""
-#~ "When you log into your Mandrakelinux system for the first time, you can "
+#~ "When you log into your Mandrivalinux system for the first time, you can "
 #~ "choose between several popular graphical desktops environments, "
 #~ "including: KDE, GNOME, WindowMaker, IceWM, and others."
 #~ msgstr ""
-#~ "Kun kirjaudut sisään Mandrakelinux-järjestelmääsi ensimmäistä kertaa voit "
+#~ "Kun kirjaudut sisään Mandrivalinux-järjestelmääsi ensimmäistä kertaa voit "
 #~ "valita graafisen työpöytäympäristön jota haluat käyttää useista "
 #~ "suosituista vaihtoehdoista: KDE, GNOME, WindowMaker, IceWM jne."
 
@@ -28096,12 +28096,12 @@ msgstr "Asennus epäonnistui"
 #~ msgstr "\t- Ja monia muita"
 
 #~ msgid ""
-#~ "Your new Mandrakelinux distribution is the result of collaborative "
-#~ "efforts between Mandrakesoft developers and Mandrakelinux contributors "
+#~ "Your new Mandrivalinux distribution is the result of collaborative "
+#~ "efforts between Mandriva developers and Mandrivalinux contributors "
 #~ "throughout the world."
 #~ msgstr ""
-#~ "Uusi Mandrakelinux-jakelusi on Mandrakesoftin kehittäjien ja ympäri "
-#~ "maailman Mandrakelinuxin kehityksessä avustaneiden välisen yhteistyön "
+#~ "Uusi Mandrivalinux-jakelusi on Mandrivain kehittäjien ja ympäri "
+#~ "maailman Mandrivalinuxin kehityksessä avustaneiden välisen yhteistyön "
 #~ "tulosta."
 
 #~ msgid ""
@@ -28153,10 +28153,10 @@ msgstr "Asennus epäonnistui"
 #~ "työkaluja helpottamaan tietokoneesi konfigurointia."
 
 #~ msgid ""
-#~ "Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- "
+#~ "Find all Mandriva products and services at <b>MandrakeStore</b> -- "
 #~ "our full service e-commerce platform."
 #~ msgstr ""
-#~ "Tutustu kaikkiin Mandrakesoftin tuotteisiin ja palveluihin "
+#~ "Tutustu kaikkiin Mandrivain tuotteisiin ja palveluihin "
 #~ "<b>MandrakeStoressa</b> -- täyden palvelun sähköisessä kaupassa."
 
 #~ msgid "Become a <b>MandrakeClub</b> member!"
@@ -28179,26 +28179,26 @@ msgstr "Asennus epäonnistui"
 #~ "\t- Erikoistarjouksia tuotteista ja palveluista jotka on tarjolla "
 #~ "MandrakeStoressa"
 
-#~ msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+#~ msgid "\t- Find out Mandrivalinux on a bootable CD with <b>Mandriva Move</b>"
 #~ msgstr ""
-#~ "\t- Tutustu <b>MandrakeMove</b> jakeluun, CD:ltä toimivaan "
-#~ "Mandrakelinuxiin"
+#~ "\t- Tutustu <b>Mandriva Move</b> jakeluun, CD:ltä toimivaan "
+#~ "Mandrivalinuxiin"
 
 #~ msgid ""
-#~ "Find all Mandrakesoft products at <b>MandrakeStore</b> -- our full "
+#~ "Find all Mandriva products at <b>MandrakeStore</b> -- our full "
 #~ "service e-commerce platform."
 #~ msgstr ""
-#~ "Tutustu kaikkiin Mandrakesoftin tuotteisiin <b>MandrakeStoressa</b> - "
+#~ "Tutustu kaikkiin Mandrivain tuotteisiin <b>MandrakeStoressa</b> - "
 #~ "täyden palvelun sähköisessä kaupassa."
 
 #~ msgid "<b>Become a MandrakeClub member!</b>"
 #~ msgstr "<b>Tule MandrakeClubin jäseneksi!</b>"
 
 #~ msgid ""
-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "
+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
 #~ "tasks:"
 #~ msgstr ""
-#~ "Mandrakelinux valikoista löydät helppokäyttöiset sovellukset kaikkiin "
+#~ "Mandrivalinux valikoista löydät helppokäyttöiset sovellukset kaikkiin "
 #~ "tehtäviin:"
 
 #~ msgid ""
@@ -28239,8 +28239,8 @@ msgstr "Asennus epäonnistui"
 #~ msgid "Mandrake Control Center"
 #~ msgstr "Mandraken Ohjauskeskus"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "This interface has not been configured yet.\n"
@@ -28362,9 +28362,9 @@ msgstr "Asennus epäonnistui"
 
 #~ msgid ""
 #~ "Take advantage of valuable benefits, products and services by joining "
-#~ "Mandrake Club, such as:"
+#~ "Mandriva Club, such as:"
 #~ msgstr ""
-#~ "Liittymällä Mandrake Clubiin saat käyttöösi arvokkaat edut, tuotteet ja "
+#~ "Liittymällä Mandriva Clubiin saat käyttöösi arvokkaat edut, tuotteet ja "
 #~ "palvelut, kuten:"
 
 #~ msgid "TCP/IP"
diff --git a/perl-install/share/po/fr.po b/perl-install/share/po/fr.po
index b1f700c9f..0e46ae012 100644
--- a/perl-install/share/po/fr.po
+++ b/perl-install/share/po/fr.po
@@ -1,7 +1,7 @@
 # translation of DrakX-fr.po to Français
 # translation of DrakX-fr.po to french
-# Translation file of Mandrakelinux graphic install
-# Copyright (C) 1999 Mandrakesoft
+# Translation file of Mandrivalinux graphic install
+# Copyright (C) 1999 Mandriva
 #
 # Veuillez ne pas mettre à jour ce fichier à moins d'être
 # certain tant de vos traductions que de votre grammaire et
@@ -136,7 +136,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "La clé USB semble être protégée en écriture, mais nous\n"
 "ne pouvons pas la déconnecter de manière sûre maintenant.\n"
@@ -144,7 +144,7 @@ msgstr ""
 "\n"
 "Cliquez le bouton pour redémarrer l'ordinateur,\n"
 "déconnectez la clé, enlevez la protection en écriture,\n"
-"connectez la clé à nouveau, et relancez Mandrake Move."
+"connectez la clé à nouveau, et relancez Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -162,7 +162,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Votre clé USB n'a aucune partition Windows (FAT) valide.\n"
@@ -174,14 +174,14 @@ msgstr ""
 "\n"
 "\n"
 "Vous pouvez aussi continuer sans clé USB - vous pourrez\n"
-"toujours utiliser Mandrake Move comme un système\n"
-"d'exploitation Mandrakelinux sur CD-ROM."
+"toujours utiliser Mandriva Move comme un système\n"
+"d'exploitation Mandrivalinux sur CD-ROM."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -189,11 +189,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Aucune clé USB n'a été détectée sur votre système. Si vous\n"
-"connectez une clé USB maintenant, Mandrake Move pourra\n"
+"connectez une clé USB maintenant, Mandriva Move pourra\n"
 "sauvegarder automatiquement les données de votre dossier\n"
 "personnel et les configurations système, pour le prochain\n"
 "démarrage de votre ordinateur ou bien sur un autre\n"
@@ -203,8 +203,8 @@ msgstr ""
 "\n"
 "\n"
 "Vous pouvez aussi continuer sans clé USB - vous pourrez\n"
-"toujours utiliser Mandrake Move comme un système\n"
-"d'exploitation Mandrakelinux sur CD-ROM."
+"toujours utiliser Mandriva Move comme un système\n"
+"d'exploitation Mandrivalinux sur CD-ROM."
 
 #: ../move/move.pm:494
 #, c-format
@@ -332,7 +332,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -348,7 +348,7 @@ msgstr ""
 "\n"
 "Cela peut provenir de fichiers de configuration système corrompus\n"
 "sur la clé USB, dans ce cas les supprimer et ensuite redémarrer\n"
-"MandrakeMove résoudrait le problème. Pour faire cela, cliquez\n"
+"Mandriva Move résoudrait le problème. Pour faire cela, cliquez\n"
 "sur le bouton correspondant.\n"
 "\n"
 "\n"
@@ -1400,7 +1400,7 @@ msgstr "Choix de la langue"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3857,13 +3857,13 @@ msgstr "activer le support de la radio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button 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 Mandrakelinux. Si vous en acceptez tous les\n"
+"l'ensemble de la distribution Mandrivalinux. Si vous en acceptez tous les\n"
 "termes, cochez la case « %s », sinon, cliquez sur le bouton « %s » pour\n"
 "redémarrer votre ordinateur."
 
@@ -4046,13 +4046,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Les paquetages requis à l'installation de Mandrakelinux sont distribués sur\n"
+"Les paquetages requis à l'installation de Mandrivalinux sont distribués sur\n"
 "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é. Si vous ne possédez pas le CD demandé, cliquez tout\n"
@@ -4065,11 +4065,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4121,11 +4121,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "C'est maintenant le moment de choisir les paquetages qui seront installés\n"
-"sur votre système. Sachez que Mandrakelinux contient plusieurs milliers de\n"
+"sur votre système. Sachez que Mandrivalinux contient plusieurs milliers de\n"
 "paquetages à installer, et ces paquetages ont été rangés par groupes chacun\n"
 "correspondant à un usage particulier de l'ordinateur.\n"
 "\n"
-"Mandrakelinux range ces groupes en quatre catégories. Vous pouvez mélanger\n"
+"Mandrivalinux range ces groupes en quatre catégories. Vous pouvez mélanger\n"
 "des groupes de plusieurs catégories de sorte qu'« une station de travail »\n"
 "peut toujours proposer des applications pour la catégorie « Serveur ».\n"
 "\n"
@@ -4232,10 +4232,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4265,7 +4265,7 @@ msgstr ""
 "apparaît à droite.\n"
 "\n"
 "!! Si un paquetage serveur a été sélectionné, vous devrez confirmer que\n"
-"vous voulez vraiment que celui-ci soit installé. Sous Mandrakelinux , par\n"
+"vous voulez vraiment que celui-ci soit installé. Sous Mandrivalinux , par\n"
 "défaut, tous les services installés sont lancés au démarrage. Malgré tous\n"
 "les efforts investis pour vous livrer une distribution Linux sécurisée, il\n"
 "est possible que certaines failles de sécurité affectent les serveurs\n"
@@ -4426,7 +4426,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4482,7 +4482,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 Mandrakelinux dépendent de X.\n"
+"etc.) présents sur Mandrivalinux dépendent de X.\n"
 "\n"
 "Il vous sera présenté une liste de divers paramètres à changer pour obtenir\n"
 "un affichage optimal :\n"
@@ -4611,12 +4611,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4643,7 +4643,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4652,7 +4652,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4673,7 +4673,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 Mandrakelinux. Si votre disque est vide ou utilisé par un\n"
+"installation de Mandrivalinux. 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"
@@ -4704,7 +4704,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 Mandrakelinux et Microsoft Windows sur le\n"
+"recommandée pour faire cohabiter Mandrivalinux et Microsoft Windows sur le\n"
 "même ordinateur.\n"
 "\n"
 "   Avant de choisir cette option, il faut comprendre qu'après cette\n"
@@ -4714,7 +4714,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"
-"Mandrakelinux, choisissez cette option. Soyez prudent, car ce choix est\n"
+"Mandrivalinux, 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"
@@ -4804,7 +4804,7 @@ msgid ""
 "\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n"
 "/dev/fd0\"."
 msgstr ""
-"Votre installation de Mandrakelinux est maintenant terminée et votre\n"
+"Votre installation de Mandrivalinux est maintenant terminée et votre\n"
 "système est prêt à être utilisé. Cliquez sur « %s » pour le redémarrer.\n"
 "N'oubliez pas de retirer la source d'installation(CD-ROM ou disquette).\n"
 "La première chose que vous verrez alors, après que l'ordinateur ait \n"
@@ -4878,7 +4878,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4898,7 +4898,7 @@ msgstr ""
 "Cliquez sur « %s » lorsque vous êtes prêt à formater les partitions.\n"
 "\n"
 "Cliquez sur « %s » pour choisir une autre partition où installer votre\n"
-"nouveau système d'exploitation Mandrakelinux.\n"
+"nouveau système d'exploitation Mandrivalinux.\n"
 "\n"
 "Cliquez sur « %s » si vous désirez sélectionner des partitions pour une\n"
 "vérification des secteurs défectueux (« Bad Blocks »)."
@@ -4917,7 +4917,7 @@ msgstr "Précédent"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4929,7 +4929,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Au moment où vous installez Mandrakelinux, il est possible que certains\n"
+"Au moment où vous installez Mandrivalinux, il est possible que certains\n"
 "paquetages aient été mis à jour depuis la sortie du produit. Des bogues ont\n"
 "pu être corrigés, et des problèmes de sécurité résolus. Pour vous permettre\n"
 "de bénéficier de ces mises à jour, il vous est maintenant proposé de les\n"
@@ -4958,7 +4958,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4973,7 +4973,7 @@ msgstr ""
 "\n"
 "Si vous ne savez pas quel niveau choisir, gardez la sélection par défaut.\n"
 "Vous pourrez le modifier ultérieurement avec l'outil draksec, qui se trouve\n"
-"dans le Centre de Contrôle Mandrakelinux\n"
+"dans le Centre de Contrôle Mandrivalinux\n"
 "\n"
 "Remplissez le champ « %s » avec l'adresse électronique de l'utilisateur qui\n"
 "sera responsable de la sécurité. Les messages de sécurité lui seront\n"
@@ -4988,7 +4988,7 @@ msgstr "Administrateur sécurité"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -5059,7 +5059,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "À cette étape, vous devez sélectionner quelle partition sera utilisée pour\n"
-"votre système Mandrakelinux. Si votre disque est déjà partitionné, soit par\n"
+"votre système Mandrivalinux. Si votre disque est déjà partitionné, soit par\n"
 "une autre installation GNU/Linux ou par un autre outil de partitionnement,\n"
 "vous pourrez les utiliser. Sinon, les partitions devront être créées.\n"
 "\n"
@@ -5151,7 +5151,7 @@ msgstr "Basculer entre les modes expert et normal"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5181,7 +5181,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"
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 "Chaque partition est identifiée comme suit : « Nom Linux », « Nom "
 "Windows »,\n"
@@ -5234,7 +5234,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5243,20 +5243,20 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Cette étape ne s'affichera que si une partition GNU/Linux a été détectée\n"
 "sur votre disque dur.\n"
 "\n"
 "DrakX doit maintenant savoir si vous désirez lancer une « Installation » ou "
 "une\n"
-"« Mise à jour » d'un système Mandrakelinux déjà installé :\n"
+"« Mise à jour » d'un système Mandrivalinux déjà installé :\n"
 "\n"
 " * « %s » : remplace l'ancien système. Cependant, selon votre table de\n"
 "partition, vous pourrez éviter l'effacement de vos données existantes\n"
@@ -5265,13 +5265,13 @@ msgstr ""
 "vous devriez utiliser cette option.\n"
 "\n"
 " * « %s » : cette classe d'installation vous permet de mettre à jour\n"
-"seulement les paquetages qui composent votre système Mandrakelinux. Elle\n"
+"seulement les paquetages qui composent votre système Mandrivalinux. Elle\n"
 "conserve les partitions existantes, ainsi que la configuration des\n"
 "utilisateurs. La plupart des autres étapes d'une installation classique\n"
 "sont accessibles.\n"
 "\n"
 "La mise à jour devrait fonctionner correctement pour les systèmes\n"
-"Mandrakelinux à partir de la version « 8.1 ». Essayer de lancer une mise à\n"
+"Mandrivalinux à partir de la version « 8.1 ». Essayer de lancer une mise à\n"
 "jour sur les versions antérieures à « 8.1 » n'est pas recommandé."
 
 #: help.pm:591
@@ -5331,7 +5331,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5374,7 +5374,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 langues existantes.\n"
 "Cependant son intégration dans GNU/Linux est encore imparfaite. Pour cette\n"
-"raison, Mandrakelinux l'utilisera ou non selon les critères suivants :\n"
+"raison, Mandrivalinux l'utilisera ou non selon les critères suivants :\n"
 "\n"
 " * Si vous choisissez une langue avec un encodage ayant une longue histoire\n"
 "(langues associées à « latin1 », Russe, Japonais, Chinois, Coréen, Thaï,\n"
@@ -5623,7 +5623,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5644,12 +5644,12 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Maintenant, il faut choisir un système d'impression pour votre ordinateur. "
 "D'autres\n"
-"systèmes d'exploitation en offrent un, mais Mandrakelinux en propose deux. "
+"systèmes d'exploitation en offrent un, mais Mandrivalinux en propose deux. "
 "Chaque système\n"
 "d'impression convient le mieux à un type différent de configuration.\n"
 "\n"
@@ -5677,7 +5677,7 @@ msgstr ""
 "Si vous choisissez votre système d'impression maintenant et que par la suite "
 "vous n'en êtes pas content, vous pourrez le changer\n"
 "ultérieurement en lançant PrinterDrake depuis le Centre de contrôle\n"
-"Mandrakelinux en cliquant sur le bouton « %s »."
+"Mandrivalinux en cliquant sur le bouton « %s »."
 
 #: help.pm:765
 #, c-format
@@ -5800,7 +5800,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5817,7 +5817,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5868,7 +5868,7 @@ msgstr ""
 "\n"
 " * « %s » : si vous souhaitez configurer votre accès Internet ou réseau\n"
 "local dès maintenant. Lisez la documentation fournie ou exécutez\n"
-"le Centre de Contrôle Mandrakelinux après l'installation pour avoir droit à "
+"le Centre de Contrôle Mandrivalinux après l'installation pour avoir droit à "
 "une\n"
 "aide complète en ligne.\n"
 "\n"
@@ -5886,7 +5886,7 @@ msgstr ""
 " * « %s » : si vous souhaitez changer la configuration par défaut de votre\n"
 "chargeur de démarrage. À réserver aux utilisateurs expérimentés. Lisez la\n"
 "documentation fournie ou l'aide en ligne sur la configuration de chargeur\n"
-"de démarrage présente dans le Centre de Contrôle Mandrakelinux.\n"
+"de démarrage présente dans le Centre de Contrôle Mandrivalinux.\n"
 "\n"
 " * « %s » : vous pourrez ici contrôler finement les services disponibles\n"
 "sur votre machine. Si vous envisagez de monter un serveur, c'est une bonne\n"
@@ -5949,7 +5949,7 @@ msgstr "Services"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux 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"
@@ -6312,12 +6312,12 @@ msgstr "Calcul de l'espace libre sur la partition Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Votre partition FAT est trop fragmentée. Redémarrez sous Windows\n"
 "et lancez le programme de défragmentation « defrag »,\n"
-"puis relancez l'installation de Mandrakelinux."
+"puis relancez l'installation de Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6440,19 +6440,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6474,7 +6474,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6482,14 +6482,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6499,7 +6499,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6519,10 +6519,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6533,11 +6533,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6553,23 +6553,23 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Introduction\n"
 "\n"
 "Le système d'exploitation et les divers composants disponibles dans la \n"
-"distribution Mandrakelinux sont ci-après dénommés les « Logiciels ».\n"
+"distribution Mandrivalinux sont ci-après dénommés les « Logiciels ».\n"
 "Les Logiciels comprennent notamment, mais de façon non limitative,\n"
 "l'ensemble des programmes, procédés, règles et documentations \n"
 "relatifs au système d'exploitation et aux divers composants de la \n"
-"distribution Mandrakelinux.\n"
+"distribution Mandrivalinux.\n"
 "\n"
 "\n"
 "1. Licence\n"
 "\n"
 "Veuillez lire attentivement le présent document. Ce document constitue \n"
 "un contrat de licence entre vous (personne physique ou personne morale) et \n"
-"Mandrakesoft S.A. portant sur les Logiciels.\n"
+"Mandriva S.A. portant sur les Logiciels.\n"
 "Le fait d'installer, de reproduire ou d'utiliser les Logiciels de quelque \n"
 "manière que ce soit indique que vous reconnaissez avoir préalablement eu \n"
 "connaissance et que vous acceptez de vous conformer aux termes et "
@@ -6584,14 +6584,14 @@ msgstr ""
 "et \n"
 "toute copie de tous programmes et de toutes documentations qui constituent \n"
 "le système d'exploitation et les divers composants disponibles dans la \n"
-"distribution Mandrakelinux.\n"
+"distribution Mandrivalinux.\n"
 "\n"
 "\n"
 "2. Garantie et limitations de garantie\n"
 "\n"
 "Les Logiciels et la documentation qui les accompagne sont fournis en "
 "l'état \n"
-"et sans aucune garantie. Mandrakesoft S.A. décline toute responsabilité \n"
+"et sans aucune garantie. Mandriva S.A. décline toute responsabilité \n"
 "découlant d'un dommage direct, spécial, indirect ou accessoire, de quelque \n"
 "nature que ce soit, en relation avec l'utilisation des Logiciels, "
 "notamment \n"
@@ -6599,13 +6599,13 @@ msgstr ""
 "bénéfices, interruptions d'activité, pertes d'informations commerciales ou \n"
 "autres pertes pécuniaires, ainsi que des éventuelles condamnations et \n"
 "indemnités devant être versées par suite d'une décision de justice, et ce \n"
-"même si Mandrakesoft S.A. a été informée de la survenue ou de \n"
+"même si Mandriva S.A. a été informée de la survenue ou de \n"
 "l'éventualité de tels dommages.\n"
 "\n"
 "AVERTISSEMENT QUANT À LA DÉTENTION OU L'UTILISATION DE LOGICIELS \n"
 "PROHIBÉS DANS CERTAINS PAYS \n"
 "\n"
-"En aucun cas, ni Mandrakesoft S.A. ni ses fournisseurs ne pourront être \n"
+"En aucun cas, ni Mandriva S.A. ni ses fournisseurs ne pourront être \n"
 "tenus responsables à raison d'un préjudice spécial, direct, indirect ou \n"
 "accessoire, de quelque nature que ce soit (notamment et de façon non \n"
 "limitative les pertes de bénéfices, interruptions d'activité, pertes \n"
@@ -6613,7 +6613,7 @@ msgstr ""
 "des éventuelles condamnations et indemnités devant être versées par suite \n"
 "d'une décision de justice) qui ferait suite à l'utilisation, la détention \n"
 "ou au simple téléchargement depuis l'un des sites de téléchargement de \n"
-"Mandrakelinux de logiciels prohibés par la législation à laquelle vous \n"
+"Mandrivalinux de logiciels prohibés par la législation à laquelle vous \n"
 "êtes soumis. Cet avertissement concerne notamment certains logiciels de \n"
 "cryptographie fournis avec les Logiciels.\n"
 "\n"
@@ -6629,9 +6629,9 @@ msgstr ""
 "régissent. Veuillez lire et agréer les termes et conditions des licences \n"
 "accompagnant chacun d'entre eux avant de les utiliser. Toute question \n"
 "concernant la licence d'un Logiciel est à soumettre à l'auteur (ou à ses\n"
-"représentants) du Logiciel et non à Mandrakesoft. \n"
-"Les programmes conçus par Mandrakesoft sont régis par la licence GPL. \n"
-"La documentation rédigée par Mandrakesoft fait l'objet d'une licence \n"
+"représentants) du Logiciel et non à Mandriva. \n"
+"Les programmes conçus par Mandriva sont régis par la licence GPL. \n"
+"La documentation rédigée par Mandriva fait l'objet d'une licence \n"
 "spécifique. Veuillez vous référez à la documentation pour obtenir plus \n"
 "de précisions.\n"
 "\n"
@@ -6642,8 +6642,8 @@ msgstr ""
 "propriété exclusive de leurs auteurs respectifs et sont protégés au titre \n"
 "des droits de propriété intellectuelle et de copyright applicables aux "
 "Logiciels.\n"
-"Les marques « Mandrake » et « Mandrakelinux » ainsi que les \n"
-"logotypes associés sont déposés par Mandrakesoft S.A. \n"
+"Les marques « Mandriva » et « Mandrivalinux » ainsi que les \n"
+"logotypes associés sont déposés par Mandriva S.A. \n"
 "\n"
 "\n"
 "5. Dispositions diverses\n"
@@ -6654,9 +6654,9 @@ msgstr ""
 "dispositions, qui recevront leurs pleins effets. Le contrat de licence \n"
 "est soumis à la Loi française. Toute contestation relative aux présentes \n"
 "dispositions sera réglée préalablement par voie amiable. A défaut d'accord\n"
-"avec Mandrakesoft S.A., les tribunaux compétents de Paris seront saisis du \n"
+"avec Mandriva S.A., les tribunaux compétents de Paris seront saisis du \n"
 "litige. Pour toute question relative au présent document, veuillez \n"
-"contacter Mandrakesoft S.A.\n"
+"contacter Mandriva S.A.\n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6753,7 +6753,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6761,21 +6761,21 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Félicitations, l'installation est terminée.\n"
 "Enlevez la disquette ou le CD-ROM d'amorçage et appuyez sur « Entrée ».\n"
 "\n"
 "\n"
 "Pour toutes informations sur les corrections disponibles pour cette version "
-"de Mandrakelinux, consultez les Errata disponibles depuis :\n"
+"de Mandrivalinux, consultez les Errata disponibles depuis :\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Des informations sur la configuration de votre système sont \n"
-"disponibles dans le Guide de l'Utilisateur de Mandrakelinux."
+"disponibles dans le Guide de l'Utilisateur de Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6811,12 +6811,12 @@ msgstr "Démarrage de l'étape « %s »\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Votre ordinateur possède peu de mémoire. Vous aurez peut-être quelques\n"
-"problèmes pour installer Mandrakelinux. Si cela se produit, vous pouvez\n"
+"problèmes pour installer Mandrivalinux. Si cela se produit, vous pouvez\n"
 "essayer de procéder à une installation en mode texte. Pour cela, appuyez\n"
 "sur la touche « F1 » après l'amorçage sur CD-ROM puis entrez « text »."
 
@@ -7368,9 +7368,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Connexion au site Web de Mandrakelinux pour obtenir la liste des serveurs "
+"Connexion au site Web de Mandrivalinux pour obtenir la liste des serveurs "
 "miroirs disponibles..."
 
 #: install_steps_interactive.pm:840
@@ -7599,8 +7599,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Installation de Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Installation de Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10192,14 +10192,14 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Configuration de drakfirewall\n"
 "\n"
 "Ceci configure un Pare-Feu (firewall) personnel pour votre machine "
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "Si vous souhaitez un Pare-Feu dédié plus puissant, tournez-vous plutôt vers\n"
 "la distribution spécialisée « MandrakeSecurity »."
 
@@ -11563,7 +11563,7 @@ msgid ""
 "work, you might want to relaunch the configuration."
 msgstr ""
 "Des problèmes sont apparus pendant la configuration.\n"
-"Testez votre connexion avec le « Centre de Contrôle Mandrakelinux » (dans la "
+"Testez votre connexion avec le « Centre de Contrôle Mandrivalinux » (dans la "
 "section « réseau ») ou la commande « net_monitor ». Si votre connexion ne "
 "fonctionne pas, vous pouvez essayer de relancer la configuration."
 
@@ -14325,12 +14325,12 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
 "Lancez Sannerdrake (Matériel->Scanner dans le Centre de Contrôle "
-"Mandrakelinux) pour partager sur le réseau votre scanner.\n"
+"Mandrivalinux) pour partager sur le réseau votre scanner.\n"
 "\n"
 
 #: printer/printerdrake.pm:3933
@@ -14643,7 +14643,7 @@ msgid ""
 msgstr ""
 "L'accès réseau n'a pas pu être démarré. Veuillez vérifier la configuration "
 "de votre matériel et de votre accès réseau grâce au « Centre de Contrôle "
-"Mandrakelinux » puis essayez à nouveau de configurer l'imprimante distante."
+"Mandrivalinux » puis essayez à nouveau de configurer l'imprimante distante."
 
 #: printer/printerdrake.pm:4206
 #, c-format
@@ -15913,7 +15913,7 @@ msgstr ""
 "Anacron exécute des tâches périodiques avec une précision exprimée en jours. "
 "Les tâches sont exécutées automatiquement au redémarrage de la machine si "
 "elles ont expiré leur délai. Quelques tâches de maintenances quotidienne et "
-"hebdomadaire sont préconfigurées pour le système Mandrakelinux. (Plus "
+"hebdomadaire sont préconfigurées pour le système Mandrivalinux. (Plus "
 "d'informations dans « man anacron »)"
 
 #: services.pm:21
@@ -16102,7 +16102,7 @@ msgstr ""
 "que vous avez choisi d'activer dès le démarrage du système. (par ex. vos "
 "connexions pour le réseau local et l'ADSL ou le Câble). Vous pouvez accéder "
 "séparément à vos interfaces réseau grâce au « Centre de Contrôle "
-"Mandrakelinux » dans la section « Internet et réseau »."
+"Mandrivalinux » dans la section « Internet et réseau »."
 
 #: services.pm:59
 #, c-format
@@ -16345,33 +16345,33 @@ msgstr "Arrêter"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Qu'est-ce que Mandrakelinux ?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Qu'est-ce que Mandrivalinux ?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "<b>Mandrakelinux</b> vous souhaite la bienvenue !"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "<b>Mandrivalinux</b> vous souhaite la bienvenue !"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux est une <b>distribution Linux</b>, qui regroupe un <b>système "
+"Mandrivalinux est une <b>distribution Linux</b>, qui regroupe un <b>système "
 "d'exploitation</b> (ie : le coeur du système, basé sur le noyau Linux) et "
 "<b>un très grand nombre d'applications</b> qui répondront à tous vos besoins."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux est la distribution Linux la plus <b>conviviale</b> de toutes. "
+"Mandrivalinux est la distribution Linux la plus <b>conviviale</b> de toutes. "
 "C'est aussi l'une des <b>plus utilisées</b> au monde !"
 
 #: share/advertising/02.pl:13
@@ -16387,15 +16387,15 @@ msgstr "Bienvenue dans le <b>monde du logiciel libre</b> !"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux adhère au modèle du logiciel libre. Cela signifie que cette "
+"Mandrivalinux adhère au modèle du logiciel libre. Cela signifie que cette "
 "dernière version est le résultat d'une <b>collaboration</b> entre "
-"<b>l'équipe des développeurs de Mandrakesoft</b> et la <b>communauté "
-"mondiale</b> des contributeurs à Mandrakelinux."
+"<b>l'équipe des développeurs de Mandriva</b> et la <b>communauté "
+"mondiale</b> des contributeurs à Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16415,10 +16415,10 @@ msgstr "<b>La GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "La plupart des logiciels inclus dans la distribution et l'intégralité des "
-"outils Mandrakelinux respectent la <b>Licence Publique Générale</b> (en "
+"outils Mandrivalinux respectent la <b>Licence Publique Générale</b> (en "
 "anglais General Public License ou GPL)."
 
 #: share/advertising/03.pl:17
@@ -16449,15 +16449,15 @@ msgstr "<b>Rejoignez la communauté</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux possède l'une des <b>plus importantes</b> communautés "
+"Mandrivalinux possède l'une des <b>plus importantes</b> communautés "
 "d'utilisateurs et de développeurs. Le rôle de cette communauté est multiple, "
 "des rapports de bugs aux développements de nouvelles applications. La "
-"communauté est une <b>part très importante</b> du monde Mandrakelinux."
+"communauté est une <b>part très importante</b> du monde Mandrivalinux."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16478,11 +16478,11 @@ msgstr "<b>Version Download</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Vous êtes en train d'installer <b>Mandrakelinux Download</b>. C'est la "
-"version gratuite que Mandrakesoft tient à garder <b>disponible pour tous</b>."
+"Vous êtes en train d'installer <b>Mandrivalinux Download</b>. C'est la "
+"version gratuite que Mandriva tient à garder <b>disponible pour tous</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16514,10 +16514,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Vous n'aurez pas non plus accès aux <b>services inclus</b> dans les autres "
-"produits de Mandrakesoft."
+"produits de Mandriva."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16526,8 +16526,8 @@ msgstr "<b>Discovery, Votre premier poste de travail sous Linux</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Vous êtes en train d'installer <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Vous êtes en train d'installer <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16549,13 +16549,13 @@ msgstr "<b>PowerPack, Le poste de travail de référence sous Linux</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Vous êtes en train d'installer <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Vous êtes en train d'installer <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -16571,8 +16571,8 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Vous êtes en train d'installer <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Vous êtes en train d'installer <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16588,22 +16588,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Les produits Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Les produits Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> a développé une large gamme de produits "
-"<b>Mandrakelinux</b>."
+"<b>Mandriva</b> a développé une large gamme de produits "
+"<b>Mandrivalinux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Les produits Mandrakelinux sont :"
+msgid "The Mandrivalinux products are:"
+msgstr "Les produits Mandrivalinux sont :"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16624,74 +16624,74 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux pour x86-64</b>, La solution Mandrakelinux pour tirer "
+"\t* <b>Mandrivalinux pour x86-64</b>, La solution Mandrivalinux pour tirer "
 "le meilleur parti de votre processeur 64 bits."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Les produits Mandrakesoft (produits nomades)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Les produits Mandriva (produits nomades)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft a développé deux produits qui permettent d'utiliser "
-"Mandrakelinux <b>sur n'importe quel ordinateur</b> et sans installation :"
+"Mandriva a développé deux produits qui permettent d'utiliser "
+"Mandrivalinux <b>sur n'importe quel ordinateur</b> et sans installation :"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, une distribution Mandrakelinux qui fonctionne entièrement "
+"\t* <b>Move</b>, une distribution Mandrivalinux qui fonctionne entièrement "
 "depuis un CD-ROM amorçable."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, une distribution Mandrakelinux préinstallée sur le "
+"\t* <b>GlobeTrotter</b>, une distribution Mandrivalinux préinstallée sur le "
 "disque dur ultra compact “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Les produits Mandrakesoft (solutions professionnelles)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Les produits Mandriva (solutions professionnelles)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Voici les produits Mandrakesoft destinés à répondre aux <b>besoins "
+"Voici les produits Mandriva destinés à répondre aux <b>besoins "
 "professionnels</b> :"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
-"\t* <b>Corporate Desktop</b>, Le poste de travail Mandrakelinux à "
+"\t* <b>Corporate Desktop</b>, Le poste de travail Mandrivalinux à "
 "destination des entreprises."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, La solution serveur Mandrakelinux."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, La solution serveur Mandrivalinux."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b>, La solution sécurité Mandrakelinux."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, La solution sécurité Mandrivalinux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16735,10 +16735,10 @@ msgstr "<b>Choisissez votre environnement de bureau favori</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Avec PowerPack, vous aurez le choix de l'<b>environnement graphique</b>. "
-"Mandrakesoft a choisi <b>KDE</b> comme environnement par défaut."
+"Mandriva a choisi <b>KDE</b> comme environnement par défaut."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16762,10 +16762,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Avec PowerPack+, vous aurez le choix de l'<b>environnement graphique</b>. "
-"Mandrakesoft a choisi <b>KDE</b> comme environnement par défaut."
+"Mandriva a choisi <b>KDE</b> comme environnement par défaut."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16896,10 +16896,10 @@ msgstr "<b>Profiter de la large gamme d'applications</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Dans le menu Mandrakelinux, vous trouverez des applications <b>faciles "
+"Dans le menu Mandrivalinux, vous trouverez des applications <b>faciles "
 "d'utilisation</b> pour <b>toutes vos tâches</b> :"
 
 #: share/advertising/18.pl:16
@@ -17170,18 +17170,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Centre de Contrôle Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Centre de Contrôle Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"Le <b>Centre de Contrôle Mandrakelinux</b> est un ensemble cohérent d'outils "
-"créés par Mandrakelinux pour simplifier la configuration de votre ordinateur."
+"Le <b>Centre de Contrôle Mandrivalinux</b> est un ensemble cohérent d'outils "
+"créés par Mandrivalinux pour simplifier la configuration de votre ordinateur."
 
 #: share/advertising/25.pl:17
 #, c-format
@@ -17205,17 +17205,17 @@ msgstr "<b>Le modèle du logiciel libre</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Comme toute autre activité informatique, le logiciel libre requiert du "
 "<b>temps et des effectifs</b> pour mener à bien les développements. Pour "
-"respecter la philosophie du logiciel libre, Mandrakesoft vend des produits "
+"respecter la philosophie du logiciel libre, Mandriva vend des produits "
 "et des services à valeur ajoutée pour <b>continuer d'améliorer "
-"Mandrakelinux</b>. Si vous souhaitez <b>soutenir la philosophie du logiciel "
-"libre</b> et le développement de Mandrakelinux, <b>merci</b> d'envisager "
+"Mandrivalinux</b>. Si vous souhaitez <b>soutenir la philosophie du logiciel "
+"libre</b> et le développement de Mandrivalinux, <b>merci</b> d'envisager "
 "l'achat d'un de nos produits ou services !"
 
 #: share/advertising/27.pl:13
@@ -17226,10 +17226,10 @@ msgstr "<b>Boutique en ligne</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Pour en savoir plus sur les produits et les services de Mandrakesoft, vous "
+"Pour en savoir plus sur les produits et les services de Mandriva, vous "
 "pouvez visitez notre <b>plate-forme de commerce électronique</b>."
 
 #: share/advertising/27.pl:17
@@ -17254,24 +17254,24 @@ msgstr "Arrêtez-vous aujourd'hui sur <b>store.mandrakesoft.com</b> !"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> est le <b>partenaire parfait</b> de votre produit "
-"Mandrakelinux."
+"<b>Mandriva Club</b> est le <b>partenaire parfait</b> de votre produit "
+"Mandrivalinux."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Profitez de <b>nombreux avantages</b> en rejoignant Mandrakeclub, tels que :"
+"Profitez de <b>nombreux avantages</b> en rejoignant Mandriva Club, tels que :"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -17293,40 +17293,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Participation aux <b>forums d'utilisateurs</b> Mandrakelinux."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Participation aux <b>forums d'utilisateurs</b> Mandrivalinux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* Accès privilégié, et avant les sorties publiques, aux images ISO de "
-"Mandrakelinux."
+"Mandrivalinux."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> est le tout nouveau service que Mandrakesoft est fier "
+"<b>Mandriva Online</b> est le tout nouveau service que Mandriva est fier "
 "de présenter à ses clients !"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline fournit une large gamme de services à valeur ajoutée pour "
-"<b>mettre à jour facilement</b> votre système Mandrakelinux :"
+"Mandriva Online fournit une large gamme de services à valeur ajoutée pour "
+"<b>mettre à jour facilement</b> votre système Mandrivalinux :"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17352,41 +17352,41 @@ msgstr "\t* <b>Planification</b> flexible des mises à jour."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* Gestion de <b>tous vos systèmes Mandrakelinux</b> avec un seul compte."
+"\t* Gestion de <b>tous vos systèmes Mandrivalinux</b> avec un seul compte."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "Vous avez besoin d'<b>assistance</b> ? Rencontrez les experts techniques de "
-"Mandrakesoft sur notre <b>plate-forme de support technique</b> www."
+"Mandriva sur notre <b>plate-forme de support technique</b> www."
 "mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Grâce aux <b>experts Mandrakelinux qualifiés</b>, vous gagnerez beaucoup de "
+"Grâce aux <b>experts Mandrivalinux qualifiés</b>, vous gagnerez beaucoup de "
 "temps."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Pour toute question relative à Mandrakelinux, vous pouvez acheter du support "
+"Pour toute question relative à Mandrivalinux, vous pouvez acheter du support "
 "d'incidents sur <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17688,8 +17688,8 @@ msgstr "Outils de surveillance, gestion de processus, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Assistants Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Assistants Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17786,8 +17786,8 @@ msgstr ""
 "\n"
 "OPTIONS :\n"
 "  --help            - affiche ce message.\n"
-"  --report          - le programme doit être un outil Mandrakelinux\n"
-"  --incident        - le programme doit être un outil Mandrakelinux"
+"  --report          - le programme doit être un outil Mandrivalinux\n"
+"  --incident        - le programme doit être un outil Mandrivalinux"
 
 #: standalone.pm:63
 #, c-format
@@ -17842,7 +17842,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17856,7 +17856,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Configurateur pour Mandrakelinux Terminal Server\n"
+"Configurateur pour Mandrivalinux Terminal Server\n"
 "--enable         : active MTS\n"
 "--disable        : désactive MTS\n"
 "--start          : démarre MTS\n"
@@ -17913,7 +17913,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17921,7 +17921,7 @@ msgid ""
 msgstr ""
 "[OPTION]...\n"
 "  --no-confirmation      ne demande pas la première confirmation en mode "
-"MandrakeUpdate\n"
+"Mandriva Update\n"
 "  --no-verify-rpm        ne vérifie pas les signatures des paquetages\n"
 "  --changelog-first      affiche le changelog avant la liste des fichiers "
 "dans la fenêtre de description\n"
@@ -20709,13 +20709,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Outil de signalement de bogue Mandrakelinux"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Outil de signalement de bogue Mandrivalinux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centre de Contrôle Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Centre de Contrôle Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20735,8 +20735,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20780,8 +20780,8 @@ msgstr "Assistants de configuration"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Choisissez un outil Mandrakesoft :"
+msgid "Select Mandriva Tool:"
+msgstr "Choisissez un outil Mandriva :"
 
 #: standalone/drakbug:82
 #, c-format
@@ -21208,20 +21208,20 @@ msgstr "Lancer au démarrage"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Cette interface n'a pas encore été configurée.\n"
 "Lancez l'assistant « Ajouter une interface » depuis le Centre de Contrôle "
-"Mandrakelinux"
+"Mandrivalinux"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Vous n'avez aucune connexion internet configurée.\n"
-"Lancez l'assistant « %s » depuis le Centre de Contrôle Mandrakelinux"
+"Lancez l'assistant « %s » depuis le Centre de Contrôle Mandrivalinux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21271,8 +21271,8 @@ msgstr "KDM (Gestionnaire de connexion de KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkDM (Gestionnaire de connexion de Mandrakelinux)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkDM (Gestionnaire de connexion de Mandrivalinux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21576,7 +21576,7 @@ msgstr "Importer"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21585,7 +21585,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright © 2001-2002 par Mandrakesoft\n"
+"Copyright © 2001-2002 par Mandriva\n"
 "\n"
 "     DUPONT Sébastien (original version)\n"
 "\n"
@@ -22137,14 +22137,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright © 2003-2004 Mandrakesoft.\n"
+"Copyright © 2003-2004 Mandriva.\n"
 "Ce programme est un logiciel libre et peut être redistribué selon les\n"
 "termes de la licence GNU GPL.\n"
 "\n"
@@ -22174,8 +22174,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Le centre d'aide de Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Le centre d'aide de Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25757,8 +25757,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Actions des Outils Mandrakelinux"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Actions des Outils Mandrivalinux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -26278,10 +26278,10 @@ msgstr "Connexion effectuée."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "La connexion a échoué.\n"
-"Vérifiez votre configuration dans le Centre de Contrôle Mandrakelinux."
+"Vérifiez votre configuration dans le Centre de Contrôle Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/fur.po b/perl-install/share/po/fur.po
index 615fdf1c8..15bfe8ab5 100644
--- a/perl-install/share/po/fur.po
+++ b/perl-install/share/po/fur.po
@@ -59,7 +59,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -78,7 +78,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -86,7 +86,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -94,7 +94,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -224,7 +224,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1216,7 +1216,7 @@ msgstr "Lenghis"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3468,7 +3468,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3578,7 +3578,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3589,11 +3589,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3700,10 +3700,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3812,7 +3812,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -3910,12 +3910,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -3942,7 +3942,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -3951,7 +3951,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4080,7 +4080,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4098,7 +4098,7 @@ msgstr "Precedent"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4127,7 +4127,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4143,7 +4143,7 @@ msgstr ""
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4229,7 +4229,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4274,7 +4274,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4283,13 +4283,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4330,7 +4330,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4487,7 +4487,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4508,7 +4508,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4608,7 +4608,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4625,7 +4625,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4687,7 +4687,7 @@ msgstr "Servizis"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -4995,7 +4995,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 
@@ -5099,19 +5099,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5133,7 +5133,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5141,14 +5141,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5158,7 +5158,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5178,10 +5178,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5192,11 +5192,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5212,7 +5212,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5269,7 +5269,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5277,7 +5277,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5309,7 +5309,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -5811,7 +5811,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
 
 #: install_steps_interactive.pm:840
@@ -6016,7 +6016,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
 msgstr ""
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -8574,7 +8574,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12129,7 +12129,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -13793,18 +13793,18 @@ msgstr "Ferme"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Benvignût in <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Benvignût in <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -13813,7 +13813,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -13830,9 +13830,9 @@ msgstr ""
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -13852,7 +13852,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -13878,10 +13878,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -13900,8 +13900,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -13928,7 +13928,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -13938,7 +13938,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -13957,13 +13957,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -13975,7 +13975,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -13989,20 +13989,20 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Applet Atualizazions Mandrakelinux"
+msgid "The Mandrivalinux products are:"
+msgstr "Applet Atualizazions Mandrivalinux"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -14022,61 +14022,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14114,7 +14114,7 @@ msgstr "<b>Ambients di svilup</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14135,7 +14135,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -14165,7 +14165,7 @@ msgstr ""
 #: share/advertising/15.pl:13
 #, fuzzy, c-format
 msgid "<b>Kontact</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/15.pl:15
 #, c-format
@@ -14252,7 +14252,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -14487,14 +14487,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr ""
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -14516,9 +14516,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -14530,7 +14530,7 @@ msgstr "<b>Server</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -14553,20 +14553,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -14585,33 +14585,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -14634,32 +14634,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -14950,8 +14950,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "Mandriva Wizards"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -15046,7 +15046,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15094,7 +15094,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17546,13 +17546,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr ""
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centri di Control Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Centri di Control Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -17572,7 +17572,7 @@ msgstr ""
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr ""
 
 #: standalone/drakbug:52
@@ -17617,7 +17617,7 @@ msgstr ""
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -18021,14 +18021,14 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18079,7 +18079,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18364,7 +18364,7 @@ msgstr ""
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -18822,7 +18822,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -18849,8 +18849,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Centri jutoris Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Centri jutoris Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -21823,7 +21823,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr ""
 
 #: standalone/logdrake:51
@@ -22327,7 +22327,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
@@ -23144,8 +23144,8 @@ msgstr "Instalazion falade"
 #~ msgstr "Identitât ssh dizà instalade"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "<b>Mandrakeexpert</b>"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "<b>Mandriva Expert</b>"
 
 #~ msgid ""
 #~ "Insert a floppy in drive\n"
diff --git a/perl-install/share/po/ga.po b/perl-install/share/po/ga.po
index 4d31fdc3a..f15975650 100644
--- a/perl-install/share/po/ga.po
+++ b/perl-install/share/po/ga.po
@@ -57,7 +57,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -76,7 +76,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -92,7 +92,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -218,7 +218,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1207,7 +1207,7 @@ msgstr "Rogha teanga"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3462,7 +3462,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3572,7 +3572,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3583,11 +3583,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3694,10 +3694,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3806,7 +3806,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -3904,12 +3904,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -3936,7 +3936,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -3945,7 +3945,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4074,7 +4074,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4092,7 +4092,7 @@ msgstr "feist"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4121,7 +4121,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4137,7 +4137,7 @@ msgstr "Riarthóir Slándála"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4223,7 +4223,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4268,7 +4268,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4277,13 +4277,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4324,7 +4324,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4481,7 +4481,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4502,7 +4502,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4602,7 +4602,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4619,7 +4619,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4681,7 +4681,7 @@ msgstr "Seirbishí"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -4995,7 +4995,7 @@ msgstr "Cruthaigh rann nua"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 
@@ -5099,19 +5099,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5133,7 +5133,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5141,14 +5141,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5158,7 +5158,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5178,10 +5178,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5192,11 +5192,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5212,7 +5212,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5269,7 +5269,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5277,7 +5277,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5309,7 +5309,7 @@ msgstr "Ag tosnú ar céim `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -5813,7 +5813,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
 
 #: install_steps_interactive.pm:840
@@ -6018,8 +6018,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Suiteáil Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Suiteáil Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8614,7 +8614,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12169,7 +12169,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -13833,18 +13833,18 @@ msgstr "Stad"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Fáilte go dtí <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Fáilte go dtí <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -13853,7 +13853,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -13870,9 +13870,9 @@ msgstr "Trialaigh an cumraíocht"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -13892,7 +13892,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -13918,10 +13918,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -13940,8 +13940,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -13968,7 +13968,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -13978,7 +13978,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -13997,13 +13997,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14015,7 +14015,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14029,19 +14029,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr "Bainteach le hIdirlíon"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -14062,61 +14062,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14154,7 +14154,7 @@ msgstr "Deasc Graphaicí Eile"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14175,7 +14175,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -14292,7 +14292,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -14527,14 +14527,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Ionad Rialaithe Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Ionad Rialaithe Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -14556,9 +14556,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -14570,7 +14570,7 @@ msgstr "Bainteach le hIdirlíon"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -14593,20 +14593,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, fuzzy, c-format
-msgid "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
 msgstr "Bainteach le hIdirlíon"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -14625,33 +14625,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr "Bainteach le hIdirlíon"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -14674,32 +14674,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
 msgstr "Bainteach le hIdirlíon"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -14991,7 +14991,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr "Bainteach le hIdirlíon"
 
 #: share/compssUsers.pl:197
@@ -15087,7 +15087,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15135,7 +15135,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17585,13 +17585,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "Bainteach le hIdirlíon"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Ionad Rialaithe Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Ionad Rialaithe Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -17611,8 +17611,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, fuzzy, c-format
-msgid "Mandrakeonline"
-msgstr "Ionad Rialaithe Mandrakelinux"
+msgid "Mandriva Online"
+msgstr "Ionad Rialaithe Mandrivalinux"
 
 #: standalone/drakbug:52
 #, fuzzy, c-format
@@ -17656,7 +17656,7 @@ msgstr "Draíodóir Cumraíocht Gréasánú"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -18061,14 +18061,14 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18119,7 +18119,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18404,7 +18404,7 @@ msgstr "Iompórtáil"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -18862,7 +18862,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -18889,7 +18889,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Bainteach le hIdirlíon"
 
 #: standalone/drakhelp:36
@@ -21864,7 +21864,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Bainteach le hIdirlíon"
 
 #: standalone/logdrake:51
@@ -22368,7 +22368,7 @@ msgstr "Athraigh cineál ranna"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
@@ -23199,7 +23199,7 @@ msgstr "Theip ar shuiteáil"
 #~ msgstr "Scrios ciú"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
+#~ msgid "Mandriva Wizards"
 #~ msgstr "Bainteach le hIdirlíon"
 
 #~ msgid ""
diff --git a/perl-install/share/po/gl.po b/perl-install/share/po/gl.po
index 53189cc8b..845e977cb 100644
--- a/perl-install/share/po/gl.po
+++ b/perl-install/share/po/gl.po
@@ -69,7 +69,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Semella ser que a memoria USB ten activada a protección de escritura, pero\n"
 "non se pode desenchufar de maneira segura.\n"
@@ -77,7 +77,7 @@ msgstr ""
 "\n"
 "Clique no botón para reiniciar a máquina, desenchúfea, desactive a "
 "protección\n"
-"de escritura, enchufe a memoria outra vez, e execute Mandrake Move outra vez."
+"de escritura, enchufe a memoria outra vez, e execute Mandriva Move outra vez."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -95,7 +95,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "A súa memoria USB non ten ningunha partición Windows (FAT)\n"
@@ -106,14 +106,14 @@ msgstr ""
 "\n"
 "\n"
 "Tamén pode continuar sen unha memoria USB - ainda\n"
-"poderá usar Mandrake Move coma un Sistema Operativo\n"
+"poderá usar Mandriva Move coma un Sistema Operativo\n"
 "Mandrake live normal."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -121,7 +121,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -249,7 +249,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1278,11 +1278,11 @@ msgstr "Selección da Lingua"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux pode soportar múltiples linguas. Seleccione\n"
+"Mandrivalinux pode soportar múltiples linguas. Seleccione\n"
 "as linguas que desexa instalar. Esta linguas estarán dispoñibles\n"
 "cando a instalación estea completa e reinicie o seu sistema."
 
@@ -3649,12 +3649,12 @@ msgstr "activar o soporte de radio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Antes de continuar, debe ler con coidado os termos da licenza. Esta\n"
-"licenza cobre toda a distribución Mandrakelinux. Se está de acordo\n"
+"licenza cobre toda a distribución Mandrivalinux. Se está de acordo\n"
 "con tódolos termos que contén, marque o cadro \"%s\". Se non o está,\n"
 "prema no botón \"%s\" e reiniciarase o seu ordenador."
 
@@ -3832,13 +3832,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"A instalación de Mandrakelinux distribúese en varios CDs. Se un\n"
+"A instalación de Mandrivalinux distribúese en varios CDs. Se un\n"
 "paquete dos seleccionados está noutro CD, o DrakX expulsará o CD\n"
 "actual e diralle que insira o CD requirido. Se non ten o CD requirido a "
 "man,\n"
@@ -3848,11 +3848,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3959,10 +3959,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4101,7 +4101,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4220,12 +4220,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4252,7 +4252,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4261,7 +4261,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4282,11 +4282,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Agora ten que decidir onde quere instalar o sistema operativo\n"
-"Mandrakelinux no disco duro. Se o seu disco duro está baleiro, ou se\n"
+"Mandrivalinux no disco duro. Se o seu disco duro está baleiro, ou se\n"
 "outro sistema operativo está usando todo o espacio dispoñible, terá que\n"
 "particionalo. Básicamente, particionar un disco duro consiste en dividilo\n"
 "lóxicamente para crear o espacio necesario para instalar o seu novo\n"
-"sistema Mandrakelinux.\n"
+"sistema Mandrivalinux.\n"
 "\n"
 "Debido a que o proceso de particionamento é normalmente irreversible\n"
 "e pode provocar perdas de datos, o particionamento pode intimidar e\n"
@@ -4316,7 +4316,7 @@ msgstr ""
 "pode levarse a cabo sen a perda de ningún dato, con tal que\n"
 "desfragmente previamente a partición Windows. É moi recomendable\n"
 "que faga unha copia de seguridade dos seus datos. Recoméndase\n"
-"usar esta opción se desexa usar Mandrakelinux e Microsoft\n"
+"usar esta opción se desexa usar Mandrivalinux e Microsoft\n"
 "Windows no mesmo ordenador.\n"
 "\n"
 "   Antes de escoller esta opción, debe comprender que despois deste\n"
@@ -4325,7 +4325,7 @@ msgstr ""
 "para almacenar os seus datos ou para instalar novo software.\n"
 "\n"
 " * \"%s\". Se desexa eliminar tódolos datos e as particións presentes no\n"
-"seu disco duro e remprazalas polo seu novo sistema Mandrakelinux, elixa\n"
+"seu disco duro e remprazalas polo seu novo sistema Mandrivalinux, elixa\n"
 "esta opción. Teña coidado, porque non poderá desfacer esta operación\n"
 "despois de que confirme.\n"
 "\n"
@@ -4453,7 +4453,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4471,7 +4471,7 @@ msgstr "Anterior"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4500,7 +4500,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4516,7 +4516,7 @@ msgstr "Administrador de Seguridade"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4602,7 +4602,7 @@ msgstr "Cambiar entre modo normal/experto"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4650,7 +4650,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4659,13 +4659,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4706,7 +4706,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4880,7 +4880,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4901,7 +4901,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -5004,7 +5004,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5021,7 +5021,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5083,11 +5083,11 @@ msgstr "Servicios"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Elixa o disco duro que desexa borrar para poder crear a súa nova partición\n"
-"Mandrakelinux. Teña tino, porque se perderán tódolos datos da unidade e\n"
+"Mandrivalinux. Teña tino, porque se perderán tódolos datos da unidade e\n"
 "non se poderán volver recuperar!"
 
 #: help.pm:863
@@ -5435,12 +5435,12 @@ msgstr "Calculando o tamaño da partición de Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "A partición de Windows está demasiado fragmentada. Por favor reinicie o seu "
 "sistema con Windows, execute a utilidade ``defrag'', e despois reinicie a "
-"instalación de Mandrakelinux."
+"instalación de Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -5556,19 +5556,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5590,7 +5590,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5598,14 +5598,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5615,7 +5615,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5635,10 +5635,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5649,11 +5649,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5669,7 +5669,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5726,7 +5726,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5734,21 +5734,21 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Noraboa, rematou a instalación.\n"
 "Quite o disco de arrinque da unidade e prema Intro para reiniciar.\n"
 "\n"
 "\n"
 "Para información sobre parches dispoñibles para esta versión\n"
-"de Mandrakelinux, consulte as erratas dispoñibles en:\n"
+"de Mandrivalinux, consulte as erratas dispoñibles en:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Para información sobre a configuración do seu sistema, despois\n"
-"da instalación, hai un capítulo na Guía de Usuario Oficial de Mandrakelinux."
+"da instalación, hai un capítulo na Guía de Usuario Oficial de Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -5783,12 +5783,12 @@ msgstr "Entrando na etapa '%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "O seu sistema ten poucos recursos. Pode que teña algún problema\n"
-"ó instala-lo Mandrakelinux. Se iso acontece, pode intenta-la instalación\n"
+"ó instala-lo Mandrivalinux. Se iso acontece, pode intenta-la instalación\n"
 "en modo texto.  Para iso, prema 'F1' cando arrinque o CDROM, e escriba\n"
 "'text'."
 
@@ -6322,9 +6322,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Contactando co sitio web de Mandrakelinux para obte-la lista de espellos "
+"Contactando co sitio web de Mandrivalinux para obte-la lista de espellos "
 "dispoñibles..."
 
 #: install_steps_interactive.pm:840
@@ -6545,8 +6545,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Instalación de Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Instalación de Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9126,13 +9126,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Configurador de drakfirewall\n"
 "\n"
-"Isto configura un cortalumes persoal para esta máquina Mandrakelinux.\n"
+"Isto configura un cortalumes persoal para esta máquina Mandrivalinux.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 
@@ -12995,12 +12995,12 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
 "Execute Scannerdrake (Hardware/Escáner no Centro de Control de "
-"Mandrakelinux) para compartir o seu escáner na rede.\n"
+"Mandrivalinux) para compartir o seu escáner na rede.\n"
 "\n"
 
 #: printer/printerdrake.pm:3933
@@ -14823,23 +14823,23 @@ msgstr "Parar"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>¿Que é Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>¿Que é Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "¡Benvid@ a <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "¡Benvid@ a <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux é unha <b>distribución de Linux</b> que consta do núcleo do "
+"Mandrivalinux é unha <b>distribución de Linux</b> que consta do núcleo do "
 "sistema, chamado <b>sistema operativo</b> (baseado no kernel Linux) xunto "
 "cunha <b>chea de aplicacións</b> satisfan tódalas necesidades en que poida "
 "pensar."
@@ -14847,10 +14847,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux é a distribución de Linux máis <b>amigable</b> hoxe en día. "
+"Mandrivalinux é a distribución de Linux máis <b>amigable</b> hoxe en día. "
 "Tamén é unha das distribucións de Linux <b>máis usadas</b> en todo o mundo!"
 
 #: share/advertising/02.pl:13
@@ -14866,15 +14866,15 @@ msgstr "¡Benvid@ ó <b>mundo do Código Aberto</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux comprométese co Modelo de Código Aberto. Isto significa que "
+"Mandrivalinux comprométese co Modelo de Código Aberto. Isto significa que "
 "esta nova versión é o resultado da <b>colaboración</b> entre o <b>equipo de "
-"desenvolvedores de Mandrakesoft</b> e a <b>comunidade mundial</b> de "
-"contribuíntes de Mandrakelinux."
+"desenvolvedores de Mandriva</b> e a <b>comunidade mundial</b> de "
+"contribuíntes de Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -14894,10 +14894,10 @@ msgstr "<b>A GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "A maioría do software incluido nesta distribución e tódalas ferramentas de "
-"Mandrakelinux usan a <b>General Public License</b>."
+"Mandrivalinux usan a <b>General Public License</b>."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -14928,15 +14928,15 @@ msgstr "<b>¡Únase á comunidade!</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux ten unha das <b>maiores comunidades</b> de usuarios e "
+"Mandrivalinux ten unha das <b>maiores comunidades</b> de usuarios e "
 "desenvolvedores. O rol desta comunidade é moi amplo, dende o informe de "
 "erros ata o desenvolvemento de novas aplicacións. A comunidade xoga un "
-"<b>rol clave</b> no mundo de Mandrakelinux."
+"<b>rol clave</b> no mundo de Mandrivalinux."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -14957,11 +14957,11 @@ msgstr "<b>Versión de Descarga</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Vostede está instalando <b>Mandrakelinux Download</b>. Esta é a versión "
-"gratuita que Mandrakesoft quere ter <b>dispoñible para tod@s</b>."
+"Vostede está instalando <b>Mandrivalinux Download</b>. Esta é a versión "
+"gratuita que Mandriva quere ter <b>dispoñible para tod@s</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -14992,10 +14992,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Non terá acceso ós <b>servicios incluidos</b> nos outros productos de "
-"Mandrakesoft."
+"Mandriva."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -15004,8 +15004,8 @@ msgstr "<b>Discovery, O Seu Primeiro Escritorio Linux</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Está instalando <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Está instalando <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -15027,18 +15027,18 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Está instalando <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Está instalando <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
 "PowerPack é o <b>principal producto Linux para escritorio</b> de "
-"Mandrakesoft. PowerPack inclúe <b>milleiros de aplicacións</b> - dende as "
+"Mandriva. PowerPack inclúe <b>milleiros de aplicacións</b> - dende as "
 "máis populares ás máis avanzadas."
 
 #: share/advertising/08.pl:13
@@ -15048,8 +15048,8 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Está instalando <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Está instalando <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -15062,22 +15062,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Productos de Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Productos de Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> desenvolveu unha gran cantidade de productos "
-"<b>Mandrakelinux</b>."
+"<b>Mandriva</b> desenvolveu unha gran cantidade de productos "
+"<b>Mandrivalinux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Os productos Mandrakelinux son:"
+msgid "The Mandrivalinux products are:"
+msgstr "Os productos Mandrivalinux son:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -15097,69 +15097,69 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Productos de Mandrakesoft (Productos para Nómadas)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Productos de Mandriva (Productos para Nómadas)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft desenvolveu dous productos que lle permiten usar Mandrakelinux "
+"Mandriva desenvolveu dous productos que lle permiten usar Mandrivalinux "
 "<b>en calquera ordenador</b> e sen necesidade de instalalo nel:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, unha distribución de Mandrakelinux que se executa "
+"\t* <b>Move</b>, unha distribución de Mandrivalinux que se executa "
 "totalmente dende un CD-ROM arrincable."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, unha distribución de Mandrakelinux pre-instalada no "
+"\t* <b>GlobeTrotter</b>, unha distribución de Mandrivalinux pre-instalada no "
 "ultracompacto “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Productos de Mandrakesoft (Solucións Profesionais)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Productos de Mandriva (Solucións Profesionais)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Debaixo están os productos de Mandrakesoft deseñados para solucionar as "
+"Debaixo están os productos de Mandriva deseñados para solucionar as "
 "<b>necesidades profesionais</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -15199,7 +15199,7 @@ msgstr "<b>Escolla o seu Ambiente de Escritorio Preferido</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -15224,7 +15224,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -15351,10 +15351,10 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"No menú de Mandrakelinux atopará aplicacións <b>fáciles de usar</b> para "
+"No menú de Mandrivalinux atopará aplicacións <b>fáciles de usar</b> para "
 "<b>tódalas tarefas</b>:"
 
 #: share/advertising/18.pl:16
@@ -15611,18 +15611,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Centro de Control de Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Centro de Control de Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"O <b>Centro de Control de Mandrakelinux</b> é unha colección esencial de "
-"utilidades específicas de Mandrakelinux para facilita-la configuración do "
+"O <b>Centro de Control de Mandrivalinux</b> é unha colección esencial de "
+"utilidades específicas de Mandrivalinux para facilita-la configuración do "
 "ordenador."
 
 #: share/advertising/25.pl:17
@@ -15647,9 +15647,9 @@ msgstr "<b>O Modelo do Código Aberto</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -15661,10 +15661,10 @@ msgstr "<b>Tenda en liña</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Para saber máis acerca dos productos e servicios de Mandrakesoft, pode "
+"Para saber máis acerca dos productos e servicios de Mandriva, pode "
 "visitar a nosa <b>plataforma de comercio electrónico</b>."
 
 #: share/advertising/27.pl:17
@@ -15688,24 +15688,24 @@ msgstr "Parar hoxe en <b>store.mandrakesoft.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> é o <b>compañeiro perfecto</b> para o seu producto "
-"Mandrakelinux."
+"<b>Mandriva Club</b> é o <b>compañeiro perfecto</b> para o seu producto "
+"Mandrivalinux."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Se se une a Mandrakeclub poderá gozar de <b>valiosos beneficios</b>, coma:"
+"Se se une a Mandriva Club poderá gozar de <b>valiosos beneficios</b>, coma:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -15727,38 +15727,38 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Participación nos <b>foros de usuarios</b> de Mandrakelinux."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Participación nos <b>foros de usuarios</b> de Mandrivalinux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Acceso privilexiado e anticipado</b>, antes da liberación pública, ás "
-"<b>imaxes ISO</b> de Mandrakelinux."
+"<b>imaxes ISO</b> de Mandrivalinux."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline fornece unha gran cantidade de valiosos servicios para "
-"<b>actualizar fácilmente</b> os seus sistemas Mandrakelinux:"
+"Mandriva Online fornece unha gran cantidade de valiosos servicios para "
+"<b>actualizar fácilmente</b> os seus sistemas Mandrivalinux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -15782,35 +15782,35 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* Administración de <b>tódolos seus sistemas Mandrakelinux</b> cunha conta."
+"\t* Administración de <b>tódolos seus sistemas Mandrivalinux</b> cunha conta."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Gracias á axuda dos <b>cualificados expertos de Mandrakelinux</b>, aforrará "
+"Gracias á axuda dos <b>cualificados expertos de Mandrivalinux</b>, aforrará "
 "unha chea de tempo."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -16112,8 +16112,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Asistentes de Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Asistentes de Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -16214,7 +16214,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16262,7 +16262,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -18806,13 +18806,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Ferramenta de Informe de Erros de Mandrakelinux"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Ferramenta de Informe de Erros de Mandrivalinux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centro de Control de Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Centro de Control de Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18832,8 +18832,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -18877,7 +18877,7 @@ msgstr "Asistentes de Configuración"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -19304,21 +19304,21 @@ msgstr "Iniciado ó arrincar"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Esta interface ainda non foi configurada.\n"
 "Execute o asistente \"Engadir unha interface\" dende o\n"
-"Centro de Control de Mandrakelinux"
+"Centro de Control de Mandrivalinux"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Non ten configurada ningunha conexión á Internet.\n"
 "Execute o asistente \"%s\" dende o\n"
-"Centro de Control de Mandrakelinux"
+"Centro de Control de Mandrivalinux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -19368,8 +19368,8 @@ msgstr "KDM (KDE Display Manager)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux Display Manager)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -19660,7 +19660,7 @@ msgstr "Importar"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19669,7 +19669,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright © 2001-2002 de Mandrakesoft \n"
+"Copyright © 2001-2002 de Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versión orixinal)\n"
@@ -20167,14 +20167,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright © 2003-2004 Mandrakesoft.\n"
+"Copyright © 2003-2004 Mandriva.\n"
 "Isto é software libre e pode ser redistribuido baixo os termos da GNU GPL.\n"
 "\n"
 "Uso: \n"
@@ -20199,7 +20199,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Centro de Axuda de Linux Mandrake"
 
 #: standalone/drakhelp:36
@@ -23346,8 +23346,8 @@ msgstr "Xa se fixo o cambio, pero para que sexa efectivo debe saír do sistema"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Ferramentas de Logs de Mandrakelinux"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Ferramentas de Logs de Mandrivalinux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -23860,10 +23860,10 @@ msgstr "Conexión establecida."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Fallo ó conectarse.\n"
-"Verifique a configuración no Centro de Control de Mandrakelinux."
+"Verifique a configuración no Centro de Control de Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -24731,5 +24731,5 @@ msgstr "Fallo ó instalar"
 #~ msgid "http://www.mandrakelinux.com/en/101errata.php3"
 #~ msgstr "http://www.mandrakelinux.com/en/101errata.php3"
 
-#~ msgid "The Mandrakelinux 10.1 products are:"
-#~ msgstr "Os productos Mandrakelinux 10.1 son:"
+#~ msgid "The Mandrivalinux 10.1 products are:"
+#~ msgstr "Os productos Mandrivalinux 10.1 son:"
diff --git a/perl-install/share/po/he.po b/perl-install/share/po/he.po
index 30deb7dae..d443359bf 100644
--- a/perl-install/share/po/he.po
+++ b/perl-install/share/po/he.po
@@ -75,7 +75,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -94,7 +94,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -102,7 +102,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -110,7 +110,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -236,7 +236,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1255,7 +1255,7 @@ msgstr "בחירת שפה"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3590,7 +3590,7 @@ msgstr "אפשר תמיכת רדיו"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3704,7 +3704,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3719,11 +3719,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3884,10 +3884,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4028,7 +4028,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4132,12 +4132,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4164,7 +4164,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4173,7 +4173,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4397,7 +4397,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4415,7 +4415,7 @@ msgstr "קודם"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4444,7 +4444,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4473,7 +4473,7 @@ msgstr "מנהל אבטחה"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4628,7 +4628,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4677,7 +4677,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4686,13 +4686,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "שלב זה מופעל רק כאשר זוהתה מחיצת גנו/לינוקס קיימת במחשבך.\n"
 "\n"
@@ -4769,7 +4769,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4929,7 +4929,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4950,7 +4950,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "כעת עליך לבחור מנגנון הדפסה במערכת. מערכות הפעלה אחרות אפשרו לך\n"
@@ -5095,7 +5095,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5112,7 +5112,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5174,7 +5174,7 @@ msgstr "שרותים"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "עליך לבחור את הכונן הקשיח שברצונך למחוק על מנת לפנות מקום\n"
@@ -5527,7 +5527,7 @@ msgstr "חישוב השטח החופשי על מחיצת חלונות"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "מחיצת החלונות אינה מאוחה. עליך להפעיל מחדש את המחשב ולהיכנס לחלונות, ושם "
@@ -5644,19 +5644,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5678,7 +5678,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5686,14 +5686,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5703,7 +5703,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5723,10 +5723,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5737,11 +5737,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5757,7 +5757,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "מבוא\n"
 "\n"
@@ -5770,7 +5770,7 @@ msgstr ""
 "1. הסכם רישוי\n"
 "\n"
 "עליך לקרוא רשיון זה בעיון רב. מסמך זה מהווה הסכם רישוי בינך ובין חברת "
-"Mandrakesoft S.A. לגבי מוצרי התוכנה.\n"
+"Mandriva S.A. לגבי מוצרי התוכנה.\n"
 "התקנה, שכפול או שימוש במוצרי התוכנה בכל צורה שהיא, משמעה שקיבלת והסכמת באופן "
 "מפורש לתנאי וסייגי רישיון זה.\n"
 "אם חלק כלשהו מרשיון זה אינו מקובל עליך, נאסר עליך להתקין, לשכפל או להשתמש "
@@ -5785,19 +5785,19 @@ msgstr ""
 "\n"
 "מוצרי התוכנה והתיעוד הנספח מסופקים \"כמות שהם\", בלי אחריות, עד לגבולות "
 "המותרים על פי חוק.\n"
-"חברת Mandrakesoft S.A. לא תהיה אחראית, בשום תנאי שהוא בכפוף להוראות החוק, "
+"חברת Mandriva S.A. לא תהיה אחראית, בשום תנאי שהוא בכפוף להוראות החוק, "
 "לכל אירוע מיוחד, נזקים ישירים\n"
 "ועקיפים למיניהם (כולל, בין היתר הפסדים הנובעים עקב אובדן עסקים, הפרעה "
 "להתנהלות העסק, הפסד כספי, שכר טרחת\n"
 "עורך דין, קנסות ואגרות הנובעים מהחלטת בית משפט, או הפסד כתוצאה מכך) הנובעים "
 "מהשימוש או מאי היכולת להשתמש\n"
-"במוצרי התוכנה, וזאת גם אם הובאה לידיעתה חברת Mandrakesoft S.A האפשרות "
+"במוצרי התוכנה, וזאת גם אם הובאה לידיעתה חברת Mandriva S.A האפשרות "
 "לאפשרות ההתרחשות של נזקים\n"
 "כאלו.\n"
 "\n"
 "הגבלת אחריות הנובעת משימוש או הפצת תוכנה אסורה במדינות מסויימות\n"
 "\n"
-"בכפוף למגבלות החוק, חברת Mandrakesoft S.A. ומפיציה, לא יהיו אחראים בשום תנאי "
+"בכפוף למגבלות החוק, חברת Mandriva S.A. ומפיציה, לא יהיו אחראים בשום תנאי "
 "שהוא, לכל נזק מיוחד, משני,\n"
 "ישיר או עקיף כלשהו  (כולל, בין היתר הפסדים הנובעים עקב אובדן עסקים, הפרעה "
 "להתנהלות העסק, הפסד כספי, שכר\n"
@@ -5818,9 +5818,9 @@ msgstr ""
 "להפיץ את המרכיבים אשר הם מכסים. עליך לקרוא בעיון את התנאים והסייגים של כל "
 "מרכיב לפני השימוש במרכיב כלשהו.\n"
 "עליך להפנות כל שאלה בנוגע לרשיון השימוש הנוגעת לרשיון של מרכיב כלשהו למפתח "
-"התוכנה ולא ל Mandrakesoft.\n"
-"  התוכנות שפותחו ע\"י חברת Mandrakesoft S.A. כפופים לרשיון ה GPL. תיעוד "
-"שנכתב על ידי חברת Mandrakesoft\n"
+"התוכנה ולא ל Mandriva.\n"
+"  התוכנות שפותחו ע\"י חברת Mandriva S.A. כפופים לרשיון ה GPL. תיעוד "
+"שנכתב על ידי חברת Mandriva\n"
 "כפוף לרשיון מיוחד. עליך לעיין בתיעוד למידע נוסף בנידון.\n"
 "\n"
 "\n"
@@ -5829,12 +5829,12 @@ msgstr ""
 "כל הזכויות למרכיבים של מוצרי התוכנה שייכים למפתחיהם בהתאמה ומוגנים על ידי "
 "חוקי קניין רוחני וזכויות יוצרים התקפים\n"
 "לגבי מוצרי תוכנה.\n"
-"חברת Mandrakesoft S.A. שומרת לעצמה את הזכות לשנות או להתאים את מוצרי התוכנה, "
+"חברת Mandriva S.A. שומרת לעצמה את הזכות לשנות או להתאים את מוצרי התוכנה, "
 "כמקשה אחת או בחלקים,\n"
 "בכל שיטה שהיא ולכל צורך שהוא.\n"
-"השמות \"Mandrake\", \"מנדרייק-לינוקס\" וסמלים מסחריים הקשורים אליהם הם שמות "
+"השמות \"Mandriva\", \"מנדרייק-לינוקס\" וסמלים מסחריים הקשורים אליהם הם שמות "
 "שמורים של חברת\n"
-"Mandrakesoft S.A.\n"
+"Mandriva S.A.\n"
 "\n"
 "\n"
 "5. תקפות לחוק\n"
@@ -5845,7 +5845,7 @@ msgstr ""
 "התנאים והסייגים של רישיון זה כפופים לחוקי צרפת. יש לשאוף להגיע להסכמה בכל "
 "ויכוח לגבי תנאי רשיון זה מחוץ לכתלי\n"
 "בית המשפט. כמוצא אחרון, הויכוח יובא בפני בית המשפט המתאים של פריז - צרפת.\n"
-"בכל שאלה הנוגעת למסמך זה, יש לפנות לחברת Mandrakesoft S.A.\n"
+"בכל שאלה הנוגעת למסמך זה, יש לפנות לחברת Mandriva S.A.\n"
 "\n"
 "\n"
 "נספח\n"
@@ -5854,7 +5854,7 @@ msgstr ""
 "(מנדרייק לינוקס). התרגום מסופק על\n"
 "מנת לאפשר לך להבין את תנאי הרישוי של הפצה זו, אולם זה אינו תרגום מחייב. "
 "השימוש בהפצה כפוף לרשיון השימוש המקורי,\n"
-"בשפה האנגלית, המופיע בתקליטור. מתרגמי ההפצה ו/או חברת Mandrakesoft לא יהיו "
+"בשפה האנגלית, המופיע בתקליטור. מתרגמי ההפצה ו/או חברת Mandriva לא יהיו "
 "אחראים לכל אי-הבנה ותוצאותיה\n"
 "שעלולים לנבוע מהסתמכות על התרגום הזה, ו/או אי הבנה ותוצאותיה שעלולים לנבוע "
 "כתוצאה מתרגום מרכיבים אחר בהפצה\n"
@@ -5929,7 +5929,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5937,7 +5937,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "ברכותינו, ההתקנה הסתיימה.\n"
 "עליך להוציא את תקליטור ההתקנה ולאחר מכן ללחוץ על \"הפעלה מחדש\" להמשך.\n"
@@ -5984,7 +5984,7 @@ msgstr "נכנס לשלב `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -6524,7 +6524,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr "מתחבר לאתר מנדרייק-לינוקס בכדי לקבל רשימה של אתרי מראה זמינים..."
 
 #: install_steps_interactive.pm:840
@@ -6741,7 +6741,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
 msgstr "התקנת מנדרייק-לינוקס %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -9318,7 +9318,7 @@ msgstr "ביטורנט"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -13186,7 +13186,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14945,18 +14945,18 @@ msgstr "הפסק"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr "מהי מנדרייק-לינוקס?"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
 msgstr "ברוך בואך אל מנדרייק-לינוקס!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14968,7 +14968,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 "מנדרייק-לינוקס היא הפצת הלינוקס הידידותית ביותר כיום. מנדרייק-לינוקס היא גם "
@@ -14987,9 +14987,9 @@ msgstr "ברוך בואך לעולם הקוד הפתוח!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 "מנדרייק-לינוקס מחוייבת למודל הקוד הפתוח. משמעות הדבר היא שגרסת הפצה חדשה זו "
@@ -15012,7 +15012,7 @@ msgstr "רשיון ה-GPL"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "רוב התוכנות הכלולות בהפצה וכל הכלים של מנדרייק-לינוקס כפופים לרישיון הציבורי "
 "הכללי של גנו (GPL)."
@@ -15045,10 +15045,10 @@ msgstr "הצטרפות לקהילה"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 "למנדרייק-לינוקס יש את אחת מקהילות המפתחים והמשתמשים הגדולות ביותר. התפקידים "
 "של קהילה זו הם מגוונים, החל מדיווח אודות בעיות ועד פיתוח של  תוכנות חדשות. "
@@ -15073,8 +15073,8 @@ msgstr "גרסת ההורדה"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 "הגרסה שתותקן במחשבך היא גרסת ההורדה של מנדרייק-לינוקס. זו גרסה חופשית "
 "וחינמית שמנדרייקסופט רוצה להעניק לקהילה."
@@ -15107,7 +15107,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "כמו כן, גרסת ההורדה אינה מקנה לך גישה לשרותי ערך מוסף הכלולים במוצרים האחרים "
 "של מנדרייקסופט."
@@ -15119,7 +15119,7 @@ msgstr "Discovery - גרסת הלינוקס השולחנית למשתמשים ח
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr "מנדרייק-לינוקס Discovery מותקנת כעת."
 
 #: share/advertising/06.pl:17
@@ -15141,13 +15141,13 @@ msgstr "PowerPack, שולחן העבודה האולטימטיבי למשתמשי
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr "מנדרייק-לינוקס PowerPack מותקנת כעת."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -15161,7 +15161,7 @@ msgstr "PowerPack+, פתרון לינוקס לשולחנות עבודה ושרת
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr "כעת מותקנת מנדרייק-לינוקס PowerPack+"
 
 #: share/advertising/08.pl:17
@@ -15175,19 +15175,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr "מוצרי מנדרייקסופט"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr "מנדרייקסופט פיתחה מגוון רחב של מוצרי מנדרייק-לינוקס."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr "מוצרי מנדרייק-לינוקס הם:"
 
 #: share/advertising/09.pl:18
@@ -15208,7 +15208,7 @@ msgstr "\t* PowerPack+, פתרון הלינוקס המתאים הן לשולחן
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 "\t* מנדרייק-לינוקס עבור x86-64</b>, מערכת מנדרייק-לינוקס המיועדת לניצול "
@@ -15216,13 +15216,13 @@ msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr "מוצרי מנדרייקסופט (מסדרת Nomad)"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 "מנדרייקסופט פיתחה שני מוצרים המאפשרים לך להשתמש במנדרייק-לינוקס על כל מחשב "
@@ -15231,14 +15231,14 @@ msgstr ""
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr "\t* Move, הפצת מנדרייק-לינוקס שניתנת להפעלה מתקליטור ללא התקנה."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 "\t* GlobeTrotter, הפצת מנדרייק-לינוקס המגיעה מותקנת בתוך כונן קומפקטי ונייד "
@@ -15246,29 +15246,29 @@ msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr "מוצרי מנדרייקסופט (פתרונות מקצועיים)"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr "להלן רשימת מוצרי מנדרייק-סופט המיועדים לענות על צרכים מקצועיים:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr "\t* Corporate Desktop, הפצת מנדרייק-לינוקס השולחנית המיועדת לעסקים."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr "\t* Corporate Server, פתרון השרת מבוסס מנדרייק-לינוקס לעסקים."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr "\t* Multi-Network Firewall, פתרון אבטחה מבוסס מנדרייק-לינוקס."
 
 #: share/advertising/12.pl:13
@@ -15308,7 +15308,7 @@ msgstr "בחירת סביבת העבודה הגרפית שלך"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -15329,7 +15329,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -15450,7 +15450,7 @@ msgstr "הנאה ממגוון רחב של יישומים"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr "בתפריט של מנדרייק-לינוקס נמצאים יישומים קלים לשימוש לכל צרכיך: "
 
@@ -15689,14 +15689,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr "מרכז הבקרה של מנדרייק-לינוקס"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 "מרכז הבקרה של מנדרייק-לינוקס כולל מגוון כלי עזר ייחודיים למנדרייק שיקלו את "
@@ -15723,9 +15723,9 @@ msgstr "מודל הקוד הפתוח"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -15737,7 +15737,7 @@ msgstr "החנות המקוונת"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr "בחנות המקוונת שלנו ניתן למצוא מגוון מוצרים ושרותים של מנדרייקסופט."
 
@@ -15760,20 +15760,20 @@ msgstr "אנו מזמינים אותך לבקר כבר היום בכתובת sto
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "Mandrakeclub"
+msgid "<b>Mandriva Club</b>"
+msgstr "Mandriva Club"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr "מועדון מנדרייק הוא השרות המושלם למוצר מנדרייק-לינוקס שברשותך."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 "הצטרפות למועדון-מנדרייק תעניק לך גישה להטבות רבות ערך, מוצרים ושרותים, כגון:"
 
@@ -15797,27 +15797,27 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr "\t* השתתפות בפורומי המשתמשים של מנדרייק-לינוקס"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* גישה ראשונית ומועדפת לתמונות תקליטור של גרסאות ציבוריות של מנדרייק-"
 "לינוקס, לפני הציבור הרחב."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr "מנדרייק-אונליין"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 "מנדרייק-אונליין הוא שרות ערך מוסף חדש שמנדרייקסופט גאה להציע ללקוחותיה!"
@@ -15825,8 +15825,8 @@ msgstr ""
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 "מנדרייק-אונליין מספק מגוון רחב של שרותים רבי ערך לעדכון קל של מערכות מנדרייק-"
 "לינוקס שברשותך:"
@@ -15853,18 +15853,18 @@ msgstr "\t* עדכונים גמישים במועדים מתוכננים מראש
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr "\t* ניהול כל מערכות מנדרייק-לינוקס שברשותך בעזרת חשבון אחד."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "Mandrakeexpert"
+msgid "<b>Mandriva Expert</b>"
+msgstr "Mandriva Expert"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "האם דרושה לך עזרה? המומחים המקצועניים של מנדרייקסופט מחכים לך במערכת התמיכה "
@@ -15873,14 +15873,14 @@ msgstr ""
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr "הודות לעזרה של מומחי מנדרייק-לינוקס מוסמכים, ייחסך לך זמן רב."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 "אם יש לך שאלות הנוגעות למנדרייק-לינוקס, יש באפשרותך לרכוש יחידות תמיכה בחנות "
@@ -16178,7 +16178,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr "אשפי מנדרייקסופט"
 
 #: share/compssUsers.pl:197
@@ -16316,7 +16316,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16330,7 +16330,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : MTS אפשור\n"
 "--disable        : MTS ביטול\n"
 "--start          : MTS התחלת\n"
@@ -16384,7 +16384,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -18945,12 +18945,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "כלי דיווח התקלות של מנדרייק-לינוקס"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
 msgstr "מרכז הבקרה של מנדרייק-לינוקס"
 
 #: standalone/drakbug:48
@@ -18971,7 +18971,7 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "חנות מנדרייק"
 
 #: standalone/drakbug:52
@@ -19016,7 +19016,7 @@ msgstr "אשפי ההגדרות"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr "עליך לבחור את תוכנת מנדרייקסופט בה חלה תקלה: "
 
 #: standalone/drakbug:82
@@ -19439,7 +19439,7 @@ msgstr "מופעל באתחול"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "הממשק לא הוגדר עדיין.\n"
 "עליך להפעיל את האשף \"הוספת ממשק\" ממרכז הבקרה של מנדרייק-לינוקס"
@@ -19448,7 +19448,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "החיבור לאינטרנט לא הוגדר עדיין.\n"
 "עליך להפעיל את האשף \"%s\" ממרכז הבקרה של מנדרייק-לינוקס"
@@ -19501,7 +19501,7 @@ msgstr "מנהל ההפעלה של פרוייקט KDE"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr "מנהל ההפעלה של מנדרייק-לינוקס MdkKDM"
 
 #: standalone/drakedm:37
@@ -19797,7 +19797,7 @@ msgstr "ייבוא"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -20301,14 +20301,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "זוהי תוכנה חופשית ומותר להפיצה מחדש בהתאם לתנאי הרשיון GNU GPL.\n"
 "\n"
 "שימוש: \n"
@@ -20333,7 +20333,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "מרכז הבקרה של מנדרייק-לינוקס"
 
 #: standalone/drakhelp:36
@@ -23364,7 +23364,7 @@ msgstr "השינוי הסתיים, אך כדי שיהיה בעל משמעות ע
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "כלי רישום של מנדרייק-לינוקס"
 
 #: standalone/logdrake:51
@@ -23877,7 +23877,7 @@ msgstr "התחברות הושלמה."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "התחברות נכשלה.\n"
 "נא לבדוק את ההגדרות במרכז ההגדרות של Mandrake."
diff --git a/perl-install/share/po/help-de.pot b/perl-install/share/po/help-de.pot
index 62b76bcbf..c454dccdf 100644
--- a/perl-install/share/po/help-de.pot
+++ b/perl-install/share/po/help-de.pot
@@ -5,12 +5,12 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -37,7 +37,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux 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 ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you won't be able to undo this operation\n"
 "after you confirm.\n"
 "\n"
@@ -65,11 +65,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 Mandrakelinux\n"
+"Sie müssen nun entscheiden, wo auf Ihrer/n Festplatte(n) Ihr Mandrivalinux\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 Mandrakelinux darauf installiert\n"
+"Plattenplatz so aufzuteilen, dass Ihr Mandrivalinux darauf installiert\n"
 "werden kann.\n"
 "\n"
 "Da dieser Schritt normalerweise irreversibel ist und auch zu Datenverlusten\n"
@@ -100,7 +100,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 Mandrakelinux) nebeneinander nutzen\n"
+"Betriebssysteme (Microsoft Windows und Mandrivalinux) nebeneinander nutzen\n"
 "wollen.\n"
 "\n"
 "   Bevor Sie sich für diese Variante entscheiden, sei hier noch einmal\n"
@@ -108,7 +108,7 @@ msgstr ""
 "als momentan.\n"
 "\n"
 " * „%s“: Falls Sie alle Daten Ihrer Platte verlieren, und sie durch Ihr\n"
-"neues Mandrakelinux System ersetzen wollen, wählen Sie diese Schaltfläche.\n"
+"neues Mandrivalinux 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"
@@ -233,7 +233,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -242,41 +242,41 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data won't be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux 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"
 "\n"
 "DrakX fragt Sie nun nach der gewünschten Installationsart. Sie haben die\n"
 "Wahl zwischen einer Aktualisierung einer bereits vorhandenen\n"
-"Mandrakelinux-Version oder einer kompletten Neuinstallation:\n"
+"Mandrivalinux-Version oder einer kompletten Neuinstallation:\n"
 "\n"
-" * „%s“: Entfernt komplett ältere Versionen von Mandrakelinux, die noch\n"
+" * „%s“: Entfernt komplett ältere Versionen von Mandrivalinux, 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. Diese Installationsart ist gut, wenn Sie die\n"
 "Partitionseinteilung auf Ihrer Festplatte sowieso ändern oder das benutzte\n"
 "Dateisystem austauschen wollen\n"
 "\n"
-" * „%s“: Mit dieser Variante können Sie eine existierende Mandrakelinux\n"
+" * „%s“: Mit dieser Variante können Sie eine existierende Mandrivalinux\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 Mandrakelinux „8.1“ oder neueren Systemen sollten\n"
-"problemlos funktionieren. Ältere Versionen von Mandrakelinux sollten Sie\n"
+"Aktualisierungen von Mandrivalinux „8.1“ oder neueren Systemen sollten\n"
+"problemlos funktionieren. Ältere Versionen von Mandrivalinux 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 ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -288,7 +288,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandrakelinux\n"
+"Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandrivalinux\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"
@@ -310,7 +310,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -339,7 +339,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 Mandrakelinux zu schaffen.\n"
+"Sie verkleinern wollen, um Platz für Ihr neues Mandrivalinux zu schaffen.\n"
 "\n"
 "Die Partitionen werden folgendermaßen aufgelistet: „Linux-Name“,\n"
 "„Windows-Name“, „Kapazität“.\n"
@@ -372,7 +372,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -428,7 +428,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 Mandrakelinux Ihnen anbietet (wie etwa KDE, GNOME,\n"
+"Benutzerumgebungen, die Mandrivalinux Ihnen anbietet (wie etwa KDE, GNOME,\n"
 "AfterStep oder WindowMaker).\n"
 "\n"
 "Sie erhalten eine Liste möglicher Parameter, mit deren Hilfe Sie die\n"
@@ -490,7 +490,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\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -511,11 +511,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you don't like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Hier können Sie das Drucksystem für Ihren Rechner wählen. Andere\n"
-"Betriebssysteme bieten Ihnen nur eines, bei Mandrakelinux können Sie\n"
+"Betriebssysteme bieten Ihnen nur eines, bei Mandrivalinux können Sie\n"
 "zwischen zwei verschiedenen wählen. jedes dieser Systeme ist für eine\n"
 "bestimmte Konfiguration des Systems am besten geeignet.\n"
 "\n"
@@ -537,18 +537,18 @@ msgstr ""
 "starten. „%s“ bietet grafische Konfigurations- und Druckmenüs.\n"
 "\n"
 "Sie können diese Wahl später immer wieder ändern, indem Sie PrinterDrake\n"
-"aus dem Mandrakelinux Control Center starten und dort die Schaltfläche „%s“\n"
+"aus dem Mandrivalinux Control Center starten und dort die Schaltfläche „%s“\n"
 "betätigen."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -600,7 +600,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Nun ist es Zeit sich zu entscheiden, welche Programme Sie auf Ihrem Rechner\n"
-"installieren wollen. Es gibt tausende von Paketen für Mandrakelinux, und\n"
+"installieren wollen. Es gibt tausende von Paketen für Mandrivalinux, und\n"
 "Sie müssen sie nicht alle auswendig kennen.\n"
 "\n"
 "Die Pakete sind nach ihrer Verwendung in vier Kategorien eingeteilt. Sie\n"
@@ -657,13 +657,13 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Die Mandrakelinux-Distribution wird auf mehreren CD-ROMs ausgeliefert. Es\n"
+"Die Mandrivalinux-Distribution wird auf mehreren CD-ROMs ausgeliefert. Es\n"
 "kann daher vorkommen, dass DrakX Pakete von anderen, als der\n"
 "Installations-CD-ROM installieren will. In diesem Fall wird es die aktuelle\n"
 "CD auswerfen und nach einer anderen fragen. Wenn Sie dieses CD nicht haben,\n"
@@ -781,10 +781,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you don't know what a particular service is supposed to do or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
 "the listed services and they will be started automatically at boot time. !!\n"
@@ -813,7 +813,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 Mandrakelinux werden installierte Server und Dienste automatisch beim\n"
+"Unter Mandrivalinux werden installierte Server und Dienste automatisch beim\n"
 "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"
@@ -933,7 +933,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -974,7 +974,7 @@ msgstr ""
 "Zur 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 Mandrakelinux diese\n"
+"leider immer noch nicht gegeben. Daher verwendet Mandrivalinux diese\n"
 "Kodierung nur auf Wunsch des Anwenders:\n"
 "\n"
 " * Falls Sie eine Sprache nutzen, die eine gut unterstütztes Kodierung\n"
@@ -1016,11 +1016,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"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux 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"
-"Mandrakelinux zu installieren. Bedenken Sie dabei, dass alle Daten auf\n"
+"Mandrivalinux 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:
@@ -1072,7 +1072,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you don't know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -1086,7 +1086,7 @@ msgstr ""
 "\n"
 "Sollten Sie sich an dieser Stelle nicht sicher sein, so behalten Sie die\n"
 "Standardeinstellung bei. Sie können die Ebene später noch mittels draksec\n"
-"im Mandrakelinux Control Center anpassen.\n"
+"im Mandrivalinux Control Center anpassen.\n"
 "\n"
 "Das Feld „%s“ dient dazu, dem System mitzuteilen, wer für die Sicherheit\n"
 "dieses Rechners verantwortlich ist. An dieses Kennzeichen/diese E-Mail\n"
@@ -1138,7 +1138,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -1155,7 +1155,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -1206,7 +1206,7 @@ msgstr ""
 "\n"
 " * „%s“: Falls Sie Ihren Internetzugang oder Ihr lokales Netzwerk nun\n"
 "einrichten wollen, können Sie das hier tun. Lesen Sie sich dazu die\n"
-"gedruckte Dokumentation durch oder benutzen Sie das Mandrakelinux Control\n"
+"gedruckte Dokumentation durch oder benutzen Sie das Mandrivalinux Control\n"
 "Center nachdem die Installation beendet ist.\n"
 "\n"
 " * „%s“: Hier können Sie HTTP- und FTP-Proxyadressen eintragen falls Ihre\n"
@@ -1225,10 +1225,10 @@ msgstr ""
 "(„Bootloader“) ändern wollen, wählen Sie diese Schaltfläche. Es sei\n"
 "angemerkt, dass dieser Punkt sich an fortgeschrittenere Nutzer richtet.\n"
 "Hilfe finden Sie in der gedruckten Dokumentation oder im integrierten\n"
-"Hilfeteil des Mandrakelinux Control Center.\n"
+"Hilfeteil des Mandrivalinux Control Center.\n"
 "\n"
 " * „%s“: Sie können hier die Dienste wählen, die ab dem Start von\n"
-"Mandrakelinux zur Verfügung gestellt werden sollen. Wollen Sie den Rechner\n"
+"Mandrivalinux zur Verfügung gestellt werden sollen. Wollen Sie den Rechner\n"
 "als Server verwenden, sollten Sie unbedingt einen Blick auf diese Liste\n"
 "werfen."
 
@@ -1338,7 +1338,7 @@ 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 Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -1526,7 +1526,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -1548,7 +1548,7 @@ msgstr ""
 "Schaltfläche „%s“, um mit dem Formatieren der Partitionen zu beginnen.\n"
 "\n"
 "Betätigen Sie „%s“, wenn Sie eine andere Partition für Ihr neues\n"
-"Mandrakelinux vorgesehen haben.\n"
+"Mandrivalinux vorgesehen haben.\n"
 "\n"
 "Betätigen Sie die Schaltfläche „%s“, falls Sie Partitionen auf defekte\n"
 "Blöcke untersuchen wollen."
@@ -1670,7 +1670,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 Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -1741,7 +1741,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Sie müssen nun entscheiden, auf welche(n) Partition(en) Ihr neues\n"
-"Mandrakelinux System installiert werden soll. Falls bereits Partitionen\n"
+"Mandrivalinux System installiert werden soll. Falls bereits Partitionen\n"
 "existieren (etwa von einer früheren Installation von GNU/Linux oder durch\n"
 "das Erzeugen mit einem anderen Partitionierungswerkzeug), können Sie diese\n"
 "verwenden. Anderenfalls müssen Sie Partitionen definieren.\n"
diff --git a/perl-install/share/po/help-es.pot b/perl-install/share/po/help-es.pot
index cdb49450d..4a26d308e 100644
--- a/perl-install/share/po/help-es.pot
+++ b/perl-install/share/po/help-es.pot
@@ -5,12 +5,12 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -37,7 +37,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux 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 ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you won't be able to undo this operation\n"
 "after you confirm.\n"
 "\n"
@@ -66,11 +66,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 Mandrakelinux. Si su disco rígido está vacío o si un\n"
+"sistema operativo Mandrivalinux. 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 Mandrakelinux nuevo.\n"
+"sistema Mandrivalinux 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, el particionado puede\n"
@@ -100,7 +100,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 Mandrakelinux como Microsoft Windows\n"
+"esta solución si desea utilizar tanto Mandrivalinux 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"
@@ -110,7 +110,7 @@ msgstr ""
 "\n"
 " * \"%s\". Si desea borrar todos los datos y todas las particiones\n"
 "presentes en su disco rígido y reemplazarlos con su nuevo sistema\n"
-"Mandrakelinux, seleccione esta opción. Tenga cuidado con esta solución ya\n"
+"Mandrivalinux, seleccione esta opción. Tenga cuidado con esta solución ya\n"
 "que no podrá revertir su elección después de confirmarla.\n"
 "\n"
 "   !! Si elige esta opción, se perderán todos los datos en su disco. !!\n"
@@ -234,7 +234,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -243,19 +243,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data won't be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Este paso se activa sólo si se encontró una partición GNU/Linux existente\n"
 "en su máquina.\n"
 "\n"
 "DrakX ahora necesita saber si desea realizar una instalación nueva o una\n"
-"actualización de un sistema Mandrakelinux existente:\n"
+"actualización de un sistema Mandrivalinux existente:\n"
 "\n"
 " * \"%s\". En gran parte, esta opción borrará por completo el sistema\n"
 "anterior. Sin embargo, dependiendo de su esquema de particiones, puede\n"
@@ -264,20 +264,20 @@ msgstr ""
 "particionan sus discos, debería usar esta opción.\n"
 "\n"
 " * \"%s\": Esta clase de instalación le permite actualizar los paquetes que\n"
-"en este momento están instalados en su sistema Mandrakelinux. No se alteran\n"
+"en este momento están instalados en su sistema Mandrivalinux. No se alteran\n"
 "las particiones corrientes de sus discos ni los datos de los usuarios. La\n"
 "mayoría de los otros pasos de configuración permanecen disponibles y son\n"
 "similares a una instalación estándar.\n"
 "\n"
 "El uso de la opción \"Actualizar\" debería funcionar sin problemas para los\n"
-"sistemas Mandrakelinux que corren la versión \"8.1\" o una posterior. No se\n"
+"sistemas Mandrivalinux que corren la versión \"8.1\" o una posterior. No se\n"
 "recomienda realizar una actualización sobre versiones anteriores a\n"
-"Mandrakelinux versión \"8.1\"."
+"Mandrivalinux versión \"8.1\"."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -289,7 +289,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Es probable que cuando instale Mandrakelinux algunos paquetes se hayan\n"
+"Es probable que cuando instale Mandrivalinux algunos paquetes se hayan\n"
 "actualizado desde la publicación inicial. Se pueden haber corregido errores\n"
 "y solucionado problemas de seguridad. Para permitir que Usted se beneficie\n"
 "de estas actualizaciones, ahora las puede descargar desde la Internet.\n"
@@ -307,7 +307,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -337,7 +337,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 Mandrakelinux nuevo.\n"
+"instalar su sistema operativo Mandrivalinux nuevo.\n"
 "\n"
 "Cada partición se lista como sigue: \"Nombre Linux\", \"Nombre Windows\",\n"
 "\"Capacidad\".\n"
@@ -374,7 +374,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -430,7 +430,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 Mandrakelinux.\n"
+"AfterStep, WindowMaker, etc.) que se incluyen con Mandrivalinux.\n"
 "\n"
 "Se le presentará la lista de parámetros diferentes a cambiar para obtener\n"
 "una presentación gráfica óptima.\n"
@@ -489,7 +489,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\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -510,12 +510,12 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you don't like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Ahora es el momento de seleccionar un sistema de impresión para su\n"
 "computadora. Otros sistemas operativos pueden ofrecerle uno, pero\n"
-"Mandrakelinux le ofrece dos. Cada uno de los sistemas de impresión es más\n"
+"Mandrivalinux le ofrece dos. Cada uno de los sistemas de impresión es más\n"
 "adecuado para tipos de configuración particulares.\n"
 "\n"
 " * \"%s\" - \"print, don't queue\" (imprimir sin poner en cola) es la\n"
@@ -538,17 +538,17 @@ msgstr ""
 "\n"
 "Si hace una elección ahora y más tarde encuentra que a Usted no le gusta su\n"
 "sistema de impresión, puede cambiarlo ejecutando PrinterDrake desde el\n"
-"Centro de Control de Mandrakelinux y haciendo clic sobre el botón \"%s\"."
+"Centro de Control de Mandrivalinux y haciendo clic sobre el botón \"%s\"."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -600,11 +600,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "Ahora es el momento de especificar los programas que desea instalar en su\n"
-"sistema. Hay miles de paquetes disponibles para Mandrakelinux, y para hacer\n"
+"sistema. Hay miles de paquetes disponibles para Mandrivalinux, y para hacer\n"
 "más simple el manejo de los paquetes, los mismos se han puesto en grupos de\n"
 "aplicaciones similares.\n"
 "\n"
-"Mandrakelinux clasifica los grupos de paquetes en cuatro categorías. Puede\n"
+"Mandrivalinux clasifica los grupos de paquetes en cuatro categorías. Puede\n"
 "mezclar y hacer coincidir aplicaciones de varias categorías, por lo que una\n"
 "instalación de \"Estación de trabajo\" puede tener instaladas aplicaciones\n"
 "de la categoría \"Desarrollo\".\n"
@@ -658,13 +658,13 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"La instalación de Mandrakelinux se distribuye en varios CD-ROM. Si un\n"
+"La instalación de Mandrivalinux 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 necesario. Si no tiene el CD necesario\n"
 "a mano, simplemente haga clic sobre \"%s\", no se instalarán los paquetes\n"
@@ -782,10 +782,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you don't know what a particular service is supposed to do or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
 "the listed services and they will be started automatically at boot time. !!\n"
@@ -819,11 +819,11 @@ msgstr ""
 "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. De manera predeterminada,\n"
-"Mandrakelinux iniciará automáticamente todos los servicios instalados al\n"
+"Mandrivalinux iniciará automáticamente todos los servicios instalados al\n"
 "momento del arranque. Aunque estos son seguros y no tienen problemas\n"
 "conocidos al momento en que se publicó la distribución, es muy posible que\n"
 "se descubran vulnerabilidades en la seguridad luego que se terminó con esta\n"
-"versión de Mandrakelinux. Si no sabe que es lo que se supone que hace un\n"
+"versión de Mandrivalinux. Si no sabe que es lo que se supone que hace un\n"
 "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 los mismos se iniciarán automáticamente al momento del arranque.\n"
@@ -937,7 +937,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -978,7 +978,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, Mandrakelinux lo usará o no dependiendo de las elecciones\n"
+"Por esta razón, Mandrivalinux 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"
@@ -1021,11 +1021,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"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux 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"
-"Mandrakelinux nueva. Tenga cuidado, ¡se perderán todos los datos presentes\n"
+"Mandrivalinux 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:
@@ -1078,7 +1078,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you don't know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -1092,7 +1092,7 @@ msgstr ""
 "\n"
 "Si no sabe cual elegir, mantenga la opción predeterminada. Podrá cambiarla\n"
 "más adelante con la herramienta draksec, que es parte del Centro de Control\n"
-"de Mandrakelinux.\n"
+"de Mandrivalinux.\n"
 "\n"
 "Complete el campo \"%s\" con la dirección de correo electrónico de la\n"
 "persona responsable de la seguridad. Los mensajes relativos a la seguridad\n"
@@ -1144,7 +1144,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -1161,7 +1161,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -1213,7 +1213,7 @@ msgstr ""
 "\n"
 " * \"%s\": si desea configurar ahora el acceso a la Internet o a su red\n"
 "local, puede hacerlo ahora. Consulte la documentación impresa o utilice el\n"
-"Centro de Control de Mandrakelinux luego que finalizó la instalación para\n"
+"Centro de Control de Mandrivalinux luego que finalizó la instalación para\n"
 "aprovechar la ayuda en línea completa.\n"
 "\n"
 " * \"%s\": permite configurar las direcciones de los proxy HTTP y FTP si la\n"
@@ -1232,7 +1232,7 @@ msgstr ""
 "haga clic sobre este botón. Esto debería estar reservado para los usuarios\n"
 "avanzados. Consulte la documentación impresa o la ayuda en línea acerca de\n"
 "la configuración del cargador de arranque en el Centro de Control de\n"
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 " * \"%s\": por medio de esta entrada podrá tener un control fino sobre qué\n"
 "servicios correrán en su máquina. Si planifica utilizar esta máquina como\n"
@@ -1346,12 +1346,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 Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button 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 Mandrakelinux. Si está de\n"
+"licencia. La misma cubre a toda la distribución Mandrivalinux. Si está de\n"
 "acuerdo con todos los términos en la misma, haga clic en el botón \"%s\".\n"
 "Si no, haga clic en el botón \"%s\" lo que reiniciará su computadora."
 
@@ -1535,7 +1535,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -1558,7 +1558,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 Mandrakelinux nuevo.\n"
+"de su sistema operativo Mandrivalinux nuevo.\n"
 "\n"
 "Haga clic sobre \"%s\" si desea seleccionar las particiones del disco en\n"
 "las que se buscarán bloques defectuosos."
@@ -1677,7 +1677,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 Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -1748,7 +1748,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Ahora necesita elegir qué particiones se utilizarán para la instalación de\n"
-"su sistema Mandrakelinux. Si ya se han definido particiones, ya sea por una\n"
+"su sistema Mandrivalinux. Si ya se han definido particiones, ya sea por una\n"
 "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 591913853..56353ecfa 100644
--- a/perl-install/share/po/help-fr.pot
+++ b/perl-install/share/po/help-fr.pot
@@ -5,12 +5,12 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -37,7 +37,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux 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 ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you won't be able to undo this operation\n"
 "after you confirm.\n"
 "\n"
@@ -66,7 +66,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 Mandrakelinux. Si votre disque est vide ou utilisé par un\n"
+"installation de Mandrivalinux. 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"
@@ -96,7 +96,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 Mandrakelinux et Microsoft Windows sur le\n"
+"recommandée pour faire cohabiter Mandrivalinux et Microsoft Windows sur le\n"
 "même ordinateur.\n"
 "\n"
 "   Avant de choisir cette option, il faut comprendre qu'après cette\n"
@@ -106,7 +106,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"
-"Mandrakelinux, choisissez cette option. Soyez prudent, car ce choix est\n"
+"Mandrivalinux, 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"
@@ -227,7 +227,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -236,19 +236,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data won't be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Cette étape ne s'affichera que si une partition GNU/Linux a été détectée\n"
 "sur votre disque dur.\n"
 "\n"
 "DrakX doit maintenant savoir si vous désirez lancer une « %s » ou une\n"
-"« %s » d'un système Mandrakelinux déjà installé :\n"
+"« %s » d'un système Mandrivalinux déjà installé :\n"
 "\n"
 " * « %s » : remplace l'ancien système. Cependant, selon votre table de\n"
 "partition, vous pourrez éviter l'effacement de vos données existantes\n"
@@ -257,13 +257,13 @@ msgstr ""
 "vous devriez utiliser cette option.\n"
 "\n"
 " * « %s » : cette classe d'installation vous permet de mettre à jour\n"
-"seulement les paquetages qui composent votre système Mandrakelinux. Elle\n"
+"seulement les paquetages qui composent votre système Mandrivalinux. Elle\n"
 "conserve les partitions existantes, ainsi que la configuration des\n"
 "utilisateurs. La plupart des autres étapes d'une installation classique\n"
 "sont accessibles.\n"
 "\n"
 "La mise à jour devrait fonctionner correctement pour les systèmes\n"
-"Mandrakelinux à partir de la version « 8.1 ». Essayer de lancer une mise à\n"
+"Mandrivalinux à partir de la version « 8.1 ». Essayer de lancer une mise à\n"
 "jour sur les versions antérieures à « 8.1 » n'est pas recommandé."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -271,7 +271,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -301,7 +301,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"
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 "Chaque partition est identifiée comme suit: \"Nom linux\", \"Nom Windows\",\n"
 "\"Capacité\".\n"
@@ -333,7 +333,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -345,7 +345,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Au moment où vous installez Mandrakelinux, il est possible que certains\n"
+"Au moment où vous installez Mandrivalinux, il est possible que certains\n"
 "paquetages aient été mis à jour depuis la sortie du produit. Des bogues ont\n"
 "pu être corrigés, et des problèmes de sécurité résolus. Pour vous permettre\n"
 "de bénéficier de ces mises à jour, il vous est maintenant proposé de les\n"
@@ -363,7 +363,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -419,7 +419,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 Mandrakelinux dépendent de X.\n"
+"etc.) présents sur Mandrivalinux dépendent de X.\n"
 "\n"
 "Il vous sera présenté une liste de divers paramètres à changer pour obtenir\n"
 "un affichage optimal :\n"
@@ -479,7 +479,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\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -500,11 +500,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you don't like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Il faut choisir ici un système d'impression pour votre ordinateur. D'autres\n"
-"OS en offrent un, Mandrakelinux en propose deux. Chaque système\n"
+"OS en offrent un, Mandrivalinux en propose deux. Chaque système\n"
 "d'impression convient le mieux à certains types de configuration.\n"
 "\n"
 " * « %s » - qui veut dire « print, don't queue », (ou, impression sans\n"
@@ -526,17 +526,17 @@ msgstr ""
 "Si vous choisissez votre système d'impression maintenant et que par la\n"
 "suite vous n'en seriez pas convaincu, vous pourrez le changer\n"
 "ultérieurement en lançant PrinterDrake depuis le Centre de contrôle\n"
-"Mandrakelinux puis en cliquant sur le bouton « %s »."
+"Mandrivalinux puis en cliquant sur le bouton « %s »."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -588,11 +588,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "C'est maintenant le moment de choisir les paquetages qui seront installés\n"
-"sur votre système. Sachez que Mandrakelinux contient plusieurs milliers de\n"
+"sur votre système. Sachez que Mandrivalinux contient plusieurs milliers de\n"
 "paquetages à installer, et ces paquetages ont été rangés par groupes chacun\n"
 "correspondant à un usage particulier de l'ordinateur.\n"
 "\n"
-"Mandrakelinux range ces groupes en quatre catégories. Vous pouvez mélanger\n"
+"Mandrivalinux range ces groupes en quatre catégories. Vous pouvez mélanger\n"
 "des groupes de plusieurs catégories de sorte qu'« une station de travail »\n"
 "peut toujours proposer des applications pour la catégorie « Serveur ».\n"
 "\n"
@@ -647,13 +647,13 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Les paquetages requis à l'installation de Mandrakelinux sont distribués sur\n"
+"Les paquetages requis à l'installation de Mandrivalinux sont distribués sur\n"
 "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é. Si vous ne possédez pas le CD demandé, cliquez tout\n"
@@ -769,10 +769,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you don't know what a particular service is supposed to do or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
 "the listed services and they will be started automatically at boot time. !!\n"
@@ -801,7 +801,7 @@ msgstr ""
 "apparaît à droite.\n"
 "\n"
 "!! Si un paquetage serveur a été sélectionné, vous devrez confirmer que\n"
-"vous voulez vraiment que celui-ci soit installé. Sous Mandrakelinux , par\n"
+"vous voulez vraiment que celui-ci soit installé. Sous Mandrivalinux , par\n"
 "défaut, tous les services installés sont lancés au démarrage. Malgré tous\n"
 "les efforts investis pour vous livrer une distribution Linux sécurisée, il\n"
 "est possible que certaines failles de sécurité affectent les serveurs\n"
@@ -924,7 +924,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -967,7 +967,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 langues existantes.\n"
 "Cependant son intégration dans GNU/Linux est encore imparfaite. Pour cette\n"
-"raison, Mandrakelinux l'utilisera ou non selon les critères suivants :\n"
+"raison, Mandrivalinux l'utilisera ou non selon les critères suivants :\n"
 "\n"
 " * Si vous choisissez une langue avec un encodage ayant une longue histoire\n"
 "(langues associées à « latin1 », Russe, Japonais, Chinois, Coréen, Thaï,\n"
@@ -997,7 +997,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"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux 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"
@@ -1044,7 +1044,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you don't know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -1059,7 +1059,7 @@ msgstr ""
 "\n"
 "Si vous ne savez pas quel niveau choisir, gardez la sélection par défaut.\n"
 "Vous pourrez le modifier ultérieurement avec l'outil draksec, qui se trouve\n"
-"dans le Mandrakelinux Control Center\n"
+"dans le Mandrivalinux Control Center\n"
 "\n"
 "Remplissez le champ « %s » avec l'adresse électronique de l'utilisateur qui\n"
 "sera responsable de la sécurité. Les messages de sécurité lui seront\n"
@@ -1120,7 +1120,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -1137,7 +1137,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -1188,7 +1188,7 @@ msgstr ""
 "\n"
 " * « %s » : si vous souhaitez configurer votre accès Internet ou réseau\n"
 "local dès maintenant. Lisez la documentation fournie ou éxécutez\n"
-"Mandrakelinux Control Center après l'installation pour avoir droit à une\n"
+"Mandrivalinux Control Center après l'installation pour avoir droit à une\n"
 "aide complète en ligne.\n"
 "\n"
 " * « %s »: permet de configurer les adresses proxy HTTP et FTP si la\n"
@@ -1205,7 +1205,7 @@ msgstr ""
 " * « %s » : si vous souhaitez changer la configuration par défaut de votre\n"
 "chargeur de démarrage. À réserver aux utilisateurs expérimentés. Lisez la\n"
 "documentation fournie ou l'aide en ligne sur la configuration de chargeur\n"
-"de démarrage présente dans Mandrakelinux Control Center.\n"
+"de démarrage présente dans Mandrivalinux Control Center.\n"
 "\n"
 " * « %s » : vous pourrez ici contrôler finement les services disponibles\n"
 "sur votre machine. Si vous envisagez de monter un serveur, c'est une bonne\n"
@@ -1294,13 +1294,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 Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button 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 Mandrakelinux. Si vous en acceptez tous les\n"
+"l'ensemble de la distribution Mandrivalinux. Si vous en acceptez tous les\n"
 "termes, cochez la case « %s », sinon, cliquez sur le bouton « %s » pour\n"
 "redémarrer votre ordinateur."
 
@@ -1510,7 +1510,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -1530,7 +1530,7 @@ msgstr ""
 "Cliquez sur « %s » lorsque vous êtes prêt à formater les partitions.\n"
 "\n"
 "Cliquez sur « %s » pour choisir une autre partition où installer votre\n"
-"nouveau système d'exploitation Mandrakelinux.\n"
+"nouveau système d'exploitation Mandrivalinux.\n"
 "\n"
 "Cliquer sur « %s » si vous désirez sélectionner des partitions pour une\n"
 "vérification des secteurs défectueux (« Bad Blocks »)."
@@ -1610,7 +1610,7 @@ msgid ""
 "\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n"
 "/dev/fd0\"."
 msgstr ""
-"Votre installation de Mandrakelinux est maintenant terminée et votre\n"
+"Votre installation de Mandrivalinux 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"
@@ -1648,7 +1648,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 Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -1719,7 +1719,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "À cette étape, vous devez sélectionner quelle partition sera utilisée pour\n"
-"votre système Mandrakelinux. Si votre disque est déjà partitionné, soit par\n"
+"votre système Mandrivalinux. Si votre disque est déjà partitionné, soit par\n"
 "une autre installation GNU/Linux ou par un autre outil de partitionnement,\n"
 "vous pourrez les utiliser. Sinon, les partitions devront être créées.\n"
 "\n"
diff --git a/perl-install/share/po/help-it.pot b/perl-install/share/po/help-it.pot
index 246fd6490..d10f299bb 100644
--- a/perl-install/share/po/help-it.pot
+++ b/perl-install/share/po/help-it.pot
@@ -5,12 +5,12 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -37,7 +37,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux 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 ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you won't be able to undo this operation\n"
 "after you confirm.\n"
 "\n"
@@ -66,12 +66,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 Mandrakelinux. Se il disco è vuoto, o se\n"
+"installare il sistema operativo Mandrivalinux. 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"
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 "Dato che gli effetti del partizionamento sono di solito irreversibili, e\n"
 "possono causare la perdita di dati, questa operazione può intimidire e\n"
@@ -102,7 +102,7 @@ msgstr ""
 "dati, a patto che prima di procedere la partizione Windows 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 Mandrakelinux che Microsoft Windows sullo stesso computer.\n"
+"usare sia Mandrivalinux che Microsoft Windows sullo stesso computer.\n"
 "\n"
 "   Prima di scegliere questa opzione, tenete presente che le dimensioni\n"
 "della partizione su cui risiede Windows saranno ridotte rispetto a quelle\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"
-"Mandrakelinux, potete selezionare questa opzione. Fate molta attenzione,\n"
+"Mandrivalinux, 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"
@@ -235,7 +235,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -244,19 +244,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data won't be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux 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 Mandrakelinux esistente:\n"
+"installazione o un aggiornamento di un sistema Mandrivalinux esistente:\n"
 "\n"
 " * \"%s\": nella maggior parte dei casi cancella completamente il vecchio\n"
 "sistema. Tuttavia, in base allo schema di partizionamento usato, potete\n"
@@ -266,19 +266,19 @@ msgstr ""
 "\n"
 " * \"%s\": questo tipo di installazione vi permette di effettuare un\n"
 "semplice aggiornamento dei pacchetti già installati sul vostro sistema\n"
-"Mandrakelinux. Tutte le partizioni attuali del disco rigido vengono\n"
+"Mandrivalinux. Tutte le partizioni attuali del disco rigido vengono\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"
-"Mandrakelinux a partire dalla versione \"8.1\", mentre non è consigliabile\n"
-"utilizzarla per aggiornare versioni di Mandrakelinux precedenti la \"8.1\"."
+"Mandrivalinux a partire dalla versione \"8.1\", mentre non è consigliabile\n"
+"utilizzarla per aggiornare versioni di Mandrivalinux precedenti la \"8.1\"."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -290,7 +290,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"È molto probabile che, al momento in cui installate Mandrakelinux, alcuni\n"
+"È molto probabile che, al momento in cui installate Mandrivalinux, 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"
@@ -311,7 +311,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -341,7 +341,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 Mandrakelinux.\n"
+"installare il vostro nuovo sistema operativo Mandrivalinux.\n"
 "\n"
 "Ogni partizione è elencata in questo modo: \"nome Linux\", \"nome Windows\"\n"
 "\"Dimensione\".\n"
@@ -374,7 +374,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -430,7 +430,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 Mandrakelinux (KDE, GNOME, AfterStep, WindowMaker, etc.).\n"
+"inclusi in Mandrivalinux (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:\n"
@@ -492,7 +492,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\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -513,11 +513,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you don't like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Qui potrete scegliere il sistema di stampa da usare con il vostro computer;\n"
-"altri sistemi operativi ve ne offrono uno, ma Mandrakelinux ve ne offre ben\n"
+"altri sistemi operativi ve ne offrono uno, ma Mandrivalinux ve ne offre ben\n"
 "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"
@@ -541,17 +541,17 @@ msgstr ""
 "\n"
 "Se fate una scelta adesso e successivamente cambiate idea, potrete sempre\n"
 "scegliere un diverso sistema di stampa avviando PrinterDrake dal\n"
-"Mandrakelinux Control Center e cliccando sul pulsante \"%s\"."
+"Mandrivalinux Control Center e cliccando sul pulsante \"%s\"."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -604,7 +604,7 @@ msgid ""
 msgstr ""
 "Adesso è il momento di indicare i programmi che volete siano installati sul\n"
 "vostro sistema. Ci sono migliaia di pacchetti disponibili per\n"
-"Mandrakelinux, e sono stati suddivisi in gruppi in base al loro campo di\n"
+"Mandrivalinux, e sono stati suddivisi in gruppi in base al loro campo di\n"
 "utilizzo, in modo da facilitarne la gestione.\n"
 "\n"
 "I gruppi sono a loro volta suddivisi in quattro categorie. Potete\n"
@@ -665,13 +665,13 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"La distribuzione Mandrakelinux è suddivisa su più CD-ROM. Se uno dei\n"
+"La distribuzione Mandrivalinux è 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à a espellerlo e a chiedervi di\n"
 "inserire quello corretto. Se non avete a portata di mano il CD richiesto,\n"
@@ -791,10 +791,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you don't know what a particular service is supposed to do or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
 "the listed services and they will be started automatically at boot time. !!\n"
@@ -825,11 +825,11 @@ 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 Mandrakelinux tutti i servizi installati vengono attivati\n"
+"predefinita, in Mandrivalinux tutti i servizi installati vengono attivati\n"
 "automaticamente all'avvio. Sebbene si tratti di servizi sicuri ed esenti da\n"
 "problemi noti al momento del rilascio della distribuzione, non è escluso\n"
 "che possano essere scoperte falle di sicurezza al loro interno dopo la\n"
-"pubblicazione di questa versione di Mandrakelinux. Quindi, se non avete\n"
+"pubblicazione di questa versione di Mandrivalinux. Quindi, se non avete\n"
 "idea di cosa faccia un particolare servizio o del perché debba essere\n"
 "installato, cliccate su \"%s\". Scegliendo \"%s\", invece, i servizi\n"
 "elencati saranno installati e attivati in automatico all'avvio del sistema.\n"
@@ -946,7 +946,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -990,7 +990,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 Mandrakelinux dipenderà dalle scelte\n"
+"questo motivo la sua attivazione su Mandrivalinux dipenderà dalle scelte\n"
 "effettuate dall'utente:\n"
 "\n"
 " * se scegliete lingue fortemente legate alle vecchie codifiche (lingue del\n"
@@ -1035,11 +1035,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"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux 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 Mandrakelinux. Attenzione, tutti i dati\n"
+"partizione su cui installare Mandrivalinux. Attenzione, tutti i dati\n"
 "presenti sul disco selezionato andranno perduti e non potranno più essere\n"
 "recuperati!"
 
@@ -1093,7 +1093,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you don't know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -1108,7 +1108,7 @@ msgstr ""
 "\n"
 "Se non sapete quale scelta fare, utilizzate l'impostazione predefinita.\n"
 "Potrete comunque cambiare in seguito il livello di sicurezza usando\n"
-"draksec, uno strumento del Mandrakelinux Control Center.\n"
+"draksec, uno strumento del Mandrivalinux Control Center.\n"
 "\n"
 "Nel campo \"%s\" inserite l'indirizzo email dell'utente che sarà\n"
 "responsabile per la sicurezza: tutti i messaggi relativi alla sicurezza\n"
@@ -1160,7 +1160,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -1177,7 +1177,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -1231,7 +1231,7 @@ msgstr ""
 "\n"
 " * \"%s\": se desiderate configurare l'accesso a Internet o a una rete\n"
 "locale potete farlo adesso. Consultate la documentazione stampata, oppure\n"
-"utilizzate il Mandrakelinux Control Center una volta terminata\n"
+"utilizzate il Mandrivalinux Control Center una volta terminata\n"
 "l'installazione per avere a vostra disposizione un aiuto in linea completo.\n"
 "\n"
 " * \"%s\": vi permette di configurare gli indirizzi di proxy HTTP e FTP,\n"
@@ -1249,7 +1249,7 @@ msgstr ""
 " * \"%s\": cliccate su questo pulsante per cambiare la configurazione del\n"
 "bootloader. Questa opzione dovrebbe essere utilizzata solo dagli utenti più\n"
 "esperti. Consultate la documentazione stampata o l'aiuto in linea del\n"
-"Mandrakelinux Control Center riguardo la configurazione del bootloader.\n"
+"Mandrivalinux Control Center riguardo la configurazione del bootloader.\n"
 "\n"
 " * \"%s\": qui potrete stabilire in dettaglio quali servizi saranno\n"
 "attivati sul vostro sistema. Se pensate di utilizzare il computer come\n"
@@ -1365,12 +1365,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 Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Prima di proseguire dovreste leggere con attenzione le condizioni d'uso che\n"
-"riguardano l'intera distribuzione Mandrakelinux. Se siete d'accordo con\n"
+"riguardano l'intera distribuzione Mandrivalinux. 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."
@@ -1558,7 +1558,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -1580,7 +1580,7 @@ msgstr ""
 "Cliccate su \"%s\" quando siete pronti ad avviare la formattazione.\n"
 "\n"
 "Cliccate su \"%s\" se desiderate installare il vostro nuovo sistema\n"
-"operativo Mandrakelinux su partizioni diverse da quelle selezionate.\n"
+"operativo Mandrivalinux su partizioni diverse da quelle selezionate.\n"
 "\n"
 "Cliccate su \"%s\" se desiderate selezionare alcune delle partizioni\n"
 "affinché venga controllata la presenza di eventuali blocchi danneggiati su\n"
@@ -1707,7 +1707,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 Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -1778,7 +1778,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "A questo punto, dovete decidere quali partizioni devono essere usate per\n"
-"l'installazione del vostro sistema Mandrakelinux. Se sono già state\n"
+"l'installazione del vostro sistema Mandrivalinux. 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 a9fa70a81..b56f80cd3 100644
--- a/perl-install/share/po/help-ru.pot
+++ b/perl-install/share/po/help-ru.pot
@@ -5,12 +5,12 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -37,7 +37,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux 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 ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you won't be able to undo this operation\n"
 "after you confirm.\n"
 "\n"
@@ -66,11 +66,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "На этом шаге вам прийдется решить, куда вы хотите установить операционную\n"
-"систему Mandrakelinux на вашем жестком диске. Если ваш жесткий диск пуст,\n"
+"систему Mandrivalinux на вашем жестком диске. Если ваш жесткий диск пуст,\n"
 "или существующая операционная система на нем занимает все дисковое\n"
 "пространство, вам прийдется диск переразбить (partition). Разделение диска\n"
 "в основном состоит в том, чтобы логически выделить на нем свободное\n"
-"пространство для установки вашей новой системы Mandrakelinux.\n"
+"пространство для установки вашей новой системы Mandrivalinux.\n"
 "\n"
 "Поскольку разделение диска - это обычно необратимый процесс и может\n"
 "привести к потере данных, если на диске уже есть установленная операционная\n"
@@ -97,7 +97,7 @@ msgstr ""
 "потери данных, особенно если вы предварительно провели дефрагментацию\n"
 "раздела Windows. Резервное копирование ваших данных настойчиво\n"
 "рекомендуется.. Рекомендуем выбрать эту опцию, если вы собираетесь\n"
-"использовать Mandrakelinux и Microsoft Windows на одном компьютере.\n"
+"использовать Mandrivalinux и Microsoft Windows на одном компьютере.\n"
 "\n"
 "   Перед тем, как выбрать эту опцию, вы должны осознать, что размер вашего\n"
 "раздела Microsoft Windows станет меньше, чем был. У вас будет меньше\n"
@@ -105,7 +105,7 @@ msgstr ""
 "новых программ.\n"
 "\n"
 " * \"%s\" выберите эту опцию, если вы хотите удалить все данные на всех\n"
-"разделах вашего жесткого диска и заменить их новой системой Mandrakelinux.\n"
+"разделах вашего жесткого диска и заменить их новой системой Mandrivalinux.\n"
 "Будьте осторожны в этом решении, потому что после подтверждения вы не\n"
 "сможете вернуть обратно все как было.\n"
 "\n"
@@ -227,7 +227,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -236,19 +236,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data won't be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Этот шаг появляется только в случае, если на вашей машине найден старый\n"
 "раздел GNU/Linux.\n"
 "\n"
 "DrakX теперь должен узнать, хотите ли вы провести новую установку или\n"
-"обновление существующей системы Mandrakelinux:\n"
+"обновление существующей системы Mandrivalinux:\n"
 "\n"
 " * \"%s\": в большинстве случаев этот вариант приведет к уничтожению старой\n"
 "системы. Если вы желаете изменить разделы вашего жесткого диска или\n"
@@ -257,18 +257,18 @@ msgstr ""
 "от перезаписи некоторые свои данные.\n"
 "\n"
 " * \"%s\": этот класс установки позволит вам обновить пакеты, установленные\n"
-"в вашей системе Mandrakelinux. Текущая схема разделов диска и\n"
+"в вашей системе Mandrivalinux. Текущая схема разделов диска и\n"
 "пользовательские данные останутся нетронутыми. Большинство других шагов\n"
 "будут доступны, как и при стандартной установке.\n"
 "\n"
-"``Обновление'' будет неплохо работать на системах Mandrakelinux начиная с\n"
-"\"8.1\" и выше. Проведение обновления на системах Mandrakelinux старше\n"
+"``Обновление'' будет неплохо работать на системах Mandrivalinux начиная с\n"
+"\"8.1\" и выше. Проведение обновления на системах Mandrivalinux старше\n"
 "\"8.1\" не рекомендуется."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -280,7 +280,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"В данный момент установки Mandrakelinux было бы неплохо обновить некоторые\n"
+"В данный момент установки Mandrivalinux было бы неплохо обновить некоторые\n"
 "пакеты из исходного релиза. Некоторые баги могут быть уже исправлены и\n"
 "решены проблемы безопасности. Чтобы получить пользу от этих обновлений,\n"
 "сейчас вы можете загрузить их из Интернет. Нажмите \"%s\", если у вас есть\n"
@@ -297,7 +297,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -327,7 +327,7 @@ msgid ""
 msgstr ""
 "На вашем жестом диске обнаружено несколько разделов Microsoft. Выберите\n"
 "необходимый раздел для изменения его размера с целью установки вашей новой\n"
-"операционной системы Mandrakelinux.\n"
+"операционной системы Mandrivalinux.\n"
 "\n"
 "Каждый раздел перечислен так: \"Linux имя\", \"Windows имя\" \"Размер\".\n"
 "\n"
@@ -359,7 +359,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -415,7 +415,7 @@ msgid ""
 msgstr ""
 "X (для системы X Window) это сердце графического интерфейса GNU/Linux, на\n"
 "базе которого работают все графические среды (KDE, GNOME, AfterStep,\n"
-"WindowMaker, и т.д..), входящие в Mandrakelinux.\n"
+"WindowMaker, и т.д..), входящие в Mandrivalinux.\n"
 "\n"
 "Вам будет представлен список различных параметров для получения\n"
 "оптимального графического отображения: Видеокарта\n"
@@ -473,7 +473,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\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -494,11 +494,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you don't like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Теперь пришло время выбрать систему печати для вашего компьютера. Другие OS\n"
-"могут предложить вам одну, а Mandrakelinux предлагает две. Каждая из систем\n"
+"могут предложить вам одну, а Mandrivalinux предлагает две. Каждая из систем\n"
 "является лучшей для определенной конфигурации.\n"
 "\n"
 " * \"%s\" -- что означает ``печатать, не ставить в очередь'' (``print,\n"
@@ -527,11 +527,11 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -583,11 +583,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "Теперь настало время определить, какие программы вы хотите установить в\n"
-"вашу систему. С Mandrakelinux поставляются тысячи пакетов и, для упрощения\n"
+"вашу систему. С Mandrivalinux поставляются тысячи пакетов и, для упрощения\n"
 "выбора, они разбиты на группы.\n"
 "\n"
 "Пакеты сортированы по группам, которые соответствуют специфике\n"
-"использования вашей машины. В Mandrakelinux пакеты сортируются по четырем\n"
+"использования вашей машины. В Mandrivalinux пакеты сортируются по четырем\n"
 "категориям. Вы можете смешивать и сочетать приложения из различных\n"
 "категорий, например, вариант установки ``Рабочая станция'' может иметь\n"
 "приложения из категории ``Разработка''.\n"
@@ -635,13 +635,13 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Инсталляция Mandrakelinux размещена на нескольких CD-ROMах. Если выбранный\n"
+"Инсталляция Mandrivalinux размещена на нескольких CD-ROMах. Если выбранный\n"
 "пакет находится на другом CD-ROM, DrakX будет отдавать текущий CD и просить\n"
 "вас вставить другой по мере надобности."
 
@@ -753,10 +753,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you don't know what a particular service is supposed to do or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
 "the listed services and they will be started automatically at boot time. !!\n"
@@ -785,10 +785,10 @@ msgstr ""
 "\n"
 "!! Если был выбран какой-либо серверный пакет, специально или он был частью\n"
 "какой-либо группы, вас попросят подтвердить, действительно ли вы желаете\n"
-"установить эти сервера. Под Mandrakelinux все установленные сервера\n"
+"установить эти сервера. Под Mandrivalinux все установленные сервера\n"
 "запускаются по умолчанию в процессе загрузки. Даже если они безопасны и не\n"
 "имеют известных проблем на момент выпуска дистрибутива, в них могут быть\n"
-"обнаружены дыры в безопасности после выпуска данной версии Mandrakelinux.\n"
+"обнаружены дыры в безопасности после выпуска данной версии Mandrivalinux.\n"
 "Если вы не знаете, зачем нужен данный сервис и что он делает, нажмите\n"
 "\"%s\". Если вы нажмете \"%s\", тогда все сервисы из списка будут\n"
 "установлены и автоматически запущены при загрузке системы. !!\n"
@@ -894,7 +894,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -932,7 +932,7 @@ msgstr ""
 "\n"
 "О поддержке UTF-8 (unicode): Unicode это новая кодировка, которая включает\n"
 "в себя все существующие языки. Однако ее полная поддержка в GNU/Linux пока\n"
-"находится в стадии разработки. Поэтому Mandrakelinux будет определять\n"
+"находится в стадии разработки. Поэтому Mandrivalinux будет определять\n"
 "использовать ее или нет в зависимости от выбора пользователя:\n"
 "\n"
 " * Если вы выбираете языки, которые имеют свою традиционную устоявшуюся\n"
@@ -975,11 +975,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"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Выберите жесткий диск, который нужно очистить для инсталляции вашего нового\n"
-"раздела Mandrakelinux. Будьте осторожны, все данные на нем будут потеряны и\n"
+"раздела Mandrivalinux. Будьте осторожны, все данные на нем будут потеряны и\n"
 "их нельзя будет восстановить!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1031,7 +1031,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you don't know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -1045,7 +1045,7 @@ msgstr ""
 "\n"
 "Если вы не знаете что выбрать, оставьте выбор по умолчанию. Вы сможете\n"
 "изменить этот уровень безопасности потом с помощью утилиты draksec из\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 "В поле \"%s\" системе указывается пользователь, который будет отвечать за\n"
 "безопасность. На этот адрес будут посылаться сообщения по безопасности."
@@ -1096,7 +1096,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -1113,7 +1113,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -1281,12 +1281,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 Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Прежде чем продолжить, вы должны внимательно прочитать условия лицензии.\n"
-"Лицензия распространяется на весь дистрибутив Mandrakelinux. Если вы\n"
+"Лицензия распространяется на весь дистрибутив Mandrivalinux. Если вы\n"
 "согласны со всеми условиями лицензии, отметьте пункт \"%s\". Если нет -\n"
 "просто выключите свой компьютер."
 
@@ -1465,7 +1465,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -1490,7 +1490,7 @@ msgstr ""
 "Нажмите \"%s\", когда будете готовы начать форматирование разделов.\n"
 "\n"
 "Нажмите \"%s\", если вы хотите выбрать другой раздел для установки\n"
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 "Нажмите \"%s\", если хотите выбрать разделы, которые следует проверить на\n"
 "сбойные блоки (bad blocks)."
@@ -1604,7 +1604,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 Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -1675,7 +1675,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Здесь вам предложат выбрать, какие разделы будут использоваться для\n"
-"установки вашей системы Mandrakelinux. Если разделы были уже определены\n"
+"установки вашей системы Mandrivalinux. Если разделы были уже определены\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 a7d768fa7..eedb1edf9 100644
--- a/perl-install/share/po/help-zh_CN.pot
+++ b/perl-install/share/po/help-zh_CN.pot
@@ -19,7 +19,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -53,7 +53,7 @@ msgstr ""
 "单击\"%s\"按钮以后，您可以选择要在您的工作站上安装哪些额外的语言，即为系统文档和应用程序安装特定语言的文件。例如，如果您的计算机要为繁体中文的用户提供服务，请在树视图中选择简体中文作为默认语言，然后在高级选项中选择\"%s\"。\n"
 "\n"
 "关于 UTF-8 (Unicode) 支持：Unicode 是一种新的字符编码，该编码可支持所有现存的语言。但是，在 GNU/Linux 下完全支持\n"
-"Unicode，仍然在开发和完善中。由此原因，Mandrakelinux 会根据用户的选择是否使用 UTF-8：\n"
+"Unicode，仍然在开发和完善中。由此原因，Mandrivalinux 会根据用户的选择是否使用 UTF-8：\n"
 "\n"
 " * 如果您所选的语言自身有强制性的编码(latin1 语言、俄语、日语、中文、朝鲜语、泰语、希腊语、土耳其语及大多数 iso-8859-2\n"
 "语言)，则会默认使用强制编码；\n"
@@ -82,12 +82,12 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -114,7 +114,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -123,7 +123,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you won't be able to undo this operation\n"
 "after you confirm.\n"
 "\n"
@@ -142,9 +142,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 ""
-"在这一步里，您需要决定您想要将 Mandrakelinux\n"
+"在这一步里，您需要决定您想要将 Mandrivalinux\n"
 "操作系统安装到硬盘的何处。如果您的硬盘完全是空的，或者已有操作系统使用了所有的空间，您就必须要对硬盘进行分区。粗略的说，对硬盘进行分区就是将其划分成几个逻辑上不同的部分，以便创建安装您新的\n"
-"Mandrakelinux 系统所需的空间。\n"
+"Mandrivalinux 系统所需的空间。\n"
 "\n"
 "由于对硬盘进行分区通常是不可恢复的，并且可能导致数据丢失，所以对于没有经验的用户来说，分区是十分危险的操作。所幸的是，DrakX\n"
 "所包含的向导能够显著简化这一过程。在继续这一步骤之前，请花点时间仔细阅读本节及以上的所有内容。\n"
@@ -159,13 +159,13 @@ msgstr ""
 " * \"%s\"。如果在您的硬盘上安装了 Microsoft Windows，而该操作系统占用了所有的空间，您就需要为 GNU/Linux\n"
 "创建剩余空间。要完成这一操作，您可以删除您的 Microsoft Windows 分区和数据(参看``删除整个磁盘''方案)，或者更改\n"
 "Microsoft Windows FAT 或 NTFS 分区的大小。更改分区大小通常不会造成任何数据丢失，但您必须事先对 Windows\n"
-"分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计算机上使用 Mandrakelinux 和 Microsoft\n"
+"分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计算机上使用 Mandrivalinux 和 Microsoft\n"
 "Windows，则推荐使用此选项。\n"
 "\n"
 "   注意，在执行这一过程之后，您原有的 Microsoft Windows 分区将会比先前小一些。而您在 Microsoft Windows\n"
 "下可用来存储数据或安装新软件的剩余空间也会变少。\n"
 "\n"
-" * \"%s\"。如果您想要删除硬盘上的全部数据和全部分区，并将其替换为全新的 Mandrakelinux\n"
+" * \"%s\"。如果您想要删除硬盘上的全部数据和全部分区，并将其替换为全新的 Mandrivalinux\n"
 "系统，请选择此选项。请额外小心，因为在您确认之后，此操作无法撤销。\n"
 "\n"
 "   !! 如果您选择了此选项，您硬盘上的全部数据都将被删除。 !!\n"
@@ -282,7 +282,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you don't know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -291,7 +291,7 @@ msgstr ""
 "在这里，DrakX 将允许您选择计算机要使用的安全级别。说的直白一点，如果计算机将包含关键数据，或者将直接暴露于 Internet\n"
 "之下，则应该设置较高的安全级别。较高的安全级别通常以损失易用性作为代价。\n"
 "\n"
-"如果您不知道要选择什么，请保持默认选项。您可以稍后从 Mandrakelinux Control Center的一部分 draksec\n"
+"如果您不知道要选择什么，请保持默认选项。您可以稍后从 Mandrivalinux Control Center的一部分 draksec\n"
 "来更改安全级别。\n"
 "\n"
 "请在\"%s\"域中填入要负责安全的人的电子邮件地址。安全信息将被发送到该地址。"
@@ -303,7 +303,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -312,26 +312,26 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data won't be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "仅当在您的计算机上发现了已有的 GNU/Linux 分区，才会激活这一步骤。\n"
 "\n"
-"DrakX 现在需要知道您是想要执行全新安装，还是升级已有的 Mandrakelinux 系统：\n"
+"DrakX 现在需要知道您是想要执行全新安装，还是升级已有的 Mandrivalinux 系统：\n"
 "\n"
 " *\n"
 "\"%s\"：总体来说，这将完全销毁旧系统。但是，根据您选择的分区方案，您可以让现有的数据(比如\"主\"目录)免于覆盖。如果您想要更改硬盘的分区方案，或者更该文件系统，您就应该使用此选项。\n"
 "\n"
-" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandrakelinux\n"
+" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandrivalinux\n"
 "系统上的软件包。您的分区方案和用户数据都不会被破坏。绝大多数配置步骤仍然可用，与标准安装类似。\n"
 "\n"
-"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrakelinux 系统上工作正常。不推荐在先于 \"8.1\" 版本的\n"
-"Mandrakelinux 系统上执行升级。"
+"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrivalinux 系统上工作正常。不推荐在先于 \"8.1\" 版本的\n"
+"Mandrivalinux 系统上执行升级。"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
@@ -379,7 +379,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -396,7 +396,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -428,7 +428,7 @@ msgstr ""
 " * \"%s\"：默认情况下，DrakX 会将您的图形界面配置为 \"800x600\" 或 \"1024x768\"\n"
 "分辨率。如果这不适合您的话，请单击\"%s\"重新配置您的图形界面。\n"
 "\n"
-" * \"%s\"：如果您想要配置您的 Internet 或局域网访问，现在就可以进行。请参考印刷文档或在安装完成后使用 Mandrakelinux\n"
+" * \"%s\"：如果您想要配置您的 Internet 或局域网访问，现在就可以进行。请参考印刷文档或在安装完成后使用 Mandrivalinux\n"
 "Control Center来获得完整的在线帮助。\n"
 "\n"
 " * \"%s\"：如果您所安装的计算机位于代理服务器之后，这里将允许您配置 HTTP 和 FTP 代理服务器地址。\n"
@@ -438,7 +438,7 @@ msgstr ""
 " * \"%s\"：如果您计划将您的计算机连接到\n"
 "Internet，那么保护您的计算机免于攻击的有效方法就是设置防火墙。请参考``初学者指南''中的相应章节，以获得关于防火墙设置的细节。\n"
 "\n"
-" * \"%s\"：如果您想要更改您的引导程序配置，请单击此按钮。这仅适用于高级用户。请参考印刷文档或 Mandrakelinux Control\n"
+" * \"%s\"：如果您想要更改您的引导程序配置，请单击此按钮。这仅适用于高级用户。请参考印刷文档或 Mandrivalinux Control\n"
 "Center中关于引导程序配置的帮助。\n"
 "\n"
 " * \"%s\"：在此您可以精确调整要在您的计算机上运行哪些服务。如果您要将此计算机用作服务器，那么应该复查这一设置。"
@@ -455,7 +455,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -467,7 +467,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"在您安装 Mandrakelinux\n"
+"在您安装 Mandrivalinux\n"
 "的这个时候，很可能有些软件包在发行之后已经更新。有些故障已经被修正，有些安全问题已经被解决。为了让您能够享用这些更新，您现在可以从 Internet\n"
 "上下载它们。如果您的 Internet 连接已经可以使用，请选择\"%s\"。如果您愿意以后再升级，请选择\"%s\"。\n"
 "\n"
@@ -531,7 +531,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -585,7 +585,7 @@ msgid ""
 "want to check \"%s\" if your machine is to act as a server, or if you were\n"
 "not successful in getting the display configured."
 msgstr ""
-"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrakelinux\n"
+"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrivalinux\n"
 "附带的所有图形环境(KDE、GNOME、AfterStep、WindowMaker 等)都依赖于该系统。\n"
 "\n"
 "您将会看到不同的参数列表，以便进行图形显示选项的更改来达到最佳状态。其中包括：\n"
@@ -629,7 +629,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\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -650,10 +650,10 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you don't like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
-"现在，应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择，但 Mandrakelinux\n"
+"现在，应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择，但 Mandrivalinux\n"
 "提供了两种。每种打印系统都能够在不同的配置中大展身手。\n"
 "\n"
 " * \"%s\" --\n"
@@ -666,7 +666,7 @@ msgstr ""
 "\"pdq\" 一样简单。如果您想模拟一台 \"lpd\" 服务器，不要忘了打开 \"cups-lpd \" 守护程序。\"%s\"\n"
 "还包括一个图形界面，可用来打印或选择打印机选项，以及管理打印机。\n"
 "\n"
-"如果您现在进行了选择，但稍后又发现您并不喜欢所选择的打印系统，可以轻松修改。只需从 Mandrakelinux Control Center中选择\n"
+"如果您现在进行了选择，但稍后又发现您并不喜欢所选择的打印系统，可以轻松修改。只需从 Mandrivalinux Control Center中选择\n"
 "PrinterDrake，然后单击\"%s\"按钮。"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -692,11 +692,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 Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
-"在继续之前，您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrakelinux\n"
+"在继续之前，您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrivalinux\n"
 "发行版。如果您同意其中的全部条款，请选中\"%s\"框。如果不同意，单击\"%s\"按钮将重新启动您的计算机。"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -745,11 +745,11 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -800,10 +800,10 @@ msgid ""
 "command-line interface. The total size of this installation is about 65\n"
 "megabytes."
 msgstr ""
-"现在该指定要在您的系统中安装哪些程序了。Mandrakelinux\n"
+"现在该指定要在您的系统中安装哪些程序了。Mandrivalinux\n"
 "为您准备了数千个软件包。而为了使管理软件包更加容易，软件包已经按相似程度分成了多个组。\n"
 "\n"
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "按四个类别对软件包进行了分类。您可以从不同的类别混合选择应用程序。也就是说，``工作站''中也可以选择安装``服务器''分类中的应用程序。\n"
 "\n"
 " * \"%s\"：如果您计划将您的计算机用作工作站，请选择工作站分类中的一个或多个组。\n"
@@ -835,13 +835,13 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM，DrakX 将弹出当前\n"
+"Mandrivalinux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM，DrakX 将弹出当前\n"
 "CD，并要求您插入所需的正确 CD。如果您手中没有所请求的 CD，只需单击\"%s\"，就不会安装相应的软件包了。"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1009,7 +1009,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -1024,7 +1024,7 @@ msgstr ""
 "\n"
 "如果您准备好格式化分区了，请单击\"%s\"。\n"
 "\n"
-"如果您想要选择其它分区用于安装 Mandrakelinux 操作系统，请单击\"%s\"。\n"
+"如果您想要选择其它分区用于安装 Mandrivalinux 操作系统，请单击\"%s\"。\n"
 "\n"
 "如果您想要选择要检测磁盘上的坏块，请单击单击\"%s\"。"
 
@@ -1042,10 +1042,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you don't know what a particular service is supposed to do or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
 "the listed services and they will be started automatically at boot time. !!\n"
@@ -1069,8 +1069,8 @@ msgstr ""
 "只要您在左侧的树中选择了软件包，右侧就会出现该软件包用途的描述。\n"
 "\n"
 "!!\n"
-"如果选择了服务器软件包，不管是您特意选中的，还是因为该软件包是某组的成员，您都需要确认是否真的想要安装这些服务器。默认情况下，Mandrakelinux\n"
-"会在启动时自动启动已安装的全部服务。尽管在发行版送出时这些服务是安全的，但完全有可能在此版本 Mandrakelinux\n"
+"如果选择了服务器软件包，不管是您特意选中的，还是因为该软件包是某组的成员，您都需要确认是否真的想要安装这些服务器。默认情况下，Mandrivalinux\n"
+"会在启动时自动启动已安装的全部服务。尽管在发行版送出时这些服务是安全的，但完全有可能在此版本 Mandrivalinux\n"
 "完成后发现了相应软件的安全漏洞。如果您并不知道特定服务的用途，或者不知道为什么要安装这些服务，请单击\"%s\"。单击\"%s\"将安装列出的服务，并且启动时这些服务会被自动启动。\n"
 "!!\n"
 "\n"
@@ -1201,7 +1201,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 Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -1271,7 +1271,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"在这一步中，您需要选择要使用哪个或哪些分区来安装您的 Mandrakelinux 系统。如果已经定义了分区，不管是先前安装的 GNU/Linux\n"
+"在这一步中，您需要选择要使用哪个或哪些分区来安装您的 Mandrivalinux 系统。如果已经定义了分区，不管是先前安装的 GNU/Linux\n"
 "还是由其它分区工具划分的，您都可以使用已有的分区。否则，必须对硬盘分区进行定义。\n"
 "\n"
 "要创建分区，您必须先选择硬盘。您可以单击``hda'' 选择第一个 IDE 硬盘进行分区，``hdb'' 选择第二个 IDE 硬盘，``sda''\n"
diff --git a/perl-install/share/po/hi.po b/perl-install/share/po/hi.po
index a0f1f2a68..184c4bf68 100644
--- a/perl-install/share/po/hi.po
+++ b/perl-install/share/po/hi.po
@@ -61,7 +61,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "लगता है कि यूएसबी कुँजी को लेखन अभिरक्षित किया हुआ है, परन्तु हम \n"
 "अभी इसे सावधानी-पूर्वक हटा नहीं सकते है।\n"
@@ -86,7 +86,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "आपकी यूएसबी कुँजी में कोई वैध विण्डो (फ़ैट) के विभाजन नहीं हैं।\n"
@@ -104,7 +104,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -112,7 +112,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "आपके कम्प्यूटर पर हम कोई यूएसबी कुँजी को नहीं खोज पायें ।\n"
@@ -250,7 +250,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1295,7 +1295,7 @@ msgstr "मैनुअल पसन्द"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3705,7 +3705,7 @@ msgstr "रेडियो समर्थन सक्रिय"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3896,7 +3896,7 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3910,11 +3910,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4069,10 +4069,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4262,7 +4262,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4436,12 +4436,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4468,7 +4468,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4477,7 +4477,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4606,7 +4606,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4624,7 +4624,7 @@ msgstr "पिछला"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4653,7 +4653,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4669,7 +4669,7 @@ msgstr "सुरक्षा प्रबंधक"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4755,7 +4755,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4833,7 +4833,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4842,13 +4842,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4889,7 +4889,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5064,7 +5064,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5085,7 +5085,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -5191,7 +5191,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5208,7 +5208,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5270,7 +5270,7 @@ msgstr "सेवायें"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "उस हार्ड ड्राइव का चयन करें जिसे आप अपने नवीन मैनड्रैक लिनक्स विभाजन के संसाधन के लिए \n"
@@ -5625,7 +5625,7 @@ msgstr "विण्डो विभाजन के आकार की गण�
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "आपका विण्डो विभाजन अति खंडित है । कृपया अपने कम्प्यूटर को विण्डो के अन्तर्गत पुनः आरम्भ "
@@ -5743,19 +5743,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5777,7 +5777,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5785,14 +5785,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5802,7 +5802,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5822,10 +5822,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5836,11 +5836,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5856,7 +5856,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "भूमिका\n"
 "\n"
@@ -5866,14 +5866,14 @@ msgstr ""
 "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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "१. अधिकार-पत्र करारनामा\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5895,7 +5895,7 @@ msgstr ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5903,14 +5903,14 @@ msgstr ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5920,7 +5920,7 @@ msgstr ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5940,10 +5940,10 @@ msgstr ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5954,11 +5954,11 @@ msgstr ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "५. लागू होने वाले कानून \n"
@@ -5974,7 +5974,7 @@ msgstr ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6036,7 +6036,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6044,7 +6044,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "बधाई हो, संसाधन सम्पूर्ण हुआ ।\n"
 "बूट माध्यम को हटायें और पुनः आरम्भ करने के लिए रीटर्न (return) कुँजी को दबायें ।\n"
@@ -6093,7 +6093,7 @@ msgstr "`%s' चरण में प्रवेश \n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -6631,7 +6631,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
 "उपलब्ध मिररों की सूची को प्राप्त करने के लिए मैनड्रैक लिनक्स वेब-स्थल से सम्पर्क किया जा रहा "
 "है..."
@@ -6853,7 +6853,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
 msgstr "मैनड्रैक लिनक्स संसाधन %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -9440,7 +9440,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -13446,7 +13446,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -15222,18 +15222,18 @@ msgstr "रूको"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, fuzzy, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
 msgstr "मैनड्रैकलिनक्स में स्वागत !"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -15242,7 +15242,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -15259,9 +15259,9 @@ msgstr "मुक्त स्रोत जगत में स्वागत !
 #: share/advertising/02.pl:17
 #, fuzzy, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 "आपका नवीन मैनड्रैक लिनक्स संचालन-तंत्र और इसके अनेकों कार्यक्रम,मैनड्रैकसॉफ़्ट विकासकर्ताओं व "
@@ -15286,7 +15286,7 @@ msgstr "<b>सूचना</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -15312,10 +15312,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -15334,8 +15334,8 @@ msgstr "यह मैनड्रैक लिनक्स का <b>डॉउ�
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -15362,7 +15362,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -15372,7 +15372,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15394,13 +15394,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -15412,7 +15412,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15426,19 +15426,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr "<b>मैनड्रैकस्टोर</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr "मैनड्रैक अपडेटो का एपलेट"
 
 #: share/advertising/09.pl:18
@@ -15459,61 +15459,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -15551,7 +15551,7 @@ msgstr "<b>अपने ग्राफ़िक्ल डेस्कटाप व
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -15572,7 +15572,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -15689,7 +15689,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -15924,14 +15924,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr "<b>मैनड्रैक नियंत्रण केन्द्र</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -15953,9 +15953,9 @@ msgstr "<b>केडीई पसन्द</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -15967,7 +15967,7 @@ msgstr "<b>मैनड्रैकस्टोर</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -15990,20 +15990,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
 msgstr "<b>मैनड्रैकक्लब</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -16022,33 +16022,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr "<b>मैनड्रैकऑनलाइन</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -16071,32 +16071,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
 msgstr "<b>मैनड्रैक-विशेषज्ञ</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -16394,7 +16394,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr "<b>मैनड्रैकस्टोर</b>"
 
 #: share/compssUsers.pl:197
@@ -16496,7 +16496,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16544,7 +16544,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -19146,12 +19146,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "मैनड्रैक दोष रिपोर्ट औज़ार"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
 msgstr "मैनड्रैक नियंत्रण केन्द्र"
 
 #: standalone/drakbug:48
@@ -19172,7 +19172,7 @@ msgstr "हार्ड ड्रैक"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "मैनड्रैक ऑनलाइन"
 
 #: standalone/drakbug:52
@@ -19217,7 +19217,7 @@ msgstr "संरचना विज़ार्ड"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -19642,7 +19642,7 @@ msgstr "बूट के समय आरम्भ"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "इस इन्टरफ़ेस को अभी तक संरचित नहीं किया गया है ।\n"
 "मैनड्रैक नियंत्रण केन्द्र से \"एक इन्टरफ़ेस को जोड़े\" सहायक को चलायें"
@@ -19651,7 +19651,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "इस इन्टरफ़ेस को अभी तक संरचित नहीं किया गया है ।\n"
 "मैनड्रैक नियंत्रण केन्द्र से \"%s\" सहायक को चलायें"
@@ -19704,7 +19704,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -19997,7 +19997,7 @@ msgstr "इम्पोर्ट"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -20492,7 +20492,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -20528,7 +20528,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "मैनड्रैक नियंत्रण केन्द्र"
 
 #: standalone/drakhelp:36
@@ -23700,7 +23700,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "मैनड्रैक टूल्स लॉग्स"
 
 #: standalone/logdrake:51
@@ -24213,7 +24213,7 @@ msgstr "संबंध सम्पूर्ण ।"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "संबंधीकरण की प्रक्रिया असफ़ल हो गई ।\n"
 "मैनड्रैक नियंत्रण केन्द्र में अपनी संरचना को सत्यापित करें ।"
@@ -25091,7 +25091,7 @@ msgstr "संसाधन असफ़ल"
 #~ msgstr "आपने किसी फ़ॉन्ट का चयन नहीं किया है"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
+#~ msgid "Mandriva Wizards"
 #~ msgstr "<b>मैनड्रैकस्टोर</b>"
 
 #~ msgid "No browser available! Please install one"
@@ -25221,7 +25221,7 @@ msgstr "संसाधन असफ़ल"
 #~ msgstr "लेखन के लिए %s को खोलने में त्रुटि: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
@@ -25630,7 +25630,7 @@ msgstr "संसाधन असफ़ल"
 #~ "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
 #~ msgstr "स्टार ऑफ़िस/ओपनऑफ़िस.ओआरजी/जीआईएमपी से \"%s\" प्रिंटर को हटाने में असफ़ल ।"
 
-#~ msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
+#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
 #~ msgstr "<b>मैनड्रैक लिनक्स का चयन करने के लिए धन्यवाद!</b>"
 
 #~ msgid ""
@@ -25652,31 +25652,31 @@ msgstr "संसाधन असफ़ल"
 #~ msgid "Listen to music files and watch videos with <b>Totem</b>."
 #~ msgstr "<b>Totem</b> के साथ संगीत संचिकाओ को सुनें और वीडियों के देखें।"
 
-#~ msgid "Become a <b>Mandrakeclub</b> member!"
+#~ msgid "Become a <b>Mandriva Club</b> member!"
 #~ msgstr "<b>मैनड्रैकक्लब</b> के एक सदस्य बनें !"
 
 #~ msgid "\t* Full access to commercial applications"
 #~ msgstr "\t* वाणिज्य कार्यक्रमों तक पूर्ण पहुँच"
 
-#~ msgid "\t* Voting for software to put in Mandrakelinux"
+#~ msgid "\t* Voting for software to put in Mandrivalinux"
 #~ msgstr "\t* मैनड्रैक लिनक्स में सॉफ़्टवेयर डालने के लिए मतदान"
 
 #~ msgid "Do you require assistance?"
 #~ msgstr "क्या आप को सहायता की आवश्यकता है?"
 
-#~ msgid "<b>Become a Mandrakeclub member!</b>"
+#~ msgid "<b>Become a Mandriva Club member!</b>"
 #~ msgstr "<b>मैनड्रैक क्लब के एक सदस्य बनें !</b>"
 
 #~ msgid "<b>Do you require assistance?</b>"
 #~ msgstr "<b>क्या आप को सहायता की आवश्यकता है?</b>"
 
-#~ msgid "This is the Mandrakelinux <b>Download version</b>."
+#~ msgid "This is the Mandrivalinux <b>Download version</b>."
 #~ msgstr "यह मैनड्रैक लिनक्स का <b>डॉउनलोड संस्मरण</b> है ।"
 
 #~ msgid ""
-#~ "Your new Mandrakelinux distribution and its many applications are the "
-#~ "result of collaborative efforts between Mandrakesoft developers and "
-#~ "Mandrakelinux contributors throughout the world."
+#~ "Your new Mandrivalinux distribution and its many applications are the "
+#~ "result of collaborative efforts between Mandriva developers and "
+#~ "Mandrivalinux contributors throughout the world."
 #~ msgstr ""
 #~ "आपका नवीन मैनड्रैक लिनक्स संचालन-तंत्र और इसके अनेकों कार्यक्रम,मैनड्रैकसॉफ़्ट विकासकर्ताओं "
 #~ "व विश्वव्यापी मैनड्रैक लिनक्स योगदानकर्ताओं केमध्य किये हुए मिले-जुले प्रयासों का मिला-जुला "
@@ -25732,7 +25732,7 @@ msgstr "संसाधन असफ़ल"
 #~ msgid ""
 #~ "Before continuing, you should carefully read the terms of the license. "
 #~ "It\n"
-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "
+#~ "covers the entire Mandrivalinux 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."
@@ -25851,7 +25851,7 @@ msgstr "संसाधन असफ़ल"
 #~ "यदि आप इस सुविधा के इच्छुक नहीं है, तो \"%s\" बॉक्स को अचिह्नन्ति करें।"
 
 #~ msgid ""
-#~ "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+#~ "The Mandrivalinux 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."
@@ -25862,14 +25862,14 @@ msgstr "संसाधन असफ़ल"
 
 #~ msgid ""
 #~ "It is now time to specify which programs you wish to install on your\n"
-#~ "system. There are thousands of packages available for Mandrakelinux, and\n"
+#~ "system. There are thousands of packages available for Mandrivalinux, 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. Mandrakelinux sorts packages groups in four categories. You can\n"
+#~ "machine. Mandrivalinux 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"
@@ -25988,11 +25988,11 @@ msgstr "संसाधन असफ़ल"
 #~ "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 Mandrakelinux will automatically start any "
+#~ "installed. By default Mandrivalinux 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 Mandrakelinux was\n"
+#~ "security holes were discovered after this version of Mandrivalinux 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"
@@ -26061,7 +26061,7 @@ msgstr "संसाधन असफ़ल"
 #~ "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"
-#~ "Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
+#~ "Mandrivalinux 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"
@@ -26082,7 +26082,7 @@ msgstr "संसाधन असफ़ल"
 #~ "modems\n"
 #~ "that require additional software to work compared to Normal modems. Some "
 #~ "of\n"
-#~ "those modems actually work under Mandrakelinux, some others do not. You\n"
+#~ "those modems actually work under Mandrivalinux, 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"
@@ -26238,7 +26238,7 @@ msgstr "संसाधन असफ़ल"
 #~ "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 Mandrakelinux rely upon.\n"
+#~ "WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 #~ "\n"
 #~ "You will be presented with a list of different parameters to change to "
 #~ "get\n"
@@ -26555,7 +26555,7 @@ msgstr "संसाधन असफ़ल"
 #~ "  --report          - कार्यक्रम को मैनड्रैक औजारों में से एक होना चाहिए \n"
 #~ "  --incident        - कार्यक्रम को मैनड्रैक औजारों में से एक होना चाहिए"
 
-#~ msgid "Mandrake Online"
+#~ msgid "Mandriva Online"
 #~ msgstr "मैनड्रैक ऑनलाइन"
 
 #~ msgid ""
diff --git a/perl-install/share/po/hr.po b/perl-install/share/po/hr.po
index aa0fa7a2c..3b034b251 100644
--- a/perl-install/share/po/hr.po
+++ b/perl-install/share/po/hr.po
@@ -68,7 +68,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "UsB zapis ima uključenu zaštitu za pisanje, ali sad se nemože sigurno\n"
 "odstraniti.\n"
@@ -94,7 +94,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -102,7 +102,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -110,7 +110,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -236,7 +236,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -252,7 +252,7 @@ msgstr ""
 "\n"
 "Mogući uzrok su uništene sistemske konfiguracijske datoteke\n"
 "na USB ključu, u ovom slučaju će problem riješiti njihovo uklanjanje\n"
-"i ponovno pokretanje Mandrake Move. Da biste to učinili, kliknite\n"
+"i ponovno pokretanje Mandriva Move. Da biste to učinili, kliknite\n"
 "na odgovarajući gumb.\n"
 "\n"
 "\n"
@@ -1275,7 +1275,7 @@ msgstr "Myanmar"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 "Možete izabrati druge jezike koji će biti dostupni nakon instalacije"
@@ -3604,12 +3604,12 @@ msgstr "omogući podršku za radio"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Prije nastavka trebate pažljivo pročitati stavke licence. Ona\n"
-"pokriva cijelu Mandrakelinux distribuciju, i ako se ne slažete u svim\n"
+"pokriva cijelu Mandrivalinux distribuciju, i ako se ne slažete u svim\n"
 "stavkama sadržanih u njoj, kliknite na \"Odbij\" gumb koji će automatski\n"
 "završiti instalaciju. Za nastavak instalacije, kliknite na\n"
 "\"Prihvati\" gumb."
@@ -3791,13 +3791,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux instalacija je proširena na nekoliko CDROMova. DrakX\n"
+"Mandrivalinux instalacija je proširena na nekoliko CDROMova. DrakX\n"
 "zna ukoliko se odabrani paket nalazi na drugom CDROMu i izbaciti će\n"
 "trenutni CD i pitati vas da ubacite drugi koji je potreban."
 
@@ -3805,11 +3805,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3977,10 +3977,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4020,13 +4020,13 @@ msgstr ""
 "grupi,\n"
 "bit ćete upitani da potvrdite da li želite stvarno instalirati te "
 "poslužitelje.\n"
-"Kod Mandrakelinuxa, svi instalirani poslužitelji se pokreću prilikom "
+"Kod Mandrivalinuxa, svi instalirani poslužitelji se pokreću prilikom "
 "podizanja\n"
 "sustava. Čak iako su sigurni, bez poznatih problema u vrijeme izlaska "
 "distribucije,\n"
 "može se dogoditi da se otkriju sigurnosne rupe nakon zgotovljenja ove "
 "inačice\n"
-"Mandrakelinuxa. Ako ne znate što bi pojedini servis trebao raditi ili "
+"Mandrivalinuxa. Ako ne znate što bi pojedini servis trebao raditi ili "
 "zašto \n"
 "se instalira, pritisnite \"Ne\". Pritiskanjem na \"Da\"instalirat će se "
 "navedeni\n"
@@ -4178,7 +4178,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4283,12 +4283,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4315,7 +4315,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4324,7 +4324,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4345,12 +4345,12 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "U ovom trenutku, trebate izabrati gdje ćete instalirati vaš\n"
-"Mandrakelinux operativni sustav na vašem tvrdom disku. Ukoliko je prazan "
+"Mandrivalinux operativni sustav na vašem tvrdom disku. Ukoliko je prazan "
 "ili \n"
 "ako postojeći operativni sustav koristi čitav prostor na disku, trebate ga\n"
 "particionirati. Jednostavno, particioniranje hard diska sastoji se od\n"
 "logičkog dijeljenja kako bi napravili prostor za instalaciju vašeg novog\n"
-"Mandrakelinux sustava.\n"
+"Mandrivalinux sustava.\n"
 "\n"
 "Zato što su posljedice procesa particioniranja obično nepovratne,\n"
 "particioniranje može biti strašno i stresno ukoliko ste korisnik bez "
@@ -4359,7 +4359,7 @@ msgstr ""
 "upute i uzmite vremena koliko vam je potrebno.\n"
 "\n"
 "Ako ste pokrenuli instalaciju u modu za stručnjake, ući ćete u DiskDrake,\n"
-"Mandrakelinuxov alat za particioniranje, s kojim možete fino podešavati\n"
+"Mandrivalinuxov alat za particioniranje, s kojim možete fino podešavati\n"
 "particije. Pogledajte DiskDrake odjeljak u ``User Guide''.\n"
 "Iz sučelja instalacije možete koristiti čarobnjake koji su ovdje opisani\n"
 "pritiskom na \"Čarobnjak\" dugme.\n"
@@ -4382,7 +4382,7 @@ msgstr ""
 " * \"Obriši cijeli disk\": ukoliko želite obrisati sve podatke i sve "
 "particije\n"
 "koje postoje na vašem hard disku i zamjeniti ih sa\n"
-"vašim novim Mandrakelinux sustavom, možete izabrati ovu opciju. Budite\n"
+"vašim novim Mandrivalinux sustavom, možete izabrati ovu opciju. Budite\n"
 "pažljivi sa ovim rješenjem, nećete moći\n"
 "povratiti vaš izbor nakon potvrde.\n"
 "\n"
@@ -4397,7 +4397,7 @@ msgstr ""
 "Microsoft Windows particije. Mijenjanje veličine može se obaviti bez\n"
 "gubitka bilo kakvih podataka, ako prethodno defragmentirate Windows "
 "particiju.\n"
-"Ovo rješenje je preporučeno ukoliko želite koristiti zajedno Mandrakelinux\n"
+"Ovo rješenje je preporučeno ukoliko želite koristiti zajedno Mandrivalinux\n"
 "i Microsoft Windows-e na istom računalu.\n"
 "\n"
 "  Prije izabiranja ovog rješenja, molimo shvatite da će veličina vaše "
@@ -4562,7 +4562,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4588,7 +4588,7 @@ msgstr ""
 "Pritisnite na \"U redu\" kada ste spremni za formatiranje particije.\n"
 "\n"
 "Pritisnite na \"Odustani\" kada želite izabrati druge particije za\n"
-"instalaciju vašeg novog Mandrakelinux operativnog sustava.\n"
+"instalaciju vašeg novog Mandrivalinux operativnog sustava.\n"
 "\n"
 "Pritisnite na \"Napredno\" ako želite izabrati particije koje će biti\n"
 "provjeravane radi loših blokova (bad blocks)."
@@ -4605,7 +4605,7 @@ msgstr "Prethodni"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4617,7 +4617,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Dok instalirate Mandrakelinux, moguće je da su neki paketi već nadograđeni\n"
+"Dok instalirate Mandrivalinux, moguće je da su neki paketi već nadograđeni\n"
 "od prvotne inačice. Neki bugovi su možda uklonjeni, i sigurnost poboljšana.\n"
 "Da bi iskoristili prednosti tih nadogradnji, predloženo vam je da ih\n"
 "skinete s Interneta. Izaberite \"Da\" ako ste povezani s Internetom, ili \"Ne"
@@ -4646,7 +4646,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4672,7 +4672,7 @@ msgstr "Udaljeno administriranje"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4744,7 +4744,7 @@ msgid ""
 msgstr ""
 "U ovoj točki instalacije, trebate izabrati koje partiticije ćete koristiti "
 "za\n"
-"instalaciju vašeg novog Mandrakelinux sustava. Ukoliko su\n"
+"instalaciju vašeg novog Mandrivalinux sustava. Ukoliko su\n"
 "particije već definirane (iz prethodne instalacije GNU/Linux-a ili iz\n"
 "drugih particijskih alata), možete koristiti postojeće particije. Inače,\n"
 "moraju biti definirane.\n"
@@ -4826,7 +4826,7 @@ msgstr "Prebaci u normalni mod"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4857,7 +4857,7 @@ msgstr ""
 "Više od jedne Microsoft Windows particije su pronađene\n"
 "na vašem hard disku. Molimo izaberite jednu kojoj želite promjeniti "
 "veličinu\n"
-"kako bi instalirali vaš novi Mandrakelinux operativni sustav.\n"
+"kako bi instalirali vaš novi Mandrivalinux operativni sustav.\n"
 "\n"
 "Svaka je particija popisana kako slijedi; \"Linux ime\", \"Windows ime\"\n"
 "\"Kapacitet\".\n"
@@ -4902,7 +4902,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4911,13 +4911,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4968,7 +4968,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5202,7 +5202,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5223,12 +5223,12 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Ovdje biramo sustav za ispis za vaše računalo. Drugi OSovi možda nude "
 "jedan,\n"
-"ali Mandrakelinux nudi tri.\n"
+"ali Mandrivalinux nudi tri.\n"
 "\n"
 " * \"pdq\", što znači ``print, do not queue'' (ispiši, bez stavljanja u "
 "red), je\n"
@@ -5385,7 +5385,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5402,7 +5402,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5464,11 +5464,11 @@ msgstr "Servisi"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Izaberite hard disk kojeg želite obrisati kako bi instalirali vašu\n"
-"novu Mandrakelinux particiju. Budite pažljivi, svi postojeći podaci\n"
+"novu Mandrivalinux particiju. Budite pažljivi, svi postojeći podaci\n"
 "biti će izgubljen i neće se moći povratiti!"
 
 #: help.pm:863
@@ -5815,7 +5815,7 @@ msgstr "Iskoristi slobodan prostor na Windows particiji"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Vaša Windows particija je prefragmentirana, molim pokrenite ``defrag'' prvo."
@@ -5933,19 +5933,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5967,7 +5967,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5975,14 +5975,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5992,7 +5992,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6012,10 +6012,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6026,11 +6026,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6046,7 +6046,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Uvod\n"
 "\n"
@@ -6056,14 +6056,14 @@ msgstr ""
 "Produkti  uključuju, ali nisu \n"
 "ograničeni na, skup programa, metoda, zakona i dokumentacija vezanih uz "
 "operativni\n"
-"sustav i različite komponente Mandrakelinux distribucije.\n"
+"sustav i različite komponente Mandrivalinux distribucije.\n"
 "\n"
 "\n"
 "1. Licencni Dogovor\n"
 "\n"
 "Molimo pažljivo pročitajte ovaj dokument. Ovaj dokument je licenci dogovor "
 "između vas i \n"
-"Mandrakesoft S.A. koji se primjenjuje na Software-ske produkte.\n"
+"Mandriva S.A. koji se primjenjuje na Software-ske produkte.\n"
 "Instaliranjem, dupliciranjem ili korištenjem Software-skih Produkata u bilo "
 "kojem obliku,eksplicitno \n"
 "prihvaćate i potpuno se slažete da ćete prihvatiti stavke i uvjete ove "
@@ -6084,7 +6084,7 @@ msgstr ""
 "Software-ski Produkt i pripadajuća dokumentacija je pružena \"kako je\", bez "
 "jamstva, do \n"
 "mjere dozvoljene zakonom.\n"
-"Mandrakesoft S.A. neće, u bilo kojim slučajevima i do te mjere dozvoljene "
+"Mandriva S.A. neće, u bilo kojim slučajevima i do te mjere dozvoljene "
 "zakonom, biti odgovaran za bilo kakvu specijalnu,\n"
 "nesretnu, direktnu ili indirektnu štetu bilo kakvu (uključujući granice "
 "štete od gubitka\n"
@@ -6092,13 +6092,13 @@ msgstr ""
 "posljedica sudskih \n"
 "presuda, ili bilo kakvih drugih posljedica gubitka) što je posljedica "
 "korištenja ili nemogućnosti korištenja Software-skog \n"
-"Produkta, iako je Mandrakesoft S.A. bio upozoren od mogućnosti takve \n"
+"Produkta, iako je Mandriva S.A. bio upozoren od mogućnosti takve \n"
 "štete.\n"
 "\n"
 "OGRANIČENA ODGOVORNOST POVEZANA SA POSJEDOVANJEM ILI KORIŠTENJEM ZABRANJENOG "
 "SOFTWARE-A U NEKIM ZEMLJAMA\n"
 "\n"
-"Do granice dozvoljene zakonom, Mandrakesoft S.A. ili njegovi distributori "
+"Do granice dozvoljene zakonom, Mandriva S.A. ili njegovi distributori "
 "neće, u bilo kakvim slučajevima, biti \n"
 "odgovaran za bilo kakvu specijalnu, nesretnu, direktnu ili indirektnu štetu "
 "bilo kako (uključujući \n"
@@ -6108,7 +6108,7 @@ msgstr ""
 "posljedicagubitka) što je posljedica \n"
 "posjedovanja ili korištenja software-skih komponenti ili kao posljedica "
 "skidanja (download-a) software-skih komponenti \n"
-"sa jednog od Mandrakelinux site-ova koja su zabranjena ili ograničena u "
+"sa jednog od Mandrivalinux site-ova koja su zabranjena ili ograničena u "
 "nekim zemljama po lokalnim zakonima.\n"
 "Ova ograničena odgovornost se primjenjuje na, ali nije ograničena, jake "
 "kriptografske komponente \n"
@@ -6127,10 +6127,10 @@ msgstr ""
 "i uvjete licencnog dogovora svake komponente prije korištenja bilo koje "
 "komponente. Bilo koje pitanje \n"
 "o licenci komponente trebao bi biti adresiran autoru komponente a ne "
-"Mandrakesoft-u.\n"
-"Programe razvijeni od strane Mandrakesoft S.A. su pokriveni GPL licencom. "
+"Mandriva-u.\n"
+"Programe razvijeni od strane Mandriva S.A. su pokriveni GPL licencom. "
 "Dokumentacija napisana \n"
-"od strane Mandrakesoft S.A. je pokrivena specifičnom licencom. Molimo "
+"od strane Mandriva S.A. je pokrivena specifičnom licencom. Molimo "
 "pogledajte dokumentaciju za \n"
 "više detalja.\n"
 "\n"
@@ -6141,11 +6141,11 @@ msgstr ""
 "autorima i \n"
 "zaštićeni su intelektualnim vlasništvom i autorskim zakonima primjenjivim na "
 "software-ske programe.\n"
-"Mandrakesoft S.A. zadržava svoje pravo za izmjenu ili prilagođavanje "
+"Mandriva S.A. zadržava svoje pravo za izmjenu ili prilagođavanje "
 "Software-skog Produkta, kao cijelinu ili u\n"
 "dijelovima, u svim slučajevima za sve namjene.\n"
-"\"Mandrake\", \"Mandrakelinux\" i pripadajući logoi su zaštićeni prodajni "
-"znaci Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" i pripadajući logoi su zaštićeni prodajni "
+"znaci Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Državni zakoni \n"
@@ -6159,7 +6159,7 @@ msgstr ""
 "Sve sporove oko stavaka licence će preferirano biti uređeno sudom. Kao "
 "zadnji \n"
 "izlaz, spor će biti predan odgovarajućem Sudu u Parizu - Francuska.\n"
-"Za bilo kakva pitanja o ovom dokumentu, molimo kontaktirajte Mandrakesoft S."
+"Za bilo kakva pitanja o ovom dokumentu, molimo kontaktirajte Mandriva S."
 "A.  \n"
 
 #: install_messages.pm:90
@@ -6245,7 +6245,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6253,7 +6253,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Čestitam, instalacija je kompletna.\n"
 "Uklonite boot medij i pritisnite return za ponovno podizanje.\n"
@@ -6268,7 +6268,7 @@ msgstr ""
 "\n"
 "\n"
 "Informacije o konfiguriranju vašeg sustava je raspoloživo u poslije\n"
-"instalacijskom poglavlju od Official Mandrakelinux User's Guide."
+"instalacijskom poglavlju od Official Mandrivalinux User's Guide."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6303,12 +6303,12 @@ msgstr "Pokrećem korak `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Vaš sustav je slab na resursima. Možete imati nekih problem prilikom\n"
-"instalacije Mandrakelinux-a. Ukoliko se to desi, možete probati tekstualnu\n"
+"instalacije Mandrivalinux-a. Ukoliko se to desi, možete probati tekstualnu\n"
 "instalaciju. Za to, pritisnite `F1' kada podižete CDROM, i unesite `text'."
 
 #: install_steps_gtk.pm:228 install_steps_interactive.pm:624
@@ -6842,9 +6842,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Kontaktiram Mandrakelinux web site za dobivanje popisa raspoloživih mirrora"
+"Kontaktiram Mandrivalinux web site za dobivanje popisa raspoloživih mirrora"
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7065,8 +7065,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux instalacija %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux instalacija %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9651,13 +9651,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "tinyfirewall podešavanje\n"
 "\n"
-"Ovo podešava osobni vatrozid za ovo Mandrakelinux računalo.\n"
+"Ovo podešava osobni vatrozid za ovo Mandrivalinux računalo.\n"
 "Za snažno primjenjena vatrozidna rješenja, molimo pogledajte\n"
 "specijaliziranu MandrakeSecurity Firewall distribuciju."
 
@@ -13467,7 +13467,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -15327,18 +15327,18 @@ msgstr "Zaustavi"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Što je Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Što je Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Dobro dosli u <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Dobro dosli u <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -15347,7 +15347,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -15364,9 +15364,9 @@ msgstr "Dobrodošli u Open Source svijet"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -15386,7 +15386,7 @@ msgstr "<b>GPL licenca</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -15412,10 +15412,10 @@ msgstr "<b>Pridružite se zajednici</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -15434,8 +15434,8 @@ msgstr "<B>Download inačica</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -15462,7 +15462,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -15472,7 +15472,7 @@ msgstr "<b>Discovery, vaš prvi Linux dekstop</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15491,13 +15491,13 @@ msgstr "<b>PowerPack, vrhunski Linux desktop</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -15509,7 +15509,7 @@ msgstr "<b>PowerPack+, Linux rješenje za desktope i poslužitelje</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15523,19 +15523,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgid "<b>Mandriva Products</b>"
+msgstr "Mandrivalinux Kontrolni Centar"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -15556,61 +15556,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesoft proizvod (Nomad proizvodi)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandriva proizvod (Nomad proizvodi)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Mandrakesoft proizvodi (Profesionalna rješenja)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Mandriva proizvodi (Profesionalna rješenja)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -15648,7 +15648,7 @@ msgstr "Izaberite vaš ključ za enkriptiranje datotečnog sustava"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -15669,7 +15669,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -15787,7 +15787,7 @@ msgstr "<b>Uživajte u velikom izboru aplikacija</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -16023,14 +16023,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux Kontrolni Centar</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux Kontrolni Centar</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -16052,21 +16052,21 @@ msgstr "<b>Model otvorenog koda</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
 #: share/advertising/27.pl:13
 #, fuzzy, c-format
 msgid "<b>Online Store</b>"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgstr "Mandrivalinux Kontrolni Centar"
 
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -16089,20 +16089,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, fuzzy, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgid "<b>Mandriva Club</b>"
+msgstr "Mandrivalinux Kontrolni Centar"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -16121,33 +16121,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -16170,32 +16170,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgid "<b>Mandriva Expert</b>"
+msgstr "Mandrivalinux Kontrolni Centar"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -16495,8 +16495,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgid "Mandriva Wizards"
+msgstr "Mandrivalinux Kontrolni Centar"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -16615,7 +16615,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16663,7 +16663,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -19226,13 +19226,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux Kontrolni Centar"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux Kontrolni Centar"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19252,8 +19252,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, fuzzy, c-format
@@ -19297,7 +19297,7 @@ msgstr "Čarobnjak mrežnih postavki"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -19712,7 +19712,7 @@ msgstr "Pokrenuto pri podizanju"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Ovo sučelje još nije podešeno.\n"
 "Pokrenite čarobnjak za postavu u glavnom prozoru"
@@ -19721,7 +19721,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Ovo sučelje još nije podešeno.\n"
 "Pokrenite čarobnjak za postavu u glavnom prozoru"
@@ -19774,7 +19774,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20069,7 +20069,7 @@ msgstr "Uvoz"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -20588,7 +20588,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -20615,7 +20615,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Mandrake Kontrolni Centar"
 
 #: standalone/drakhelp:36
@@ -23639,7 +23639,7 @@ msgstr "Promjena je izvršena, ali da bi imala učinak, morate se odlogirati"
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Objašnjenja Mandrake alata"
 
 #: standalone/logdrake:51
@@ -24146,10 +24146,10 @@ msgstr "Veza uspostavljena."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Spajanje nije uspjelo.\n"
-"Provjerite konfiguraciju u Mandrakelinux kontrolnom centru."
+"Provjerite konfiguraciju u Mandrivalinux kontrolnom centru."
 
 #: standalone/net_monitor:341
 #, fuzzy, c-format
@@ -24994,8 +24994,8 @@ msgstr "Instalacija nije uspjela"
 #~ msgstr "nisam mogao naći nijedan font.\n"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Mandrakelinux Kontrolni Centar"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Mandrivalinux Kontrolni Centar"
 
 #, fuzzy
 #~ msgid "No browser available! Please install one"
diff --git a/perl-install/share/po/hu.po b/perl-install/share/po/hu.po
index 463d451fd..1fa77f30c 100644
--- a/perl-install/share/po/hu.po
+++ b/perl-install/share/po/hu.po
@@ -68,7 +68,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Úgy tűnik, az USB-kulcson be van kapcsolva az írásvédelem, de az\n"
 "eszközt jelenleg nem lehet biztonságosan eltávolítani.\n"
@@ -76,7 +76,7 @@ msgstr ""
 "\n"
 "Kattintson a gombra a gép újraindításához, távolítsa el az eszközt,\n"
 "kapcsolja ki az írásvédelmet, tegye be a kulcsot ismét, majd indítsa\n"
-"el újra a Mandrake Move rendszert."
+"el újra a Mandriva Move rendszert."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -94,7 +94,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Az USB-kulcson nincsen érvényes windowsos (FAT) partíció.\n"
@@ -112,7 +112,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -120,11 +120,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "A rendszerben nem található USB-kulcs. Ha behelyez egy USB-kulcsot,\n"
-"akkor a Mandrake Move el tudja menteni az Ön saját könyvtárában\n"
+"akkor a Mandriva Move el tudja menteni az Ön saját könyvtárában\n"
 "levő adatokat valamint a rendszer beállításait, amelyek\n"
 "felhasználhatók lesznek a gép következő indításakor vagy egy másik\n"
 "gépen. Ha most helyez be egy ilyen eszközt, várjon néhány\n"
@@ -260,7 +260,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -276,7 +276,7 @@ msgstr ""
 "\n"
 "Ezt okozhatja például egy, az USB-kulcson levő sérült\n"
 "rendszerbeállítási fájl - ebben az esetben a fájl\n"
-"eltávolítása, majd a Mandrake Move újraindítása megoldja\n"
+"eltávolítása, majd a Mandriva Move újraindítása megoldja\n"
 "a problémát. Ehhez kattintson a megfelelő gombra.\n"
 "\n"
 "\n"
@@ -1319,11 +1319,11 @@ msgstr "Nyelvválasztás"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"A Mandrakelinux több nyelvvel is telepíthető. Jelölje ki,\n"
+"A Mandrivalinux több nyelvvel is telepíthető. Jelölje ki,\n"
 "mely nyelveket szeretné telepíteni. Ezek a telepítés befejeződése\n"
 "utáni újraindítást követően lesznek elérhetők."
 
@@ -3761,12 +3761,12 @@ msgstr "Rádiótámogatás bekapcsolása"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Mielőtt továbblépne, olvassa át alaposan a licencegyezményt, amely az\n"
-"egész Mandrakelinux disztribúcióra érvényes. Ha elfogadja az abban\n"
+"egész Mandrivalinux disztribúcióra érvényes. Ha elfogadja az abban\n"
 "szereplő feltételeket, akkor jelölje be a(z) \"%s\" opciót.\n"
 "Ha nem fogadja el valamelyik feltételt, akkor kattintson a(z)\n"
 "\"%s\" gombra - ezzel újraindítja a számítógépet."
@@ -3947,13 +3947,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"A Mandrakelinux telepítőanyag több CD-n helyezkedik el. Ha egy kiválasztott\n"
+"A Mandrivalinux telepítőanyag több CD-n helyezkedik el. Ha egy kiválasztott\n"
 "csomag egy másik CD-n található, akkor a telepítő kiadja az\n"
 "aktuális CD-t, és megkéri Önt, hogy helyezze be a megfelelőt.\n"
 "Ha a szóban forgó lemez nincs kéznél, akkor kattintson a(z) \"%s\" gombra,\n"
@@ -3963,11 +3963,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4019,10 +4019,10 @@ msgid ""
 "megabytes."
 msgstr ""
 "Most meg kell adnia, mely programokat kívánja telepíteni a rendszerére.\n"
-"Több ezer program létezik Mandrakelinuxhoz; a kezelésük megkönnyítése\n"
+"Több ezer program létezik Mandrivalinuxhoz; a kezelésük megkönnyítése\n"
 "érdekében a programok (hasonlóság alapján) csoportokba lettek sorolva.\n"
 "\n"
-"A Mandrakelinux rendszerben négy előredefiniált csomagkategória van\n"
+"A Mandrivalinux rendszerben négy előredefiniált csomagkategória van\n"
 "meghatározva. A különböző kategóriákban levő csomagok keverhetők is,\n"
 "tehát egy \"Munkaállomás\" típusú telepítés tartalmazhat olyan\n"
 "alkalmazásokat is, amelyek csak a \"Kiszolgáló\" kategóriában vannak\n"
@@ -4128,10 +4128,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4162,7 +4162,7 @@ msgstr ""
 "Ha kiszolgálócsomagok is ki lettek választva - akár közvetlenül, akár\n"
 "bizonyos csoportok tagjaként -, a telepítő megerősítést kér Öntől arra\n"
 "vonatkozóan, hogy valóban telepíteni kívánja-e azon kiszolgálószoftvereket.\n"
-"A Mandrakelinux rendszerben alapértelmezésben az összes feltelepített\n"
+"A Mandrivalinux rendszerben alapértelmezésben az összes feltelepített\n"
 "szolgáltatás elindításra kerül a rendszer indulásakor. Még ha azok\n"
 "biztonságosak is illetve nem rendelkeznek ismert problémákkal, akkor is\n"
 "előfordulhat, hogy utóbb biztonsági problémák merülnek fel velük\n"
@@ -4317,7 +4317,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4372,7 +4372,7 @@ msgid ""
 "not successful in getting the display configured."
 msgstr ""
 "Az X (teljes néven: X Window System) a Linux grafikus felületét nyújtó\n"
-"rendszer. A Mandrakelinuxban levő grafikus környezetek (KDE, GNOME,\n"
+"rendszer. A Mandrivalinuxban levő grafikus környezetek (KDE, GNOME,\n"
 "AfterStep, WindowMaker, ...) ezen grafikus rendszert használják.\n"
 "\n"
 "Egy listát fog látni az elérhető paraméterekről, amelyekkel optimalizálható\n"
@@ -4493,12 +4493,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4525,7 +4525,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4534,7 +4534,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4554,11 +4554,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 ""
-"Ebben a lépésben kell megadni, hogy a Mandrakelinux telepítése a merevlemez\n"
+"Ebben a lépésben kell megadni, hogy a Mandrivalinux telepítése a merevlemez\n"
 "melyik részére történjen. Ha a lemez még teljesen üres, vagy a korábban\n"
 "telepített operációs rendszer(ek) miatt nincs elég szabad hely, akkor újra\n"
 "kell partícionálni a lemezt. A partícionálás a lemezterület logikai\n"
-"újrafelosztását jelenti - erre a Mandrakelinux telepítéséhez szükséges\n"
+"újrafelosztását jelenti - erre a Mandrivalinux telepítéséhez szükséges\n"
 "hely létrehozása érdekében van szükség.\n"
 "\n"
 "A partícionálás veszélyes művelet. Hiba esetén adatvesztéssel járhat\n"
@@ -4590,7 +4590,7 @@ msgstr ""
 "Az átméretezés végrehajtható a lemezen levő adatok\n"
 "elvesztése nélkül - feltéve, hogy azt megelőzően töredezettségmentesítve\n"
 "lett a kérdéses partíció. Javasolt továbbá az adatok mentése is.\n"
-"Ezen módszer a javasolt abban az esetben, ha a Mandrakelinuxt és a\n"
+"Ezen módszer a javasolt abban az esetben, ha a Mandrivalinuxt és a\n"
 "Windowst ugyanazon a gépen szeretné használni.\n"
 "\n"
 "Ha ezt a lehetőséget választja, ne feledkezzen meg arról, hogy ennek\n"
@@ -4710,7 +4710,7 @@ msgstr ""
 "\n"
 "Ez a lehetőség jól használható akkor, amikor nagyobb számú azonos gépre\n"
 "kell a rendszert feltelepíteni. Az automatikus telepítéssel\n"
-"kapcsolatban a Mandrakelinux honlapján találhatók további információk.\n"
+"kapcsolatban a Mandrivalinux honlapján találhatók további információk.\n"
 "\n"
 "  - \"%s\"(*): elmenti a telepítés során\n"
 "kiválasztott csomagok listáját. Ha egy újabb telepítés alkalmával fel\n"
@@ -4765,7 +4765,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4787,7 +4787,7 @@ msgstr ""
 "Kattintson a(z) \"%s\" gombra a formázások megkezdéséhez.\n"
 "\n"
 "Kattintson a(z) \"%s\" gombra, ha más partícióra szeretné telepíteni a\n"
-"Mandrakelinux operációs rendszert.\n"
+"Mandrivalinux operációs rendszert.\n"
 "\n"
 "Kattintson a(z) \"%s\" gombra, ha bizonyos partíciókat ellenőriztetni\n"
 "kíván (hibás blokkok keresése)."
@@ -4804,7 +4804,7 @@ msgstr "Előző"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4816,7 +4816,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Lehetséges, hogy amikor Ön a Mandrakelinux rendszert telepíti, már\n"
+"Lehetséges, hogy amikor Ön a Mandrivalinux rendszert telepíti, már\n"
 "frissítésre kerültek bizonyos csomagok a rendszer kiadása óta.\n"
 "Elképzelhető, hogy bizonyos hibák ki lettek javítva, illetve\n"
 "hogy meg lettek oldva bizonyos felmerült biztonsági problémák. Ezeket\n"
@@ -4848,7 +4848,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4861,7 +4861,7 @@ msgstr ""
 "\n"
 "Ha nem biztos benne, hogy mit volna érdemes választani, akkor válassza\n"
 "az alapértelmezés szerinti lehetőséget. A biztonsági szint később is\n"
-"módosítható a Mandrakelinux Vezérlőközpontban elérhető \"draksec\"\n"
+"módosítható a Mandrivalinux Vezérlőközpontban elérhető \"draksec\"\n"
 "eszközzel.\n"
 "\n"
 "A(z) \"%s\" mezőben megadandó a biztonságért felelős személy email-címe.\n"
@@ -4876,7 +4876,7 @@ msgstr "Biztonsági adminisztrátor"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4946,7 +4946,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Ebben a lépésben kell kiválasztani a Mandrakelinux rendszer telepítéséhez\n"
+"Ebben a lépésben kell kiválasztani a Mandrivalinux rendszer telepítéséhez\n"
 "használni kívánt partíciókat. Ha a kívánt partíciók már létre lettek hozva\n"
 "(egy korábbi Linux-telepítés vagy valamilyen partícionálási segédprogram\n"
 "által), akkor felhasználhatók a már létező partíciók. Ha viszont még nem\n"
@@ -5039,7 +5039,7 @@ msgstr "Váltás a normál és a szakértői módok közt"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5069,7 +5069,7 @@ msgid ""
 msgstr ""
 "Egynél több microsoftos partíció van a lemezen.\n"
 "Válassza ki azt, amelyiket át szeretné méretezni, hogy a\n"
-"Mandrakelinux feltelepíthető legyen.\n"
+"Mandrivalinux feltelepíthető legyen.\n"
 "\n"
 "A partíciólista a következő mezőket tartalmazza: \"linuxos név\",\n"
 "\"windowsos név\", \"kapacitás\".\n"
@@ -5119,7 +5119,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5128,18 +5128,18 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Erre a lépésre csak akkor kerül sor, ha a gépen már van linuxos partíció.\n"
 "\n"
 "Most közölnie kell a telepítővel, hogy új telepítést szeretne-e végezni\n"
-"vagy pedig egy meglevő Mandrakelinux-rendszert kíván frissíteni:\n"
+"vagy pedig egy meglevő Mandrivalinux-rendszert kíván frissíteni:\n"
 "\n"
 "  - \"%s\": a korábbi rendszer felülírásra kerül. Attól függően, hogy\n"
 "milyen partíciók találhatók a gépen, bizonyos partíciók (például a\n"
@@ -5147,13 +5147,13 @@ msgstr ""
 "megőrizhetők. Ha szeretné módosítani a merevlemezek partícionálását\n"
 "vagy a fájlrendszereket, akkor ezt a lehetőséget használja.\n"
 "\n"
-"  - \"%s\": lehetővé teszi egy korábbi Mandrakelinux-telepítés\n"
+"  - \"%s\": lehetővé teszi egy korábbi Mandrivalinux-telepítés\n"
 "csomagjainak frissítését. A merevlemezek partícionálása változatlanul\n"
 "marad, a felhasználók adatai sem módosulnak. A többi beállítási lépés közül\n"
 "a legtöbb elérhető lesz - a folyamat hasonló a normál telepítéshez.\n"
 "\n"
 "Frissítés használata akkor javasolt, ha a számítógépen\n"
-"Mandrakelinux 8.1 vagy újabb kiadás van."
+"Mandrivalinux 8.1 vagy újabb kiadás van."
 
 #: help.pm:591
 #, c-format
@@ -5211,7 +5211,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5254,7 +5254,7 @@ msgstr ""
 "Az UTF-8 (Unicode) szabvány támogatásáról: A Unicode egy új\n"
 "karakterkódolási szabvány az összes létező nyelv lefedésére.\n"
 "A Linux alatti teljes támogatása még fejlesztés alatt áll.\n"
-"A Mandrakelinux UTF-8-használatát befolyásolják a felhasználó\n"
+"A Mandrivalinux UTF-8-használatát befolyásolják a felhasználó\n"
 "által végzett beállítások:\n"
 "\n"
 "  - ha olyan nyelvet választ, amelyhez erősen kapcsolódik egy\n"
@@ -5508,7 +5508,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5529,11 +5529,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Itt lehet nyomtatórendszert választani a gép számára. Más operációs\n"
-"rendszerekben általában csak egy van, a Mandrakelinuxban viszont kettő is.\n"
+"rendszerekben általában csak egy van, a Mandrivalinuxban viszont kettő is.\n"
 "Mindkettőnek megvannak a maga előnyei bizonyos környezetben használva.\n"
 "\n"
 "  - \"%s\": \"print, do not queue\", azaz sorba tevés nélkül történő\n"
@@ -5558,7 +5558,7 @@ msgstr ""
 "\n"
 "Telepítés után lehetősége lesz a nyomtatórendszer lecserélésére (ha mégsem\n"
 "felel meg az itt kiválasztott) - ehhez a PrinterDrake programot kell\n"
-"elindítani a Mandrakelinux Vezérlőközpontban, majd rá kell kattintani a(z)\n"
+"elindítani a Mandrivalinux Vezérlőközpontban, majd rá kell kattintani a(z)\n"
 "\"%s\" gombra."
 
 #: help.pm:765
@@ -5675,7 +5675,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5692,7 +5692,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5743,7 +5743,7 @@ msgstr ""
 "\n"
 "  - \"%s\": ha be szeretné állítani az internet vagy a helyi hálózat\n"
 "elérését most, akkor kattintson a gombra. Információkat a nyomtatott\n"
-"dokumentációból szerezhet, vagy telepítés után a Mandrakelinux\n"
+"dokumentációból szerezhet, vagy telepítés után a Mandrivalinux\n"
 "Vezérlőközpontban.\n"
 "\n"
 "  - \"%s\": lehetővé teszi a HTTP- és FTP-proxyk beállítását arra az\n"
@@ -5760,7 +5760,7 @@ msgstr ""
 "beállításait, kattintson a megfelelő gombra. Elsősorban a komolyabb\n"
 "ismeretekkel rendelkező felhasználóknak javasolt. Információkat a\n"
 "nyomtatott dokumentációból szerezhet, vagy telepítés után a\n"
-"Mandrakelinux Vezérlőközpontban a rendszerindítónál.\n"
+"Mandrivalinux Vezérlőközpontban a rendszerindítónál.\n"
 "\n"
 "  - \"%s\": itt részletesen beállítható, hogy mely\n"
 "szolgáltatások legyenek működtetve a gépen. Ha kiszolgálóként szeretné\n"
@@ -5821,11 +5821,11 @@ msgstr "Szolgáltatások"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Válassza ki azt a lemezt, amelyet törölni szeretne a\n"
-"Mandrakelinux-partíció létrehozásához. Figyelem: a lemezen\n"
+"Mandrivalinux-partíció létrehozásához. Figyelem: a lemezen\n"
 "található adatok elvesznek, és később nem nyerhetők vissza!"
 
 #: help.pm:863
@@ -6175,12 +6175,12 @@ msgstr "A windowsos partíció méretének meghatározása"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "A windowsos partíció túlzottan töredezett. Indítsa újra a gépet Windowsszal, "
 "majd futtassa a \"defrag\" programot. Ennek végeztével indítsa el újra a "
-"Mandrakelinux telepítését."
+"Mandrivalinux telepítését."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6296,19 +6296,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6330,7 +6330,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6338,14 +6338,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6355,7 +6355,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6375,10 +6375,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6389,11 +6389,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6409,15 +6409,15 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Bevezetés\n"
 "\n"
-"A továbbiakban az operációs rendszerre és a Mandrakelinux disztribúcióban "
+"A továbbiakban az operációs rendszerre és a Mandrivalinux disztribúcióban "
 "elérhető\n"
 "különféle komponensekre \"Szoftvertermékek\" néven hivatkozunk. A "
 "Szoftvertermékek körébe - nem\n"
-"kizárólagosan - beletartoznak az operációs rendszerhez és a Mandrakelinux "
+"kizárólagosan - beletartoznak az operációs rendszerhez és a Mandrivalinux "
 "disztribúció\n"
 "különféle komponenseihez kapcsolódó programok, módszerek, szabályok és "
 "dokumentáció.\n"
@@ -6427,7 +6427,7 @@ msgstr ""
 "\n"
 "Kérjük, olvassa el jelen dokumentumot figyelmesen. Ezen dokumentum egy, a "
 "Szoftvertermékekre\n"
-"vonatkozó licencegyezmény Ön és a Mandrakesoft S.A. között.\n"
+"vonatkozó licencegyezmény Ön és a Mandriva S.A. között.\n"
 "Ha a Szoftvertermékeket bármiféle módon telepíti, sokszorosítja vagy "
 "felhasználja,\n"
 "azzal Ön elfogadja jelen licenc kikötéseit és feltételeit, továbbá "
@@ -6453,7 +6453,7 @@ msgstr ""
 "állapotban állnak\n"
 "rendelkezésre. Garancia nincsen azokra - a törvények által engedélyezett "
 "mértékben.\n"
-"A Mandrakesoft S.A. - a törvények által engedélyezett mértékben - semmilyen "
+"A Mandriva S.A. - a törvények által engedélyezett mértékben - semmilyen "
 "körülmények\n"
 "között sem vonható felelősségre a Szoftvertermékek használatából vagy "
 "használhatatlanságából\n"
@@ -6463,7 +6463,7 @@ msgstr ""
 "pénzügyi\n"
 "veszteség, jogi díjak illetve bírósági ítéletből származó büntetés, vagy "
 "bármilyen\n"
-"származékos veszteség); még abban az esetben sem, ha a Mandrakesoft S.A. "
+"származékos veszteség); még abban az esetben sem, ha a Mandriva S.A. "
 "tájékoztatva lett\n"
 "az ilyesféle károk bekövetkezésének lehetőségéről.\n"
 "\n"
@@ -6471,7 +6471,7 @@ msgstr ""
 "BIRTOKLÁSÁVAL ILLETVE\n"
 "HASZNÁLATÁVAL KAPCSOLATBAN\n"
 "\n"
-"A Mandrakesoft S.A. és disztribútorai - a törvények által engedélyezett "
+"A Mandriva S.A. és disztribútorai - a törvények által engedélyezett "
 "mértékben - semmilyen\n"
 "körülmények között sem vonhatók felelősségre az olyan - speciális, előre nem "
 "látott, közvetlen\n"
@@ -6483,7 +6483,7 @@ msgstr ""
 "károk a\n"
 "szoftverkomponensek birtoklásából vagy használatából illetve a helyi "
 "törvények által\n"
-"tiltott vagy korlátozott szoftverkomponenseknek egy Mandrakelinux-címről "
+"tiltott vagy korlátozott szoftverkomponenseknek egy Mandrivalinux-címről "
 "való\n"
 "letöltéséből származnak.\n"
 "Ezen korlátozott felelősség vonatkozik többek közt a Szoftvertermékekben "
@@ -6504,11 +6504,11 @@ msgstr ""
 "el figyelmesen\n"
 "a komponensre vonatkozó licenc kikötéseit és feltételeit. Egy komponens "
 "licencére vonatkozó\n"
-"kérdést nem a Mandrakesoft céghez, hanem az adott komponens szerzőjéhez kell "
+"kérdést nem a Mandriva céghez, hanem az adott komponens szerzőjéhez kell "
 "irányítani.\n"
-"A Mandrakesoft S.A. által fejlesztett programok a GPL licenc hatálya alá "
+"A Mandriva S.A. által fejlesztett programok a GPL licenc hatálya alá "
 "tartoznak.\n"
-"A Mandrakesoft S.A. által írt dokumentációs anyagokra egy speciális licenc "
+"A Mandriva S.A. által írt dokumentációs anyagokra egy speciális licenc "
 "vonatkozik.\n"
 "További részletek a dokumentációban.\n"
 "\n"
@@ -6520,12 +6520,12 @@ msgstr ""
 "és a szoftverekre vonatkozó szellemi tulajdoni illetve szerzői jogi "
 "(copyright) törvények\n"
 "védelme alatt áll.\n"
-"A Mandrakesoft S.A. fenntartja a jogot arra, hogy módosítsa illetve "
+"A Mandriva S.A. fenntartja a jogot arra, hogy módosítsa illetve "
 "átalakítsa a\n"
 "Szoftvertermékeket - teljes egészében vagy részben, bármilyen módon illetve "
 "bármilyen célra.\n"
-"A \"Mandrake\", a \"Mandrakelinux\" és az azokhoz tartozó logók a "
-"Mandrakesoft S.A. védjegyei.\n"
+"A \"Mandriva\", a \"Mandrivalinux\" és az azokhoz tartozó logók a "
+"Mandriva S.A. védjegyei.\n"
 "\n"
 "\n"
 "5. Vonatkozó törvények\n"
@@ -6544,7 +6544,7 @@ msgstr ""
 "megfelelő\n"
 "párizsi (Franciaország) bíróságra kerül.\n"
 "Ha jelen dokumentummal kapcsolatban kérdése van, vegye fel a kapcsolatot a "
-"Mandrakesoft S.A.\n"
+"Mandriva S.A.\n"
 "céggel.\n"
 
 #: install_messages.pm:90
@@ -6638,7 +6638,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6646,21 +6646,21 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Gratulálunk; a telepítés befejeződött. Vegye ki a rendszerindítási\n"
 "adathordozókat, majd nyomja le az Enter billentyűt a rendszer\n"
 "újraindításához.\n"
 "\n"
 "\n"
-"Az ehhez a Mandrakelinux-verzióhoz elérhető javításokról a következő\n"
+"Az ehhez a Mandrivalinux-verzióhoz elérhető javításokról a következő\n"
 "helyen olvashat:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"A rendszer beállításával kapcsolatban a Mandrakelinux hivatalos\n"
+"A rendszer beállításával kapcsolatban a Mandrivalinux hivatalos\n"
 "felhasználói kézikönyvében talál további információkat."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6697,12 +6697,12 @@ msgstr "A következő lépés: \"%s\"\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "A rendszer gyenge erőforrásokkal rendelkezik. Előfordulhat, hogy problémái\n"
-"lesznek a Mandrakelinux telepítésével. Ha így történik, próbálkozzon\n"
+"lesznek a Mandrivalinux telepítésével. Ha így történik, próbálkozzon\n"
 "szöveges módú telepítéssel: CD-ről való rendszerindítást követően nyomjon\n"
 "\"F1\"-et, majd írja be azt, hogy \"text\"."
 
@@ -7259,9 +7259,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Kapcsolódás a Mandrakelinux webkiszolgálójához; az elérhető tükörkiszolgálók "
+"Kapcsolódás a Mandrivalinux webkiszolgálójához; az elérhető tükörkiszolgálók "
 "listájának lekérdezése..."
 
 #: install_steps_interactive.pm:840
@@ -7490,8 +7490,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux-telepítés %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux-telepítés %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10080,14 +10080,14 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "A DrakFirewall beállítása\n"
 "\n"
 "Ezzel egy személyes felhasználásra szánt tűzfalat lehet beállítani ehhez\n"
-"a Mandrakelinuxt használó géphez. Ha egy komolyabb tűzfalmegoldást\n"
+"a Mandrivalinuxt használó géphez. Ha egy komolyabb tűzfalmegoldást\n"
 "szeretne, szerezze be a speciális MandrakeSecurity Firewall disztribúciót."
 
 #: network/drakfirewall.pm:164
@@ -14175,12 +14175,12 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
 "Ha szeretné megosztani a lapolvasót a hálózaton, akkor használja a "
-"Scannerdrake programot (Hardver/Lapolvasók a Mandrakelinux "
+"Scannerdrake programot (Hardver/Lapolvasók a Mandrivalinux "
 "Vezérlőközpontban).\n"
 "\n"
 
@@ -16186,33 +16186,33 @@ msgstr "Leállítás"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mi a Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Mi a Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Üdvözli a <b>Mandrakelinux</b>"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Üdvözli a <b>Mandrivalinux</b>"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"A Mandrakelinux egy <b>Linux-disztribúció</b>, amely az alaprendszeren - a "
+"A Mandrivalinux egy <b>Linux-disztribúció</b>, amely az alaprendszeren - a "
 "Linux kernelen alapuló <b>operációs rendszeren</b> - kívül tartalmaz "
 "<b>számos alkalmazást</b> is, megfelelve ezzel minden igénynek."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"A Mandrakelinux a leginkább <b>felhasználóbarát</b> Linux-disztribúció, "
+"A Mandrivalinux a leginkább <b>felhasználóbarát</b> Linux-disztribúció, "
 "továbbá az egyik <b>legelterjedtebb</b> is."
 
 #: share/advertising/02.pl:13
@@ -16228,13 +16228,13 @@ msgstr "Üdvözöljük a <b>nyílt forráskód világában</b>"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"A Mandrakelinux a nyílt forrás-modellt alkalmazza. Ez azt jelenti, hogy ez a "
-"verzió a <b>Mandrakesoft fejlesztőcsapata</b> és a Mandrakelinux "
+"A Mandrivalinux a nyílt forrás-modellt alkalmazza. Ez azt jelenti, hogy ez a "
+"verzió a <b>Mandriva fejlesztőcsapata</b> és a Mandrivalinux "
 "fejlesztésében közreműködők <b>világméretű közössége</b> közti "
 "<b>együttműködés</b> eredménye."
 
@@ -16256,9 +16256,9 @@ msgstr "<b>A GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"A disztribúcióban levő legtöbb szoftver, valamint az összes Mandrakelinux-"
+"A disztribúcióban levő legtöbb szoftver, valamint az összes Mandrivalinux-"
 "eszköz a <b>General Public License</b> nevű licencet használja."
 
 #: share/advertising/03.pl:17
@@ -16290,15 +16290,15 @@ msgstr "<b>Csatlakozzon a közösséghez</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"A Mandrakelinux rendelkezik az egyik <b>legnagyobb</b> felhasználói és "
+"A Mandrivalinux rendelkezik az egyik <b>legnagyobb</b> felhasználói és "
 "fejlesztői <b>közösséggel</b>. A közösség széles körű tevékenységet végez a "
 "hibakereséstől kezdve az alkalmazásfejlesztésig. A közösség "
-"<b>kulcsszerepet</b> játszik a Mandrakelinux világában."
+"<b>kulcsszerepet</b> játszik a Mandrivalinux világában."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16320,11 +16320,11 @@ msgstr "<b>Letölthető verzió</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Jelenleg a <b>Mandrakelinux letölthető verziójának</b> telepítése folyik. "
-"Ezt az ingyenes verziót a Mandrakesoft <b>mindenki számára elérhetően</b> "
+"Jelenleg a <b>Mandrivalinux letölthető verziójának</b> telepítése folyik. "
+"Ezt az ingyenes verziót a Mandriva <b>mindenki számára elérhetően</b> "
 "terjeszti."
 
 #: share/advertising/05.pl:19
@@ -16354,9 +16354,9 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
-"A többi Mandrakesoft-termékkel kínált <b>szolgáltatásokhoz</b> sem lesz "
+"A többi Mandriva-termékkel kínált <b>szolgáltatásokhoz</b> sem lesz "
 "hozzáférési lehetőség."
 
 #: share/advertising/06.pl:13
@@ -16366,8 +16366,8 @@ msgstr "<b>Discovery - az Ön első Linux-munkaasztala</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Ön most a <b>Mandrakelinux Discovery</b> terméket telepíti."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Ön most a <b>Mandrivalinux Discovery</b> terméket telepíti."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16389,17 +16389,17 @@ msgstr "<b>PowerPack - a legerősebb Linux-munkaasztal</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Ön most a <b>Mandrakelinux PowerPack</b> terméket telepíti."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Ön most a <b>Mandrivalinux PowerPack</b> terméket telepíti."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"A PowerPack a Mandrakesoft által készített <b>linuxos munkaasztali termékek "
+"A PowerPack a Mandriva által készített <b>linuxos munkaasztali termékek "
 "zászlóshajója</b>. A PowerPack <b>alkalmazások ezreit</b> tartalmazza - a "
 "legnépszerűbbeket és a legfejlettebbeket."
 
@@ -16410,8 +16410,8 @@ msgstr "<b>PowerPack+ - Linux-megoldás munkaasztalra és kiszolgálóra</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Ön most a <b>Mandrakelinux PowerPack+</b> terméket telepíti."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Ön most a <b>Mandrivalinux PowerPack+</b> terméket telepíti."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16428,22 +16428,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesoft-termékek</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva-termékek</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"A <b>Mandrakesoft</b> széles skálával rendelkezik <b>Mandrakelinux</b>-"
+"A <b>Mandriva</b> széles skálával rendelkezik <b>Mandrivalinux</b>-"
 "termékekből."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "A Mandrakelinux-termékek a következők:"
+msgid "The Mandrivalinux products are:"
+msgstr "A Mandrivalinux-termékek a következők:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16463,76 +16463,76 @@ msgstr "\t- <b>PowerPack+</b> - Linux-megoldás munkaasztalra és kiszolgálóra
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t- <b>Mandrakelinux az x86-64 architektúrához</b> - a Mandrakelinux-"
+"\t- <b>Mandrivalinux az x86-64 architektúrához</b> - a Mandrivalinux-"
 "megoldás, amellyel a legtöbbet hozhatja ki 64 bites processzorából"
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesoft-termékek (Nomad)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandriva-termékek (Nomad)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"A Mandrakesoft rendelkezik kettő olyan termékkel, amelyek lehetővé teszik a "
-"Mandrakelinux <b>bármely számítógépen</b> való, telepítés nélküli "
+"A Mandriva rendelkezik kettő olyan termékkel, amelyek lehetővé teszik a "
+"Mandrivalinux <b>bármely számítógépen</b> való, telepítés nélküli "
 "használatát:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t- <b>Move</b> - Mandrakelinux-rendszer, amely teljes mértékben egy "
+"\t- <b>Move</b> - Mandrivalinux-rendszer, amely teljes mértékben egy "
 "indítható CD-ről fut"
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t- <b>GlobeTrotter</b> - Mandrakelinux-rendszer előre telepítve a tömör "
+"\t- <b>GlobeTrotter</b> - Mandrivalinux-rendszer előre telepítve a tömör "
 "felépítésű LaCie Mobile Hard Drive lemezegységre"
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Mandrakesoft-termékek (professzionális megoldások)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Mandriva-termékek (professzionális megoldások)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"A <b>professzionális igények</b> kielégítésére tervezett Mandrakesoft-"
+"A <b>professzionális igények</b> kielégítésére tervezett Mandriva-"
 "termékek:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
-"\t- <b>Corporate Desktop</b> - az üzleti célra szánt Mandrakelinux-"
+"\t- <b>Corporate Desktop</b> - az üzleti célra szánt Mandrivalinux-"
 "munkaasztal"
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t- <b>Corporate Server</b> - Mandrakelinux-kiszolgálói megoldás"
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t- <b>Corporate Server</b> - Mandrivalinux-kiszolgálói megoldás"
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
-"\t- <b>Multi-Network Firewall</b> - biztonsági megoldás Mandrakelinuxszal"
+"\t- <b>Multi-Network Firewall</b> - biztonsági megoldás Mandrivalinuxszal"
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16575,10 +16575,10 @@ msgstr "<b>Válassza ki a kedvenc munkaasztali környezetét</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "A PowerPack rendszerben lehetősége van <b>grafikus asztali környezetet</b> "
-"választani. A Mandrakesoft alapértelmezésként a <b>KDE</b> környezetet "
+"választani. A Mandriva alapértelmezésként a <b>KDE</b> környezetet "
 "jelölte ki."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -16603,10 +16603,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "A PowerPack+ rendszerben lehetősége van <b>grafikus asztali környezetet</b> "
-"választani. A Mandrakesoft alapértelmezésként a <b>KDE</b> környezetet "
+"választani. A Mandriva alapértelmezésként a <b>KDE</b> környezetet "
 "jelölte ki."
 
 #: share/advertising/14.pl:15
@@ -16734,10 +16734,10 @@ msgstr "<b>Alkalmazások széles skálája</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"A Mandrakelinux menüjében <b>minden feladathoz</b> talál <b>egyszerűen "
+"A Mandrivalinux menüjében <b>minden feladathoz</b> talál <b>egyszerűen "
 "használható</b> alkalmazásokat:"
 
 #: share/advertising/18.pl:16
@@ -17008,17 +17008,17 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux Vezérlőközpont</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux Vezérlőközpont</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"A <b>Mandrakelinux Vezérlőközpont</b> a Mandrakelinux-beli számítógép-"
+"A <b>Mandrivalinux Vezérlőközpont</b> a Mandrivalinux-beli számítógép-"
 "beállítási szoftvereszközök nélkülözhetetlen gyűjteménye."
 
 #: share/advertising/25.pl:17
@@ -17043,17 +17043,17 @@ msgstr "<b>A nyílt forrás-modell</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Mint mindenféle számítógép-programozás, a nyílt forráskódú szoftver "
 "fejlesztése is <b>igényel időt és embereket</b>. A nyílt forráskód "
-"filozófiájának tiszteletben tartásával a Mandrakesoft értéknövelt termékeket "
-"és szolgáltatásokat kínál a <b>Mandrakelinux fejlesztésének fenntartása</b> "
+"filozófiájának tiszteletben tartásával a Mandriva értéknövelt termékeket "
+"és szolgáltatásokat kínál a <b>Mandrivalinux fejlesztésének fenntartása</b> "
 "érdekében. Ha szeretné <b>támogatni a nyílt forráskód filozófiáját</b> és a "
-"Mandrakelinux fejlesztését, akkor <b>fontolja meg</b> valamely termékünk "
+"Mandrivalinux fejlesztését, akkor <b>fontolja meg</b> valamely termékünk "
 "vagy szolgáltatásunk megvásárlását."
 
 #: share/advertising/27.pl:13
@@ -17064,10 +17064,10 @@ msgstr "<b>Webes áruház</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Ha információt szeretne a Mandrakesoft termékeiről és szolgáltatásairól, "
+"Ha információt szeretne a Mandriva termékeiről és szolgáltatásairól, "
 "akkor látogassa meg <b>webes áruházunkat</b>."
 
 #: share/advertising/27.pl:17
@@ -17093,24 +17093,24 @@ msgstr "Látogassa meg a <b>store.mandrakesoft.com</b> weboldalt"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"A <b>Mandrakeclub</b> a <b>tökéletes kiegészítő</b> az Ön Mandrakelinux-"
+"A <b>Mandriva Club</b> a <b>tökéletes kiegészítő</b> az Ön Mandrivalinux-"
 "rendszeréhez."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Használja ki a Mandrakeclub-tagsággal járó <b>előnyöket</b>, mint például:"
+"Használja ki a Mandriva Club-tagsággal járó <b>előnyöket</b>, mint például:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -17132,39 +17132,39 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t- a Mandrakelinux <b>felhasználói fórumainak</b> használata"
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t- a Mandrivalinux <b>felhasználói fórumainak</b> használata"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t- <b>korábbi és elsőbbségi hozzáférés</b> - a nyilvános kiadás előtt - a "
-"Mandrakelinux <b>ISO-fájljaihoz</b>"
+"Mandrivalinux <b>ISO-fájljaihoz</b>"
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"A <b>Mandrakeonline</b> egy új szolgáltatás, amelyet a Mandrakesoft büszkén "
+"A <b>Mandriva Online</b> egy új szolgáltatás, amelyet a Mandriva büszkén "
 "kínál vásárlóinak"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"A Mandrakeonline széles körű szolgáltatásokat nyújt Mandrakelinux-rendszerek "
+"A Mandriva Online széles körű szolgáltatásokat nyújt Mandrivalinux-rendszerek "
 "<b>egyszerűen végezhető frissítésére</b>:"
 
 #: share/advertising/29.pl:18
@@ -17190,41 +17190,41 @@ msgstr "\t- rugalmas, <b>ütemezett</b> frissítések"
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t- az <b>összes Mandrakelinux-rendszer</b> kezelése egyetlen azonosítóval"
+"\t- az <b>összes Mandrivalinux-rendszer</b> kezelése egyetlen azonosítóval"
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"<b>Segítségre</b> van szüksége? A Mandrakesoft technikai szakértőit "
+"<b>Segítségre</b> van szüksége? A Mandriva technikai szakértőit "
 "megtalálhatja a <b>technikai támogatási oldalunkon</b>: www.mandrakeexpert."
 "com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"A <b>képzett Mandrakelinux-szakértők</b> segítségének köszönhetően időt "
+"A <b>képzett Mandrivalinux-szakértők</b> segítségének köszönhetően időt "
 "takaríthat meg."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Bármilyen, a Mandrakelinuxszal kapcsolatos kérdés esetén lehetősége van "
+"Bármilyen, a Mandrivalinuxszal kapcsolatos kérdés esetén lehetősége van "
 "támogatási egységek vásárlására a <b>store.mandrakesoft.com</b> helyen."
 
 #: share/compssUsers.pl:25
@@ -17522,8 +17522,8 @@ msgstr "Figyelőeszközök, folyamatszámlázás, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesoft-varázslók"
+msgid "Mandriva Wizards"
+msgstr "Mandriva-varázslók"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17617,8 +17617,8 @@ msgstr ""
 "\n"
 "OPCIÓK:\n"
 "  --help            - jelen segítség megjelenítése\n"
-"  --report          - programnév (a Mandrakelinux-eszközök egyike)\n"
-"  --incident        - programnév (a Mandrakelinux-eszközök egyike)"
+"  --report          - programnév (a Mandrivalinux-eszközök egyike)\n"
+"  --incident        - programnév (a Mandrivalinux-eszközök egyike)"
 
 #: standalone.pm:63
 #, c-format
@@ -17673,7 +17673,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17687,7 +17687,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPCIÓK]...\n"
-"A Mandrakelinux terminálkiszolgáló (MTS) beállítása\n"
+"A Mandrivalinux terminálkiszolgáló (MTS) beállítása\n"
 "--enable         : az MTS bekapcsolása\n"
 "--disable        : az MTS kikapcsolása\n"
 "--start          : az MTS elindítása\n"
@@ -17744,7 +17744,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17752,7 +17752,7 @@ msgid ""
 msgstr ""
 "[OPCIÓ]...\n"
 "  --no-confirmation      az első megerősítési kérdés kihagyása\n"
-"                         MandrakeUpdate módban\n"
+"                         Mandriva Update módban\n"
 "  --no-verify-rpm        a csomagaláírások ellenőrzésének kihagyása\n"
 "  --changelog-first      a módosítási napló megjelenítése a fájllista\n"
 "                         előtt a leírásablakban\n"
@@ -20542,13 +20542,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux hibabejelentő program"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux hibabejelentő program"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Vezérlőközpont"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux Vezérlőközpont"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20568,8 +20568,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "MandrakeOnline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20613,8 +20613,8 @@ msgstr "Beállítási varázslók"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Adja meg a Mandrakesoft-eszközt:"
+msgid "Select Mandriva Tool:"
+msgstr "Adja meg a Mandriva-eszközt:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -21044,19 +21044,19 @@ msgstr "Automatikus indítás"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Ez a csatoló még nem lett beállítva.\n"
-"Használja a \"Csatoló felvétele\" funkciót a Mandrakelinux Vezérlőközpontban."
+"Használja a \"Csatoló felvétele\" funkciót a Mandrivalinux Vezérlőközpontban."
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Internetkapcsolat még nem lett beállítva.\n"
-"Használja a \"%s\" funkciót a Mandrakelinux Vezérlőközpontban."
+"Használja a \"%s\" funkciót a Mandrivalinux Vezérlőközpontban."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21106,8 +21106,8 @@ msgstr "KDM (KDE bejelentkezéskezelő)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux bejelentkezéskezelő)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux bejelentkezéskezelő)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21406,7 +21406,7 @@ msgstr "Importálás"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21415,7 +21415,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002, Mandrakesoft.\n"
+"Copyright (C) 2001-2002, Mandriva.\n"
 "\n"
 "\n"
 "       DUPONT Sebastien (eredeti verzió)\n"
@@ -21970,14 +21970,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 "DrakHelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "Ez a program szabad szoftver; a GNU GPL alapján terjeszthető.\n"
 "\n"
 "Használat: \n"
@@ -22006,8 +22006,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux segítségrendszer"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux segítségrendszer"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22681,7 +22681,7 @@ msgstr ""
 "gépbe.\n"
 "\n"
 "\n"
-"A Mandrakelinux hardver-adatbázisa a következő helyen található:\n"
+"A Mandrivalinux hardver-adatbázisa a következő helyen található:\n"
 "\n"
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
@@ -24725,7 +24725,7 @@ msgstr ""
 "gépbe.\n"
 "\n"
 "\n"
-"A Mandrakelinux hardver-adatbázisa a következő helyen található:\n"
+"A Mandrivalinux hardver-adatbázisa a következő helyen található:\n"
 "\n"
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
@@ -25559,8 +25559,8 @@ msgstr "A módosítás megtörtént, de az érvénybe lépéséhez ki kell jelen
 # what it did by writing to /var/log/explanations
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinux-eszközök naplói"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinux-eszközök naplói"
 
 #: standalone/logdrake:51
 #, c-format
@@ -26079,10 +26079,10 @@ msgstr "A kapcsolat létrejött."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "A kapcsolódás nem sikerült.\n"
-"Ellenőrizze a beállításokat a Mandrakelinux Vezérlőközpontban."
+"Ellenőrizze a beállításokat a Mandrivalinux Vezérlőközpontban."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -27115,13 +27115,13 @@ msgstr "A telepítés hibával ért véget."
 #~ msgstr "Hiba történt %s írásra való megnyitásánál: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "HardDrake - Mandrakelinux hardverbeállítási program.\n"
+#~ "HardDrake - Mandrivalinux hardverbeállítási program.\n"
 #~ "<span foreground=\"royalblue3\">Verzió:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Szerző:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
@@ -27451,7 +27451,7 @@ msgstr "A telepítés hibával ért véget."
 #~ msgstr ""
 #~ "Nincs beállítva egyetlen internetkapcsolat sem.\n"
 #~ "Kapcsolat létrehozásához használja az \"Internet-hozzáférés\"\n"
-#~ "funkciót a Mandrakelinux Vezérlőközpontban."
+#~ "funkciót a Mandrivalinux Vezérlőközpontban."
 
 #~ msgid ""
 #~ "Welcome to the UPS configuration utility.\n"
@@ -27559,9 +27559,9 @@ msgstr "A telepítés hibával ért véget."
 #~ "A(z) \"%s\" nyomtatót nem sikerült eltávolítani a StarOffice/OpenOffice."
 #~ "org/GIMP programból."
 
-#~ msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
+#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
 #~ msgstr ""
-#~ "<b>Gratulálunk ahhoz, hogy a Mandrakelinux rendszert választotta</b>"
+#~ "<b>Gratulálunk ahhoz, hogy a Mandrivalinux rendszert választotta</b>"
 
 #~ msgid ""
 #~ "We would like to thank everyone who participated in the development of "
@@ -27656,24 +27656,24 @@ msgstr "A telepítés hibával ért véget."
 #~ "Nézzen és szerkesszen képeket illetve fotókat a <b>GQview</b>-val és a "
 #~ "<b>GIMP</b>-pel."
 
-#~ msgid "Become a <b>Mandrakeclub</b> member!"
-#~ msgstr "Legyen tagja a <b>Mandrakeclub</b>nak"
+#~ msgid "Become a <b>Mandriva Club</b> member!"
+#~ msgstr "Legyen tagja a <b>Mandriva Club</b>nak"
 
 #~ msgid ""
 #~ "Take advantage of valuable benefits, products and services by joining "
-#~ "Mandrakeclub, such as:"
-#~ msgstr "Használja ki a Mandrakeclub-tagsággal járó előnyöket:"
+#~ "Mandriva Club, such as:"
+#~ msgstr "Használja ki a Mandriva Club-tagsággal járó előnyöket:"
 
 #~ msgid "\t* Full access to commercial applications"
 #~ msgstr "\t* teljes hozzáférés kereskedelmi alkalmazásokhoz"
 
 #~ msgid ""
-#~ "\t* Special download mirror list exclusively for Mandrakeclub Members"
+#~ "\t* Special download mirror list exclusively for Mandriva Club Members"
 #~ msgstr ""
-#~ "\t* letöltési tükörkiszolgálók kizárólagosan a Mandrakeclub-tagok számára"
+#~ "\t* letöltési tükörkiszolgálók kizárólagosan a Mandriva Club-tagok számára"
 
-#~ msgid "\t* Voting for software to put in Mandrakelinux"
-#~ msgstr "\t* szavazás a Mandrakelinux rendszerbe felveendő alkalmazásokról"
+#~ msgid "\t* Voting for software to put in Mandrivalinux"
+#~ msgstr "\t* szavazás a Mandrivalinux rendszerbe felveendő alkalmazásokról"
 
 #~ msgid "\t* Plus much more"
 #~ msgstr "\t* ..."
@@ -27684,12 +27684,12 @@ msgstr "A telepítés hibával ért véget."
 #~ msgid "Do you require assistance?"
 #~ msgstr "Szüksége van segítségre?"
 
-#~ msgid "<b>Mandrakeexpert</b> is the primary source for technical support."
+#~ msgid "<b>Mandriva Expert</b> is the primary source for technical support."
 #~ msgstr ""
-#~ "A <b>Mandrakeexpert</b> az elsődleges forrás a technikai támogatáshoz."
+#~ "A <b>Mandriva Expert</b> az elsődleges forrás a technikai támogatáshoz."
 
 #~ msgid ""
-#~ "If you have Linux questions, subscribe to Mandrakeexpert at <b>www."
+#~ "If you have Linux questions, subscribe to Mandriva Expert at <b>www."
 #~ "mandrakeexpert.com</b>"
 #~ msgstr ""
 #~ "Ha Linuxszal kapcsolatos kérdései vannak, iratkozzon fel a "
@@ -27742,24 +27742,24 @@ msgstr "A telepítés hibával ért véget."
 #~ msgid ""
 #~ "Before continuing, you should carefully read the terms of the license. "
 #~ "It\n"
-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "
+#~ "covers the entire Mandrivalinux 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 ""
 #~ "Mielőtt továbblépne, olvassa át alaposan a licencegyezményt, amely az\n"
-#~ "egész Mandrakelinux disztribúcióra érvényes. Ha elfogadja az abban\n"
+#~ "egész Mandrivalinux disztribúcióra érvényes. Ha elfogadja az abban\n"
 #~ "szereplő feltételeket, akkor jelölje be a(z) \"%s\" opciót.\n"
 #~ "Ha nem fogadja el valamelyik feltételt, akkor kattintson a(z)\n"
 #~ "\"%s\" gombra - ezzel újraindítja a számítógépet."
 
 #~ msgid ""
-#~ "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+#~ "The Mandrivalinux 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 ""
-#~ "A Mandrakelinux telepítőanyag több CD-n helyezkedik el. Ha egy "
+#~ "A Mandrivalinux telepítőanyag több CD-n helyezkedik el. Ha egy "
 #~ "kiválasztott\n"
 #~ "csomag egy másik CD-n található, akkor a telepítő kiadja az\n"
 #~ "aktuális CD-t, és megkéri Önt, hogy helyezze be a megfelelőt."
@@ -27902,7 +27902,7 @@ msgstr "A telepítés hibával ért véget."
 #~ "választani."
 
 #~ msgid ""
-#~ "At the time you are installing Mandrakelinux, it is likely that some\n"
+#~ "At the time you are installing Mandrivalinux, 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"
@@ -27917,7 +27917,7 @@ msgstr "A telepítés hibával ért véget."
 #~ "the\n"
 #~ "selected package(s), or \"%s\" to abort."
 #~ msgstr ""
-#~ "Lehetséges, hogy amikor Ön a Mandrakelinux rendszert telepíti, már\n"
+#~ "Lehetséges, hogy amikor Ön a Mandrivalinux rendszert telepíti, már\n"
 #~ "frissítésre kerültek bizonyos csomagok a rendszer kiadása óta.\n"
 #~ "Elképzelhető, hogy bizonyos hibák ki lettek javítva, illetve\n"
 #~ "hogy meg lettek oldva bizonyos felmerült biztonsági problémák. Ezeket\n"
@@ -28205,10 +28205,10 @@ msgstr "A telepítés hibával ért véget."
 #~ "alkalmazásokat tartalmaz."
 
 #~ msgid ""
-#~ "Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- "
+#~ "Find all Mandriva products and services at <b>MandrakeStore</b> -- "
 #~ "our full service e-commerce platform."
 #~ msgstr ""
-#~ "Az összes Mandrakesoft-terméket és -szolgáltatást megtalálhatja a "
+#~ "Az összes Mandriva-terméket és -szolgáltatást megtalálhatja a "
 #~ "<b>MandrakeStore</b> webáruházban."
 
 #~ msgid "Become a <b>MandrakeClub</b> member!"
@@ -28244,8 +28244,8 @@ msgstr "A telepítés hibával ért véget."
 #~ "  --report          - paraméter: programnév (a Mandrake-eszközök egyike)\n"
 #~ "  --incident        - paraméter: programnév (a Mandrake-eszközök egyike)"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "MandrakeOnline"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "This interface has not been configured yet.\n"
diff --git a/perl-install/share/po/id.po b/perl-install/share/po/id.po
index 5af3e3147..74c004c25 100644
--- a/perl-install/share/po/id.po
+++ b/perl-install/share/po/id.po
@@ -1,5 +1,5 @@
 # Instalator Grafis Mandrake
-# Copyright (C) 1999 Mandrakesoft
+# Copyright (C) 1999 Mandriva
 # Budi Rachmanto <rac@linux-mandrake.com>, 2001-2003
 # Linux Indonesia <http://www.linux.or.id>, 1999-2001
 # Mohammad DAMT <mdamt@cdl2000.com>, 1999-2001
@@ -72,7 +72,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Tampaknya proteksi penulisan USB diaktifkan, tetapi USB tidak bisa dilepas "
 "dengan\n"
@@ -80,7 +80,7 @@ msgstr ""
 "\n"
 "\n"
 "Klik tombol reboot pada komputer, lepaskan USB, hilangkan proteksinya,\n"
-"pasang kembali USB, lalu jalankan Mandrake Move lagi."
+"pasang kembali USB, lalu jalankan Mandriva Move lagi."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -98,7 +98,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "USB Anda tidak mempunyai partisi Windows (FAT). Diperlukan minimal\n"
@@ -110,14 +110,14 @@ msgstr ""
 "\n"
 "\n"
 "Anda bisa melanjutkan proses tanpa USB - Anda akan tetap \n"
-"bisa menjalankan Mandrake Move seperti layaknya Sistem Operasi \n"
+"bisa menjalankan Mandriva Move seperti layaknya Sistem Operasi \n"
 "Mandrake."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -125,11 +125,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Kami tidak mendeteksi adanya USB pada sistem Anda. Jika \n"
-"Anda memasang USB sekarang, Mandrake Move dapat \n"
+"Anda memasang USB sekarang, Mandriva Move dapat \n"
 "menyimpan data secara tranparan ke direktori home dan\n"
 "konfigurasi umum sistem, untuk boot selanjutnya dikomputer ini\n"
 "atau komputer lain. Catatan:jika USB dipasang sekarang, tunggu beberapa\n"
@@ -137,7 +137,7 @@ msgstr ""
 "\n"
 "\n"
 "Anda bisa melanjutkan proses tanpa USB - Anda akan tetap \n"
-"bisa menjalankan Mandrake Move seperti layaknya Sistem Operasi \n"
+"bisa menjalankan Mandriva Move seperti layaknya Sistem Operasi \n"
 "Mandrake."
 
 #: ../move/move.pm:494
@@ -263,7 +263,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -279,7 +279,7 @@ msgstr ""
 "\n"
 "Hal ini bisa datang dari file konfigurasi sistem pada USB \n"
 "yang terkorupsi, dalam kasus ini menghapus lalu mereboot \n"
-"Mandrake Move akan memperbaiki masalah. Untuk melakukannya\n"
+"Mandriva Move akan memperbaiki masalah. Untuk melakukannya\n"
 "klik tombol ini.\n"
 "\n"
 "\n"
@@ -1316,11 +1316,11 @@ msgstr "Pilihan bahasa"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux mendukung beberapa bahasa. Pilihlah\n"
+"Mandrivalinux mendukung beberapa bahasa. Pilihlah\n"
 "bahasa yang akan diinstall. Bahasa pilihan akan ditampilkan\n"
 "setelah proses installasi selesai dan Anda merestart sistem Anda."
 
@@ -3732,12 +3732,12 @@ msgstr "aktifkan dukungan radio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Bacalah lisensi sebelum melanjutkan. Lisensi mencakup seluruh distribusi\n"
-"Mandrakelinux. Jika Anda setuju dengan semua pasal di dalamnya, klik\n"
+"Mandrivalinux. Jika Anda setuju dengan semua pasal di dalamnya, klik\n"
 "kotak \"%s\". Jika tidak, klik pada tombol \"%s\" akan mereboot komputer "
 "Anda."
 
@@ -3918,13 +3918,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Installasi Mandrakelinux didistribusikan pada beberapa CDROM. DrakX tahu "
+"Installasi Mandrivalinux didistribusikan pada beberapa CDROM. DrakX tahu "
 "jika paket\n"
 "terpilih berada di CDROM lain dan akan mengeluarkan CD yang ada untuk "
 "kemudian\n"
@@ -3936,11 +3936,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3993,11 +3993,11 @@ msgid ""
 msgstr ""
 "Sekarang waktunya untuk menentukan program yang akan diinstal. Terdapat "
 "ribuan \n"
-"pada Mandrakelinux, dan untuk mempermudah, mereka telah diletakkan pada "
+"pada Mandrivalinux, dan untuk mempermudah, mereka telah diletakkan pada "
 "grup \n"
 "aplikasi yang sejenis.\n"
 "\n"
-"Mandrakelinux mengurutkan paket dalam empat kategori. Anda bisa "
+"Mandrivalinux mengurutkan paket dalam empat kategori. Anda bisa "
 "menggabungkan \n"
 "menyesuaikan aplikasi dari berbagai kategori, sehingga installasi "
 "``Workstation''\n"
@@ -4106,10 +4106,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4141,9 +4141,9 @@ msgstr ""
 "!! Jika paket server terpilih dengan sengaja atau karena merupakan bagian "
 "suatu\n"
 "grup besar, akan ada pertanyaan konfirmasi installasi paket tersebut. Pada\n"
-"Mandrakelinux, secara default semua server terinstal dijalankan saat boot.\n"
+"Mandrivalinux, secara default semua server terinstal dijalankan saat boot.\n"
 "Meski aman saat distribusi diluncurkan, ada kemungkinan lubang keamanan\n"
-"ditemukan setelah versi Mandrakelinux ini selesai. Jika Anda tidak tahu apa\n"
+"ditemukan setelah versi Mandrivalinux ini selesai. Jika Anda tidak tahu apa\n"
 "yang dilakukan oleh suatu layanan atau mengapa ia diinstal, klik \"%s\".\n"
 "Jika Anda menekan \"%s\" layanan terdaftar akan diinstal dan akan "
 "dijalankan\n"
@@ -4308,7 +4308,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4364,7 +4364,7 @@ msgid ""
 msgstr ""
 "X (untuk X Window System) adalah jantung dari interface grafis GNU/Linux\n"
 "yang diperlukan oleh semua lingkungan grafis (KDE, GNOME, AfterStep,\n"
-"WindowMaker, dll.) yang dibundel pada Mandrakelinux.\n"
+"WindowMaker, dll.) yang dibundel pada Mandrivalinux.\n"
 "\n"
 "Anda akan melihat daftar parameter yang berbeda untuk merubah untuk "
 "mendapatkan\n"
@@ -4494,12 +4494,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4526,7 +4526,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4535,7 +4535,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4557,11 +4557,11 @@ msgid ""
 msgstr ""
 "Sekarang Anda harus menentukan dimana Anda hendak menginstall sistem "
 "operasi\n"
-"Mandrakelinux pada harddisk Anda. Jika harddisk Anda kosong atau jika "
+"Mandrivalinux pada harddisk Anda. Jika harddisk Anda kosong atau jika "
 "sebuah\n"
 "sistem operasi menggunakan semua tempat, Anda harus mempartisi drive.\n"
 "Pada dasarnya, mempartisi harddisk berarti membaginya secara logical\n"
-"untuk membuat ruang yang diperlukan sistem Mandrakelinux baru Anda.\n"
+"untuk membuat ruang yang diperlukan sistem Mandrivalinux baru Anda.\n"
 "\n"
 "Karena proses partisi harddisk biasanya tidak bisa dikembalikan dan bisa \n"
 "mengacu pada kehilangan data, partisi bisa menegangkan dan membuat stress\n"
@@ -4598,7 +4598,7 @@ msgstr ""
 "dengan sebelumnya Anda sudah mendefrag partisi Windows.\n"
 "Membackup data sangat disarankan. Penggunaan opsi ini sangat "
 "direkomendasikan jika Anda\n"
-"ingin menggunakan Mandrakelinux dan Microsoft Windows pada komputer yang "
+"ingin menggunakan Mandrivalinux dan Microsoft Windows pada komputer yang "
 "sama.\n"
 "\n"
 "   Sebelum memilih opsi ini, harap dipahami bahwa setelah prosedur ini, "
@@ -4611,7 +4611,7 @@ msgstr ""
 "\n"
 " * \"%s\". Jika Anda hendak menghapus seluruh data dan semua partisi yang "
 "ada pada harddisk\n"
-"Anda dan menggantinya dengan sistem Mandrakelinux yang baru, pilih opsi ini. "
+"Anda dan menggantinya dengan sistem Mandrivalinux yang baru, pilih opsi ini. "
 "Hati-hati, karena\n"
 "Anda tidak bisa membatalkan opsi ini setelah Anda mengkonfirmasikan.\n"
 "\n"
@@ -4780,7 +4780,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4802,7 +4802,7 @@ msgstr ""
 "Klik pada \"%s\" ketika Anda siap memformat partisi.\n"
 "\n"
 "Klik pada \"%s\" jika Anda hendak memilih partisi lain untuk \n"
-"installasi sistem operasi Mandrakelinux baru Anda.\n"
+"installasi sistem operasi Mandrivalinux baru Anda.\n"
 "\n"
 "Klik pada \"%s\" jika Anda hendak memilih partisi yang hendak \n"
 "diperiksa untuk block rusak pada disk."
@@ -4819,7 +4819,7 @@ msgstr "Sebelumnya"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4831,7 +4831,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Saat Mandrakelinux diinstal, mungkin beberapa paket telah diupdate sejak\n"
+"Saat Mandrivalinux diinstal, mungkin beberapa paket telah diupdate sejak\n"
 "rilis awal. Beberapa kesalahan mungkin telah diperbaiki / masalah keamanan\n"
 "dipecahkan. Untuk memanfaatkan update ini Anda dapat men-download-nya dari\n"
 "Internet. Pilih \"%s\" jika Anda memiliki koneksi Internet, atau \"%s\" "
@@ -4859,7 +4859,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4872,7 +4872,7 @@ msgstr ""
 "\n"
 "Jika Anda tidak tahu apa yang akan dipilih, gunakan opsi default. Anda\n"
 "mampu mengubahnya menggunakan perkakas draksec, yang merupakan bagian\n"
-"dari dari Pusat Kontrol Mandrakelinux.\n"
+"dari dari Pusat Kontrol Mandrivalinux.\n"
 "\n"
 "Isi bagian \"%s\" dengan alamat email dari orang yang bertanggung jawab\n"
 "atas keaman. Pesan keamanan akan dikirimkan pada alamat tersebut."
@@ -4886,7 +4886,7 @@ msgstr "Administrator Keamanan"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4957,7 +4957,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Saat ini, Anda harus memilih partisi yang akan digunakan untuk installasi\n"
-"sistem Mandrakelinux Anda. Jika partisi telah didefinisikan, baik dari\n"
+"sistem Mandrivalinux Anda. Jika partisi telah didefinisikan, baik dari\n"
 "installasi GNU/Linux sebelumnya atau melalui perkakas partisi lainnya,\n"
 "Anda bisa menggunakan partisi yang ada. Jika tidak, partisi harddisk \n"
 "harus didefinisikan.\n"
@@ -5041,7 +5041,7 @@ msgstr "Ubah ke modus normal/ahli"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5118,7 +5118,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5127,18 +5127,18 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Tahap ini hanya aktif jika partisi GNU/Linux lama ditemukan.\n"
 "\n"
 "DrakX perlu tahu Anda ingin melakukan installasi baru atau upgrade sistem\n"
-"Mandrakelinux yang sudah ada:\n"
+"Mandrivalinux yang sudah ada:\n"
 "\n"
 "* \"%s\": Untuk sebagian besar bagian, opsi ini menghapus sistem lama.\n"
 "Namun, bergantung pada skema partisi Anda, Anda bisa mencegah data Anda\n"
@@ -5147,11 +5147,11 @@ msgstr ""
 "harus menggunakan opsi ini.\n"
 "\n"
 "* \"%s\": Kelas installasi ini akan mengupdate paket yang terinstall\n"
-"pada sistem Mandrakelinux Anda. Skema partisi dan data pengguna Anda\n"
+"pada sistem Mandrivalinux Anda. Skema partisi dan data pengguna Anda\n"
 "tidak akan diubah. Sebagian besar langkah konfigurasi yang tersisa\n"
 "serupa pada installasi standar.\n"
 "\n"
-"Menggunakan opsi ``Upgrade'' seharusnya berjalan pada Mandrakelinux\n"
+"Menggunakan opsi ``Upgrade'' seharusnya berjalan pada Mandrivalinux\n"
 "versi \"8.1\" keatas. Melakukan upgrade pada versi sebelum \"8.1\"\n"
 "tidak dianjurkan."
 
@@ -5210,7 +5210,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5251,7 +5251,7 @@ msgstr ""
 "Tentang dukungan UTF-8 (unicode): Unicode adalah enkoding karakter yang\n"
 "baru yang ditujukan untuk mencakup seluruh bahasa yang ada. Namun \n"
 "dukungan penuh pada GNU/Linux sedang dalam pengembangan. Untuk alasan\n"
-"tersebut, penggunaan UTF-8 pada Mandrakelinux bergantung pada pilihan\n"
+"tersebut, penggunaan UTF-8 pada Mandrivalinux bergantung pada pilihan\n"
 "pengguna:\n"
 "\n"
 " * Jika Anda memilih menggunakan bahasa dengan enkoding yang kuat (bahasa\n"
@@ -5485,7 +5485,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5506,11 +5506,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Sekarang, waktunya memilih sistem pencetakan untuk komputer Anda. Sistem\n"
-"operasi lain mungkin menawarkan satu, tetapi Mandrakelinux menawarkan dua.\n"
+"operasi lain mungkin menawarkan satu, tetapi Mandrivalinux menawarkan dua.\n"
 "Setiap sistem pencetakan sesuai untuk jenis konfigurasi tertentu.\n"
 "\n"
 " * \"%s\" - yang merupakan akronim untuk ``print, tidak ada antrian'',\n"
@@ -5648,7 +5648,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5665,7 +5665,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5716,7 +5716,7 @@ msgstr ""
 "\n"
 " * \"%s\": jika Anda hendak mengkonfigurasi akses jaringan Internet\n"
 "atau lokal Anda, Anda bisa melakukannya sekarang. Lihat dokumentasi\n"
-"cetak atau gunakan Pusat Kontrol Mandrakelinux setelah installasi\n"
+"cetak atau gunakan Pusat Kontrol Mandrivalinux setelah installasi\n"
 "selesai untuk mengambil keuntungan dari bantuannya.\n"
 "\n"
 " * \"%s\": mengijinkan Anda mengkonfigurasi alamat proxy HTTP dan\n"
@@ -5733,7 +5733,7 @@ msgstr ""
 " * \"%s\": jika Anda hendak merubah konfigurasi bootloader Anda, klik\n"
 "tombol ini. Opsi ini ditujukan untuk pengguna tingkat lanjut. Lihat\n"
 "dokumentasi cetak atau bantuan tentang konfigurasi bootloader pada \n"
-"Pusat Kontrol Mandrakelinux.\n"
+"Pusat Kontrol Mandrivalinux.\n"
 "\n"
 " * \"%s\": melalui daftar ini Anda bisa menentukan layanan apa yang\n"
 "akan dijalankan pada komputer Anda. Jika Anda berencana untuk memakai\n"
@@ -5795,10 +5795,10 @@ msgstr "Layanan"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Pilih harddrive yang akan dihapus untuk menginstall partisi Mandrakelinux\n"
+"Pilih harddrive yang akan dihapus untuk menginstall partisi Mandrivalinux\n"
 "baru Anda. Hati-hati, semua data pada drive ini akan hilang dan\n"
 "tidak dapat dikembalikan seperti semula!"
 
@@ -6150,11 +6150,11 @@ msgstr "Menghitung ukuran partisi Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Partisi Windows Anda terlalu terfragmen. Harap reboot komputer Anda pada "
-"Windows, jalankan utilitas ``defrag'', lalu ulangi installasi Mandrakelinux."
+"Windows, jalankan utilitas ``defrag'', lalu ulangi installasi Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6272,19 +6272,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6306,7 +6306,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6314,14 +6314,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6331,7 +6331,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6351,10 +6351,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6365,11 +6365,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6385,7 +6385,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Introduction\n"
 "\n"
@@ -6402,7 +6402,7 @@ msgstr ""
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6424,7 +6424,7 @@ msgstr ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6432,14 +6432,14 @@ msgstr ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6469,10 +6469,10 @@ msgstr ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6483,11 +6483,11 @@ msgstr ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva S.A. reserves its rights to modify or adapt the Software "
 "Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6503,7 +6503,7 @@ msgstr ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6593,7 +6593,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6601,13 +6601,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Selamat, installasi selesai.\n"
 "Ambil media boot dan tekan Return/Enter untuk reboot.\n"
 "\n"
 "\n"
-"Untuk informasi perbaikan yang tersedia untuk rilis Mandrakelinux\n"
+"Untuk informasi perbaikan yang tersedia untuk rilis Mandrivalinux\n"
 "ini, silakan lihat Errata yang tersedia pada:\n"
 "\n"
 "\n"
@@ -6615,7 +6615,7 @@ msgstr ""
 "\n"
 "\n"
 "Informasi tentang konfigurasi sistem tersedia pada bab Pasca\n"
-"Installasi di Panduan Pengguna Resmi Linux Mandrakelinux."
+"Installasi di Panduan Pengguna Resmi Linux Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6650,12 +6650,12 @@ msgstr "Memasuki langkah `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Sumber daya sistem Anda rendah. Anda akan mengalami kesulitan\n"
-"menginstall Mandrakelinux. Jika terjadi, Anda bisa mencoba\n"
+"menginstall Mandrivalinux. Jika terjadi, Anda bisa mencoba\n"
 "installasi berbasis teks. Untuk melakukannya, tekan `F1' saat\n"
 "booting pada CDROM, lalu ketikkan `text'."
 
@@ -7192,8 +7192,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "Menghubungi situs Mandrakelinux untuk mengambil daftar mirror..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
+msgstr "Menghubungi situs Mandrivalinux untuk mengambil daftar mirror..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7416,8 +7416,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Installasi Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Installasi Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10219,13 +10219,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "konfigurator drakfirewall\n"
 "\n"
-"Program ini mengkonfigurasi firewall pribadi untuk Mandrakelinux.\n"
+"Program ini mengkonfigurasi firewall pribadi untuk Mandrivalinux.\n"
 "Untuk membuat solusi firewall yang lebih baik, cobalah\n"
 "distribusi khusus MandrakeSecurity Firewall"
 
@@ -14264,12 +14264,12 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
 "Jalankan Scannerdrake (Perangkat Lunak/Scanner pada Pusat Kontrol "
-"Mandrakelinux) untuk berbagi scanner pada jaringan.\n"
+"Mandrivalinux) untuk berbagi scanner pada jaringan.\n"
 
 #: printer/printerdrake.pm:3933
 #, c-format
@@ -16182,33 +16182,33 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Apa itu Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Apa itu Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Selamat Datang di <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Selamat Datang di <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux adalah sebuah <b>distribusi Linux</b> yang menggabungkan inti "
+"Mandrivalinux adalah sebuah <b>distribusi Linux</b> yang menggabungkan inti "
 "sistem, yang disebut <b>sistem operasi</b> (berbasiskan kernel Linux) dengan "
 "<b>banyak aplikasi</b> yang sesuai kebutuhan Anda."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux juga merupakan distribusi Linux paling <b>ramah pengguna</b>. "
+"Mandrivalinux juga merupakan distribusi Linux paling <b>ramah pengguna</b>. "
 "Ia juga merupakan distribusi Linux yang <b>paling banyak digunakan</b>!"
 
 #: share/advertising/02.pl:13
@@ -16224,14 +16224,14 @@ msgstr "Selamat datang di <b>dunia open source</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux berkomitmen dengan model open source. Hal ini berarti rilis "
-"baru adalah hasil <b>kolaborasi</b> antara <b>tim pengembang Mandrakesoft</"
-"b> dengan <b>komunitas</b> kontributor Mandrakelinux."
+"Mandrivalinux berkomitmen dengan model open source. Hal ini berarti rilis "
+"baru adalah hasil <b>kolaborasi</b> antara <b>tim pengembang Mandriva</"
+"b> dengan <b>komunitas</b> kontributor Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16251,10 +16251,10 @@ msgstr "<b>GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "Sebagian besar perangkat lunak yang disertakan pada distribusi ini dan semua "
-"perkakas Mandrakelinux berada dibawah lisensi <b>General Public License</b>."
+"perkakas Mandrivalinux berada dibawah lisensi <b>General Public License</b>."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16284,15 +16284,15 @@ msgstr "<b>Bergabung dengan Komunitas</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux memiliki salah satu <b>komunitas terbesar</b> dari pengguna "
+"Mandrivalinux memiliki salah satu <b>komunitas terbesar</b> dari pengguna "
 "dan pengembang. Fungsi dari komunitas sangatlah luas, mulai dari pelaporan "
 "kesalahan hingga pengembangan aplikasi baru. Komunitas memainkan <b>peran</"
-"b> dalam dunia Mandrakelinux."
+"b> dalam dunia Mandrivalinux."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16313,10 +16313,10 @@ msgstr "<b>Versi Download</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Saat ini Anda akan menginstall <b>Mandrakelinux Versi Download</b>. Ini "
+"Saat ini Anda akan menginstall <b>Mandrivalinux Versi Download</b>. Ini "
 "merupakan versi gratis yang <b>tersedia untuk semua</b>."
 
 #: share/advertising/05.pl:19
@@ -16348,10 +16348,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Anda tidak akan mendapatkan akses ke <b>layanan yang disertakan</b> pada "
-"produk Mandrakesoft lainnya."
+"produk Mandriva lainnya."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16360,8 +16360,8 @@ msgstr "<b>Discovery, Desktop Linux Pertama Anda</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Anda sekarang akan menginstall <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Anda sekarang akan menginstall <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16383,17 +16383,17 @@ msgstr "<b>PowerPack, Desktop Linux Handal</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Anda akan menginstall <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Anda akan menginstall <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack adalah produk <b>desktop Linux khusus</b> Mandrakesoft. PowerPack "
+"PowerPack adalah produk <b>desktop Linux khusus</b> Mandriva. PowerPack "
 "menyertakan <b>ribuan aplikasi</b> - semua dari yang paling populer hingga "
 "yang paling canggih."
 
@@ -16404,8 +16404,8 @@ msgstr "<b>PowerPack+, Solusi Linux untuk Desktop dan Server</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Anda akan menginstall <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Anda akan menginstall <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16421,22 +16421,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Produk Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Produk Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> telah mengembangkan produk <b>Mandrakelinux</b> yang "
+"<b>Mandriva</b> telah mengembangkan produk <b>Mandrivalinux</b> yang "
 "luas."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Produk Mandrakelinux adalah:"
+msgid "The Mandrivalinux products are:"
+msgstr "Produk Mandrivalinux adalah:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16456,72 +16456,72 @@ msgstr "\t* <b>PowerPack+</b>, Solusi Linux untuk Desktop dan Server."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux untuk x86-64</b>, Solusi Mandrakelinux untuk "
+"\t* <b>Mandrivalinux untuk x86-64</b>, Solusi Mandrivalinux untuk "
 "memaksimalkan prosesor 64-bit Anda."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Produk Mandrakesoft (Produk Nomad)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Produk Mandriva (Produk Nomad)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft telah mengembangan dua produk yang mengijinkan Anda menggunakan "
-"Mandrakelinux <b>pada sembarang komputer</b> dan tanpa harus menginstallnya:"
+"Mandriva telah mengembangan dua produk yang mengijinkan Anda menggunakan "
+"Mandrivalinux <b>pada sembarang komputer</b> dan tanpa harus menginstallnya:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, distribusi Mandrakelinux yang berjalan sepenuhnya melalui "
+"\t* <b>Move</b>, distribusi Mandrivalinux yang berjalan sepenuhnya melalui "
 "CD-ROM bootable."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, distribusi Mandrakelinux yang terinstall pada ultra-"
+"\t* <b>GlobeTrotter</b>, distribusi Mandrivalinux yang terinstall pada ultra-"
 "compact “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Produk Mandrakesoft (Solusi Professional)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Produk Mandriva (Solusi Professional)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Dibawah ini adalah produk Mandrakesoft yang didesain untuk memenuhi "
+"Dibawah ini adalah produk Mandriva yang didesain untuk memenuhi "
 "<b>kebutuhan professional</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, Desktop Mandrakelinux untuk Bisnis."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Desktop Mandrivalinux untuk Bisnis."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Solusi Server Mandrakelinux."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Solusi Server Mandrivalinux."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b>, Solusi Keamanan Mandrakelinux."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, Solusi Keamanan Mandrivalinux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16564,10 +16564,10 @@ msgstr "<b>Pilih Lingkungan Desktop Favorit Anda</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Dengan PowerPack, Anda akan memiliki pilihan untuk <b>lingkungan desktop "
-"grafis</b>. Mandrakesoft telah memilih <b>KDE</b> sebagai default."
+"grafis</b>. Mandriva telah memilih <b>KDE</b> sebagai default."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16591,10 +16591,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Dengan PowerPack+, Anda akan memiliki pilihan untuk <b>lingkungan desktop "
-"grafis</b>. Mandrakesoft telah memilih <b>KDE</b> sebagai default."
+"grafis</b>. Mandriva telah memilih <b>KDE</b> sebagai default."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16720,10 +16720,10 @@ msgstr "<b>Menikmati Aplikasi yang Luas</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Pada menu Mandrakelinux Anda akan menemukan aplikasi <b>mudah digunakan</b> "
+"Pada menu Mandrivalinux Anda akan menemukan aplikasi <b>mudah digunakan</b> "
 "untuk <b>semua tugas Anda</b>:"
 
 #: share/advertising/18.pl:16
@@ -16989,18 +16989,18 @@ msgstr "\t* <b>Postfix</b> dan <b>Sendmail</b>: server mail paling populer."
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Pusat Kontrol Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Pusat Kontrol Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Pusat Kontrol Mandrakelinux</b> adalah kumpulan koleksi penting dari "
-"utilitas khusus Mandrakelinux yang didesain untuk mempermudah konfigurasi "
+"<b>Pusat Kontrol Mandrivalinux</b> adalah kumpulan koleksi penting dari "
+"utilitas khusus Mandrivalinux yang didesain untuk mempermudah konfigurasi "
 "komputer Anda."
 
 #: share/advertising/25.pl:17
@@ -17024,16 +17024,16 @@ msgstr "<b>Model Open Source</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Seperti semua pemrograman komputer, perangkat lunak open source "
 "<b>membutuhkan waktu dan orang</b> untuk pengembangan. Untuk menghargai "
-"filosofi open source, Mandrakesoft menjual produk dan layanan yang bernilai "
-"lebih untuk <b>meningkatkan Mandrakelinux</b>. Jika Anda ingin <b>mendukung "
-"filosofi open source</b> dan pengembangan dari Mandrakelinux, <b>silahkan</"
+"filosofi open source, Mandriva menjual produk dan layanan yang bernilai "
+"lebih untuk <b>meningkatkan Mandrivalinux</b>. Jika Anda ingin <b>mendukung "
+"filosofi open source</b> dan pengembangan dari Mandrivalinux, <b>silahkan</"
 "b> mempertimbangkan untuk membeli salah satu produk atau layanan kami!"
 
 #: share/advertising/27.pl:13
@@ -17044,10 +17044,10 @@ msgstr "<b>Toko Online</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Untuk mempelajari tentang produk dan layanan Mandrakesoft, Anda bisa "
+"Untuk mempelajari tentang produk dan layanan Mandriva, Anda bisa "
 "mengujungi <b>platform e-commerce</b> kami."
 
 #: share/advertising/27.pl:17
@@ -17073,25 +17073,25 @@ msgstr "Berkunjunglah sekarang pada <b>store.mandrakesoft.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> adalah <b>pelengkap sempurna</b> untuk produk "
-"Mandrakelinux Anda..."
+"<b>Mandriva Club</b> adalah <b>pelengkap sempurna</b> untuk produk "
+"Mandrivalinux Anda..."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 "Ambil keuntungan dari <b>keuntungan bernilai</b> dengan bergabung dengan "
-"Mandrakeclub, seperti:"
+"Mandriva Club, seperti:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -17112,40 +17112,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Partisipasi pada <b>forum pengguna</b> Mandrakelinux."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Partisipasi pada <b>forum pengguna</b> Mandrivalinux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Akses cepat dan khusus</b>, sebelum rilis publik, untuk <b>citra ISO</"
-"b> Mandrakelinux."
+"b> Mandrivalinux."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> adalah layanan premium baru yang diperkenalkan "
-"Mandrakesoft bagi konsumennya!."
+"<b>Mandriva Online</b> adalah layanan premium baru yang diperkenalkan "
+"Mandriva bagi konsumennya!."
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline menawarkan layanan yang luas untuk <b>kemudahan update</b> "
-"dari sistem Mandrakelinux Anda:"
+"Mandriva Online menawarkan layanan yang luas untuk <b>kemudahan update</b> "
+"dari sistem Mandrivalinux Anda:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17169,40 +17169,40 @@ msgstr "\t* Update <b>terjadwal</b> yang fleksibel."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* Pengelolaan <b>semua sistem Mandrakelinux Anda</b> dengan satu account."
+"\t* Pengelolaan <b>semua sistem Mandrivalinux Anda</b> dengan satu account."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Apakah Anda membutuhkan <b>asisten?</b> Temukan teknisi ahli Mandrakesoft "
+"Apakah Anda membutuhkan <b>asisten?</b> Temukan teknisi ahli Mandriva "
 "pada <b>platform dukungan teknis kami</b> www.mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Terima kasih kepada bantuan dari <b>ahli berkualitas Mandrakelinux</b>, Anda "
+"Terima kasih kepada bantuan dari <b>ahli berkualitas Mandrivalinux</b>, Anda "
 "akan menghemat banyak waktu."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Untuk sembarang pertanyaan yang berhubungan dengan Mandrakelinux, Anda "
+"Untuk sembarang pertanyaan yang berhubungan dengan Mandrivalinux, Anda "
 "memiliki kesempatan untuk membeli dukungan insiden pada <b>store."
 "mandrakesoft.com</b>."
 
@@ -17503,8 +17503,8 @@ msgstr "Perkakas pengawasan, akuntasi proses, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Wizard Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Wizard Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17652,7 +17652,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17723,14 +17723,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPSI]...\n"
-"  --no-confirmation      tidak ada konfirmasi awal pada mode MandrakeUpdate\n"
+"  --no-confirmation      tidak ada konfirmasi awal pada mode Mandriva Update\n"
 "  --no-verify-rpm        tidak ada verifikasi tandatangan paket\n"
 "  --changelog-first      tampilkan changelog sebelum filelist di window "
 "penjelasan\n"
@@ -20493,13 +20493,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Perkakas Pelapor Kesalahan Mandrakelinux"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Perkakas Pelapor Kesalahan Mandrivalinux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Pusat Kontrol Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Pusat Kontrol Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20519,8 +20519,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20564,8 +20564,8 @@ msgstr "Wizard Konfigurasi"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Pilih Perkakas Mandrakesoft:"
+msgid "Select Mandriva Tool:"
+msgstr "Pilih Perkakas Mandriva:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20990,19 +20990,19 @@ msgstr "Dijalankan saat boot"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Antarmuka ini belum terkonfigurasi.\n"
-"Jalankan asisten \"Tambahkan antarmuka\" dari Pusat Kontrol Mandrakelinux"
+"Jalankan asisten \"Tambahkan antarmuka\" dari Pusat Kontrol Mandrivalinux"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Anda tidak memiliki koneksi Internet yang terkonfigurasi.\n"
-"Jalankan asisten \"%s\" dari Pusat Kontrol Mandrakelinux"
+"Jalankan asisten \"%s\" dari Pusat Kontrol Mandrivalinux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21052,8 +21052,8 @@ msgstr "KDM (KDE Display Manager)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux Display Manager)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21351,7 +21351,7 @@ msgstr "Import"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21360,7 +21360,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Hak Cipta (C) 2001-2002 oleh Mandrakesoft \n"
+"Hak Cipta (C) 2001-2002 oleh Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versi orisinal)\n"
@@ -21904,14 +21904,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Hak Cipta (C) 2003-2004 Mandrakesoft.\n"
+"Hak Cipta (C) 2003-2004 Mandriva.\n"
 "Ini merupakan free software dan dapat didistribusikan ulang dibawah aturan "
 "GNU GPL.\n"
 "\n"
@@ -21941,8 +21941,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Pusat Bantuan Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Pusat Bantuan Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25473,8 +25473,8 @@ msgstr "Perubahan selesai, tetapi agar efektif, Anda harus logout"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Log Perkakas Mandrakelinux"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Log Perkakas Mandrivalinux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25997,10 +25997,10 @@ msgstr "Koneksi selesai."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Koneksi gagal.\n"
-"Periksa konfigurasi Anda pada Pusat Kontrol Mandrakelinux."
+"Periksa konfigurasi Anda pada Pusat Kontrol Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -27486,8 +27486,8 @@ msgstr "Installasi gagal"
 #~ "  --report          - program harus berupa perkakas mandrake\n"
 #~ "  --incident        - program harus berupa perkakas mandrake"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "Connection failed.\n"
diff --git a/perl-install/share/po/is.po b/perl-install/share/po/is.po
index 7b66d6e16..eb9473d14 100644
--- a/perl-install/share/po/is.po
+++ b/perl-install/share/po/is.po
@@ -2,7 +2,7 @@
 # translation of DrakX-is.po to Icelandic
 # Translation file for Mandrake graphic install, DrakX
 # Copyright (C) 1999,2003, 2005 Free Software Foundation, Inc.
-# Copyright (C) 1999 Mandrakesoft
+# Copyright (C) 1999 Mandriva
 # Jóhann Þorvarðarson <johann.torvardarson@lais.is>, 1999-2000.
 # Þórarinn (Tony) R. Einarsson <thori@mindspring.com>, 1999-2000.
 # Pjetur G. Hjaltason <pjetur@pjetur.net>, 2003, 2005.
@@ -72,14 +72,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "USB lykillinn virðist vera með virka ritvörn, en við getum ekki aftengt\n"
 "hann með öryggi núna.\n"
 "\n"
 "\n"
 "Smelltu á hnappinn til að endurræsa vélina, aftengdu lykilinn, fjarlægðu\n"
-"ritvörnina, tengdu lykilin aftur og ræstu Mandrake Move aftur."
+"ritvörnina, tengdu lykilin aftur og ræstu Mandriva Move aftur."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -97,7 +97,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "USB lykillinn þinn inniheldur ekki neinar gildar Windows (FAT) disksneiðar.\n"
@@ -108,13 +108,13 @@ msgstr ""
 "\n"
 "\n"
 "Þú getur einnig haldið áfram án USB lykils - þú getur samt notað\n"
-"Mandrake Move eins og venjulegt Mandrake stýrikerfi."
+"Mandriva Move eins og venjulegt Mandrake stýrikerfi."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -122,18 +122,18 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Við fundum engan USB lykil á kerfinu þínu. Ef þú tengir USB\n"
-"lykil núna, þá mun Mandrake Move vista gögnin þín á þínu\n"
+"lykil núna, þá mun Mandriva Move vista gögnin þín á þínu\n"
 "heimasvæði auk kerfisuppsetninga, þær varðveitast þá þegar\n"
 "þú ræsir aftur á þessari tölvu, eða annari. Athugið: ef þú stingur\n"
 "inn lykli núna, bíddu þá í nokkrar sekúndur áður en þú reynir aftur.\n"
 "\n"
 "\n"
 "Þú getur einnig haldið áfram án USB lykils - þú getur samt notað\n"
-"Mandrake Move eins og venjulegt Mandrake stýrikerfi."
+"Mandriva Move eins og venjulegt Mandrake stýrikerfi."
 
 #: ../move/move.pm:494
 #, c-format
@@ -257,7 +257,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -273,7 +273,7 @@ msgstr ""
 "\n"
 "Þetta getur verið vegna gallaðra kerfisuppsetningarskráa\n"
 "á USB lyklinum, ef sú er raunin, reynið þá að fjarlægja þær og\n"
-"enduræsing Mandrake Move mun leysa málið. Til að gera\n"
+"enduræsing Mandriva Move mun leysa málið. Til að gera\n"
 "það, smelltu á viðeigandi hnapp.\n"
 "\n"
 "\n"
@@ -1298,11 +1298,11 @@ msgstr "Tungumálaval"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux getur stutt mörg tungumál.  Veldu tungumál\n"
+"Mandrivalinux getur stutt mörg tungumál.  Veldu tungumál\n"
 "sem þú vilt setja upp stuðning fyrir.  Þau verða tiltæk þegar\n"
 "uppsetningu er lokið. og þú endurræsir kerfið."
 
@@ -3712,12 +3712,12 @@ msgstr "virkja útvarps stuðning"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Áður en þú heldur áfram, ættir þú að lesa vandlega leyfisskilmálana. Þeir\n"
-"taka yfir alla Mandrakelinux dreifinguna. Ef þú er samþykk(ur) öllum þeim\n"
+"taka yfir alla Mandrivalinux dreifinguna. Ef þú er samþykk(ur) öllum þeim\n"
 "skilmáum sem þar standa, krossaðu þá við í \"%s\" reitinn, ef ekki\n"
 "smelltu þá á \"%s\" hnappinn sem mun endurræsa tölvuna þína."
 
@@ -3897,13 +3897,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux uppsetningunni er dreift á nokkra geisladiska. Ef valinn\n"
+"Mandrivalinux uppsetningunni er dreift á nokkra geisladiska. Ef valinn\n"
 "pakki er á öðrum geisladiski, þá mun DrakX spýta út núverandi diski\n"
 "og biðja þig um að setja inn rétta diskinn. Ef þú hefur ekki rétta diskinn "
 "við\n"
@@ -3914,11 +3914,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3971,10 +3971,10 @@ msgid ""
 msgstr ""
 "Nú er tími til að skilgreina hvaða forrit þú vilt að séu sett upp á kerfinu "
 "þínu.\n"
-"Það eru þúsundir pakka til fyrir Mandrakelinux, og til að einfalda\n"
+"Það eru þúsundir pakka til fyrir Mandrivalinux, og til að einfalda\n"
 "umsjón pakkanna hafa þeir verið flokkaðir í hópa af svipuðum forritum.\n"
 "\n"
-"Mandrakelinux skiptir pökkunum í fjóra flokka. Þú getur blandað saman\n"
+"Mandrivalinux skiptir pökkunum í fjóra flokka. Þú getur blandað saman\n"
 "pökkum úr mismunandi flokkkum svo að ``Vinnustöðvar'' uppsetning\n"
 "getur innihaldið forrit úr ``Miðlara'' flokknum.\n"
 "\n"
@@ -4080,10 +4080,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4114,7 +4114,7 @@ msgstr ""
 "!! Ef miðlara-pakki hefur verið valinn, annað hvort af því að þú valdir "
 "stakan\n"
 "pakka eða hann var hluti af hóp, verður þú beðinn um að staðfesta að\n"
-"þú viljir fá þessa miðlara uppsetta. Sjálfgefið mun Mandrakelinux ræsa "
+"þú viljir fá þessa miðlara uppsetta. Sjálfgefið mun Mandrivalinux ræsa "
 "allar\n"
 "uppsettar þjónustur og miðlara við kerfisræsingu. Jafnvel þó að þeir séu\n"
 "öruggir og engar þekktar villur þegar kerfinu var dreift þá er möguleiki að\n"
@@ -4276,7 +4276,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4390,12 +4390,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4422,7 +4422,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4431,7 +4431,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4560,7 +4560,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4578,7 +4578,7 @@ msgstr "Fyrra"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4607,7 +4607,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4623,7 +4623,7 @@ msgstr "Öryggisfulltrúi"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4710,7 +4710,7 @@ msgstr "Víxla milli venjulegs/sérfræðings-hams"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4741,7 +4741,7 @@ msgstr ""
 "Fleiri en ein Microsoft disksneið hefur fundist á harða disknum.\n"
 "Vinsamlega veldu hverja þeirra þú vilt breyta stærðinni á til að geta sett "
 "upp\n"
-"nýja Mandrakelinux stýrikerfið.\n"
+"nýja Mandrivalinux stýrikerfið.\n"
 "\n"
 "Hver sneið á listanum inniheldur \"Linux nafn\", \"Windows nafn\" \"Diskrýmd"
 "\".\n"
@@ -4787,7 +4787,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4796,13 +4796,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4843,7 +4843,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5002,7 +5002,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5023,7 +5023,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -5146,7 +5146,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5163,7 +5163,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5285,11 +5285,11 @@ msgstr "Þjónustur"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Veldu harða diskinn sem þú vilt hreinsa allt af til að setja upp nýja\n"
-"Mandrakelinux disksneið.  Varúð, öllum gögnum á disknum verður\n"
+"Mandrivalinux disksneið.  Varúð, öllum gögnum á disknum verður\n"
 "eytt, og það er ekki hægt að sækja þau aftur!"
 
 #: help.pm:863
@@ -5632,7 +5632,7 @@ msgstr "Reikna stærð Windows disksneiðar"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 
@@ -5751,19 +5751,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5785,7 +5785,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5793,14 +5793,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5810,7 +5810,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5830,10 +5830,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5844,11 +5844,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5864,7 +5864,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5921,7 +5921,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5929,21 +5929,21 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Til hamingju! Innsetningu er lokið.\n"
 "Taktu disklinginn eða geisladiskinn úr drifinu og sláðu á ENTER.\n"
 "\n"
 "\n"
 "viðbætur og/eða lagfæringar á göllum sem gætu verið til\n"
-"staðar í þessari útgáfu af Mandrakelinux má finna á \n"
+"staðar í þessari útgáfu af Mandrivalinux má finna á \n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Frekari upplýsingar um hvernig á að stilla vélina eftir innsetninguna er að\n"
-"finna í viðeigandi kafla í Official Mandrakelinux User's Guide bókinni."
+"finna í viðeigandi kafla í Official Mandrivalinux User's Guide bókinni."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -5978,7 +5978,7 @@ msgstr "Hef skref `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -6516,9 +6516,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Hef samband við Mandrakelinux vefinn til að sækja lista yfir fáanlega "
+"Hef samband við Mandrivalinux vefinn til að sækja lista yfir fáanlega "
 "spegla..."
 
 #: install_steps_interactive.pm:840
@@ -6738,8 +6738,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux innsetning %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux innsetning %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9321,13 +9321,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall stillingar\n"
 "\n"
-"Þessi eining stillir prívat eldvegg fyrir þessa Mandrakelinux vél\n"
+"Þessi eining stillir prívat eldvegg fyrir þessa Mandrivalinux vél\n"
 "Fyrir öruggan og aflmikinn eldvegg líttu á hina sértæku\n"
 "Mandrake eldveggs útgáfu."
 
@@ -13015,7 +13015,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14763,18 +14763,18 @@ msgstr "Stöðva"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Velkomin(n) í <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Velkomin(n) í <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14783,7 +14783,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -14800,9 +14800,9 @@ msgstr "Velkomin í <b>heim opins hugbúnaðar</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -14822,7 +14822,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14848,10 +14848,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14870,8 +14870,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14898,7 +14898,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14908,7 +14908,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14927,13 +14927,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14945,7 +14945,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14959,19 +14959,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesoft vörur</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva vörur</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -14992,61 +14992,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -15084,7 +15084,7 @@ msgstr "<b>Veldu uppáhalds gluggaumhverfið þitt</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -15105,7 +15105,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -15222,7 +15222,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -15457,14 +15457,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux Stjórnborð</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux Stjórnborð</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -15486,9 +15486,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -15500,7 +15500,7 @@ msgstr "<b>Vefverslun</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -15523,20 +15523,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -15555,33 +15555,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr "<b>Mandrake beint</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -15604,32 +15604,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15926,8 +15926,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesoft Álfar"
+msgid "Mandriva Wizards"
+msgstr "Mandriva Álfar"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -16022,7 +16022,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16070,7 +16070,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -16078,7 +16078,7 @@ msgid ""
 msgstr ""
 "[OPTION]...\n"
 "  --no-confirmation      Ekki biðja um staðfestingu í upphafi "
-"MandrakeUpdate\n"
+"Mandriva Update\n"
 "  --no-verify-rpm        Ekki staðfesta undiskriftir pakka\n"
 "  --changelog-first      Birta breytingalista á undan skráarlista í "
 "lýsingaglugga\n"
@@ -18553,13 +18553,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux villutilkynningar-tól"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux villutilkynningar-tól"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Stjórnborð"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux Stjórnborð"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18579,7 +18579,7 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "Mandrake beint"
 
 #: standalone/drakbug:52
@@ -18624,7 +18624,7 @@ msgstr "Stilli-álfar"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -19041,19 +19041,19 @@ msgstr "Virkjað við ræsingu"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Þetta nettengi hefur ekki verið stillt enn.\n"
-"Keyrið \"Bæta við tengingu\" aðstoðarálfinn frá Mandrakelinux stjórnborðinu"
+"Keyrið \"Bæta við tengingu\" aðstoðarálfinn frá Mandrivalinux stjórnborðinu"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Þú hefur ekki skilgreint neina internettengingu.\n"
-"Keyrið \"%s\" aðstoðarálfinn frá Mandrakelinux stjórnborðinu"
+"Keyrið \"%s\" aðstoðarálfinn frá Mandrivalinux stjórnborðinu"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -19103,8 +19103,8 @@ msgstr "KDM (KDE gluggastjóri)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux gluggastjóri)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux gluggastjóri)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -19405,7 +19405,7 @@ msgstr "Flytja inn"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19414,7 +19414,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Höfundaréttur (C) 2001-2002 hjá Mandrakesoft \n"
+"Höfundaréttur (C) 2001-2002 hjá Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (upprunaleg útgáfa)\n"
@@ -19917,14 +19917,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Höfundaréttur (C) 2003-2004 Mandrakesoft.\n"
+"Höfundaréttur (C) 2003-2004 Mandriva.\n"
 "þetta er frjáls hugbúnaður og má dreifa samakvæmt skilmálum GNU GPL.\n"
 "\n"
 "Notkun: \n"
@@ -19949,8 +19949,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux hjálp"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux hjálp"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -23226,8 +23226,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinux tólaannálar"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinux tólaannálar"
 
 #: standalone/logdrake:51
 #, c-format
@@ -23737,10 +23737,10 @@ msgstr "Tenging uppsett."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Tenging mistókst\n"
-"Athugaðu uppsetninguna í Mandrakelinux stjórnborði."
+"Athugaðu uppsetninguna í Mandrivalinux stjórnborði."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -24606,8 +24606,8 @@ msgstr "Innsetning mistókst"
 #~ msgstr "Þú hefur ekki valið neitt letur"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Mandrakesoft Álfar"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Mandriva Álfar"
 
 #~ msgid ""
 #~ "No browser is installed on your system, Please install one if you want to "
@@ -24704,13 +24704,13 @@ msgstr "Innsetning mistókst"
 #~ msgstr "Villa við að opna %s til skriftar: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Þetta er HardDrake, vélbúnaðarstillitól Mandrakelinux.\n"
+#~ "Þetta er HardDrake, vélbúnaðarstillitól Mandrivalinux.\n"
 #~ "<span foreground=\"royalblue3\">Útgáfa:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Höfundur:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
@@ -25095,7 +25095,7 @@ msgstr "Innsetning mistókst"
 #~ msgid "mkraid failed"
 #~ msgstr "mkraid mistókst"
 
-#~ msgid "Mandrake Online"
+#~ msgid "Mandriva Online"
 #~ msgstr "Mandrake beint"
 
 #~ msgid ""
diff --git a/perl-install/share/po/it.po b/perl-install/share/po/it.po
index 9aaff733a..b47e0ccb9 100644
--- a/perl-install/share/po/it.po
+++ b/perl-install/share/po/it.po
@@ -72,14 +72,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "La chiave USB sembra essere protetta in scrittura, ma non può\n"
 "essere estratta senza rischi in questo momento.\n"
 "\n"
 "\n"
 "Premi il tasto di riavvio del computer, estrai la chiave, togli la\n"
-"protezione, inserisci di nuovo la chiave e riavvia Mandrake Move."
+"protezione, inserisci di nuovo la chiave e riavvia Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -97,7 +97,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "La chiave USB non ha partizioni Windows (FAT) valide. Ne serve\n"
@@ -108,14 +108,14 @@ msgstr ""
 "\n"
 "\n"
 "Puoi anche proseguire senza una chiave USB e utilizzare\n"
-"Mandrake Move come un normale sistema operativo\n"
+"Mandriva Move come un normale sistema operativo\n"
 "Mandrake \"live\"."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -123,11 +123,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Non è stata rilevata nessuna chiave USB su questo computer.\n"
-"Se ne inserisci una adesso, Mandrake Move sarà in grado di salvare "
+"Se ne inserisci una adesso, Mandriva Move sarà in grado di salvare "
 "automaticamente i dati della tua home directory e le\n"
 "configurazioni del sistema, per un futuro boot su questo PC\n"
 "o su un altro. Tieni presente che, se inserisci ora una chiave,\n"
@@ -136,7 +136,7 @@ msgstr ""
 "\n"
 "\n"
 "Puoi anche proseguire senza una chiave USB e continuare\n"
-"ad utilizzare Mandrake Move come un normale sistema\n"
+"ad utilizzare Mandriva Move come un normale sistema\n"
 "operativo Mandrake \"live\"."
 
 #: ../move/move.pm:494
@@ -263,7 +263,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -279,7 +279,7 @@ msgstr ""
 "\n"
 "Può derivare da file di configurazione danneggiati sulla\n"
 "chiave USB. Se così fosse, cancellarli e riavviare\n"
-"Mandrake Move potrebbe risolvere il problema.\n"
+"Mandriva Move potrebbe risolvere il problema.\n"
 "Per farlo basta premere l'apposito pulsante.\n"
 "\n"
 "\n"
@@ -1322,11 +1322,11 @@ msgstr "Scelta della lingua"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux può gestire più di una lingua.\n"
+"Mandrivalinux può gestire più di una lingua.\n"
 "Seleziona le lingue da installare. Esse saranno disponibili\n"
 "quando riavvierai il sistema alla fine dell'installazione."
 
@@ -3757,12 +3757,12 @@ msgstr "abilita il supporto radio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Prima di proseguire dovresti leggere con attenzione le condizioni d'uso che\n"
-"riguardano l'intera distribuzione Mandrakelinux. Se sei d'accordo con\n"
+"riguardano l'intera distribuzione Mandrivalinux. Se sei d'accordo con\n"
 "tutti i termini della licenza clicca sul pulsante \"%s\". In caso contrario\n"
 "ti basterà un clic sul pulsante \"%s\" per riavviare il computer."
 
@@ -3947,13 +3947,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"La distribuzione Mandrakelinux è suddivisa su più CD-ROM. Se uno dei\n"
+"La distribuzione Mandrivalinux è 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à a espellerlo e a chiedervi di\n"
 "inserire quello corretto. Se non avete a portata di mano il CD richiesto,\n"
@@ -3966,11 +3966,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4023,7 +4023,7 @@ msgid ""
 msgstr ""
 "Adesso è il momento di indicare i programmi che volete siano installati sul\n"
 "vostro sistema. Ci sono migliaia di pacchetti disponibili per\n"
-"Mandrakelinux, e sono stati suddivisi in gruppi in base al loro campo di\n"
+"Mandrivalinux, e sono stati suddivisi in gruppi in base al loro campo di\n"
 "utilizzo, in modo da facilitarne la gestione.\n"
 "\n"
 "I gruppi sono a loro volta suddivisi in quattro categorie. Potete\n"
@@ -4138,10 +4138,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4173,11 +4173,11 @@ 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 Mandrakelinux tutti i servizi installati vengono attivati\n"
+"predefinita, in Mandrivalinux tutti i servizi installati vengono attivati\n"
 "automaticamente all'avvio. Sebbene si tratti di servizi sicuri ed esenti da\n"
 "problemi noti al momento del rilascio della distribuzione, non è escluso\n"
 "che possano essere scoperte falle di sicurezza al loro interno dopo la\n"
-"pubblicazione di questa versione di Mandrakelinux. Quindi, se non avete\n"
+"pubblicazione di questa versione di Mandrivalinux. Quindi, se non avete\n"
 "idea di cosa faccia un particolare servizio o del perché debba essere\n"
 "installato, cliccate su \"%s\". Scegliendo \"%s\", invece, i servizi\n"
 "elencati saranno installati e attivati in automatico all'avvio del sistema.\n"
@@ -4345,7 +4345,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4401,7 +4401,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 Mandrakelinux (KDE, GNOME, AfterStep, WindowMaker, etc.).\n"
+"inclusi in Mandrivalinux (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:\n"
@@ -4529,12 +4529,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4561,7 +4561,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4570,7 +4570,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4591,12 +4591,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 Mandrakelinux. Se il disco è vuoto, o se\n"
+"installare il sistema operativo Mandrivalinux. 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"
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 "Dato che gli effetti del partizionamento sono di solito irreversibili, e\n"
 "possono causare la perdita di dati, questa operazione può intimidire e\n"
@@ -4627,7 +4627,7 @@ msgstr ""
 "dati, a patto che prima di procedere la partizione Windows 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 Mandrakelinux che Microsoft Windows sullo stesso computer.\n"
+"usare sia Mandrivalinux che Microsoft Windows sullo stesso computer.\n"
 "\n"
 "   Prima di scegliere questa opzione, tenete presente che le dimensioni\n"
 "della partizione su cui risiede Windows saranno ridotte rispetto a quelle\n"
@@ -4636,7 +4636,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"
-"Mandrakelinux, potete selezionare questa opzione. Fate molta attenzione,\n"
+"Mandrivalinux, 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"
@@ -4809,7 +4809,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4831,7 +4831,7 @@ msgstr ""
 "Cliccate su \"%s\" quando siete pronti ad avviare la formattazione.\n"
 "\n"
 "Cliccate su \"%s\" se desiderate installare il vostro nuovo sistema\n"
-"operativo Mandrakelinux su partizioni diverse da quelle selezionate.\n"
+"operativo Mandrivalinux su partizioni diverse da quelle selezionate.\n"
 "\n"
 "Cliccate su \"%s\" se desiderate selezionare alcune delle partizioni\n"
 "affinché venga controllata la presenza di eventuali blocchi danneggiati su\n"
@@ -4851,7 +4851,7 @@ msgstr "Indietro"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4863,7 +4863,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"È molto probabile che, al momento in cui installate Mandrakelinux, alcuni\n"
+"È molto probabile che, al momento in cui installate Mandrivalinux, 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"
@@ -4897,7 +4897,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4912,7 +4912,7 @@ msgstr ""
 "\n"
 "Se non sapete quale scelta fare, utilizzate l'impostazione predefinita.\n"
 "Potrete comunque cambiare in seguito il livello di sicurezza usando\n"
-"draksec, uno strumento del Mandrakelinux Control Center.\n"
+"draksec, uno strumento del Mandrivalinux Control Center.\n"
 "\n"
 "Nel campo \"%s\" inserite l'indirizzo email dell'utente che sarà\n"
 "responsabile per la sicurezza: tutti i messaggi relativi alla sicurezza\n"
@@ -4929,7 +4929,7 @@ msgstr "Amministratore per la sicurezza"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -5000,7 +5000,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "A questo punto, dovete decidere quali partizioni devono essere usate per\n"
-"l'installazione del vostro sistema Mandrakelinux. Se sono già state\n"
+"l'installazione del vostro sistema Mandrivalinux. 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"
@@ -5096,7 +5096,7 @@ msgstr "Scambio tra modo normale e esperto"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5126,7 +5126,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 Mandrakelinux.\n"
+"installare il vostro nuovo sistema operativo Mandrivalinux.\n"
 "\n"
 "Ogni partizione è elencata in questo modo: \"nome Linux\", \"nome Windows\"\n"
 "\"Dimensione\".\n"
@@ -5178,7 +5178,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5187,19 +5187,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux 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 Mandrakelinux esistente:\n"
+"installazione o un aggiornamento di un sistema Mandrivalinux esistente:\n"
 "\n"
 " * \"%s\": nella maggior parte dei casi cancella completamente il vecchio\n"
 "sistema. Tuttavia, in base allo schema di partizionamento usato, potete\n"
@@ -5209,14 +5209,14 @@ msgstr ""
 "\n"
 " * \"%s\": questo tipo di installazione vi permette di effettuare un\n"
 "semplice aggiornamento dei pacchetti già installati sul vostro sistema\n"
-"Mandrakelinux. Tutte le partizioni attuali del disco rigido vengono\n"
+"Mandrivalinux. Tutte le partizioni attuali del disco rigido vengono\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"
-"Mandrakelinux a partire dalla versione \"8.1\", mentre non è consigliabile\n"
-"utilizzarla per aggiornare versioni di Mandrakelinux precedenti la \"8.1\"."
+"Mandrivalinux a partire dalla versione \"8.1\", mentre non è consigliabile\n"
+"utilizzarla per aggiornare versioni di Mandrivalinux precedenti la \"8.1\"."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
@@ -5279,7 +5279,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5323,7 +5323,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 Mandrakelinux dipenderà dalle scelte\n"
+"questo motivo la sua attivazione su Mandrivalinux dipenderà dalle scelte\n"
 "effettuate dall'utente:\n"
 "\n"
 " * se scegliete lingue fortemente legate alle vecchie codifiche (lingue del\n"
@@ -5586,7 +5586,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5607,11 +5607,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Qui potrete scegliere il sistema di stampa da usare con il vostro computer;\n"
-"altri sistemi operativi ve ne offrono uno, ma Mandrakelinux ve ne offre ben\n"
+"altri sistemi operativi ve ne offrono uno, ma Mandrivalinux ve ne offre ben\n"
 "due. Ciascuno di essi è adatto a un particolare tipo di configurazione.\n"
 "\n"
 " * \"%s\" -- che sta per \"\"print, do not queue\"\" (\"stampa, non mettere\n"
@@ -5635,7 +5635,7 @@ msgstr ""
 "\n"
 "Se fate una scelta adesso e successivamente cambiate idea, potrete sempre\n"
 "scegliere un diverso sistema di stampa avviando PrinterDrake dal\n"
-"Mandrakelinux Control Center e cliccando sul pulsante \"%s\"."
+"Mandrivalinux Control Center e cliccando sul pulsante \"%s\"."
 
 #: help.pm:765
 #, c-format
@@ -5764,7 +5764,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5781,7 +5781,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5835,7 +5835,7 @@ msgstr ""
 "\n"
 " * \"%s\": se desiderate configurare l'accesso a Internet o a una rete\n"
 "locale potete farlo adesso. Consultate la documentazione stampata, oppure\n"
-"utilizzate il Mandrakelinux Control Center una volta terminata\n"
+"utilizzate il Mandrivalinux Control Center una volta terminata\n"
 "l'installazione per avere a vostra disposizione un aiuto in linea completo.\n"
 "\n"
 " * \"%s\": vi permette di configurare gli indirizzi di proxy HTTP e FTP,\n"
@@ -5853,7 +5853,7 @@ msgstr ""
 " * \"%s\": cliccate su questo pulsante per cambiare la configurazione del\n"
 "bootloader. Questa opzione dovrebbe essere utilizzata solo dagli utenti più\n"
 "esperti. Consultate la documentazione stampata o l'aiuto in linea del\n"
-"Mandrakelinux Control Center riguardo la configurazione del bootloader.\n"
+"Mandrivalinux Control Center riguardo la configurazione del bootloader.\n"
 "\n"
 " * \"%s\": qui potrete stabilire in dettaglio quali servizi saranno\n"
 "attivati sul vostro sistema. Se pensate di utilizzare il computer come\n"
@@ -5916,11 +5916,11 @@ msgstr "Servizi"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Scegli il disco rigido che vuoi cancellare per poter preparare le nuove\n"
-"partizioni per Mandrakelinux. Attenzione! tutti i dati sul disco andranno\n"
+"partizioni per Mandrivalinux. Attenzione! tutti i dati sul disco andranno\n"
 "perduti e non saranno più recuperabili!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -6275,12 +6275,12 @@ msgstr "Sto calcolando la dimensione della partizione Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "La partizione Windows è troppo frammentata. Bisogna riavviare il computer "
 "sotto Windows, lanciare \"defrag\" e poi ricominciare l'installazione di "
-"Mandrakelinux."
+"Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6399,19 +6399,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6433,7 +6433,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6441,14 +6441,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6458,7 +6458,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6478,10 +6478,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6492,11 +6492,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6512,23 +6512,23 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Introduzione\n"
 "\n"
 "Nel seguito intendiamo con \"Software\" il sistema operativo e le diverse "
 "componenti disponibili\n"
-"nella distribuzione Mandrakelinux. Il Software include, ma non è limitato "
+"nella distribuzione Mandrivalinux. Il Software include, ma non è limitato "
 "all'insieme di\n"
 "programmi, metodi, regole e documentazione relativi al sistema operativo e "
 "alle diverse componenti\n"
-"della distribuzione Mandrakelinux.\n"
+"della distribuzione Mandrivalinux.\n"
 "\n"
 "\n"
 "1. Licenza\n"
 "\n"
 "Per favore leggete con attenzione questo documento.\n"
-"Questo documento costituisce un contratto tra voi e la Mandrakesoft S.A. per "
+"Questo documento costituisce un contratto tra voi e la Mandriva S.A. per "
 "quanto riguarda l'uso del Software. L'azione di installare, duplicare o "
 "usare in qualsiasi modo il Software implica l'esplicita accettazione e il "
 "pieno consenso ad adeguarsi ai termini e alle condizioni di questa Licenza. "
@@ -6546,27 +6546,27 @@ msgstr ""
 "\n"
 "Il Software e la documentazione allegata sono forniti \"come sono\", senza "
 "nessuna garanzia, nei limiti permessi dalla legge. In nessun caso, e nei "
-"limiti permessi dalla legge, la Mandrakesoft S.A. potrà essere ritenuta "
+"limiti permessi dalla legge, la Mandriva S.A. potrà essere ritenuta "
 "responsabile per un qualsiasi danno, speciale, accidentale, diretto o "
 "indiretto (inclusi, senza limitazioni, danni dovuti alla perdita di attività "
 "commerciali, interruzioni dell'attività commerciale, perdite finanziarie, "
 "oneri legali e sanzioni pecuniarie che derivino da sentenze giudiziarie, o "
 "qualsiasi altra perdita conseguente), dovuto all'utilizzo o "
 "all'impossibilità di utilizzo del Software, anche nel caso in cui "
-"Mandrakesoft S.A. sia stata avvertita della possibilità che si verificassero "
+"Mandriva S.A. sia stata avvertita della possibilità che si verificassero "
 "tali danni.\n"
 "\n"
 "RESPONSABILITÀ LIMITATA IN RELAZIONE AL POSSESSO O ALL'USO DI SOFTWARE "
 "PROIBITO IN ALCUNE NAZIONI\n"
 "\n"
-"Nei limiti di legge, in nessun caso Mandrakesoft S.A. o i suoi distributori "
+"Nei limiti di legge, in nessun caso Mandriva S.A. o i suoi distributori "
 "potranno essere ritenuti responsabili per un qualsiasi danno, speciale, "
 "accidentale, diretto o indiretto (inclusi, senza limitazioni, danni dovuti "
 "alla perdita di attività commerciali, interruzioni dell'attività "
 "commerciale, perdite finanziarie, oneri legali e sanzioni pecuniarie che "
 "derivino da sentenze giudiziarie, o qualsiasi altra perdita conseguente), "
 "dovuto al possesso e all'uso di componenti software, o derivante dall'aver "
-"scaricato componenti software da uno dei siti di Mandrakelinux, che "
+"scaricato componenti software da uno dei siti di Mandrivalinux, che "
 "risultino proibiti o soggetti a limitazioni d'uso in alcune nazioni per "
 "effetto di leggi locali. Questa limitazione di responsabilità si applica, ma "
 "non è limitata, alle componenti di crittografia sicura incluse nel "
@@ -6583,9 +6583,9 @@ msgstr ""
 "Per favore, si leggano con attenzione i termini e le condizioni della "
 "licenza relativi a ciascuna componente prima di utilizzarla. Qualsiasi "
 "domanda relativa alla licenza di una componente software dovrebbe essere "
-"indirizzata all'autore di tale componente, e non alla Mandrakesoft. I "
-"programmi sviluppati dalla Mandrakesoft S.A. sono soggetti alla licenza GPL."
-"La documentazione scritta dalla Mandrakesoft S.A. è soggetta ad una licenza "
+"indirizzata all'autore di tale componente, e non alla Mandriva. I "
+"programmi sviluppati dalla Mandriva S.A. sono soggetti alla licenza GPL."
+"La documentazione scritta dalla Mandriva S.A. è soggetta ad una licenza "
 "specifica. Per favore si consulti la documentazione per ulteriori dettagli.\n"
 "\n"
 "\n"
@@ -6594,10 +6594,10 @@ msgstr ""
 "Tutti i diritti relativi alle componenti del Software appartengono ai "
 "rispettivi autori e sono protetti dalle leggi che disciplinano la proprietà "
 "intellettuale e il copyright applicabili ai programmi software. La "
-"Mandrakesoft S.A. si riserva il diritto di modificare o adattare il "
+"Mandriva S.A. si riserva il diritto di modificare o adattare il "
 "Software, in parte o in tutto, con ogni mezzo e per qualsiasi scopo."
-"\"Mandrake\", \"Mandrakelinux\" e i relativi logo sono proprietà della "
-"Mandrakesoft S.A.\n"
+"\"Mandriva\", \"Mandrivalinux\" e i relativi logo sono proprietà della "
+"Mandriva S.A.\n"
 "\n"
 "\n"
 "5. Disposizioni diverse\n"
@@ -6610,7 +6610,7 @@ msgstr ""
 "merito ai termini di questa licenza verrà risolta preferibilmente per via "
 "extra-giudiziaria. Come ultima risorsa, la disputa verrà portata "
 "all'attenzione del Tribunale competente di Parigi - Francia. Per qualsiasi "
-"domanda riguardo questo documento, per favore si contatti Mandrakesoft S.A.\n"
+"domanda riguardo questo documento, per favore si contatti Mandriva S.A.\n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6704,7 +6704,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6712,21 +6712,21 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Congratulazioni, l'installazione è completa.\n"
 "Rimuovi il disco di avvio e premi Invio per riavviare il sistema.\n"
 "\n"
 "\n"
 "Per informazioni su correzioni disponibili per questa versione di Linux\n"
-"Mandrakelinux, consulta gli \"Errata\" che trovi su\n"
+"Mandrivalinux, consulta gli \"Errata\" che trovi su\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Altre informazioni sulla configurazione del sistema sono nel capitolo\n"
-"sulla post-installazione del \"Manuale dell'Utente\" di Mandrakelinux."
+"sulla post-installazione del \"Manuale dell'Utente\" di Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6761,12 +6761,12 @@ msgstr "Avvio della fase \"%s\"\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Il sistema ha risorse scarse. Potrebbero verificarsi problemi installando\n"
-"Mandrakelinux. In tal caso, puoi tentare un'installazione testuale. \n"
+"Mandrivalinux. In tal caso, puoi tentare un'installazione testuale. \n"
 "Per farlo, premi \"F1\" all'avvio da CDROM e poi digita \"text\"."
 
 #: install_steps_gtk.pm:228 install_steps_interactive.pm:624
@@ -7308,9 +7308,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Connessione al sito Mandrakelinux per ricevere l'elenco dei mirror "
+"Connessione al sito Mandrivalinux per ricevere l'elenco dei mirror "
 "disponibili..."
 
 #: install_steps_interactive.pm:840
@@ -7536,8 +7536,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Installazione di Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Installazione di Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10124,13 +10124,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Configuratore di drakfirewall\n"
 "\n"
-"Configura un firewall personale per questo sistema Mandrakelinux.\n"
+"Configura un firewall personale per questo sistema Mandrivalinux.\n"
 "Per una soluzione firewall potente e dedicata, affidati alla\n"
 "distribuzione specializzata MandrakeSecurity Firewall."
 
@@ -14211,11 +14211,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"Puoi lanciare Scannerdrake (Hardware/Scanner in Mandrakelinux Control "
+"Puoi lanciare Scannerdrake (Hardware/Scanner in Mandrivalinux Control "
 "Center) per condividere in rete questo scanner.\n"
 "\n"
 
@@ -16165,23 +16165,23 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Cos'è Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Cos'è Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Benvenuto in <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Benvenuto in <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux è una <b>distribuzione Linux</b> formata da una parte "
+"Mandrivalinux è una <b>distribuzione Linux</b> formata da una parte "
 "centrale, chiamata <b>sistema operativo</b> (che si basa sul kernel Linux) a "
 "cui sono aggiunte <b>una marea di applicazioni</b> che soddisfano ogni "
 "esigenza tu possa pensare di avere."
@@ -16189,10 +16189,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux è attualmente la distribuzione Linux più <b>facile da usare</"
+"Mandrivalinux è attualmente la distribuzione Linux più <b>facile da usare</"
 "b>. Essa è anche una delle distribuzioni <b>più diffuse</b> a livello "
 "mondiale!"
 
@@ -16209,16 +16209,16 @@ msgstr "Benvenuto nel <b>mondo dell'open source</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux è impegnata nel modello di sviluppo a codice sorgente aperto "
+"Mandrivalinux è impegnata nel modello di sviluppo a codice sorgente aperto "
 "ed applica sempre la General Public License. Questa nuova release è il "
 "risultato della <b>collaborazione</b> tra il <b>team di sviluppo della "
-"Mandrakesoft </b> e la <b>comunità internazionale</b> di chi contribuisce a "
-"Mandrakelinux."
+"Mandriva </b> e la <b>comunità internazionale</b> di chi contribuisce a "
+"Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16238,10 +16238,10 @@ msgstr "<b>La GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "Gran parte dei software inclusi nella distribuzione e tutti gli strumenti "
-"Mandrakelinux sono rilasciati sotto la <b>General Public License</b>"
+"Mandrivalinux sono rilasciati sotto la <b>General Public License</b>"
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16273,15 +16273,15 @@ msgstr "<b>Unisciti alla Comunità</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux ha una delle <b>più grandi comunità</b> di utenti e "
+"Mandrivalinux ha una delle <b>più grandi comunità</b> di utenti e "
 "sviluppatori. Il ruolo di questa comunità è molto ampio, va dalla "
 "segnalazione di bug allo sviluppo di nuove applicazioni. La comunità svolge "
-"un <b>ruolo chiave</b> nel mondo di Mandrakelinux."
+"un <b>ruolo chiave</b> nel mondo di Mandrivalinux."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16302,11 +16302,11 @@ msgstr "<b>Versione scaricabile</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Stai per installare <b>Mandrakelinux Download</b>. Questa è la versione "
-"gratuita che Mandrakesoft vuol mantenere <b>disponibile per tutti</b>."
+"Stai per installare <b>Mandrivalinux Download</b>. Questa è la versione "
+"gratuita che Mandriva vuol mantenere <b>disponibile per tutti</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16336,10 +16336,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Non potrai neppure accedere ai <b>servizi inclusi</b> negli altri prodotti "
-"Mandrakesoft."
+"Mandriva."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16348,8 +16348,8 @@ msgstr "<b>Discovery, il tuo primo desktop Linux</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Stai per installare <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Stai per installare <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16371,17 +16371,17 @@ msgstr "<b>PowerPack, il desktop Linux ideale</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Stai per installare <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Stai per installare <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack è il <b>desktop Linux di punta</b> della Mandrakesoft. PowerPack "
+"PowerPack è il <b>desktop Linux di punta</b> della Mandriva. PowerPack "
 "include <b>migliaia di applicazioni</b>, dalle più popolari alle più "
 "tecniche."
 
@@ -16392,8 +16392,8 @@ msgstr "<b>PowerPack+, La soluzione Linux per desktop e server</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Stai per installare <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Stai per installare <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16409,22 +16409,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Prodotti Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Prodotti Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> ha sviluppato un'ampia gamma di prodotti "
-"<b>Mandrakelinux</b>."
+"<b>Mandriva</b> ha sviluppato un'ampia gamma di prodotti "
+"<b>Mandrivalinux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "I prodotti Mandrakelinux sono:"
+msgid "The Mandrivalinux products are:"
+msgstr "I prodotti Mandrivalinux sono:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16445,76 +16445,76 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux per x86-64</b> - La soluzione Mandrakelinux per "
+"\t* <b>Mandrivalinux per x86-64</b> - La soluzione Mandrivalinux per "
 "sfruttare al massimo un processore a 64-bit."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Prodotti Mandrakesoft per \"nomadi\"</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Prodotti Mandriva per \"nomadi\"</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft ha sviluppato due prodotti che ti permettono di utilizzare "
-"Mandrakelinux <b>su tutti i computer</b> e senza alcun bisogno di "
+"Mandriva ha sviluppato due prodotti che ti permettono di utilizzare "
+"Mandrivalinux <b>su tutti i computer</b> e senza alcun bisogno di "
 "installarlo:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b> - una distribuzione Mandrakelinux che gira completamente da "
+"\t* <b>Move</b> - una distribuzione Mandrivalinux che gira completamente da "
 "un CD-ROM avviabile."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b> - una distribuzione Mandrakelinux pre-installata su "
+"\t* <b>GlobeTrotter</b> - una distribuzione Mandrivalinux pre-installata su "
 "un “LaCie Mobile Hard Drive” ultra-compatto."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Prodotti Mandrakesoft (soluzioni professionali)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Prodotti Mandriva (soluzioni professionali)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Questi sono i prodotti Mandrakesoft progettati per soddisfare le <b>esigenze "
+"Questi sono i prodotti Mandriva progettati per soddisfare le <b>esigenze "
 "professionali</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 "\t* <b>Corporate Desktop</b> - L'ambiente di lavoro aziendale di "
-"Mandrakelinux."
+"Mandrivalinux."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b> - La soluzione Mandrakelinux per i server."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b> - La soluzione Mandrivalinux per i server."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
-"\t* <b>Multi-Network Firewall</b> - La soluzione Mandrakelinux per la "
+"\t* <b>Multi-Network Firewall</b> - La soluzione Mandrivalinux per la "
 "sicurezza."
 
 #: share/advertising/12.pl:13
@@ -16559,10 +16559,10 @@ msgstr "<b>Scegli l'ambiente di lavoro che preferisci!</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Con PowerPack, puoi scegliere <b>l'ambiente grafico di lavoro</b>. "
-"Mandrakesoft ha impostato <b>KDE</b> come predefinito."
+"Mandriva ha impostato <b>KDE</b> come predefinito."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16586,10 +16586,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Con PowerPack, puoi scegliere <b>l'ambiente grafico di lavoro</b>. "
-"Mandrakesoft ha impostato <b>KDE</b> come predefinito."
+"Mandriva ha impostato <b>KDE</b> come predefinito."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16717,10 +16717,10 @@ msgstr "<b>Sfrutta l'ampia gamma di applicazioni</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Nel menu di Mandrakelinux troverai <b>agevoli</b> strumenti per realizzare "
+"Nel menu di Mandrivalinux troverai <b>agevoli</b> strumenti per realizzare "
 "<b>ogni compito</b>:"
 
 #: share/advertising/18.pl:16
@@ -16987,18 +16987,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Il Centro di Controllo Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Il Centro di Controllo Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"Il <b>Centro di Controllo Mandrakelinux</b> è un'importante raccolta di "
-"strumenti specifici di Mandrakelinux studiati per semplificare la "
+"Il <b>Centro di Controllo Mandrivalinux</b> è un'importante raccolta di "
+"strumenti specifici di Mandrivalinux studiati per semplificare la "
 "configurazione del computer."
 
 #: share/advertising/25.pl:17
@@ -17022,16 +17022,16 @@ msgstr "<b>Il modello Open Source</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Come tutta la programmazione, anche il software a codice sorgente aperto "
 "<b>richiede tempo e personale</b>. Nel rispetto della filosofia open source, "
-"Mandrakesoft vende prodotti a valore aggiunto e servizi per <b>continuare a "
-"sviluppare Mandrakelinux</b>. Se vuoi <b>supportare la filosofia open "
-"source</b> e lo sviluppo di Mandrakelinux, dovresti prendere in "
+"Mandriva vende prodotti a valore aggiunto e servizi per <b>continuare a "
+"sviluppare Mandrivalinux</b>. Se vuoi <b>supportare la filosofia open "
+"source</b> e lo sviluppo di Mandrivalinux, dovresti prendere in "
 "considerazione l'idea di acquistare uno dei nostri prodotti o servizi!"
 
 #: share/advertising/27.pl:13
@@ -17042,10 +17042,10 @@ msgstr "<b>Il negozio online</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Per saperne di più sui prodotti e i servizi di Mandrakesoft puoi visitare la "
+"Per saperne di più sui prodotti e i servizi di Mandriva puoi visitare la "
 "nostra <b>piattaforma e-commerce</b>."
 
 #: share/advertising/27.pl:17
@@ -17071,23 +17071,23 @@ msgstr "Fermati oggi stesso a <b>store.mandrakesoft.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> è il <b>perfetto completamento</b> del tuo Mandrakelinux."
+"<b>Mandriva Club</b> è il <b>perfetto completamento</b> del tuo Mandrivalinux."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Associandoti al Mandrakeclub usufruirai di <b>concreti benefici</b>, quali:"
+"Associandoti al Mandriva Club usufruirai di <b>concreti benefici</b>, quali:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -17109,40 +17109,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* participazione ai <b>forum degli utenti</b> Mandrakelinux;"
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* participazione ai <b>forum degli utenti</b> Mandrivalinux;"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>accesso privilegiato e anticipato</b>, prima del rilascio al "
-"pubblico, alle <b>immagini ISO</b> di Mandrakelinux."
+"pubblico, alle <b>immagini ISO</b> di Mandrivalinux."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> è un nuovo straordinario servizio che Mandrakesoft è "
+"<b>Mandriva Online</b> è un nuovo straordinario servizio che Mandriva è "
 "orgogliosa di offrire!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline fornisce un'ampia gamma di preziosi servizi per <b>aggiornare "
-"facilmente</b> i tuoi sistemi Mandrakelinux:"
+"Mandriva Online fornisce un'ampia gamma di preziosi servizi per <b>aggiornare "
+"facilmente</b> i tuoi sistemi Mandrivalinux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17168,42 +17168,42 @@ msgstr "\t* aggiornamenti flessibili e <b>programmati</b>;"
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* gestione di <b>tutti i tuoi sistemi Mandrakelinux</b> con un solo "
+"\t* gestione di <b>tutti i tuoi sistemi Mandrivalinux</b> con un solo "
 "account."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Ti serve <b>assistenza?</b> Incontra gli esperti tecnici di Mandrakesoft "
+"Ti serve <b>assistenza?</b> Incontra gli esperti tecnici di Mandriva "
 "sulla <b>nostra piattaforma per il supporto tecnico</b> www.mandrakeexpert."
 "com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Grazie all'aiuto di <b>esperti qualificati su Mandrakelinux</b>, "
+"Grazie all'aiuto di <b>esperti qualificati su Mandrivalinux</b>, "
 "risparmierai moltissimo tempo."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Per risolvere ogni problema relativo a Mandrakelinux, puoi comprare su "
+"Per risolvere ogni problema relativo a Mandrivalinux, puoi comprare su "
 "<b>store.mandrakesoft.com</b> degli interventi di supporto."
 
 #: share/compssUsers.pl:25
@@ -17503,8 +17503,8 @@ msgstr "Strumenti di monitoraggio, accounting dei processi, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Procedure guidate Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Procedure guidate Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17656,7 +17656,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17670,7 +17670,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPZIONI]...\n"
-"Configuratore del Mandrakelinux Terminal Server\n"
+"Configuratore del Mandrivalinux Terminal Server\n"
 "--enable         : abilita MTS\n"
 "--disable        : disabilita MTS\n"
 "--start          : avvia MTS\n"
@@ -17727,7 +17727,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17735,7 +17735,7 @@ msgid ""
 msgstr ""
 "[OPZIONE]...\n"
 "  --no-confirmation      non chiedere prima una conferma in modalità "
-"MandrakeUpdate\n"
+"Mandriva Update\n"
 "  --no-verify-rpm        non verificare le firme dei pacchetti\n"
 "  --changelog-first      mostra nella finestra delle descrizioni il log dei "
 "cambiamenti prima della lista dei file\n"
@@ -20522,13 +20522,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Procedura Mandrakelinux per segnalare bug"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Procedura Mandrivalinux per segnalare bug"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centro di Controllo Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Centro di Controllo Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20548,8 +20548,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20593,8 +20593,8 @@ msgstr "Assistenti di configurazione"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Scegli uno degli strumenti Mandrakesoft:"
+msgid "Select Mandriva Tool:"
+msgstr "Scegli uno degli strumenti Mandriva:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -21020,20 +21020,20 @@ msgstr "Attivato al boot"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Questa interfaccia non è stata ancora configurata.\n"
-"Lancia l'assistente \"Aggiungi un'interfaccia\" dal Mandrakelinux Control "
+"Lancia l'assistente \"Aggiungi un'interfaccia\" dal Mandrivalinux Control "
 "Center"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Non è stata configurata nessuna interfaccia Internet.\n"
-"Lancia l'assistente \"%s\" dal Centro di controllo Mandrakelinux."
+"Lancia l'assistente \"%s\" dal Centro di controllo Mandrivalinux."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21083,8 +21083,8 @@ msgstr "KDM (KDE Display Manager)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux Display Manager)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21383,7 +21383,7 @@ msgstr "Importa"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21392,7 +21392,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 di Mandrakesoft \n"
+"Copyright (C) 2001-2002 di Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versione originale)\n"
@@ -21940,14 +21940,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "Questo è software libero e può essere ridistributo nei termini fissati dalla "
 "GPL di GNU.\n"
 "\n"
@@ -21976,8 +21976,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Centro di aiuto Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Centro di aiuto Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25511,8 +25511,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Log dei programmi Mandrakelinux"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Log dei programmi Mandrivalinux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -26024,10 +26024,10 @@ msgstr "Connessione completata."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Connessione non riuscita.\n"
-"Verifica la configurazione dal Centro di Controllo Mandrakelinux."
+"Verifica la configurazione dal Centro di Controllo Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po
index 5caa193d2..b7499573d 100644
--- a/perl-install/share/po/ja.po
+++ b/perl-install/share/po/ja.po
@@ -70,14 +70,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "USBキーに書き込みプロテクトがかかっているようですが、安全に取り外す\n"
 "ことができません\n"
 "\n"
 "\n"
 "再起動ボタンをクリックし、プラグを抜いて書き込みプロテクトを外してから\n"
-"再度キーを差し込んで Mandrake Move を起動してください。"
+"再度キーを差し込んで Mandriva Move を起動してください。"
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -95,7 +95,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "お使いのUSBキーには有効なWindows(FAT)パーティションがありません。\n"
@@ -104,14 +104,14 @@ msgstr ""
 "移動・読込が可能になります)\n"
 "\n"
 "\n"
-"Mandrake MoveはUSBキーなしで使用することもできます。\n"
+"Mandriva MoveはUSBキーなしで使用することもできます。\n"
 "その場合は通常のライブOSになります。"
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -119,7 +119,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "システムにUSBキーを検出できませんでした。USBキーを使うと\n"
@@ -128,7 +128,7 @@ msgstr ""
 "注意: キーを差し込んでから検出するまでに数秒かかります。\n"
 "\n"
 "\n"
-"Mandrake MoveはUSBキーなしで使用することもできます。\n"
+"Mandriva MoveはUSBキーなしで使用することもできます。\n"
 "その場合は通常のライブOSになります。"
 
 #: ../move/move.pm:494
@@ -253,7 +253,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -269,7 +269,7 @@ msgstr ""
 "\n"
 "USBキーに保存されているシステム設定ファイルが壊れている\n"
 "可能性があります。その場合は、設定ファイルを削除し再度\n"
-"Mandrake Moveを起動すると解決できます。そうするには\n"
+"Mandriva Moveを起動すると解決できます。そうするには\n"
 "アクションに対応したボタンをクリックしてください。\n"
 "\n"
 "\n"
@@ -1304,11 +1304,11 @@ msgstr "言語の選択"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinuxでは複数の言語を使うことができます。\n"
+"Mandrivalinuxでは複数の言語を使うことができます。\n"
 "お使いになりたい言語を選んでください。\n"
 "インストール後に再選択することも可能です。"
 
@@ -3706,11 +3706,11 @@ msgstr "ラジオサポートを有効にする"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
-"先に進む前にライセンスをよく読んでください。これはMandrakelinux\n"
+"先に進む前にライセンスをよく読んでください。これはMandrivalinux\n"
 "全体に適用されます。全ての項目に同意する場合は \"%s\" を押してください。\n"
 "そうでない場合は \"%s\" をクリックしてコンピュータを再起動してください。"
 
@@ -3880,13 +3880,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinuxのインストールは数枚のCD-ROMから行ないます。\n"
+"Mandrivalinuxのインストールは数枚のCD-ROMから行ないます。\n"
 "選択したパッケージが別のCD-ROMの中にあると、DrakXは現在のCDを\n"
 "イジェクトして別のCDを入れるよう促します。\n"
 "指示されたCDをお持ちでない場合は %s をクリックしてください。"
@@ -3895,11 +3895,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3950,11 +3950,11 @@ msgid ""
 "command-line interface. The total size of this installation is about 65\n"
 "megabytes."
 msgstr ""
-"ここではインストールするプログラムを選びます。Mandrakelinuxには数千 \n"
+"ここではインストールするプログラムを選びます。Mandrivalinuxには数千 \n"
 "ものパッケージが用意されています。それらは管理し易いように類似した\n"
 "アプリケーションごとにグループ化されています 。\n"
 "\n"
-"Mandrakelinuxではこのグループをさらに四つのカテゴリーに分類しています。\n"
+"Mandrivalinuxではこのグループをさらに四つのカテゴリーに分類しています。\n"
 "パッケージの選択に際しては、複数のカテゴリーからグループを選ぶことが\n"
 "できます。つまり、「ワークステーション」としてのインストールに「サーバ」\n"
 "カテゴリーのグループを加えることもできます。\n"
@@ -4059,10 +4059,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4092,7 +4092,7 @@ msgstr ""
 "注意!! 選択されたグループにサーバ用のパッケージが含まれていたり、または\n"
 "個別にそれを選択されると、本当にインストールしてよいか確認を促す\n"
 "メッセージが出ます。\n"
-"Mandrakelinuxのデフォルトの設定では、インストールされたサービスはすべて\n"
+"Mandrivalinuxのデフォルトの設定では、インストールされたサービスはすべて\n"
 "起動時に自動的に開始されます。ディストリビューションがリリースされた時点\n"
 "で既知の問題がなく安全だとされていても、リリース後にセキュリティホールが\n"
 "発見される可能性はあります。\n"
@@ -4240,7 +4240,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4295,7 +4295,7 @@ msgid ""
 "not successful in getting the display configured."
 msgstr ""
 "X(X Window System)はGNU/Linuxのグラフィカルインターフェースの中心となる\n"
-"部分でMandrakelinuxに収録されている様々なグラフィカル環境(KDE/GNOME/\n"
+"部分でMandrivalinuxに収録されている様々なグラフィカル環境(KDE/GNOME/\n"
 "AfterStep/WindowMakerなど)は全てこれに依存しています。\n"
 "\n"
 "最適なグラフィック表示を得るために調整可能ないくつかの設定項目が\n"
@@ -4404,12 +4404,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4436,7 +4436,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4445,7 +4445,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4465,10 +4465,10 @@ 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 ""
-"ここではMandrakelinuxをハードドライブのどこにインストールするかを\n"
+"ここではMandrivalinuxをハードドライブのどこにインストールするかを\n"
 "選択します。ハードドライブが空であったり既存のOSが全ての領域を使用して\n"
 "いたりする場合は、パーティションを設定しなければなりません。\n"
-"基本的に、Mandrakelinuxをインストールするには、ハードドライブを\n"
+"基本的に、Mandrivalinuxをインストールするには、ハードドライブを\n"
 "論理分割して領域を確保することが必要です。\n"
 "\n"
 "パーティションの設定は、たいていの場合復元不可能なうえ、データの消失に\n"
@@ -4495,7 +4495,7 @@ msgstr ""
 "Microsoft WindowsのFATまたはNTFSパーティションのサイズを変更します。\n"
 "サイズ変更は、Windowsのパーティションがあらかじめデフラグ(最適化)されて\n"
 "いれば、データを失うことなく実行できます。(必ずデータのバックアップを\n"
-"しておいてください) MandrakelinuxとMicrosoft Windowsを両方使われる場合は\n"
+"しておいてください) MandrivalinuxとMicrosoft Windowsを両方使われる場合は\n"
 "このオプションを選んでください。(Windowsを消去される場合は次を参照して\n"
 "ください: ディスク全体を消去)\n"
 "\n"
@@ -4505,7 +4505,7 @@ msgstr ""
 "なりますので注意してください。\n"
 "\n"
 " * %s: ハードドライブのすべてのデータとパーティション\n"
-"を削除しMandrakelinuxシステムに入れ替える場合はこのオプションを選んで\n"
+"を削除しMandrivalinuxシステムに入れ替える場合はこのオプションを選んで\n"
 "ください。確認後は取り消しできませんので十分注意してください。\n"
 "\n"
 "   !! このオプションを選ぶとディスク上の全データが消去されます !!\n"
@@ -4661,7 +4661,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4679,7 +4679,7 @@ msgstr ""
 "\n"
 "パーティションをフォーマットする準備ができたら %s をクリックしてください。\n"
 "\n"
-"Mandrakelinuxを別のパーティションに新規にインストールする場合は %s\n"
+"Mandrivalinuxを別のパーティションに新規にインストールする場合は %s\n"
 "をクリックしてください。\n"
 "\n"
 "ディスクの不良ブロックを検証するパーティションを選ぶには %s を\n"
@@ -4697,7 +4697,7 @@ msgstr "戻る"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4709,7 +4709,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Mandrakelinuxのリリース後に、バグの修正、あるいはセキュリティ問題を解決\n"
+"Mandrivalinuxのリリース後に、バグの修正、あるいはセキュリティ問題を解決\n"
 "するために更新されたパッケージがあるかもしれません。これらのパッケージを\n"
 "インターネットからダウンロードしてシステムを更新することができます。すでに\n"
 "インターネットに接続されていれば %s にチェックを入れてください。\n"
@@ -4736,7 +4736,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4748,7 +4748,7 @@ msgstr ""
 "しかしセキュリティレベルを高くすると一般的には使い勝手が悪くなります。\n"
 "\n"
 "何を選択してよいか分からない場合はデフォルトのままにしておいてください。\n"
-"設定は後で変更できます。Mandrakelinuxコントロールセンタには draksec\n"
+"設定は後で変更できます。Mandrivalinuxコントロールセンタには draksec\n"
 "というそのためのツールが用意されています。\n"
 "\n"
 "%s にセキュリティ管理者のメールアドレスを入力してください。\n"
@@ -4763,7 +4763,7 @@ msgstr "セキュリティ管理者"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4833,7 +4833,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"ここではどのパーティションにMandrakelinuxをインストールするかを選びます。\n"
+"ここではどのパーティションにMandrivalinuxをインストールするかを選びます。\n"
 "以前にインストールしたGNU/Linuxシステムが残っていたり、別のツールを使って\n"
 "既にパーティションが定義されている場合は、既存のパーティションを利用する\n"
 "ことができます。そうでない場合はハードドライブのパーティションを定義しな\n"
@@ -4918,7 +4918,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4947,7 +4947,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "ハードドライブにMicrosoftのパーティションがいくつか検出されました。\n"
-"Mandrakelinuxをインストールするためにリサイズするパーティションを\n"
+"Mandrivalinuxをインストールするためにリサイズするパーティションを\n"
 "選んでください。\n"
 "\n"
 "パーティションは次のように表示されます: \"Linux name\", \"Windows name\"\n"
@@ -4995,7 +4995,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5004,18 +5004,18 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "このステップは既存のGNU/Linuxパーティションが検出された時にのみ表示\n"
 "されます。\n"
 "\n"
-"DrakXは既存のMandrakelinuxシステムを更新するかそれとも新規にインストール\n"
+"DrakXは既存のMandrivalinuxシステムを更新するかそれとも新規にインストール\n"
 "するかを尋ねます:\n"
 "\n"
 " * %s: 基本的には古いシステムを完全に消去してしまいます。\n"
@@ -5023,10 +5023,10 @@ msgstr ""
 "\"home\" ディレクトリ)を残すことができます。パーティションの設定やファイル\n"
 "システムを変更される場合はこのオプションをお使いください。\n"
 "\n"
-" * %s: これは既にMandrakelinuxにインストールされている\n"
+" * %s: これは既にMandrivalinuxにインストールされている\n"
 "パッケージをアップデートします。現在のパーティションの設定やユーザデータは\n"
 "変更されません。その他の設定の大部分は標準のインストールと同様に行えます。\n"
-"「アップグレード」はMandrakelinuxのバージョンが\"8.1\"以降であれば問題ない\n"
+"「アップグレード」はMandrivalinuxのバージョンが\"8.1\"以降であれば問題ない\n"
 "はずです。\"8.1\"より古いバージョンにはお勧めできません。"
 
 #: help.pm:591
@@ -5078,7 +5078,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5117,7 +5117,7 @@ msgstr ""
 "\n"
 "ユニコード(UTF-8)サポートについて: ユニコードは世界中のすべての言語を\n"
 "カバーします。しかしながら、GNU/Linux環境でのユニコードサポートはまだ開発\n"
-"途上にあります。そのため、Mandrakelinuxではユーザの選択に応じてその使用を\n"
+"途上にあります。そのため、Mandrivalinuxではユーザの選択に応じてその使用を\n"
 "制限しています:\n"
 "\n"
 " * レガシーなエンコードを使用する言語(latin1/ロシア語/日本語/中国語/\n"
@@ -5345,7 +5345,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5366,11 +5366,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "ここでは、コンピュータの印刷システムを選択します。他のOSには一種類しか\n"
-"ありませんが、Mandrakelinuxには二種類の印刷システムがあります。それぞれ\n"
+"ありませんが、Mandrivalinuxには二種類の印刷システムがあります。それぞれ\n"
 "利点と欠点がありますので、より適したものを選んでください。\n"
 "\n"
 " * %s - 'Print, Do not Queue(印刷する。キューはしない)'の略。\n"
@@ -5388,7 +5388,7 @@ msgstr ""
 "%s には印刷/プリンタオプションの選択/プリンタの管理などのための\n"
 "グラフィカルフロントエンドがあります。\n"
 "\n"
-"選択した印刷システムを後で変更する場合は、Mandrakelinuxコントロールセンタ\n"
+"選択した印刷システムを後で変更する場合は、Mandrivalinuxコントロールセンタ\n"
 "のPrinterDrakeで %s をクリックしてください。"
 
 #: help.pm:765
@@ -5506,7 +5506,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5523,7 +5523,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5567,7 +5567,7 @@ msgstr ""
 "%s をクリックして設定し直してください。\n"
 "\n"
 " * %s: インターネットとローカルネットワークの設定。\n"
-"マニュアルを参照するか、もしくはインストール完了後にMandrakelinux\n"
+"マニュアルを参照するか、もしくはインストール完了後にMandrivalinux\n"
 "コントロールセンターのヘルプにしたがって行なってください。\n"
 "\n"
 " * %s: あなたのマシンがプロキシサーバの背後にあれば\n"
@@ -5582,7 +5582,7 @@ msgstr ""
 "\n"
 " * %s: ブートローダの設定を変更する時はこのボタンを\n"
 "押してください。(注意:これは上級者向きです) 印刷されたドキュメントまたは\n"
-"Mandrakelinuxコントロールセンターのブートローダに関するヘルプを参照して\n"
+"Mandrivalinuxコントロールセンターのブートローダに関するヘルプを参照して\n"
 "ください。\n"
 "\n"
 " * %s: ここではどのサービスを有効にするかを細かく設定できます。\n"
@@ -5643,10 +5643,10 @@ msgstr "サービス"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Mandrakelinuxをインストールするためにフォーマットするハードドライブを\n"
+"Mandrivalinuxをインストールするためにフォーマットするハードドライブを\n"
 "選んでください。注意: このドライブのデータは全て失われ、回復すること\n"
 "はできません。"
 
@@ -5996,11 +5996,11 @@ msgstr "Windowsパーティションのサイズを計算"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Windowsパーティションが断片化しすぎています。再起動してWindowsを立ち上げ、\n"
-"デフラグを実行してください。その後再起動してMandrakelinuxをインストール\n"
+"デフラグを実行してください。その後再起動してMandrivalinuxをインストール\n"
 "してください。"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6114,19 +6114,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6148,7 +6148,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6156,14 +6156,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6173,7 +6173,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6193,10 +6193,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6207,11 +6207,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6227,14 +6227,14 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "序文\n"
 "\n"
-"オペレーティング・システムとMandrakelinuxディストリビューションに\n"
+"オペレーティング・システムとMandrivalinuxディストリビューションに\n"
 "含まれる様々なコンポーネントを、以下「ソフトウェア製品」と呼びます。\n"
 "ソフトウェア製品には、オペレーティング・システムに関連するプログラム\n"
-"一式・方法・ルール・ドキュメントとMandrakelinuxディストリビューション\n"
+"一式・方法・ルール・ドキュメントとMandrivalinuxディストリビューション\n"
 "の様々なコンポーネントが含まれます。但し、これらに限定されるものでは\n"
 "ありません。\n"
 "\n"
@@ -6242,7 +6242,7 @@ msgstr ""
 "1. 使用承諾契約\n"
 "\n"
 "この文書をよくお読みください。この文書はソフトウェア製品に適用される\n"
-"お客様とMandrakesoft S.A.との間の使用承諾契約です。方法の如何にかかわ\n"
+"お客様とMandriva S.A.との間の使用承諾契約です。方法の如何にかかわ\n"
 "らず、ソフトウェア製品をインストール・コピーまたは使用することによって\n"
 "お客様は使用承諾契約の規約に従うことに同意されたものとします。使用承諾\n"
 "契約に少しでも同意できない部分がある場合は、ソフトウェア製品をインスト\n"
@@ -6255,21 +6255,21 @@ msgstr ""
 "\n"
 "2. 限定保証\n"
 "\n"
-"法律で認められる範囲内で、Mandrakesoft S.A.はソフトウェア製品と付属の\n"
+"法律で認められる範囲内で、Mandriva S.A.はソフトウェア製品と付属の\n"
 "ドキュメントを「保証なし」で提供しています。法律で認められる範囲内で、\n"
-"Mandrakesoft S.A.はいかなる状況においてもソフトウェア製品の使用または\n"
+"Mandriva S.A.はいかなる状況においてもソフトウェア製品の使用または\n"
 "使用不能によって生じた特殊・偶発的・直接的・間接的な損害に対して責任を\n"
 "負いません。これらの損害には、取引上の損失・事業の中断・経済的損失・\n"
 "裁判の判決によって発生した訴訟費用ならびに罰金、その他の間接的な損失を\n"
-"無制限に含みます。Mandrakesoft S.A.はこのような損害またはその可能性を\n"
+"無制限に含みます。Mandriva S.A.はこのような損害またはその可能性を\n"
 "報告された場合も責任を負いかねます。\n"
 "\n"
 "いくつかの国で禁止されているソフトウェアの所持・使用に関する限定保証\n"
 "\n"
-"法律で認められる範囲内で、Mandrakesoft S.A.またはその製品を配布する者\n"
+"法律で認められる範囲内で、Mandriva S.A.またはその製品を配布する者\n"
 "は、いかなる状況においてもソフトウェア製品のコンポーネントの所持・使用\n"
 "またはいくつかの国の法律によって禁止・制限されているソフトウェアを\n"
-"Mandrakelinuxのウェブサイトからダウンロードしたことによって生じた特殊・\n"
+"Mandrivalinuxのウェブサイトからダウンロードしたことによって生じた特殊・\n"
 "偶発的・直接的・間接的な損害に対して責任を負いません。これらの損害には\n"
 "取引上の損失・事業の中断・経済的損失・裁判の判決によって発生した訴訟\n"
 "費用ならびに罰金、その他の間接的な損失を無制限に含みます。この限定保証\n"
@@ -6284,9 +6284,9 @@ msgstr ""
 "これらのライセンスの多くは対象となるコンポーネントの使用・コピー・改作\n"
 "または再配布を認めています。各コンポーネントを使用する前に、それぞれの\n"
 "使用承諾契約の規約をよくお読みください。各コンポーネントのライセンスに\n"
-"関し不明な点があれば、Mandrakesoftではなくコンポーネントの作者へお問い\n"
-"合わせください。Mandrakesoft S.A.が開発したプログラムはGPLライセンスに\n"
-"準拠します。Mandrakesoft S.A.が作成したドキュメントについては、特別な\n"
+"関し不明な点があれば、Mandrivaではなくコンポーネントの作者へお問い\n"
+"合わせください。Mandriva S.A.が開発したプログラムはGPLライセンスに\n"
+"準拠します。Mandriva S.A.が作成したドキュメントについては、特別な\n"
 "ライセンスに準拠します。詳しくはドキュメントをご参照ください。\n"
 "\n"
 "\n"
@@ -6294,9 +6294,9 @@ msgstr ""
 "\n"
 "ソフトウェア製品に含まれるコンポーネントのすべての権利はそれぞれの作者\n"
 "に属し、ソフトウェア・プログラムに適用される知的財産法・著作権法によって\n"
-"保護されています。Mandrakesoft S.A.は方法・目的の如何にかかわらずソフト\n"
+"保護されています。Mandriva S.A.は方法・目的の如何にかかわらずソフト\n"
 "ウェア製品を全面的・部分的に改変する権利を留保しています。Mandrakeと\n"
-"Mandrakelinux、ならびに関連するロゴはMandrakesoft S.A.の登録商標です。\n"
+"Mandrivalinux、ならびに関連するロゴはMandriva S.A.の登録商標です。\n"
 "\n"
 "\n"
 "5. 準拠法\n"
@@ -6307,7 +6307,7 @@ msgstr ""
 "承諾契約の規約はフランス共和国の法律に準拠しています。この使用承諾契約\n"
 "の条項に関する争議は法廷外で解決されることが望まれますが、解決できない\n"
 "場合は最後の手段としてパリ(フランス共和国)の適切な法廷に持ち込みます。\n"
-"この文書に関し不明な点があれば、Mandrakesoft S.A.までご連絡ください。\n"
+"この文書に関し不明な点があれば、Mandriva S.A.までご連絡ください。\n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6393,7 +6393,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6401,7 +6401,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "おめでとうございます。インストールが完了しました。\n"
 "起動用メディアを抜き、[Enter]を押して再起動してください。\n"
@@ -6413,7 +6413,7 @@ msgstr ""
 "%s\n"
 "\n"
 "\n"
-"システム設定に関する詳細については Mandrakelinux User's Guide を\n"
+"システム設定に関する詳細については Mandrivalinux User's Guide を\n"
 "ご覧ください。"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6448,11 +6448,11 @@ msgstr "%s を開始\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"リソースが足りません。Mandrakelinuxをインストール中に問題が発生する\n"
+"リソースが足りません。Mandrivalinuxをインストール中に問題が発生する\n"
 "可能性があります。\n"
 "別の方法として、テキストモードでインストールすることもできます。\n"
 "その場合は、CD-ROMから起動した時に[F1]を押し、続いて'text'と入力\n"
@@ -6993,8 +6993,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "Mandrakelinuxのサイトに接続してミラーのリストを取得しています"
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
+msgstr "Mandrivalinuxのサイトに接続してミラーのリストを取得しています"
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7217,8 +7217,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinuxのインストール %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinuxのインストール %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9802,7 +9802,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -13810,13 +13810,13 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
 "お使いのスキャナをネットワークで共有するにはScannerdrakeを実行してくださ"
 "い。\n"
-"(Mandrakelinuxコントロールセンターのハードウェア->スキャナを選択)\n"
+"(Mandrivalinuxコントロールセンターのハードウェア->スキャナを選択)\n"
 
 #: printer/printerdrake.pm:3933
 #, c-format
@@ -15703,33 +15703,33 @@ msgstr "停止"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "Mandrakelinux とは？"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "Mandrivalinux とは？"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Mandrakelinux へようこそ"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Mandrivalinux へようこそ"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux は Linux カーネルを核にしたオペレーティングシステムと、あらゆる"
+"Mandrivalinux は Linux カーネルを核にしたオペレーティングシステムと、あらゆる"
 "ニーズを満たす多くのアプリケーションからなる Linux ディストリビューションで"
 "す。"
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"MandrakelinuxはユーザーフレンドリーなLinux ディストリビューションです。世界中"
+"MandrivalinuxはユーザーフレンドリーなLinux ディストリビューションです。世界中"
 "で最も広く使われているディストリビューションのひとつです。"
 
 #: share/advertising/02.pl:13
@@ -15745,13 +15745,13 @@ msgstr "オープンソースの世界へようこそ"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux はオープンソースモデルに力を注いでいます。この新しいリリースは "
-"Mandrakesoft の開発チームと Mandrakelinux のコントリビュータが生み出した世界"
+"Mandrivalinux はオープンソースモデルに力を注いでいます。この新しいリリースは "
+"Mandriva の開発チームと Mandrivalinux のコントリビュータが生み出した世界"
 "規模のコミュニティによるコラボレーションの成果です。"
 
 #: share/advertising/02.pl:19
@@ -15770,9 +15770,9 @@ msgstr "GPL"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"このディストリビューションに含まれるほとんどのソフトウェアと Mandrakelinux の"
+"このディストリビューションに含まれるほとんどのソフトウェアと Mandrivalinux の"
 "ツールは、 General Public License でライセンスされています。"
 
 #: share/advertising/03.pl:17
@@ -15803,14 +15803,14 @@ msgstr "コミュニティへの参加"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux はユーザと開発者から成る世界規模のコミュニティを生み出しまし"
+"Mandrivalinux はユーザと開発者から成る世界規模のコミュニティを生み出しまし"
 "た。このコミュニティは様々な役割を果たしています。新しいアプリケーションの開"
-"発に際してはバグを報告し問題の解決を助けます。コミュニティは Mandrakelinux "
+"発に際してはバグを報告し問題の解決を助けます。コミュニティは Mandrivalinux "
 "World で中心的な役割を担っています。"
 
 #: share/advertising/04.pl:17
@@ -15832,11 +15832,11 @@ msgstr "ダウンロードバージョン"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"これは Mandrakesoft が無償で提供するダウンロードバージョンです。 "
-"Mandrakesoft は今後もすべての人が利用できる無償版の提供を続けていきたいと思っ"
+"これは Mandriva が無償で提供するダウンロードバージョンです。 "
+"Mandriva は今後もすべての人が利用できる無償版の提供を続けていきたいと思っ"
 "ています。"
 
 #: share/advertising/05.pl:19
@@ -15866,8 +15866,8 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
-msgstr "Mandrakesoft の有償製品に含まれているサービスはご利用になれません。"
+"Mandriva products either."
+msgstr "Mandriva の有償製品に含まれているサービスはご利用になれません。"
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -15876,8 +15876,8 @@ msgstr "Discovery: 初めての Linux デスクトップ"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Mandrakelinux Discovery をインストールします。"
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Mandrivalinux Discovery をインストールします。"
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -15899,17 +15899,17 @@ msgstr "PowerPack: Linux デスクトップの決定版"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Mandrakelinux PowerPack をインストールします。"
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Mandrivalinux PowerPack をインストールします。"
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack は Mandrakesoft のプレミアム製品です。最も人気の高いものから最先端"
+"PowerPack は Mandriva のプレミアム製品です。最も人気の高いものから最先端"
 "に至るまで、 PowerPack には数千のアプリケーションがぎっしり詰まっています。"
 
 #: share/advertising/08.pl:13
@@ -15919,8 +15919,8 @@ msgstr "PowerPack+: デスクトップ/サーバ向け Linux ソリューショ�
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Mandrakelinux PowerPack+ をインストールします。"
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Mandrivalinux PowerPack+ をインストールします。"
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -15936,20 +15936,20 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "Mandrakesoft の製品"
+msgid "<b>Mandriva Products</b>"
+msgstr "Mandriva の製品"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
-msgstr "Mandrakesoft は幅広い Mandrakelinux 製品を開発しています。"
+msgstr "Mandriva は幅広い Mandrivalinux 製品を開発しています。"
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinuxの製品:"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinuxの製品:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -15969,69 +15969,69 @@ msgstr "\t* PowerPack+: デスクトップ/サーバ向け Linux ソリューシ
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
-msgstr "\t* Mandrakelinux for x86-64: 64-bitプロセッサのための Mandrakelinux"
+msgstr "\t* Mandrivalinux for x86-64: 64-bitプロセッサのための Mandrivalinux"
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "Mandrakesoft の製品 - 行動派のあなたに"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "Mandriva の製品 - 行動派のあなたに"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft は Mandrakelinux をインストールすることなしにどのコンピュータで"
+"Mandriva は Mandrivalinux をインストールすることなしにどのコンピュータで"
 "もお使い頂けるよう、ふたつの製品を開発しました。"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* Move: ブータブルCD一枚で稼動できる Mandrakelinux ディストリビューション"
+"\t* Move: ブータブルCD一枚で稼動できる Mandrivalinux ディストリビューション"
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 "\t* GlobeTrotter: 超コンパクトな LaCie Mobile ハードドライブにプリインストー"
-"ルされた Mandrakelinux ディストリビューション"
+"ルされた Mandrivalinux ディストリビューション"
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "Mandrakesoftの製品 - プロフェッショナル・ユースに"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "Mandrivaの製品 - プロフェッショナル・ユースに"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Mandrakesoft はプロフェッショナルなニーズを満たすため、次の製品を開発しまし"
+"Mandriva はプロフェッショナルなニーズを満たすため、次の製品を開発しまし"
 "た。"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr "\t* Corporate Desktop: ビジネス向けデスクトップ"
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* Corporate Server: Mandrakelinux サーバ・ソリューション"
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* Corporate Server: Mandrivalinux サーバ・ソリューション"
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* Multi-Network Firewall: Mandrakelinux セキュリティ・ソリューション"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* Multi-Network Firewall: Mandrivalinux セキュリティ・ソリューション"
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16074,10 +16074,10 @@ msgstr "お好きなデスクトップ環境を選んでください"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "PowerPack にはいくつものグラフィカルデスクトップ環境が用意されています。 "
-"Mandrakesoft は KDE をデフォルトに選びました。"
+"Mandriva は KDE をデフォルトに選びました。"
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16101,10 +16101,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "PowerPack にはいくつものグラフィカルデスクトップ環境が用意されています。 "
-"Mandrakesoft は KDE をデフォルトに選びました。"
+"Mandriva は KDE をデフォルトに選びました。"
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16226,10 +16226,10 @@ msgstr "幅広いアプリケーション"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Mandrakelinux のメニューにはあらゆる用途に合った使い易いアプリケーションが"
+"Mandrivalinux のメニューにはあらゆる用途に合った使い易いアプリケーションが"
 "ぎっしり詰まってます:"
 
 #: share/advertising/18.pl:16
@@ -16474,18 +16474,18 @@ msgstr "\t* Postfix と Sendmail: 強力で人気のあるメールサーバ"
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "Mandrakelinux コントロールセンタ"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "Mandrivalinux コントロールセンタ"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"Mandrakelinux コントロールセンタは、コンピュータの設定を簡単に行えるよう考案"
-"された Mandrakelinux 独自のツール群です。"
+"Mandrivalinux コントロールセンタは、コンピュータの設定を簡単に行えるよう考案"
+"された Mandrivalinux 独自のツール群です。"
 
 #: share/advertising/25.pl:17
 #, c-format
@@ -16508,15 +16508,15 @@ msgstr "オープンソースモデル"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "オープンソースソフトウェアも他のソフトウェアと同様に開発には時間と人が必要で"
-"す。オープンソースの理念を尊重するために、 Mandrakesoft は付加価値商品やサー"
-"ビスを販売して Mandrakelinux の改良を続けています。オープンソースの理念と "
-"Mandrakelinux の開発を支援して下さるのであれば、ぜひ当社の製品またはサービス"
+"す。オープンソースの理念を尊重するために、 Mandriva は付加価値商品やサー"
+"ビスを販売して Mandrivalinux の改良を続けています。オープンソースの理念と "
+"Mandrivalinux の開発を支援して下さるのであれば、ぜひ当社の製品またはサービス"
 "の購入をご検討ください。"
 
 #: share/advertising/27.pl:13
@@ -16527,10 +16527,10 @@ msgstr "オンラインストア"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Mandrakesoft の製品とサービスについては当社の E-コマース をご利用ください。"
+"Mandriva の製品とサービスについては当社の E-コマース をご利用ください。"
 
 #: share/advertising/27.pl:17
 #, c-format
@@ -16553,21 +16553,21 @@ msgstr "store.mandrakesoft.com にぜひお立ち寄りください。"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "Mandrakeclub"
+msgid "<b>Mandriva Club</b>"
+msgstr "Mandriva Club"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
-msgstr "Mandrakelinux 製品に合わせて Mandrakeclub へのご入会をお勧めします。 "
+msgstr "Mandrivalinux 製品に合わせて Mandriva Club へのご入会をお勧めします。 "
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
-msgstr "Mandrakeclub にご入会いただくと次のような特典をお楽しみいただけます:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
+msgstr "Mandriva Club にご入会いただくと次のような特典をお楽しみいただけます:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -16585,37 +16585,37 @@ msgstr "\t* NVIDIA®/ATI™ をはじめとする商用アプリケーション�
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Mandrakelinux ユーザ・フォーラムへの参加"
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Mandrivalinux ユーザ・フォーラムへの参加"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
-msgstr "\t* 公式リリースに先立つ Mandrakelinux ISO イメージの早期ダウンロード"
+"Mandrivalinux <b>ISO images</b>."
+msgstr "\t* 公式リリースに先立つ Mandrivalinux ISO イメージの早期ダウンロード"
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "Mandrakeonline"
+msgid "<b>Mandriva Online</b>"
+msgstr "Mandriva Online"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"Mandrakeonline は Mandrakesoft が自信をもってご提案する新しいプリミアムサービ"
+"Mandriva Online は Mandriva が自信をもってご提案する新しいプリミアムサービ"
 "スです。"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline は Mandrakelinux システムを簡単に更新して頂けるよう幅広いサー"
+"Mandriva Online は Mandrivalinux システムを簡単に更新して頂けるよう幅広いサー"
 "ビスをご提供します。"
 
 #: share/advertising/29.pl:18
@@ -16638,38 +16638,38 @@ msgstr "\t* 更新スケジュールをフレキシブルに設定できます"
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* ひとつのアカウントでお使いのすべての Mandrakelinux システムを管理して頂け"
+"\t* ひとつのアカウントでお使いのすべての Mandrivalinux システムを管理して頂け"
 "ます。"
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "Mandrakeexpert"
+msgid "<b>Mandriva Expert</b>"
+msgstr "Mandriva Expert"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "お困りのことがあれば当社のテクニカルサポート www.mandrakeexpert.com で "
-"Mandrakesoft のテクニカルエキスパートに相談してみてください。"
+"Mandriva のテクニカルエキスパートに相談してみてください。"
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"経験豊富な Mandrakelinux エキスパートに手助けしてもらえば、大切な時間を節約で"
+"経験豊富な Mandrivalinux エキスパートに手助けしてもらえば、大切な時間を節約で"
 "きるでしょう。"
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr "store.mandrakesoft.com でサポートチケットをご購入頂くこともできます。"
 
@@ -16964,8 +16964,8 @@ msgstr "モニタリングツール/プロセス管理/tcpdump/nmap..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesoftウィザード"
+msgid "Mandriva Wizards"
+msgstr "Mandrivaウィザード"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17059,8 +17059,8 @@ msgstr ""
 "\n"
 "オプション:\n"
 "  --help            - このヘルプを表示\n"
-"  --report          - プログラムはMandrakelinuxのツールに限ります\n"
-"  --incident        - プログラムはMandrakelinuxのツールに限ります"
+"  --report          - プログラムはMandrivalinuxのツールに限ります\n"
+"  --incident        - プログラムはMandrivalinuxのツールに限ります"
 
 #: standalone.pm:63
 #, c-format
@@ -17114,7 +17114,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17128,7 +17128,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Mandrakelinuxターミナルサーバ設定ツール\n"
+"Mandrivalinuxターミナルサーバ設定ツール\n"
 "--enable         : MTSを有効にする\n"
 "--disable        : MTSを無効にする\n"
 "--start          : MTSを開始する\n"
@@ -17183,14 +17183,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPTION]..\n"
-"  --no-confirmation      MandrakeUpdateで最初の確認メッセージを表示しない\n"
+"  --no-confirmation      Mandriva Updateで最初の確認メッセージを表示しない\n"
 "  --no-verify-rpm        パッケージのサインを確認しない\n"
 "  --changelog-first      説明欄で変更ログをファイルリストより先に表示\n"
 "  --merge-all-rpmnew     検出した全ての.rpmnew/.rpmsaveファイルをマージ"
@@ -19945,13 +19945,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinuxバグ報告ツール"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinuxバグ報告ツール"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinuxコントロールセンタ"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinuxコントロールセンタ"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19971,7 +19971,7 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "Mandrakeオンライン"
 
 #: standalone/drakbug:52
@@ -20016,8 +20016,8 @@ msgstr "設定ウィザード"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Mandrakesoftのツールを選択:"
+msgid "Select Mandriva Tool:"
+msgstr "Mandrivaのツールを選択:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20441,20 +20441,20 @@ msgstr "起動時に開始"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "このインターフェースはまだ設定されていません。\n"
-"Mandrakelinuxコントロールセンタの \"インターフェースを追加\" を実行してくださ"
+"Mandrivalinuxコントロールセンタの \"インターフェースを追加\" を実行してくださ"
 "い"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "インターネットの接続が設定されていません。\n"
-"Mandrakelinuxコントロールセンタの \"%s\" を実行してください。"
+"Mandrivalinuxコントロールセンタの \"%s\" を実行してください。"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20504,8 +20504,8 @@ msgstr "KDM (KDEディスプレイマネージャ)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinuxディスプレイマネージャ)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinuxディスプレイマネージャ)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -20806,7 +20806,7 @@ msgstr "インポート"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -20815,7 +20815,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21350,14 +21350,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -21385,8 +21385,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinuxヘルプセンタ"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinuxヘルプセンタ"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -24883,8 +24883,8 @@ msgstr "設定を変更しました。有効にするにはログアウトして
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinuxツールのログ"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinuxツールのログ"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25396,10 +25396,10 @@ msgstr "接続完了"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "接続に失敗しました。\n"
-"Mandrakelinuxコントロールセンタの設定を確認してください。"
+"Mandrivalinuxコントロールセンタの設定を確認してください。"
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26283,8 +26283,8 @@ msgstr "インストール失敗"
 #~ msgid "Save and close"
 #~ msgstr "保存して閉じる"
 
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Mandrakesoftウィザード"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Mandrivaウィザード"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "ブラウザがありません。インストールしてください。"
diff --git a/perl-install/share/po/ko.po b/perl-install/share/po/ko.po
index d60ffbea5..59b2703a7 100644
--- a/perl-install/share/po/ko.po
+++ b/perl-install/share/po/ko.po
@@ -60,7 +60,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -79,7 +79,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -87,7 +87,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -95,7 +95,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1231,7 +1231,7 @@ msgstr "미얀마"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 "설치후 다른 다른 언어를 선택할수 있습니다."
@@ -3509,7 +3509,7 @@ msgstr "라디오 지원"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3657,7 +3657,7 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3672,11 +3672,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3820,10 +3820,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3946,7 +3946,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4050,12 +4050,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4082,7 +4082,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4091,7 +4091,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4320,7 +4320,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4361,7 +4361,7 @@ msgstr "이전"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4390,7 +4390,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4417,7 +4417,7 @@ msgstr "보안 관리자 (로그인 또는 이메일)"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4561,7 +4561,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4635,7 +4635,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4644,13 +4644,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4701,7 +4701,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4884,7 +4884,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4905,7 +4905,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -5032,7 +5032,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5049,7 +5049,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5111,7 +5111,7 @@ msgstr "서비스"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "맨드레이크 리눅스 파티션을 만들기 위해서 삭제할 하드디스클르 선택하세요.\n"
@@ -5456,7 +5456,7 @@ msgstr "윈도우즈 파티션의 빈 공간 사용하세요."
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "윈도우즈 파티션이 심하게 조각나 있습니다. 먼저 ``디스크 조각 모음''을 하세요."
@@ -5573,19 +5573,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5607,7 +5607,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5615,14 +5615,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5632,7 +5632,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5652,10 +5652,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5666,11 +5666,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5686,7 +5686,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5743,7 +5743,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5751,7 +5751,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "축하합니다. 설치가 성공적으로 끝났습니다.\n"
 "부트 미디어를 제거하고 리턴을 눌러서 리부팅 하세요.\n"
@@ -5798,7 +5798,7 @@ msgstr "%s 단계로 넘어갑니다.\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -6322,7 +6322,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr "유효한 미러 목록을 받기 위해 맨드레이크 리눅스 웹사이트에 접속 중..."
 
 #: install_steps_interactive.pm:840
@@ -6539,7 +6539,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
 msgstr "리눅스-맨드레이크 설치 %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -9111,7 +9111,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12781,7 +12781,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14585,18 +14585,18 @@ msgstr "중지"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, fuzzy, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
 msgstr "맨드레이크 온라인에 잘 오셨습니다."
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14605,7 +14605,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -14622,9 +14622,9 @@ msgstr "공개 소스 세계에 오신 것을 환영합니다."
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -14644,7 +14644,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14670,10 +14670,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14692,8 +14692,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14720,7 +14720,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14730,7 +14730,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14749,13 +14749,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14767,7 +14767,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14781,19 +14781,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr "맨드레이크 제어 센터"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -14814,61 +14814,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14906,7 +14906,7 @@ msgstr "파일 시스템 암호화 키 선택"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14927,7 +14927,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -15044,7 +15044,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -15279,14 +15279,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr "<b>맨드레이크 제어 센터</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -15308,9 +15308,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -15322,7 +15322,7 @@ msgstr "맨드레이크 제어 센터"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -15345,20 +15345,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, fuzzy, c-format
-msgid "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
 msgstr "<b>맨드레이크 온라인</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -15377,33 +15377,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr "<b>맨드레이크 온라인</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -15426,32 +15426,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
 msgstr "맨드레이크 제어 센터"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15746,7 +15746,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr "맨드레이크 제어 센터"
 
 #: share/compssUsers.pl:197
@@ -15842,7 +15842,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15890,7 +15890,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -18366,12 +18366,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "맨드레이크 버그 보고 도구"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
 msgstr "맨드레이크 제어 센터"
 
 #: standalone/drakbug:48
@@ -18392,7 +18392,7 @@ msgstr "하드 드레이크"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "맨드레이크 온라인"
 
 #: standalone/drakbug:52
@@ -18437,7 +18437,7 @@ msgstr "설정 마법사"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -18847,14 +18847,14 @@ msgstr "부팅시 시작됨"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "인터넷 연결이 없습니다.\n"
 "「설정」을 눌러 먼저 연결을 설정하세요."
@@ -18907,7 +18907,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -19197,7 +19197,7 @@ msgstr "연결"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19676,7 +19676,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -19703,7 +19703,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "맨드레이크 제어 센터"
 
 #: standalone/drakhelp:36
@@ -22695,7 +22695,7 @@ msgstr "변경이 완료 되었지만, 적용되기 위해서는 재로그인해
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "맨드레이크 도구 설명"
 
 #: standalone/logdrake:51
@@ -23202,7 +23202,7 @@ msgstr "연결 속도"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
@@ -24034,7 +24034,7 @@ msgstr "설치 실패."
 #~ msgstr "폰트를 찾을 수 없었습니다.\n"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
+#~ msgid "Mandriva Wizards"
 #~ msgstr "맨드레이크 제어 센터"
 
 #~ msgid "No browser available! Please install one"
@@ -24370,7 +24370,7 @@ msgstr "설치 실패."
 #~ msgid "mkraid failed"
 #~ msgstr "mkraid 실패"
 
-#~ msgid "Mandrake Online"
+#~ msgid "Mandriva Online"
 #~ msgstr "맨드레이크 온라인"
 
 #~ msgid "The package %s is needed. Install it?"
diff --git a/perl-install/share/po/ky.po b/perl-install/share/po/ky.po
index ba9edf9a1..70241b603 100644
--- a/perl-install/share/po/ky.po
+++ b/perl-install/share/po/ky.po
@@ -68,7 +68,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "USB-ачкычта жазуудан коргонуу орнотулса керек,\n"
 "бирок азыр аны чыгаруу кооптуу.\n"
@@ -76,7 +76,7 @@ msgstr ""
 "\n"
 "Машинени кайра жүктөтүүчү түймөнү басыңыз, ачкычты чыгарып алыңыз,\n"
 "жазуудан коргонуусун алыңыз дагы, ачкычты кайра салыңыз, андан соң\n"
-"Mandrake Move'ни кайра жүктөңүз."
+"Mandriva Move'ни кайра жүктөңүз."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -94,7 +94,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Сиздин USB-ачкычта бир дагы туура Windows (FAT) бөлүмү жок.\n"
@@ -105,14 +105,14 @@ msgstr ""
 "\n"
 "\n"
 "Сиз USB-ачкычы жок эле ишти улантсаңыз боло берет - мындай\n"
-"учурда сиз Mandrake Move'ду кадимки live Mandrake операциондук\n"
+"учурда сиз Mandriva Move'ду кадимки live Mandriva операциондук\n"
 "системасы катары колдоно аласыз."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -120,11 +120,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Сиздин системада эч бир USB-ачкычы табылган жок. Эгерде\n"
-"сиз USB-ачкычын азыр орнотсоңуз, Mandrake Move ушул же башка\n"
+"сиз USB-ачкычын азыр орнотсоңуз, Mandriva Move ушул же башка\n"
 "компьютерде келечектеги жүктөлүүсүндө пайдалана алгыдай кылып\n"
 "беримдерди өздүк каталогуңузга жана бүтүндөй системанын конфигурациясын\n"
 "так сактап алуу мүмкүнчүлүгүн алат. Эскертүү: эгер ачкычты жаңы\n"
@@ -132,7 +132,7 @@ msgstr ""
 "\n"
 "\n"
 "Учурда сиз USB-ачкычы жок эле ишти улантсаңыз болот - мындай\n"
-"учурда сиз Mandrake Move'ду кадимки Mandrake операциондук системасы\n"
+"учурда сиз Mandriva Move'ду кадимки Mandrake операциондук системасы\n"
 "катары колдоно аласыз."
 
 #: ../move/move.pm:494
@@ -260,7 +260,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -276,7 +276,7 @@ msgstr ""
 "\n"
 "Мунун себеби USB-ачкычынындагы системалык конфигурациялык\n"
 "файлдардын жабырланышында болушу мүмкүн, бул учурда\n"
-"көйгөйдү чечүү үчүн ачкычты сууруп салып Mandrake Move'ни\n"
+"көйгөйдү чечүү үчүн ачкычты сууруп салып Mandriva Move'ни\n"
 "кайра жүктөө жетиштүү. Ал үчүн тиешелүү түймөнү басыңыз.\n"
 "\n"
 "\n"
@@ -1319,11 +1319,11 @@ msgstr "Тилди тандоо"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux көп тилдүүлүктү колдойт. Орнотуу үчүн\n"
+"Mandrivalinux көп тилдүүлүктү колдойт. Орнотуу үчүн\n"
 "каалаган тилди тандаңыз. Орнотуу процесси бүтүп,\n"
 "системаңызды кайра жүктөгөн соң алар колдонууга даяр болот."
 
@@ -3746,12 +3746,12 @@ msgstr "радиону колдоону иштетүү"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Мындан ары улантуу үчүн сиз лицензия шартын көңүл коюп окууңуз керек.\n"
-"Ал Mandrakelinux'тун бардык дистрибутивдерине таратылат. Эгер сиз анын\n"
+"Ал Mandrivalinux'тун бардык дистрибутивдерине таратылат. Эгер сиз анын\n"
 "ичиндеги бардык шарттарга көнбөсөңүз, \"%s\" рамкасын тандаңыз. Андай\n"
 "болбосо, \"%s\" баскычын бассаңыз сиздин компьютер кайра жүктөлөт."
 
@@ -3931,13 +3931,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux орнотулушу бир нече CD-ROMго бөлүнүп жайгаштырылган. Эгерде\n"
+"Mandrivalinux орнотулушу бир нече CD-ROMго бөлүнүп жайгаштырылган. Эгерде\n"
 "тандалган пакет башка CD-ROMдо жатса, DrakX учурдагы CDни чыгарып\n"
 "керектелип жаткан тийишүү CDни салууңузду сурайт. Эгерде Сизде тийиштүү\n"
 "CD кол алдыңызда жок болсо, жөн гана \"%s\" түймөсүн чертиңиз, бул учурда\n"
@@ -3947,11 +3947,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4003,12 +4003,12 @@ msgid ""
 "megabytes."
 msgstr ""
 "Эми системаңызга кайсы программаларды орнотууну кааларыңызды аныктоого\n"
-"убакыт келип жетти. Mandrakelinux менен кошо миңдеген пакеттер сунуш "
+"убакыт келип жетти. Mandrivalinux менен кошо миңдеген пакеттер сунуш "
 "кылынат,\n"
 "тандоону жеңилдетүү үчүн алар жакындыгынакарата топторго бөлүнгөн.\n"
 "\n"
 "Пакеттер машинаңыздын колдонуу спецификасына дал келе тургандай\n"
-"болуп топторго иреттелген. Mandrakelinux'та пакетер төрт категория\n"
+"болуп топторго иреттелген. Mandrivalinux'та пакетер төрт категория\n"
 "боюнча иреттелет. Сиз ар түрдүү категорияларда жайгашкан тиркемелерди\n"
 "аралаштырып же айкалыштыра аласыз, мисалы ``Иш станциясы'' орнотуу варианты\n"
 "``Иштеп түзүү'' категорясындагы тиркемелерди да камтышы мүмкүн.\n"
@@ -4113,10 +4113,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4146,11 +4146,11 @@ msgstr ""
 "\n"
 "!! Эгерде кандайдыр бир сервердик пакет тандалса, сиз аны атайын\n"
 "тандасаңыз же ал башка пакеттин бөлүгү болсо, сиз аны чынында эле\n"
-"ал серверлерди орнотууну каалагандыгыңызды сурайт. Mandrakelinux\n"
+"ал серверлерди орнотууну каалагандыгыңызды сурайт. Mandrivalinux\n"
 "бардык орнотулган серверлерлерди жүктөө убагында алдынала ишке\n"
 "киргизилет. Дистрибутив чыгарылып жаткан убакта алар коопсуздук\n"
 "боюнча белгилүү проблемалары жок болгону менен, аларда бул\n"
-"Mandrakelinux версиясы чыгарылгандан кийин да, кооптуу болгон\n"
+"Mandrivalinux версиясы чыгарылгандан кийин да, кооптуу болгон\n"
 "жылчыктар табылышы мүмкүн. Эгер сиз берилген кызмат эмне үчүн\n"
 "колдонорун жана эмне иш кыларын билбесеңиз \"%s\" басыңыз.\n"
 "Эгер сиз \"%s\" бассаңыз тизмедеги бардык кызматтар орнотулуп\n"
@@ -4301,7 +4301,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4356,7 +4356,7 @@ msgid ""
 "not successful in getting the display configured."
 msgstr ""
 "X (X Window системасы үчүн) GNU/Linux графикалык интерфейсинин\n"
-"жүрөгү, анын негизинде Mandrakelinux-ка кирген бардык графикалык\n"
+"жүрөгү, анын негизинде Mandrivalinux-ка кирген бардык графикалык\n"
 "чөйрөлөр (KDE, GNOME, AfterStep, WindowMaker, ж.б.д.у.с.) иштейт.\n"
 "\n"
 "Оптималдык графикалык көрүнүштү алуу үчүн, сизге ар түрдүү\n"
@@ -4472,12 +4472,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4504,7 +4504,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4513,7 +4513,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4533,11 +4533,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 ""
-"Бул кадамда, Mandrakelinux аркеттер системасын сиздин катуу дисктин\n"
+"Бул кадамда, Mandrivalinux аркеттер системасын сиздин катуу дисктин\n"
 "кайсы жерине орнотууну чечүүңүзгө туура келет. Эгер сиздин катуу диск бош\n"
 "болсо же орнотулган аракеттери системасы дисктин бардыгын ээлесе, сизге\n"
 "дискиңизди кайра бөлүүгө туура келет. Негизинен дискти бөлүү сиздин\n"
-"жаңы Mandrakelinux системасын орнотуу үчүн дисктен логикалык түрдө\n"
+"жаңы Mandrivalinux системасын орнотуу үчүн дисктен логикалык түрдө\n"
 "орун бөлүүдө турат.\n"
 "\n"
 "Эгерде дискте орнотулган аракеттер системасы болсо, дискти бөлүү кайра\n"
@@ -4563,7 +4563,7 @@ msgstr ""
 "Windows FAT же NTFS бөлүмдөрүнүн өлчөмдөрүн өзгөртсөңүз болот.\n"
 "Өлчөмүн өзгөртүү процессин маалыматтарды жоготпой жасаса да болот, өзгөчө\n"
 "Windows бөлүмү дефрагментация кылынгандан кийин. Маалыматтарыңыздын\n"
-"резервдик копиясын түзүү көптөн-көп сунуш кылынат.Эгер сиз Mandrakelinux\n"
+"резервдик копиясын түзүү көптөн-көп сунуш кылынат.Эгер сиз Mandrivalinux\n"
 "жана Microsoft Windows бир компьютерде колдонгуңуз келсе, бул опцияны\n"
 "тандаңыз.\n"
 "\n"
@@ -4572,7 +4572,7 @@ msgstr ""
 "берилиштерин жана жаңы программаларды орнотуу үчүн бош орун азыраак болот.\n"
 "\n"
 " * \"%s\" эгер сиз катуу дискиңиздеги бардык маалыматтарды жоготуп ордуна\n"
-"Mandrakelinux орнотууну кааласаңыз, бул опцияны тандаңыз. Бул чечимди\n"
+"Mandrivalinux орнотууну кааласаңыз, бул опцияны тандаңыз. Бул чечимди\n"
 "тандоодо этият болуңуз, себеби муну тастыктаган соң бардыгын мурда\n"
 "болгондой кылып калыбына келтире албайсыз.\n"
 "\n"
@@ -4733,7 +4733,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4758,7 +4758,7 @@ msgstr ""
 "\n"
 "Бөлүмдөрдү форматтого даяр болгондон кийин \"%s\" баскычын басыңыз.\n"
 "\n"
-"Эгер сиз Mandrakelinux системасын башка бөлүмгө орноткуңуз келсе \"%s\"\n"
+"Эгер сиз Mandrivalinux системасын башка бөлүмгө орноткуңуз келсе \"%s\"\n"
 "баскычын басыңыз.\n"
 "\n"
 "Эгер сиз начар делген блокторду (bad blocks) текшерүүгө бөлүмдөрдү\n"
@@ -4776,7 +4776,7 @@ msgstr "Мурунку"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4788,7 +4788,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Mandrakelinux орнотуу убагында баштапкы релиздин кээ бир пакеттерин\n"
+"Mandrivalinux орнотуу убагында баштапкы релиздин кээ бир пакеттерин\n"
 "жаңы чыкандары менен жаңыласаңыз жакшы болот. Кээ бир багдар\n"
 "оңдолушу жана коопсуздук проблемалары чечилиши мүмкүн. Бул\n"
 "жаңылоолордон пайда алуу үчүн аларды сиз азыр Интернеттен жүктөп\n"
@@ -4817,7 +4817,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4845,7 +4845,7 @@ msgstr "Коопсуздук администратору"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4931,7 +4931,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4976,7 +4976,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4985,13 +4985,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -5032,7 +5032,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5191,7 +5191,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5212,7 +5212,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -5312,7 +5312,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5329,7 +5329,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5391,7 +5391,7 @@ msgstr "Кызматтар"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -5728,7 +5728,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 
@@ -5832,19 +5832,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5866,7 +5866,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5874,14 +5874,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5891,7 +5891,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5911,10 +5911,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5925,11 +5925,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5945,7 +5945,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -6002,7 +6002,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6010,7 +6010,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6042,7 +6042,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -6544,7 +6544,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
 
 #: install_steps_interactive.pm:840
@@ -6749,7 +6749,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
 msgstr ""
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -9311,7 +9311,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12873,7 +12873,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14537,18 +14537,18 @@ msgstr "Стоп"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "<b>Mandrakelinux</b>'ка кош келиңиз!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "<b>Mandrivalinux</b>'ка кош келиңиз!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14557,7 +14557,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -14574,9 +14574,9 @@ msgstr ""
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -14596,7 +14596,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14622,10 +14622,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14644,8 +14644,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14672,7 +14672,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14682,7 +14682,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14701,13 +14701,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14719,7 +14719,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14733,20 +14733,20 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux Updates апплети"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux Updates апплети"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -14766,61 +14766,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14858,7 +14858,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14879,7 +14879,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -14909,7 +14909,7 @@ msgstr ""
 #: share/advertising/15.pl:13
 #, fuzzy, c-format
 msgid "<b>Kontact</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/15.pl:15
 #, c-format
@@ -14996,7 +14996,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -15231,14 +15231,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr ""
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -15260,9 +15260,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -15274,7 +15274,7 @@ msgstr "<b>Серверлер</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -15297,20 +15297,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -15329,33 +15329,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -15378,32 +15378,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15710,8 +15710,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "Mandriva Wizards"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -15806,7 +15806,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15854,7 +15854,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -18304,13 +18304,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr ""
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Башкаруу Борбору"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux Башкаруу Борбору"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18330,8 +18330,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -18375,7 +18375,7 @@ msgstr ""
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -18783,14 +18783,14 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18841,7 +18841,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -19126,7 +19126,7 @@ msgstr ""
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19584,7 +19584,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -19611,8 +19611,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux Башкаруу Борбору"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux Башкаруу Борбору"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22670,7 +22670,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Mandrake куралдарынын журналдары"
 
 #: standalone/logdrake:51
@@ -23186,7 +23186,7 @@ msgstr "Туташуу ишке ашты."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Туташуу ишке ашпады.\n"
 "Mandrake Башкаруу Борборунан конфигурацияны текшериңиз."
diff --git a/perl-install/share/po/lt.po b/perl-install/share/po/lt.po
index 1ec07e2c8..bafb1abd7 100644
--- a/perl-install/share/po/lt.po
+++ b/perl-install/share/po/lt.po
@@ -57,7 +57,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -76,7 +76,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -92,7 +92,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -218,7 +218,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1223,7 +1223,7 @@ msgstr "Vanuatu"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 "Tu gali pasirinkti kitas kalbas, kurios bus prieinamos po įdiegimo"
@@ -3505,7 +3505,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3655,7 +3655,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3666,11 +3666,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3777,10 +3777,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3902,7 +3902,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4000,12 +4000,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4032,7 +4032,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4041,7 +4041,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4062,10 +4062,10 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Dabar tu turi nuspręsti, kurioje savo kietojo disko vietoje nori įdiegti\n"
-"Mandrakelinux operacijų sistemą. Jei jis yra tuščias arba jau esanti\n"
+"Mandrivalinux operacijų sistemą. Jei jis yra tuščias arba jau esanti\n"
 "operacijų sistema naudoja visą vietą jame, tau reikės sudalinti jį. Kietojo\n"
 "disko sudalinimas į skirsnius tiesiog yra jo logiškas padalinimas taip, kad\n"
-"atsirastų laisvos vietos įdiegti tavo naujajai Mandrakelinux sistemai.\n"
+"atsirastų laisvos vietos įdiegti tavo naujajai Mandrivalinux sistemai.\n"
 "\n"
 "\n"
 "Kadangi sudalinimo skirsniais padariniai dažniausiai yra negrįžtami,\n"
@@ -4096,7 +4096,7 @@ msgstr ""
 "\n"
 "* Išvalyti visą diską: jei tu nori sunaikinti visus duomenis ir skirsnius, "
 "esančius kietajame diske, ir pakeisti juos\n"
-"  nauja Mandrakelinux sistema, gali pasirinkti šį variantą. Būk atsargus su "
+"  nauja Mandrivalinux sistema, gali pasirinkti šį variantą. Būk atsargus su "
 "šiuo sprendimu, nes jei sutiksi,\n"
 "  nebegalėsi apsigalvoti ir sugrįžti.\n"
 "\n"
@@ -4109,7 +4109,7 @@ msgstr ""
 "sprendimus) arba pakeisti Windows skirsnio\n"
 "  dydį. Dydžio pakeitimas gali būti atliktas be duomenų praradimo. Šis "
 "sprendimas yra rekomenduojamas, jei\n"
-"  tu nori naudoti tiek Mandrakelinux, tiek Microsoft Windows tame pačiame "
+"  tu nori naudoti tiek Mandrivalinux, tiek Microsoft Windows tame pačiame "
 "kompiuteryje.\n"
 "\n"
 "\n"
@@ -4235,7 +4235,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4264,7 +4264,7 @@ msgstr ""
 "\n"
 "\n"
 "Spausk \"Atšaukti\", jei nori pasirinkti kitus skirsnius, į kuriuos įdiegti\n"
-"Mandrakelinux sistemą."
+"Mandrivalinux sistemą."
 
 #: help.pm:431 install_steps_gtk.pm:392 interactive.pm:434
 #: interactive/newt.pm:318 printer/printerdrake.pm:3676
@@ -4278,7 +4278,7 @@ msgstr "Ankstesnis"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4307,7 +4307,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4323,7 +4323,7 @@ msgstr "Nutolusio lpd spausdintuvo nuostatos"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4480,7 +4480,7 @@ msgstr "Pakeisti į normalų režimą"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4511,7 +4511,7 @@ msgstr ""
 "Tavo kietajame diske buvo aptiktas vienas ar daugiau Microsoft Windows\n"
 "skirsnis. Prašom pasirinkti, kurio iš jų dydį nori pakeisti, kad įdiegtum "
 "savo\n"
-"naująją Mandrakelinux operacijų sistemą.\n"
+"naująją Mandrivalinux operacijų sistemą.\n"
 "\n"
 "\n"
 "Tavo žiniai, kiekvienas skirsnis sąraše užrašomas pavidalu \"Linux "
@@ -4567,7 +4567,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4576,13 +4576,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4623,7 +4623,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4782,7 +4782,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4803,7 +4803,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4929,7 +4929,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4946,7 +4946,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5008,11 +5008,11 @@ msgstr "Paslaugų nustatymai"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Pasirink kietąjį diską, kurį nori ištuštinti, kad įdiegtum naują\n"
-"Mandrakelinux sistemą. Būk atsargus, visi duomenys, esantys jame, bus\n"
+"Mandrivalinux sistemą. Būk atsargus, visi duomenys, esantys jame, bus\n"
 "prarasti, ir jų nebebus įmanoma atkurti."
 
 #: help.pm:863
@@ -5347,7 +5347,7 @@ msgstr "Naudoti laisvą vietą Windows skirsnyje"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Tavo Windows skirsnis yra pernelyg fragmentuotas, pirma paleisk „defrag“"
@@ -5466,19 +5466,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5500,7 +5500,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5508,14 +5508,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5525,7 +5525,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5545,10 +5545,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5559,11 +5559,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5579,7 +5579,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5665,7 +5665,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5673,13 +5673,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Sveikiname. Įdiegimas baigtas.\n"
 "Ištrauk įdiegimo laikmenas ir spausk Enter, kad perkrautum.\n"
 "\n"
 "\n"
-"Kad sužinotum apie pataisymus, kurie prieinami šiai Mandrakelinux laidai,\n"
+"Kad sužinotum apie pataisymus, kurie prieinami šiai Mandrivalinux laidai,\n"
 "pasižiūrėk į Errata, kuris yra \n"
 "\n"
 "\n"
@@ -5687,7 +5687,7 @@ msgstr ""
 "\n"
 "\n"
 "Informacija apie tavo sistemos konfigūravimą yra oficialioje\n"
-"Mandrakelinux User's Guide knygoje."
+"Mandrivalinux User's Guide knygoje."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -5722,12 +5722,12 @@ msgstr "Įeinama į žingsnį „%s“\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Tavo sistemoje mažai resursų. Tu gali susidurti su bėdomis, įdiegdamas\n"
-"Mandrakelinux. Jei taip atsitiktų, gali pabandyti tekstinį diegimo būdą:\n"
+"Mandrivalinux. Jei taip atsitiktų, gali pabandyti tekstinį diegimo būdą:\n"
 "Kai užsikrauna iš CDROM'o, paspausk `F1', o tada įvesk \"text\"."
 
 #: install_steps_gtk.pm:228 install_steps_interactive.pm:624
@@ -6240,7 +6240,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, fuzzy, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
 "Jungiamasi prie atvaizdžio (mirror), kad gautume prieinamų paketų sąrašą"
 
@@ -6457,8 +6457,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux įdiegimas %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux įdiegimas %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9028,7 +9028,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12657,7 +12657,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14397,18 +14397,18 @@ msgstr "Sustoti"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Sveiki atvykę į <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Sveiki atvykę į <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14417,7 +14417,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -14434,9 +14434,9 @@ msgstr "Nustatymų tikrinimas"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -14456,7 +14456,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14482,10 +14482,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14504,8 +14504,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14532,7 +14532,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14542,7 +14542,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14561,13 +14561,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14579,7 +14579,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14593,19 +14593,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr "Prisijungti prie interneto"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -14626,61 +14626,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14718,7 +14718,7 @@ msgstr "Kiti grafiniai darbalaukiai"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14739,7 +14739,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -14856,7 +14856,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -15091,14 +15091,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr "Prisijungti prie interneto"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -15120,9 +15120,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -15134,7 +15134,7 @@ msgstr "Prisijungti prie interneto"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -15157,20 +15157,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, fuzzy, c-format
-msgid "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
 msgstr "Prisijungti prie interneto"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -15189,33 +15189,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr "Prisijungti prie interneto"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -15238,32 +15238,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
 msgstr "Prisijungti prie interneto"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15565,7 +15565,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr "Prisijungti prie interneto"
 
 #: share/compssUsers.pl:197
@@ -15661,7 +15661,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15709,7 +15709,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -18161,12 +18161,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "Prisijungti prie interneto"
 
 #: standalone/drakbug:46
 #, fuzzy, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
 msgstr "Prisijungti prie interneto"
 
 #: standalone/drakbug:48
@@ -18187,7 +18187,7 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, fuzzy, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "Prisijungti prie interneto"
 
 #: standalone/drakbug:52
@@ -18232,7 +18232,7 @@ msgstr "Tinklo Konfigūravimo Meistras"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -18638,14 +18638,14 @@ msgstr "Startavo įkrovos metu"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18696,7 +18696,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18981,7 +18981,7 @@ msgstr "Importuoti"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19464,7 +19464,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -19491,7 +19491,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Prisijungti prie interneto"
 
 #: standalone/drakhelp:36
@@ -22485,7 +22485,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Konsolės įrankiai"
 
 #: standalone/logdrake:51
@@ -22989,7 +22989,7 @@ msgstr "Jungties tipas: "
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
@@ -23819,7 +23819,7 @@ msgstr "Įdiegimas nepavyko"
 #~ msgstr "Pašalinti eilę"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
+#~ msgid "Mandriva Wizards"
 #~ msgstr "Prisijungti prie interneto"
 
 #, fuzzy
diff --git a/perl-install/share/po/ltg.po b/perl-install/share/po/ltg.po
index bb8ceb468..25b3933dc 100644
--- a/perl-install/share/po/ltg.po
+++ b/perl-install/share/po/ltg.po
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandrakesoft.
+# Copyright (c) 2000 Mandriva.
 #
 msgid ""
 msgstr ""
@@ -60,7 +60,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Izaver, ka USB atslāgai ir uzstuodeits raksteišonys aizlīgums, bet tagad\n"
 "tū nav īspiejams drūši izjimt.\n"
@@ -68,7 +68,7 @@ msgstr ""
 "\n"
 "Nūspīdit pūgu, kab puorsuokneitu mašynu, izjemit tū, nūjemit raksteišonys "
 "aizlīgumu,\n"
-"otkon pīsliedzit, i vēlreiz palaidit Mandrake Move."
+"otkon pīsliedzit, i vēlreiz palaidit Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -86,7 +86,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Jiusu USB atslāgai nav ni vīna dereiga Windows (FAT) nūdaliejuma.\n"
@@ -98,14 +98,14 @@ msgstr ""
 "\n"
 "\n"
 "Jius varit ari turpynuot bez USB atslāgys - jiusim jūprūjom byus\n"
-"īspieja lītuot Mandrake Move kai normali dorbojūšūs Mandrake\n"
+"īspieja lītuot Mandriva Move kai normali dorbojūšūs Mandrake\n"
 "opereituojsistemu."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -113,11 +113,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Natyka atrosta ni vīna USB atslāga iz jiusu sistemys.\n"
-"Ja jius pīslēgsit USB atslāgu niule, Mandrake Move byus pīeja\n"
+"Ja jius pīslēgsit USB atslāgu niule, Mandriva Move byus pīeja\n"
 "napuorprūtami saglobuot datus jiusu sātys katalogā\n"
 "i vysys sistemys konfiguraceju dieļ nuokūšuos suokneišonys iz ituo\n"
 "ci iz cyta datora. Pīzeime: ja jius pīslēdzet atslāgu tagad,\n"
@@ -125,7 +125,7 @@ msgstr ""
 "\n"
 "\n"
 "Jius varit ari turpynuot bez USB atslāgys - jiusim jūprūjom byus\n"
-"īspieja lītuot Mandrake Move kai normali dorbuojūšūs Mandrake\n"
+"īspieja lītuot Mandriva Move kai normali dorbuojūšūs Mandrake\n"
 "opereituojsistemu."
 
 #: ../move/move.pm:494
@@ -252,7 +252,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1273,11 +1273,11 @@ msgstr "Manuali"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux var nūdrūšynuot vairuokys volūdys. Izavielejit\n"
+"Mandrivalinux var nūdrūšynuot vairuokys volūdys. Izavielejit\n"
 "volūdys, kaidys gribit uzstuodeit. Tuos byus pīejamys,\n"
 "kod jiusu instaleišona byus gotova i jius puorstarteisit sovu sistemu."
 
@@ -3610,13 +3610,13 @@ msgstr "īslēgt radejis atbolstu"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Pyrms turpynuot, jiusim vajadzātu uzmaneigi izlaseit licencis vīnuošonūs. "
 "Tei nūsadz\n"
-"vysu Mandrakelinux distribuceju. Ja jius napīkreitit vysim tuos "
+"vysu Mandrivalinux distribuceju. Ja jius napīkreitit vysim tuos "
 "nūteikumiem,\n"
 "puorbaudit \"%s\"  kasti, nūspīdit pūgu \"%s\",\n"
 "lai jiusu dators puorstarteitu."
@@ -3756,13 +3756,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux instalācija ir sadalīta pa dažiem CD-ROM diskiem. DrakX\n"
+"Mandrivalinux instalācija ir sadalīta pa dažiem CD-ROM diskiem. DrakX\n"
 "zin, vai izvēlētā pakotne atrodas uz cita CD-ROM diska, izvirzīs pašreizējo\n"
 "kompaktdisku un palūgs ievietot citu pēc nepieciešamības."
 
@@ -3770,11 +3770,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3881,10 +3881,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4005,7 +4005,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4111,12 +4111,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4143,7 +4143,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4152,7 +4152,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4172,11 +4172,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 ""
-"Pošlaik jiusim ir juoizavielej, kur iz cītuo diska instalēt Mandrakelinux\n"
+"Pošlaik jiusim ir juoizavielej, kur iz cītuo diska instalēt Mandrivalinux\n"
 "opereituojsistemu. Ja disks ir tukšs voi cyta opereituojsistema aizjam vysu\n"
 "vītu iz diska, jiusim byus juoveic diska sadaleišona. Eisumā, cītuo diska\n"
 "sadaleišona nūzeimej tū sadaleit logiskuos daļuos, lai izveiduotu vītu\n"
-"Mandrakelinux sistemys instaleišonai.\n"
+"Mandrivalinux sistemys instaleišonai.\n"
 "\n"
 "Sakarā ar tū, ka diska sadaleišonys process parasti ir naatgrīzenisks,\n"
 "napīredziejušam lītuotuojam tys var byut napateikams i stresa pylns.\n"
@@ -4205,7 +4205,7 @@ msgstr ""
 "\n"
 "* Izdzēst visu disku: ja vēlaties izdzēst visus uz diska esošos datus un "
 "sadaļas un aizstāt tās ar jaunu\n"
-"  Mandrakelinux sistēmu, varat izvēlēties šo opciju. Esiet uzmanīgi, "
+"  Mandrivalinux sistēmu, varat izvēlēties šo opciju. Esiet uzmanīgi, "
 "izvēloties šo risinājumu, jo pēc\n"
 "  apstiprināšanas jūs vairs nevarēsit atteikties no šīs izvēles.\n"
 "\n"
@@ -4218,7 +4218,7 @@ msgstr ""
 "vai izmainīt Microsoft\n"
 "  Windows sadaļas izmēru. Sadaļas izmēru var izmainīt bez datu zaudēšanas. "
 "Šis risinājums ir ieteicams, ja\n"
-"  jūs savā datorā vēlaties izmantot gan Mandrakelinux, gan Microsoft "
+"  jūs savā datorā vēlaties izmantot gan Mandrivalinux, gan Microsoft "
 "Windows.\n"
 "\n"
 "\n"
@@ -4342,7 +4342,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4366,7 +4366,7 @@ msgstr ""
 "Noklikšķiniet \"Labi\", kad esat gatavi formatēt sadaļas.\n"
 "\n"
 "Noklikšķiniet \"Atcelt\", ja jūs gribat izvēlēties citas sadaļas, kur\n"
-"instalēt jauno Mandrakelinux operētājsistēmu."
+"instalēt jauno Mandrivalinux operētājsistēmu."
 
 #: help.pm:431 install_steps_gtk.pm:392 interactive.pm:434
 #: interactive/newt.pm:318 printer/printerdrake.pm:3676
@@ -4380,7 +4380,7 @@ msgstr "Atpakaļ"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4409,7 +4409,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4433,7 +4433,7 @@ msgstr "Drošības administrators:"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4503,7 +4503,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Pašlaik jums ir jāizvēlas, kurā(s) diska sadaļā(s) instalēt Mandrakelinux\n"
+"Pašlaik jums ir jāizvēlas, kurā(s) diska sadaļā(s) instalēt Mandrivalinux\n"
 "operētājsistēmu. Ja sadaļas jau ir izveidotas (agrākas GNU/Linux "
 "instalēšanas\n"
 "laikā vai ar citu diska sadalīšanas rīku), jūs varat izmantot esošās "
@@ -4586,7 +4586,7 @@ msgstr "Pārslēgt normālajā režīmā"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4616,7 +4616,7 @@ msgid ""
 msgstr ""
 "Uz jūsu cietā diska ir atrasta vairāk nekā viena Microsoft Windows sadaļa.\n"
 "Lūdzu izvēlieties to sadaļu, kuras izmēru jūs vēlaties izmainīt, lai\n"
-"instalētu jauno Mandrakelinux operētājsistēmu.\n"
+"instalētu jauno Mandrivalinux operētājsistēmu.\n"
 "\n"
 "\n"
 "Jūsu zināšanai, katra sadaļa ir uzskaitīta šādā veidā: \"Linux nosaukums\",\n"
@@ -4663,7 +4663,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4672,13 +4672,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4732,7 +4732,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4891,7 +4891,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4912,7 +4912,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -5033,7 +5033,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5050,7 +5050,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5112,11 +5112,11 @@ msgstr "Servisi"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Norādiet cieto disku, ko vēlaties izdzēst, lai izveidotu jaunu\n"
-"Mandrakelinux sadaļu. Esiet uzmanīgi, jo visi diskā esošie dati\n"
+"Mandrivalinux sadaļu. Esiet uzmanīgi, jo visi diskā esošie dati\n"
 "pazudīs un nebūs atjaunojami."
 
 #: help.pm:863
@@ -5465,11 +5465,11 @@ msgstr "Izmantot Windows sadaļas brīvo vietu"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Windows sadaļa ir puoruok fragmenteita. Vyspyrms nu Windows vidis palaidit "
-"``defrag'' i tod atsuocit Mandrakelinux instaleišonu."
+"``defrag'' i tod atsuocit Mandrivalinux instaleišonu."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -5585,19 +5585,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5619,7 +5619,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5627,14 +5627,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5644,7 +5644,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5664,10 +5664,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5678,11 +5678,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5698,7 +5698,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5787,7 +5787,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5795,14 +5795,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Apsveicam, instaleišona ir pabeigta.\n"
 "Izjemit suokneišonys datu nesieju i nūspīdit īvodu, lai puorstarteitu "
 "datoru.\n"
 "\n"
 "\n"
-"Lai sajimtu informaceju par lobuojumim, kas ir pīejami itam Mandrakelinux\n"
+"Lai sajimtu informaceju par lobuojumim, kas ir pīejami itam Mandrivalinux\n"
 "izdavumam, skotit Errata failu, kas atrūnams\n"
 "\n"
 "\n"
@@ -5810,7 +5810,7 @@ msgstr ""
 "\n"
 "\n"
 "Informaceja par jiusu sistemys konfigureišonu ir pīejama Oficialajā\n"
-"Mandrakelinux lītuotuoja rūkysgruomotys piecinstaleišonys (post install) "
+"Mandrivalinux lītuotuoja rūkysgruomotys piecinstaleišonys (post install) "
 "nūdaļā."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5846,11 +5846,11 @@ msgstr "Uzsuocu sūli `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Jiusu sistemai tryukst resursu. Mandrakelinux instaleišonys laikā var\n"
+"Jiusu sistemai tryukst resursu. Mandrivalinux instaleišonys laikā var\n"
 "rastīs problemys. Ja tai nūteik, varit pamieginuot teksta režima "
 "instaleišonu.\n"
 "Lai tū izdareitu, nūspīdit`F1', kod nūteik īluode nu CDROM, tod īvodit\n"
@@ -6388,9 +6388,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Pīsaslādzu Mandrakelinux teimeklim, lai sajimtu pīejamū spūguļserveru "
+"Pīsaslādzu Mandrivalinux teimeklim, lai sajimtu pīejamū spūguļserveru "
 "sarokstu..."
 
 #: install_steps_interactive.pm:840
@@ -6606,8 +6606,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux instaleišona %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux instaleišona %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9201,13 +9201,13 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall konfigurētājs\n"
 "\n"
-"Šis rīks konfigurē personālo ugunssienu priekš Mandrakelinux\n"
+"Šis rīks konfigurē personālo ugunssienu priekš Mandrivalinux\n"
 "datora. Priekš spēcīga, ugunssienas izveidei veltīta risinājuma,\n"
 "lūdzu apskatiet MandrakeSecurity Firewall XXXXXX."
 
@@ -12943,7 +12943,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14723,18 +14723,18 @@ msgstr "Apturēt"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Laipni lyudzam <b>Mandrakelinux</b>'ā!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Laipni lyudzam <b>Mandrivalinux</b>'ā!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14743,7 +14743,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -14760,9 +14760,9 @@ msgstr "Esit sveicynuoti atvartuo koda pasaulē!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -14782,7 +14782,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14808,10 +14808,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14830,8 +14830,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14858,7 +14858,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14868,7 +14868,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14887,13 +14887,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14905,7 +14905,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14919,19 +14919,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr "<b>Mandrake veikals</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -14952,61 +14952,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -15044,7 +15044,7 @@ msgstr "<b>Izavielejit jiusu dorba viersmys grafiskū vidi!</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -15065,7 +15065,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -15095,7 +15095,7 @@ msgstr ""
 #: share/advertising/15.pl:13
 #, fuzzy, c-format
 msgid "<b>Kontact</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/15.pl:15
 #, c-format
@@ -15182,7 +15182,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -15417,14 +15417,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux kontrolis centrs</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux kontrolis centrs</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -15446,9 +15446,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -15460,7 +15460,7 @@ msgstr "<b>Mandrake veikals</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -15483,20 +15483,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -15515,33 +15515,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -15564,32 +15564,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15890,7 +15890,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr "<b>Mandrake veikals</b>"
 
 #: share/compssUsers.pl:197
@@ -15986,7 +15986,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16034,7 +16034,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -18563,13 +18563,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "Mandrake kliudys ziņuojumu reiks"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux kontrolis centrs"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux kontrolis centrs"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18589,8 +18589,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -18634,7 +18634,7 @@ msgstr "Konfigureišonys miestars"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -19047,19 +19047,19 @@ msgstr "Palaists pi īluodis"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Itei saskarne vēl nabeja nūkonfigurāta.\n"
-"Palaidit paleigu \"Pīvīnuot saskarni\" nu Mandrakelinux kontrolis centra."
+"Palaidit paleigu \"Pīvīnuot saskarni\" nu Mandrivalinux kontrolis centra."
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Itei saskarne vēl nabeja nūkonfigurāta.\n"
-"Palaidit paleigu \"%s\" nu Mandrakelinux kontrolis centra."
+"Palaidit paleigu \"%s\" nu Mandrivalinux kontrolis centra."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -19109,7 +19109,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -19404,7 +19404,7 @@ msgstr "Importēt"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19911,7 +19911,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -19938,7 +19938,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Mandrake kontrolis centrs"
 
 #: standalone/drakhelp:36
@@ -22966,7 +22966,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Mandrake reiku aproksti"
 
 #: standalone/logdrake:51
@@ -23481,7 +23481,7 @@ msgstr "Savīnuojums izpiļdeits."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
@@ -24326,7 +24326,7 @@ msgstr "Instalaceja naizadeve"
 #~ msgstr "Jius naizavielēt nivīnu fontu"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
+#~ msgid "Mandriva Wizards"
 #~ msgstr "<b>Mandrake veikals</b>"
 
 #~ msgid "No browser available! Please install one"
@@ -24443,13 +24443,13 @@ msgstr "Instalaceja naizadeve"
 #~ msgstr "Kliuda, atverūt %s īraksteišonai: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Itys ir HardDrake, Mandrakelinux aparaturys konfigureišonys reiks.\n"
+#~ "Itys ir HardDrake, Mandrivalinux aparaturys konfigureišonys reiks.\n"
 #~ "<span foreground=\"royalblue3\">Verseja:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Autors:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
@@ -24790,8 +24790,8 @@ msgstr "Instalaceja naizadeve"
 #~ msgstr ""
 #~ "Naizadeve printeri \"%s\" nūjimt nu Star Office/OpenOffice.org/GIMP."
 
-#~ msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
-#~ msgstr "<b>Paļdis, ka izavielēt Mandrakelinux!</b>"
+#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
+#~ msgstr "<b>Paļdis, ka izavielēt Mandrivalinux!</b>"
 
 #~ msgid "<b>Discovery</b>"
 #~ msgstr "<b>Atkluošona</b>"
@@ -24799,21 +24799,21 @@ msgstr "Instalaceja naizadeve"
 #~ msgid "<b>Surf The Internet</b>"
 #~ msgstr "<b>Puorlyukojit Internetu</b>"
 
-#~ msgid "Become a <b>Mandrakeclub</b> member!"
+#~ msgid "Become a <b>Mandriva Club</b> member!"
 #~ msgstr "Kliustit  par <b>Mandrake kluba</b> lūcekli!"
 
 #~ msgid "\t* Full access to commercial applications"
 #~ msgstr "\t* Pylna pīeja komercialajom aplikacejom"
 
-#~ msgid "\t* Voting for software to put in Mandrakelinux"
+#~ msgid "\t* Voting for software to put in Mandrivalinux"
 #~ msgstr ""
 #~ "\t* Īspieja bolsuot par programmnūdrūšynuojumu, kurs tiks īkļauts "
-#~ "Mandrakelinux\"ā"
+#~ "Mandrivalinux\"ā"
 
 #~ msgid "Do you require assistance?"
 #~ msgstr "Voi jiusim ir vajadzeiga paleidzeiba?"
 
-#~ msgid "<b>Become a Mandrakeclub member!</b>"
+#~ msgid "<b>Become a Mandriva Club member!</b>"
 #~ msgstr "<b>Kliustit par Mandrake kluba lūcekli!</b>"
 
 #~ msgid "<b>Do you require assistance?</b>"
@@ -24855,14 +24855,14 @@ msgstr "Instalaceja naizadeve"
 #~ msgid ""
 #~ "Before continuing, you should carefully read the terms of the license. "
 #~ "It\n"
-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "
+#~ "covers the entire Mandrivalinux 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 ""
 #~ "Pyrms turpynuot, jiusim vajadzātu uzmaneigi izlaseit licencis vīnuošonūs. "
 #~ "Tei nūsadz\n"
-#~ "vysu Mandrakelinux distribuceju. Ja jius napīkreitit vysim tuos "
+#~ "vysu Mandrivalinux distribuceju. Ja jius napīkreitit vysim tuos "
 #~ "nūteikumiem,\n"
 #~ "puorbaudit \"%s\"  kasti, nūspīdit pūgu \"%s\",\n"
 #~ "lai jiusu dators puorstarteitu."
@@ -24956,8 +24956,8 @@ msgstr "Instalaceja naizadeve"
 #~ msgid "<b>Become a MandrakeClub member!</b>"
 #~ msgstr "<b>Kliustit par Mandrake kluba lūcekli!</b>"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "This interface has not been configured yet.\n"
diff --git a/perl-install/share/po/lv.po b/perl-install/share/po/lv.po
index 068b95983..b8eb07ecb 100644
--- a/perl-install/share/po/lv.po
+++ b/perl-install/share/po/lv.po
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandrakesoft.
+# Copyright (c) 2000 Mandriva.
 #
 msgid ""
 msgstr ""
@@ -58,7 +58,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -77,7 +77,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -93,7 +93,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -219,7 +219,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1237,7 +1237,7 @@ msgstr "Mjanma"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 "Jūs varat izvēlēties citas valodas, kas būs pieejamas pēc instalēšanas"
@@ -3570,13 +3570,13 @@ msgstr "ieslēgt radio atbalstu"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Pirms turpināt, Jums vajadzētu uzmanīgi izlasīt licences vienošanos. Tā "
 "nosedz\n"
-"visu Mandrakelinux distribūciju, un ja Jūs nepiekrītat visiem noteikumiem,\n"
+"visu Mandrivalinux distribūciju, un ja Jūs nepiekrītat visiem noteikumiem,\n"
 "nospiediet uz pogas \"Noraidīt\", kas nekavējoties pārtrauks instalāciju. "
 "Lai turpinātu\n"
 "instalācijas procesu, nospiediet pogu \"Pieņemt\"."
@@ -3716,13 +3716,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux instalācija ir sadalīta pa dažiem CD-ROM diskiem. DrakX\n"
+"Mandrivalinux instalācija ir sadalīta pa dažiem CD-ROM diskiem. DrakX\n"
 "zin, vai izvēlētā pakotne atrodas uz cita CD-ROM diska, izvirzīs pašreizējo\n"
 "kompaktdisku un palūgs ievietot citu pēc nepieciešamības."
 
@@ -3730,11 +3730,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3843,10 +3843,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3967,7 +3967,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4070,12 +4070,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4102,7 +4102,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4111,7 +4111,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4131,11 +4131,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 ""
-"Pašlaik jums ir jāizvēlas, kur uz cietā diska instalēt Mandrakelinux\n"
+"Pašlaik jums ir jāizvēlas, kur uz cietā diska instalēt Mandrivalinux\n"
 "operētājsistēmu. Ja disks ir tukšs vai cita operētājsistēma aizņem visu\n"
 "vietu uz diska, jums būs jāveic diska sadalīšana. Īsumā, cietā diska\n"
 "sadalīšana nozīmē to sadalīt loģiskās daļās, lai izveidotu vietu\n"
-"Mandrakelinux sistēmas instalēšanai.\n"
+"Mandrivalinux sistēmas instalēšanai.\n"
 "\n"
 "\n"
 "Sakarā ar to, ka diska sadalīšanas process parasti ir neatgriezenisks,\n"
@@ -4164,7 +4164,7 @@ msgstr ""
 "\n"
 "* Izdzēst visu disku: ja vēlaties izdzēst visus uz diska esošos datus un "
 "sadaļas un aizstāt tās ar jaunu\n"
-"  Mandrakelinux sistēmu, varat izvēlēties šo opciju. Esiet uzmanīgi, "
+"  Mandrivalinux sistēmu, varat izvēlēties šo opciju. Esiet uzmanīgi, "
 "izvēloties šo risinājumu, jo pēc\n"
 "  apstiprināšanas jūs vairs nevarēsit atteikties no šīs izvēles.\n"
 "\n"
@@ -4177,7 +4177,7 @@ msgstr ""
 "vai izmainīt Microsoft\n"
 "  Windows sadaļas izmēru. Sadaļas izmēru var izmainīt bez datu zaudēšanas. "
 "Šis risinājums ir ieteicams, ja\n"
-"  jūs savā datorā vēlaties izmantot gan Mandrakelinux, gan Microsoft "
+"  jūs savā datorā vēlaties izmantot gan Mandrivalinux, gan Microsoft "
 "Windows.\n"
 "\n"
 "\n"
@@ -4301,7 +4301,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4325,7 +4325,7 @@ msgstr ""
 "Noklikšķiniet \"Labi\", kad esat gatavi formatēt sadaļas.\n"
 "\n"
 "Noklikšķiniet \"Atcelt\", ja jūs gribat izvēlēties citas sadaļas, kur\n"
-"instalēt jauno Mandrakelinux operētājsistēmu."
+"instalēt jauno Mandrivalinux operētājsistēmu."
 
 #: help.pm:431 install_steps_gtk.pm:392 interactive.pm:434
 #: interactive/newt.pm:318 printer/printerdrake.pm:3676
@@ -4339,7 +4339,7 @@ msgstr "Atpakaļ"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4368,7 +4368,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4392,7 +4392,7 @@ msgstr "Drošības administrators:"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4462,7 +4462,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Pašlaik jums ir jāizvēlas, kurā(s) diska sadaļā(s) instalēt Mandrakelinux\n"
+"Pašlaik jums ir jāizvēlas, kurā(s) diska sadaļā(s) instalēt Mandrivalinux\n"
 "operētājsistēmu. Ja sadaļas jau ir izveidotas (agrākas GNU/Linux "
 "instalēšanas\n"
 "laikā vai ar citu diska sadalīšanas rīku), jūs varat izmantot esošās "
@@ -4545,7 +4545,7 @@ msgstr "Pārslēgt normālajā režīmā"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4575,7 +4575,7 @@ msgid ""
 msgstr ""
 "Uz jūsu cietā diska ir atrasta vairāk nekā viena Microsoft Windows sadaļa.\n"
 "Lūdzu izvēlieties to sadaļu, kuras izmēru jūs vēlaties izmainīt, lai\n"
-"instalētu jauno Mandrakelinux operētājsistēmu.\n"
+"instalētu jauno Mandrivalinux operētājsistēmu.\n"
 "\n"
 "\n"
 "Jūsu zināšanai, katra sadaļa ir uzskaitīta šādā veidā: \"Linux nosaukums\",\n"
@@ -4622,7 +4622,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4631,13 +4631,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4691,7 +4691,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4850,7 +4850,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4871,7 +4871,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4992,7 +4992,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5009,7 +5009,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5071,11 +5071,11 @@ msgstr "Servisi"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Norādiet cieto disku, ko vēlaties izdzēst, lai izveidotu jaunu\n"
-"Mandrakelinux sadaļu. Esiet uzmanīgi, jo visi diskā esošie dati\n"
+"Mandrivalinux sadaļu. Esiet uzmanīgi, jo visi diskā esošie dati\n"
 "pazudīs un nebūs atjaunojami."
 
 #: help.pm:863
@@ -5424,11 +5424,11 @@ msgstr "Izmantot Windows sadaļas brīvo vietu"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Windows sadaļa ir pārāk fragmentēta. Vispirms no Windows vides palaidiet "
-"``defrag'' un tad atsāciet Mandrakelinux instalēšanu."
+"``defrag'' un tad atsāciet Mandrivalinux instalēšanu."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -5542,19 +5542,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5576,7 +5576,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5584,14 +5584,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5601,7 +5601,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5621,10 +5621,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5635,11 +5635,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5655,7 +5655,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5739,7 +5739,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5747,14 +5747,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Apsveicam, instalēšana ir pabeigta.\n"
 "Izņemiet sāknēšanas datu nesēju un nospiediet ievadu, lai pārstartētu "
 "datoru.\n"
 "\n"
 "\n"
-"Lai saņemtu informāciju par labojumiem, kas ir pieejami šim Mandrakelinux\n"
+"Lai saņemtu informāciju par labojumiem, kas ir pieejami šim Mandrivalinux\n"
 "izdevumam, skatiet Errata failu, kas atrodams\n"
 "\n"
 "\n"
@@ -5762,7 +5762,7 @@ msgstr ""
 "\n"
 "\n"
 "Informācija par jūsu sistēmas konfigurēšanu ir pieejama Oficiālās\n"
-"Mandrakelinux rokasgrāmatas pēcinstalēšanas nodaļā."
+"Mandrivalinux rokasgrāmatas pēcinstalēšanas nodaļā."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -5797,11 +5797,11 @@ msgstr "Uzsāku soli `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Jūsu sistēmai trūkst resursu. Mandrakelinux instalēšanas laikā var\n"
+"Jūsu sistēmai trūkst resursu. Mandrivalinux instalēšanas laikā var\n"
 "rasties problēmas. Ja tā notiek, varat pamēģināt teksta instalēšanu.\n"
 "Lai to izdarītu, nospiediet`F1', ka notiek ielāde no CDROM, tad ievadiet\n"
 "`text'."
@@ -6336,9 +6336,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Pieslēdzos Mandrakelinux tīmeklim, lai saņemtu pieejamo spoguļserveru "
+"Pieslēdzos Mandrivalinux tīmeklim, lai saņemtu pieejamo spoguļserveru "
 "sarakstu sarakstu..."
 
 #: install_steps_interactive.pm:840
@@ -6552,8 +6552,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux instalēšana %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux instalēšana %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9136,13 +9136,13 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall konfigurētājs\n"
 "\n"
-"Šis rīks konfigurē personālo ugunssienu priekš Mandrakelinux\n"
+"Šis rīks konfigurē personālo ugunssienu priekš Mandrivalinux\n"
 "datora. Priekš spēcīga, ugunssienas izveidei veltīta risinājuma,\n"
 "lūdzu apskatiet MandrakeSecurity Firewall XXXXXX."
 
@@ -12874,7 +12874,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14652,18 +14652,18 @@ msgstr "Apturēt"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Laipni lūdzam <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Laipni lūdzam <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14672,7 +14672,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -14689,9 +14689,9 @@ msgstr "Esiet sveicināti atvērtā koda pasaulē"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -14711,7 +14711,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14737,10 +14737,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14759,8 +14759,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14787,7 +14787,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14797,7 +14797,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14816,13 +14816,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14834,7 +14834,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14848,19 +14848,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "Mandrakelinux kontroles centrs"
+msgid "<b>Mandriva Products</b>"
+msgstr "Mandrivalinux kontroles centrs"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -14881,61 +14881,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14973,7 +14973,7 @@ msgstr "Izvēlieties jūsu failsistēmas šifrēšanas atslēgu"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14994,7 +14994,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -15112,7 +15112,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -15350,14 +15350,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux kontroles centrs</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux kontroles centrs</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -15379,21 +15379,21 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
 #: share/advertising/27.pl:13
 #, fuzzy, c-format
 msgid "<b>Online Store</b>"
-msgstr "Mandrakelinux kontroles centrs"
+msgstr "Mandrivalinux kontroles centrs"
 
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -15416,20 +15416,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, fuzzy, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -15448,33 +15448,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -15497,32 +15497,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "Mandrakelinux kontroles centrs"
+msgid "<b>Mandriva Expert</b>"
+msgstr "Mandrivalinux kontroles centrs"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15830,8 +15830,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakelinux kontroles centrs"
+msgid "Mandriva Wizards"
+msgstr "Mandrivalinux kontroles centrs"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -15926,7 +15926,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15974,7 +15974,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -18533,13 +18533,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "Mandrake kļūdu ziņojuma rīks"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux kontroles centrs"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux kontroles centrs"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18559,8 +18559,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -18604,7 +18604,7 @@ msgstr "Konfigurēšanas meistari"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -19020,20 +19020,20 @@ msgstr "Palaists pie ielādes"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Šis %s skeneris jākonfigurē ar printerdrake.\n"
-"Jūs varat palaist printerdrake no Mandrakelinux kontroles centra Aparatūras "
+"Jūs varat palaist printerdrake no Mandrivalinux kontroles centra Aparatūras "
 "sekcijā."
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Šis %s skeneris jākonfigurē ar printerdrake.\n"
-"Jūs varat palaist printerdrake no Mandrakelinux kontroles centra Aparatūras "
+"Jūs varat palaist printerdrake no Mandrivalinux kontroles centra Aparatūras "
 "sekcijā."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -19085,7 +19085,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -19380,7 +19380,7 @@ msgstr "Importēt"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19888,7 +19888,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -19915,7 +19915,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Mandrake kontroles centrs"
 
 #: standalone/drakhelp:36
@@ -22829,7 +22829,7 @@ msgid ""
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
-"Šis ir HardDrake, Mandrakelinux aparatūras konfigurēšanas rīks.\n"
+"Šis ir HardDrake, Mandrivalinux aparatūras konfigurēšanas rīks.\n"
 "<span foreground=\"royalblue3\">Versija:</span> %s\n"
 "<span foreground=\"royalblue3\">Autors:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
@@ -22940,7 +22940,7 @@ msgstr "Izmaiņa ir notikusi, bet, lai to padarītu efektīvu, Jums jāatslēdza
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Mandrake rīku apraksti"
 
 #: standalone/logdrake:51
@@ -23450,7 +23450,7 @@ msgstr "Savienojuma ātrums"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
@@ -23684,7 +23684,7 @@ msgstr ""
 #: standalone/scannerdrake:101
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "Šī Mandrakelinux versija neatbalsta %s."
+msgstr "Šī Mandrivalinux versija neatbalsta %s."
 
 #: standalone/scannerdrake:104
 #, fuzzy, c-format
@@ -23724,7 +23724,7 @@ msgstr ""
 #: standalone/scannerdrake:144
 #, fuzzy, c-format
 msgid "The %s is not supported under Linux."
-msgstr "Šī Mandrakelinux versija neatbalsta %s."
+msgstr "Šī Mandrivalinux versija neatbalsta %s."
 
 #: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
@@ -24295,8 +24295,8 @@ msgstr "Instalēšana neizdevās"
 #~ msgstr "netika atrasts neviens fonts.\n"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Mandrakelinux kontroles centrs"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Mandrivalinux kontroles centrs"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Pārlūks nav pieejams. Lūdzu, instalējiet kādu"
@@ -24765,8 +24765,8 @@ msgstr "Instalēšana neizdevās"
 #~ msgid "mkraid failed"
 #~ msgstr "mkraid neizdevās"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid "The package %s is needed. Install it?"
 #~ msgstr "Ir nepieciešama pakotne %s. Instalēt to?"
diff --git a/perl-install/share/po/mk.po b/perl-install/share/po/mk.po
index edfacc5b2..df0417276 100644
--- a/perl-install/share/po/mk.po
+++ b/perl-install/share/po/mk.po
@@ -71,7 +71,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Изгледа дека USB клучот има овозможено заштита за запишување, но сепак не "
 "можам\n"
@@ -80,7 +80,7 @@ msgstr ""
 "\n"
 "Притиснете на копчето да го рестартирате компјутерот, отстранете го, "
 "исклучете ја заштитата за запишување, внесете го клучот повторно и повторно "
-"подигнете го Mandrake Move."
+"подигнете го Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -98,7 +98,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -106,7 +106,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -114,7 +114,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -244,7 +244,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1281,11 +1281,11 @@ msgstr "Избор на јазик"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux може да подржи повеќе јазици. Изберете\n"
+"Mandrivalinux може да подржи повеќе јазици. Изберете\n"
 "ѓи јазиците кои сакате да ѓи инсталирате. Тие ќе бидат\n"
 "достапни кога инсталацијата ќе заврши и кога ќе го\n"
 "рестартирате системот."
@@ -3691,7 +3691,7 @@ msgstr "овозможи радио поддршка"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3887,7 +3887,7 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3901,11 +3901,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3957,7 +3957,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Сега е време да изберете програми што ќе се инсталираат на Вашиот систем.\n"
-"Постојат илјадници пакети за Mandrakelinux, и од Вас не се очекува да\n"
+"Постојат илјадници пакети за Mandrivalinux, и од Вас не се очекува да\n"
 "ги препознете напамет.\n"
 "\n"
 "Ако вршите стандардна инсталација од CD, прво ќе бидете запрашани за тоа\n"
@@ -4060,10 +4060,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4267,7 +4267,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4434,12 +4434,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4466,7 +4466,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4475,7 +4475,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4495,7 +4495,7 @@ 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 ""
-"Сега треба да изберете каде на Вашиот диск да се инсталира Mandrakelinux\n"
+"Сега треба да изберете каде на Вашиот диск да се инсталира Mandrivalinux\n"
 "оперативниот систем. Ако Вашиот диск е празен или ако веќе некој оперативен\n"
 "систем го користи целокупниот простор, ќе треба да го партицирате. \n"
 "Партицирањето се состои од логичко делење за да се создаде простор за\n"
@@ -4531,7 +4531,7 @@ msgstr ""
 "Менувањето на големина може да се изведе без губиток на податоци,\n"
 "под услов претходно да сте ја дефрагментирале Windows партицијата. Не би "
 "било лошо ни да направите бекап на Вашите податоци.\n"
-"Оваа солуција се пропорачува ако сакате да ги користите и Mandrakelinux и\n"
+"Оваа солуција се пропорачува ако сакате да ги користите и Mandrivalinux и\n"
 "Microsoft Windows на истиот компјутер.\n"
 "\n"
 "   Пред избирање на оваа опција треба да знаете дека по ова Microsoft "
@@ -4708,7 +4708,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4752,7 +4752,7 @@ msgstr "Претходно"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4793,7 +4793,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4821,7 +4821,7 @@ msgstr "Администратор за безбедност"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4979,7 +4979,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5057,7 +5057,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5066,13 +5066,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Оваа постапка се активира само ако на Вашиот компјутер се најде некоја стара "
 "GNU/Linux партиција.\n"
@@ -5087,13 +5087,13 @@ msgstr ""
 "\n"
 " * \"%s\": Ова ви овозможува да ги надградите пакетите кои веќе се "
 "инсталирани на Вашиот систем\n"
-"currently installed on your Mandrakelinux system. Your current\n"
+"currently installed on your Mandrivalinux 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"
-"�����``Upgrade'' ����should work fine on Mandrakelinux systems\n"
+"�����``Upgrade'' ����should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 
 #: help.pm:591
 #, fuzzy, c-format
@@ -5150,7 +5150,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5392,7 +5392,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5413,7 +5413,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Сега се избира принтерски систем за Вашиот компјутер. Некои други "
@@ -5571,7 +5571,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5588,7 +5588,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5650,7 +5650,7 @@ msgstr "Сервиси"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Изберете го дискот што сакат да го избришете за да ја инсталирате новата\n"
@@ -6003,7 +6003,7 @@ msgstr "Пресметување на големината на Windows парт
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Вашата Windows партиција е премногу фрагментирана. Рестартирајте го "
@@ -6124,19 +6124,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6158,7 +6158,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6166,14 +6166,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6183,7 +6183,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6203,10 +6203,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6217,11 +6217,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6237,7 +6237,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Вовед\n"
 "\n"
@@ -6252,7 +6252,7 @@ msgstr ""
 "1. Лиценцен договор\n"
 "\n"
 "Внимателно прочитајте го овој документ. Овој документ е лиценцен договор\n"
-"меѓу Вас и Mandrakesoft S.A. кој се однесува на софтверските производи.\n"
+"меѓу Вас и Mandriva S.A. кој се однесува на софтверските производи.\n"
 "Со инсталирање, дуплицирање или користење на софтверските производи\n"
 "на било кој начин, Вие експлицитно прифаќате и целосно се согласувате со\n"
 "термините и условите на оваа лиценца. Ако не се согласувате со било кој \n"
@@ -6269,19 +6269,19 @@ msgstr ""
 "\n"
 "Софтверските производи и придружната документација се дадени \n"
 "\"како што се\" (\"as is\"), без никаква гаранција, до степен можен со \n"
-"закон. Mandrakesoft S.A. нема во никој случај, до степен можен со закон, \n"
+"закон. Mandriva S.A. нема во никој случај, до степен можен со закон, \n"
 "да одговара за било какви специјални, инцидентни, директни и индиректни\n"
 "штети (вклучувајќи, и неограничувајќи се, на губиток на бизнис, прекин на\n"
 "бизнис, финансиски губиток, легални такси и казни последеици на судска\n"
 "одлука, или било каква друга консеквентна штета) кои потекнуваат од \n"
 "користење или неспособност за користење на софтверските производи, \n"
-"дури и ако Mandrakesoft S.A. бил советуван за можноста од или случувањето\n"
+"дури и ако Mandriva S.A. бил советуван за можноста од или случувањето\n"
 "на такви штети.\n"
 "\n"
 "ОГРАНИЧЕНА ОДГОВОРНОСТ ПОВРЗАНА СО ПОСЕДУВАЊЕТО ИЛИ \n"
 "КОРИСТЕЊЕТО СОФТВЕР ЗАБРАНЕТ ВО НЕКОИ ЗЕМЈИ\n"
 "\n"
-"До степен дозволн со закон, Mandrakesoft S.A. или неговите дистрибутери\n"
+"До степен дозволн со закон, Mandriva S.A. или неговите дистрибутери\n"
 "нема во никој случај да бидат одговорни за било какви специјални, \n"
 "инцидентни, директни и индиректни штети (вклучувајќи, и неограничувајќи се, "
 "на губиток на бизнис, прекин на\n"
@@ -6306,9 +6306,9 @@ msgstr ""
 "кои ги покриваат. Прочитајате ги внимателно термините и условите на \n"
 "лиценцниот договор за секоја окмпонента, пред да користите било ко од нив.\n"
 "Било какви прашања за лиценца на некоја компонента треба да се адресира\n"
-"на авторот на компонентата, а не на Mandrakesoft. Програмите развиени од\n"
-"Mandrakesoft S.A. потпаѓаат под GPL лиценцата. Документацијата напишана\n"
-"од Mandrakesoft S.A. потпаѓа под посебна лиценца. Видете ја "
+"на авторот на компонентата, а не на Mandriva. Програмите развиени од\n"
+"Mandriva S.A. потпаѓаат под GPL лиценцата. Документацијата напишана\n"
+"од Mandriva S.A. потпаѓа под посебна лиценца. Видете ја "
 "документацијата,\n"
 "за повеќе детали.\n"
 "\n"
@@ -6317,11 +6317,11 @@ msgstr ""
 "Сите права на компонентите на софтверските производи им припаѓаат на нивните "
 "соодветни автори и се заштитени со законите за интелектуална\n"
 "сопственост или авторски права (copyright laws) применливи на софтверски\n"
-"програми. Mandrakesoft S.A. го задржува правото да ги модифицира или \n"
+"програми. Mandriva S.A. го задржува правото да ги модифицира или \n"
 "адаптира софтверските производи, како целина или во делови, на било кој\n"
 "начин и за било која цел.\n"
-"\"Mandrake\", \"Mandrakelinux\" и придружените логотипи се заштитени знаци\n"
-"на Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" и придружените логотипи се заштитени знаци\n"
+"на Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Правосилни закони\n"
@@ -6334,7 +6334,7 @@ msgstr ""
 "Секој спор за термините на оваа лиценца по можност ќе се реши на суд.\n"
 "Како последен чекор, спорот ќе биде предаден на соодветинот суд во\n"
 "Париз - Франиција. За било какви прашања во врска со овој документ,\n"
-"контактирајте го Mandrakesoft S.A.\n"
+"контактирајте го Mandriva S.A.\n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6420,7 +6420,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6428,7 +6428,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Инсталацијата е завршена. Ви честитаме!\n"
 "Извадете ги инсталационите медиуми и притиснете Ентер за рестартирање.\n"
@@ -6477,7 +6477,7 @@ msgstr "Премин на чекор \"%s\"\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -7020,7 +7020,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
 "Контактирање со веб сајтот на Мандрак Линукс за добивање на листата на "
 "огледала..."
@@ -7245,8 +7245,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux Инсталација %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux Инсталација %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9830,13 +9830,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall конфигуратор\n"
 "\n"
-"Ова конфигурира личен огнен ѕид за оваа Mandrakelinux машина.\n"
+"Ова конфигурира личен огнен ѕид за оваа Mandrivalinux машина.\n"
 "За моќно и наменско решение на огнен ѕид, видете ја специјализираната\n"
 "дистрибуција MandrakeSecurity Firewall."
 
@@ -13753,7 +13753,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -15635,18 +15635,18 @@ msgstr "Стоп"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
 msgstr "Добредојдовте во <b>Мандраклинукс</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -15655,7 +15655,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -15672,9 +15672,9 @@ msgstr "Добредојдовте во светот на Open Source."
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -15694,7 +15694,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -15720,10 +15720,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -15742,8 +15742,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -15770,7 +15770,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -15780,7 +15780,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15799,13 +15799,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -15817,7 +15817,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15831,19 +15831,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "Mandrakelinux контролен центар"
+msgid "<b>Mandriva Products</b>"
+msgstr "Mandrivalinux контролен центар"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -15864,61 +15864,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -15956,7 +15956,7 @@ msgstr "Изберете го клучот за криптирање на фај
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -15977,7 +15977,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -16007,7 +16007,7 @@ msgstr ""
 #: share/advertising/15.pl:13
 #, fuzzy, c-format
 msgid "<b>Kontact</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/15.pl:15
 #, c-format
@@ -16094,7 +16094,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -16329,14 +16329,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux контролен центар</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux контролен центар</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -16358,21 +16358,21 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
 #: share/advertising/27.pl:13
 #, fuzzy, c-format
 msgid "<b>Online Store</b>"
-msgstr "Mandrakelinux контролен центар"
+msgstr "Mandrivalinux контролен центар"
 
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -16395,20 +16395,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -16427,33 +16427,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -16476,32 +16476,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -16799,7 +16799,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr "Лансирај го волшебникот"
 
 #: share/compssUsers.pl:197
@@ -16926,7 +16926,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16997,7 +16997,7 @@ msgstr "[--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -19606,13 +19606,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "Mandrake Bug Report алатка"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux контролен центар"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux контролен центар"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19632,8 +19632,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -19677,7 +19677,7 @@ msgstr "Конфигурационен Волшебник"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -20099,7 +20099,7 @@ msgstr "Покренато при стартување"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "овој интерфејс не е конфигуриран.\n"
 " Стартувај го волшебникот за конфгурација."
@@ -20108,7 +20108,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "овој интерфејс не е конфигуриран.\n"
 " Стартувај го волшебникот за конфгурација."
@@ -20161,7 +20161,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20457,7 +20457,7 @@ msgstr "Внеси"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -20990,7 +20990,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -21017,8 +21017,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux контролен центар"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux контролен центар"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -24134,8 +24134,8 @@ msgstr "Промената е направена, но за да има ефек
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Логови за алтките на Mandrakelinux"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Логови за алтките на Mandrivalinux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -24649,7 +24649,7 @@ msgstr "Врската е завршена."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Врската не успеа.\n"
 "Потврдете ја вашата конфигурација во Мандрак Контролниот Центар."
@@ -25516,7 +25516,7 @@ msgstr "Неуспешна инсталација"
 #~ msgstr "немате одбрано ни еден фонт"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
+#~ msgid "Mandriva Wizards"
 #~ msgstr "Лансирај го волшебникот"
 
 #, fuzzy
diff --git a/perl-install/share/po/mn.po b/perl-install/share/po/mn.po
index 83387cf63..be42ed3e6 100644
--- a/perl-install/share/po/mn.po
+++ b/perl-install/share/po/mn.po
@@ -61,7 +61,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -80,7 +80,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -96,7 +96,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -220,7 +220,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1202,7 +1202,7 @@ msgstr "Хэл"
 #: any.pm:733
 #, fuzzy, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 "вы бол вы."
@@ -3451,7 +3451,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3567,7 +3567,7 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3581,11 +3581,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3700,10 +3700,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3820,7 +3820,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -3927,12 +3927,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -3959,7 +3959,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -3968,7 +3968,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4104,7 +4104,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4122,7 +4122,7 @@ msgstr "Өмнөх"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4151,7 +4151,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4167,7 +4167,7 @@ msgstr "Хамгаалалт:"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4253,7 +4253,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4304,7 +4304,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4313,13 +4313,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "бол г вы шинэ г\n"
 " с вы вы аас г\n"
@@ -4365,7 +4365,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4531,7 +4531,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4552,7 +4552,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "с Бусад вы туг аас аас г\n"
@@ -4655,7 +4655,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4672,7 +4672,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4749,7 +4749,7 @@ msgstr "Үйлчилгээ"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -5059,7 +5059,7 @@ msgstr "хэмжээ аас Цонхнууд"
 #, fuzzy, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr "Цонхнууд бол Цонхнууд."
 
@@ -5163,19 +5163,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5197,7 +5197,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5205,14 +5205,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5222,7 +5222,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5242,10 +5242,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5256,11 +5256,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5276,7 +5276,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5335,7 +5335,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5343,7 +5343,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5375,7 +5375,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr "бол Та вы текст текст."
@@ -5877,7 +5877,7 @@ msgstr "Та г вы Интернэт г вы?"
 #: install_steps_interactive.pm:821
 #, fuzzy, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr "сайт жигсаалт аас."
 
 #: install_steps_interactive.pm:840
@@ -6082,7 +6082,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
 msgstr ""
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -8642,7 +8642,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr "г."
@@ -12282,7 +12282,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -13996,18 +13996,18 @@ msgstr "Зогсоох"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
 msgstr "<b>Мандраке Линукс</b>-т тавтай морилно уу"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14016,7 +14016,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -14033,9 +14033,9 @@ msgstr "Тавтай морил Нээх."
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -14055,7 +14055,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14081,10 +14081,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14103,8 +14103,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14131,7 +14131,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14141,7 +14141,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14160,13 +14160,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14178,7 +14178,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14192,19 +14192,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr "Мандрак удирдлагын төв"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -14225,61 +14225,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14317,7 +14317,7 @@ msgstr "Сонгох"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14338,7 +14338,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -14455,7 +14455,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -14690,14 +14690,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr "<b>Мандрак удирдлагын төв</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -14719,9 +14719,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -14733,7 +14733,7 @@ msgstr "Мандрак удирдлагын төв"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -14756,20 +14756,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
 msgstr "<b>Мандрак Клуб</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -14788,33 +14788,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr "Мандрак удирдлагын төв"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -14837,32 +14837,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
 msgstr "<b>Мандраке Мэргэжилтэн</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15153,7 +15153,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr "Мандрак удирдлагын төв"
 
 #: share/compssUsers.pl:197
@@ -15262,7 +15262,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15310,7 +15310,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17822,12 +17822,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "Мандрак удирдлагын төв"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
 msgstr "Мандрак удирдлагын төв"
 
 #: standalone/drakbug:48
@@ -17848,7 +17848,7 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr ""
 
 #: standalone/drakbug:52
@@ -17893,7 +17893,7 @@ msgstr "Тоноглол"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -18302,14 +18302,14 @@ msgstr "Ачаалахад эхэлсэн"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr "ямх"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr "ямх"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18360,7 +18360,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18649,7 +18649,7 @@ msgstr "Авчирах"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19119,7 +19119,7 @@ msgstr "Интернэт бусад Сүлжээ."
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -19146,7 +19146,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Мандрак удирдлагын төв"
 
 #: standalone/drakhelp:36
@@ -22140,7 +22140,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Мандрак удирдлагын төв"
 
 #: standalone/logdrake:51
@@ -22644,7 +22644,7 @@ msgstr "Холболт."
 #, fuzzy, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr "Холболт ямх Контрол Төвд."
 
 #: standalone/net_monitor:341
@@ -23485,7 +23485,7 @@ msgstr "Хэлбэр!"
 #~ msgstr "Та"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
+#~ msgid "Mandriva Wizards"
 #~ msgstr "Мандрак удирдлагын төв"
 
 #, fuzzy
diff --git a/perl-install/share/po/ms.po b/perl-install/share/po/ms.po
index c0a2cb40d..4d83bc2c2 100644
--- a/perl-install/share/po/ms.po
+++ b/perl-install/share/po/ms.po
@@ -58,7 +58,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -77,7 +77,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -93,7 +93,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1208,7 +1208,7 @@ msgstr "Pilihan Tidak Sah"
 #: any.pm:733
 #, fuzzy, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 "dan ulanghidup."
@@ -3457,7 +3457,7 @@ msgstr "Hidupkan sokongan SSL"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr "dalam off."
@@ -3576,7 +3576,7 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3587,11 +3587,11 @@ msgstr "on on dan."
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3706,10 +3706,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3823,7 +3823,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -3934,12 +3934,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -3966,7 +3966,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -3975,7 +3975,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4121,7 +4121,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4139,7 +4139,7 @@ msgstr "Terdahulu"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4168,7 +4168,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4184,7 +4184,7 @@ msgstr "Pentadbir Domain:"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4285,7 +4285,7 @@ msgstr "normal"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4335,7 +4335,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4344,13 +4344,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "on\n"
 " keluar fail on\n"
@@ -4394,7 +4394,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4558,7 +4558,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4579,7 +4579,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Lain-lain\n"
@@ -4682,7 +4682,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4699,7 +4699,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4776,7 +4776,7 @@ msgstr "Perkhidmatan"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr "dalam on dan!"
 
@@ -5086,7 +5086,7 @@ msgstr "Kemasukan Tidak Sah bagi Saiz Partisyen"
 #, fuzzy, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr "Tetingkap Tetingkap ulanghidup."
 
@@ -5190,19 +5190,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5224,7 +5224,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5232,14 +5232,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5249,7 +5249,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5269,10 +5269,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5283,11 +5283,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5303,7 +5303,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Pengenalan dan dalam dan dan dan A dalam dan dan dalam dan dan dan tidak A "
 "dalam tidak dan dan keluar A A dalam tidak keluar dan keluar dalam lokal "
@@ -5364,7 +5364,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5372,7 +5372,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr "Tahniah dan on on dalam Pengguna."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5404,7 +5404,7 @@ msgstr "Memasuki permulaan interaktif"
 #, fuzzy, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr "on on."
@@ -5920,7 +5920,7 @@ msgstr "Internet?"
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
 
 #: install_steps_interactive.pm:840
@@ -6127,8 +6127,8 @@ msgstr "on"
 
 #: install_steps_newt.pm:20
 #, fuzzy, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Arahan Pemasangan - Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Arahan Pemasangan - Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8691,7 +8691,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr "dan."
@@ -12267,7 +12267,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -13933,18 +13933,18 @@ msgstr "Henti"
 
 #: share/advertising/01.pl:13
 #, fuzzy, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr "Pilihan Anda? (1-%d) "
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Selamat Datang ke <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Selamat Datang ke <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -13953,7 +13953,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -13970,9 +13970,9 @@ msgstr "Selamat Datang Buka."
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -13992,7 +13992,7 @@ msgstr "GPL"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14018,10 +14018,10 @@ msgstr "Sertai Saluran..."
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14040,8 +14040,8 @@ msgstr " - Versi sijil: #%d\n"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14068,7 +14068,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14078,7 +14078,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14097,13 +14097,13 @@ msgstr "Red Hat Enterprise Linux Desktop"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14115,7 +14115,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14129,19 +14129,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "/_Produk Mandrakelinux"
+msgid "<b>Mandriva Products</b>"
+msgstr "/_Produk Mandrivalinux"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr "Hujah yang sah adalah:"
 
 #: share/advertising/09.pl:18
@@ -14162,61 +14162,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr " PenimbalBingkai jauh - Hak Cipta (C) %s Mandrakesoft S.A."
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr " PenimbalBingkai jauh - Hak Cipta (C) %s Mandriva S.A."
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14254,7 +14254,7 @@ msgstr "Sila pilih persekitaran desktop default anda:"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14275,7 +14275,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -14392,7 +14392,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -14627,14 +14627,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Pusat Kawalan Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Pusat Kawalan Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -14656,9 +14656,9 @@ msgstr "Pustaka kriptografi sumber terbuka."
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -14670,7 +14670,7 @@ msgstr "  %-20s dalamtalian\n"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -14693,20 +14693,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, fuzzy, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "Mandrakeclub"
+msgid "<b>Mandriva Club</b>"
+msgstr "Mandriva Club"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -14725,33 +14725,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -14774,32 +14774,32 @@ msgstr "Membaca kemaskini anaconda..."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "Mandrakeexpert"
+msgid "<b>Mandriva Expert</b>"
+msgstr "Mandriva Expert"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15090,8 +15090,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Pengguna Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Pengguna Mandriva"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -15193,7 +15193,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15241,7 +15241,7 @@ msgstr "lpd"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17718,13 +17718,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "Lapor pepijat pada GNOME"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Pusat Kawalan Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Pusat Kawalan Mandrivalinux"
 
 #: standalone/drakbug:48
 #, fuzzy, c-format
@@ -17744,8 +17744,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -17789,7 +17789,7 @@ msgstr "Status konfigurasi bagi %s %s\n"
 
 #: standalone/drakbug:81
 #, fuzzy, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr "Alatan Penukar Desktop"
 
 #: standalone/drakbug:82
@@ -18195,14 +18195,14 @@ msgstr "_Aktifkan semasa boot"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr "dalam utama"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr "dalam utama"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18253,7 +18253,7 @@ msgstr "Mematikan pengurus paparan: "
 
 #: standalone/drakedm:36
 #, fuzzy, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr "Mematikan pengurus paparan: "
 
 #: standalone/drakedm:37
@@ -18538,7 +18538,7 @@ msgstr "Import"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -18998,13 +18998,13 @@ msgstr "Semuanya Internet on Rangkaian DHCP."
 #, fuzzy, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
-"drakbt 0.8.1nHakmilik © 2003-2004 Mandrakesoft.\n"
+"drakbt 0.8.1nHakmilik © 2003-2004 Mandriva.\n"
 "Ini adalah perisian percuma dan boleh disebarkan dibawah akta GNU GPL.\n"
 "\n"
 "penggunaan:\n"
@@ -19029,7 +19029,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Pusat Bantuan KDE"
 
 #: standalone/drakhelp:36
@@ -22027,7 +22027,7 @@ msgstr "siap"
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Alatan Konfigurasi Pelayan"
 
 #: standalone/logdrake:51
@@ -22533,7 +22533,7 @@ msgstr "Konfigurasi Selesai"
 #, fuzzy, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr "dalam."
 
 #: standalone/net_monitor:341
diff --git a/perl-install/share/po/mt.po b/perl-install/share/po/mt.po
index 7e1217888..a74a0d8d7 100644
--- a/perl-install/share/po/mt.po
+++ b/perl-install/share/po/mt.po
@@ -68,14 +68,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Il-USB key jidher li hija protetta mill-ktib, imma ma nistgħux naqilgħuha\n"
 "bħalissa.\n"
 "\n"
 "\n"
 "Klikkja l-buttuna biex tirributja l-magna, aqla' l-USB key, neħħi\n"
-"l-protezzjoni kontra l-ktib, erġa' waħħalha, u erġa' tella' Mandrake Move."
+"l-protezzjoni kontra l-ktib, erġa' waħħalha, u erġa' tella' Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -93,7 +93,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Il-USB key m'għandhiex partizzjonijiet validi tal-Windows (FAT).\n"
@@ -104,13 +104,13 @@ msgstr ""
 "\n"
 "\n"
 "Tista' wkoll tkompli mingħajr USB key - xorta tkun tista' tuża\n"
-"Mandrake Move bħala sistema operattiva normali \"live\" Mandrake."
+"Mandriva Move bħala sistema operattiva normali \"live\" Mandrake."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -118,18 +118,18 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Ma sibniex USB key fuq is-sistema. Jekk twaħħal USB key issa,\n"
-"Mandrake Move ikun jista' jikteb id-data fid-direttorju personali\n"
+"Mandriva Move ikun jista' jikteb id-data fid-direttorju personali\n"
 "tiegħek u tal-konfigurazzjoni tas-sistema, għal meta terġa' tibbutja\n"
 "dan il-kompjuter jew kompjuter ieħor. Nota: Jekk twaħħal USB key \n"
 "issa, stenna ftit sekondi qabel terġa' tipprova ssibha.\n"
 "\n"
 "\n"
 "Tista' wkoll tkompli mingħajr USB key - xorta tkun tista' tuża\n"
-"Mandrake Move bħala sistema operattiva normali \"live\" Mandrake."
+"Mandriva Move bħala sistema operattiva normali \"live\" Mandrake."
 
 #: ../move/move.pm:494
 #, c-format
@@ -255,7 +255,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -271,7 +271,7 @@ msgstr ""
 "\n"
 "Dan jista' jkun minn fajls ta' konfigurazzjoni korrotti\n"
 "fuq il-USB key. F'dak il-każ jekk tneħħihom u tirributja\n"
-"Mandrake Move għandha tiġi riżolta l-problema. Biex tagħmel\n"
+"Mandriva Move għandha tiġi riżolta l-problema. Biex tagħmel\n"
 "dan, klikkja fuq il-buttuna rispettiva.\n"
 "\n"
 "\n"
@@ -1310,7 +1310,7 @@ msgstr "Għażla ta' lingwa"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 "Tista' tagħżel lingwi oħra li jkun u disponibbli wara li tinstalla"
@@ -3730,12 +3730,12 @@ msgstr "ippermetti sapport għal radju"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Qabel tkompli int mitlub taqra sew it-termini ta' din il-liċenzja. Hija\n"
-"tkopri d-distribuzzjoni sħiħa ta' Mandrakelinux. Jekk taqbel mat-termini\n"
+"tkopri d-distribuzzjoni sħiħa ta' Mandrivalinux. Jekk taqbel mat-termini\n"
 "kollha tagħha, agħfas il-buttuna \"%s\". Jekk ma taqbilx, agħfas \"%s\" "
 "biex\n"
 "tirributja l-kompjuter."
@@ -3905,13 +3905,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"L-installazzjoni ta' Mandrakelinux hija maqsuma fuq diversi CD-ROMs. Jekk\n"
+"L-installazzjoni ta' Mandrivalinux hija maqsuma fuq diversi CD-ROMs. Jekk\n"
 "pakkett qiegħed fuq CD-ROM oħra, DrakX jiftaħ is-CDROM u jitolbok iddaħħal "
 "is-\n"
 "CD li jmiss. Jekk m'għandekx dik is-CD tista' tikklikkja \"%s\" u l-pakketti "
@@ -3922,11 +3922,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3978,11 +3978,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "Issa wasal il-mument fejn tagħżel liema programmi tixtieq tinstalla fuq\n"
-"is-sistema tiegħek. Hemm eluf ta' pakketti disponibbli għal Mandrakelinux,\n"
+"is-sistema tiegħek. Hemm eluf ta' pakketti disponibbli għal Mandrivalinux,\n"
 "u biex ikun iżjed faċli timmaniġġjahom, qegħdin imqassmin fi gruppi ta'\n"
 "programmi simili.\n"
 "\n"
-"Mandrakelinux iqassam il-gruppi ta' pakketti fi tlett kategoriji. Tista' \n"
+"Mandrivalinux iqassam il-gruppi ta' pakketti fi tlett kategoriji. Tista' \n"
 "tagħżel u tħallat programmi minn diversi kategoriji, jiġifieri "
 "installazzjoni\n"
 "\"workstation\" tista' tinkludi programmi mis-sezzjoni \"server\", eċċ.\n"
@@ -4083,10 +4083,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4115,7 +4115,7 @@ msgstr ""
 "li tgħidlek għal xiex jintuża dak il-pakkett.\n"
 "!! Jekk pakkett ta' server jiġi installat intenzjonalment jew għax jifforma\n"
 "parti minn grupp, int tintalab tikkonferma jekk verament tridx lill dawn\n"
-"is-servizzi jiġu nstallati. Fil-Mandrakelinux, is-servizzi li tinstalla "
+"is-servizzi jiġu nstallati. Fil-Mandrivalinux, is-servizzi li tinstalla "
 "jiġu\n"
 "mtella' awtomatikament meta tixgħel. Għalkemm dawn kienu siguri u ma kien "
 "fihom\n"
@@ -4271,7 +4271,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4326,7 +4326,7 @@ msgid ""
 "not successful in getting the display configured."
 msgstr ""
 "X (għal Sistema X Window) huwa l-qalb ta' l-interfaċċja grafika GNU/Linux\n"
-"li fuqu huma bbażati l-ambjenti grafiċi kollha inklużi ma' Mandrakelinux "
+"li fuqu huma bbażati l-ambjenti grafiċi kollha inklużi ma' Mandrivalinux "
 "(KDE,\n"
 "GNOME, AfterStep, WindowMaker, eċċ).\n"
 "\n"
@@ -4441,12 +4441,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4473,7 +4473,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4482,7 +4482,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4503,12 +4503,12 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "F'dan il-punt int trid tagħżel fejn, fuq il-ħard disk, trid tinstalla s-\n"
-"sistema operattiva Mandrakelinux. Jekk il-ħard disk huwa vojt, jew jekk\n"
+"sistema operattiva Mandrivalinux. Jekk il-ħard disk huwa vojt, jew jekk\n"
 "hemm sistema operattiva qed tokkupaha kollha, l-ewwel trid toħloq \n"
 "partizzjonijiet. Bażikament, il-partizzjonijiet tal-ħard disk jaqsmu d-"
 "diska\n"
 "f'partijiet biex ikun hemm sezzjonijiet fejn tiġi nstallata s-sistema ġdida\n"
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 "Peress li l-effett ta' partizzjonament tal-ħard disk m'humiex riversibbli,\n"
 "u jista' jwassal għal telf ta' informazzjoni, dan il-proċess jista' jidher\n"
@@ -4705,7 +4705,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4728,7 +4728,7 @@ msgstr ""
 "Agħfas \"%s\" meta tkun lest biex tifformattja l-partizzjonijiet.\n"
 "\n"
 "Agħfas \"%s\" jekk trid tagħżel partizzjoni oħra għas-sistema ġdida\n"
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 "Agħfas \"%s\" biex tagħżel partizzjonijiet biex jiġu ċċekkjati għal blokki\n"
 "ħżiena fuq id-diska."
@@ -4745,7 +4745,7 @@ msgstr "Ta' qabel"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4757,7 +4757,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Fid-data meta tinstalla l-Mandrakelinux, aktarx ikunu ġew aġġornati xi\n"
+"Fid-data meta tinstalla l-Mandrivalinux, aktarx ikunu ġew aġġornati xi\n"
 "pakketti minn meta ġiet pubblikata. Xi żbalji jistgħu ikunu ġew irranġati,\n"
 "u problemi ta' sigurtà ġew riżolti. Sabiex tibbenifika minn dawn l-\n"
 "aġġornamenti, jaqbillek tniżżilhom minn fuq l-internet. Agħżel \"%s\" jekk\n"
@@ -4786,7 +4786,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4801,7 +4801,7 @@ msgstr ""
 "\n"
 "Jekk ma tafx liema tagħżel, żomm l-għażla impliċita. Tkun tista' tibdel dan\n"
 "il-livell iżjed 'il quddiem bl-għodda draksex, li jifforma parti miċ-Ċentru\n"
-"ta' Kontroll Mandrakelinux.\n"
+"ta' Kontroll Mandrivalinux.\n"
 "\n"
 "Imla' l-kaxxa \"%s\" bl-indirizz tal-imejl tal-persuna responsabbli mis-"
 "sigurtà.\n"
@@ -4816,7 +4816,7 @@ msgstr "Amministratur tas-sigurtà"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4887,7 +4887,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "F'dan il-punt trid tagħżel liema partizzjoni(jiet) se jintużaw għall-\n"
-"installazzjoni tas-sistema Mandrakelinux. Jekk diġà ġew definiti xi\n"
+"installazzjoni tas-sistema Mandrivalinux. Jekk diġà ġew definiti xi\n"
 "partizzjonijiet, jew minn installazzjoni preċedenti ta' GNU/Linux jew minn\n"
 "għodda ta' partizzjonament oħra, tista' tuża l-partizzjonijiet eżistenti.\n"
 "Altrimenti, l-partizzjonijiet tal-ħard disk iridu jiġu definiti.\n"
@@ -4975,7 +4975,7 @@ msgstr "Aqleb bejn modalità normali u esperta"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5005,7 +5005,7 @@ msgid ""
 msgstr ""
 "Instabu iżjed minn partizzjoni waħda tal-Microsoft fuq il-ħard disk. Jekk \n"
 "jogħġbok agħżel liema minnhom trid iċċekken biex tinstalla s-sistema \n"
-"operattiva Mandrakelinux.\n"
+"operattiva Mandrivalinux.\n"
 "\n"
 "Kull partizzjoni hija mmarkata hekk: \"Isem tal-Linux\", \"Isem fil-Windows"
 "\",\n"
@@ -5055,7 +5055,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5064,19 +5064,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Dan il-pass jiġi attivat biss jekk instabet partizzjoni eżistenti GNU/Linux\n"
 "fuq il-kompjuter.\n"
 "\n"
 "DrakX issa għandu bżonn ikun jaf jekk tridx tagħmel installazzjoni ġdida\n"
-"jew aġġornament tas-sistema eżistenti Mandrakelinux:\n"
+"jew aġġornament tas-sistema eżistenti Mandrivalinux:\n"
 "\n"
 " * \"%s\". Fil-parti l-kbira, din tħassar is-sistema antika għal kollox.\n"
 "Però, skond l-iskema ta' partizzjonijiet, tista' ma tħallix ċerti \n"
@@ -5085,16 +5085,16 @@ msgstr ""
 "fajls, għandek tagħżel din l-għażla.\n"
 "\n"
 " * \"%s\". Din il-klassi ta' installazzjoni tħallik taġġorna l-pakketti\n"
-"installati bħalissa fuq is-sistema Mandrakelinux. Il-partizzjonijiet "
+"installati bħalissa fuq is-sistema Mandrivalinux. Il-partizzjonijiet "
 "eżistenti\n"
 "u d-data tal-utenti ma jintmessux. Ħafna mill-passi l-oħra tal-"
 "konfigurazzjoni\n"
 "jibqgħu disponibbli u huma simili għal installazzjoni normali.\n"
 "\n"
 "L-użu tal-għażla \"Aġġorna\" għandha taħdem tajjeb fuq sistemi "
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "minn verżjoni \"8.1\" 'il fuq. Mhux rakkomandat li tagħmel aġġornament ta'\n"
-"sistema Mandrakelinux qabel 8.1."
+"sistema Mandrivalinux qabel 8.1."
 
 #: help.pm:591
 #, c-format
@@ -5148,7 +5148,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5191,7 +5191,7 @@ msgstr ""
 "tal-karattri intenzjonata biex tipprovdi sapport għal-lingwi kollha. Però \n"
 "s-sapport għaliha fil-Linux għadu qed jiġi żviluppat. Għalhekk, l-użu tal-"
 "UTF-8\n"
-"fil-Mandrakelinux jiddependi mill-għażla tal-utent:\n"
+"fil-Mandrivalinux jiddependi mill-għażla tal-utent:\n"
 "\n"
 "* Jekk tagħżel lingwa b'ħafna sapport eżistenti f'kodifika oħra (eż, "
 "lingwi \n"
@@ -5440,7 +5440,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5461,11 +5461,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Issa wasal il-waqt li tagħżel sistema ta' printjar għall-kompjuter tiegħek.\n"
-"Sistemi operattivi oħra joffrulek waħda, Mandrakelinux jagħtik tnejn.\n"
+"Sistemi operattivi oħra joffrulek waħda, Mandrivalinux jagħtik tnejn.\n"
 "Kull waħda minn dawn is-sistema hija idejali għal ċirkostanzi differenti.\n"
 " * \"%s\" - li jfisser \"printja minngħajr kju\", hija l-aħjar għażla\n"
 "jekk għandek konnessjoni diretta mal-printer, trid il-faċilità li twaqqaf\n"
@@ -5485,7 +5485,7 @@ msgstr ""
 "\n"
 "Jekk tagħmel għażla issa, u wara tiskopri li ma togħġbokx din is-sistema,\n"
 "tista' tibdilha billi tħaddem PrinterDrake miċ-ċentru tal-kontroll ta' \n"
-"Mandrakelinux u tikklikkja l-buttuna \"%s\"."
+"Mandrivalinux u tikklikkja l-buttuna \"%s\"."
 
 #: help.pm:765
 #, c-format
@@ -5601,7 +5601,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5618,7 +5618,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5665,7 +5665,7 @@ msgstr ""
 "\n"
 " * \"%s\": jekk tixtieq tikkonfigura l-aċċess għall-internet jew network\n"
 "lokali tista tagħmel dan issa. Irreferi għad-dokumentazzjoni stampata jew\n"
-"uża ċ-Ċentru tal-Kontroll Mandrakelinux wara li tlesti l-installazzjoni "
+"uża ċ-Ċentru tal-Kontroll Mandrivalinux wara li tlesti l-installazzjoni "
 "biex\n"
 "tikseb għajnuna online sħiħa.\n"
 "\n"
@@ -5688,7 +5688,7 @@ msgstr ""
 "din il-buttuna. Dan għandu jsir minn utenti avvanzati biss. Irreferi għad-\n"
 "dokumentazzjoni stampata, jew l-għajnuna online dwar il-konfigurazzjoni "
 "tal-\n"
-"bootloader fiċ-Ċentru tal-Kontroll Mandrakelinux.\n"
+"bootloader fiċ-Ċentru tal-Kontroll Mandrivalinux.\n"
 "\n"
 " * \"%s\": permezz ta' dan l-element tista' tirfina liema servizzi se \n"
 "jitħaddmu fuq il-kompjuter. Jekk qed tippjana li tuża l-kompjuter bħala \n"
@@ -5749,11 +5749,11 @@ msgstr "Servizzi"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Agħżel liema ħard disk trid tħassar biex tinstalla l-partizzjonijiet tal-\n"
-"Mandrakelinux fuqha. Oqgħod attent, l-informazzjoni kollha fuq din id-\n"
+"Mandrivalinux fuqha. Oqgħod attent, l-informazzjoni kollha fuq din id-\n"
 "diska jintilef u ma jkunx jista' jinġab lura!"
 
 #: help.pm:863
@@ -6108,7 +6108,7 @@ msgstr "Qed jiġi kalkulat id-daqs tal-partizzjoni Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Il-partizzjoni tal-Windows hija mgerfxa wisq. Jekk jogħġbok ħaddem \"defrag"
@@ -6230,19 +6230,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6264,7 +6264,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6272,14 +6272,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6289,7 +6289,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6309,10 +6309,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6323,11 +6323,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6343,7 +6343,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -6439,7 +6439,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6447,14 +6447,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Prosit! L-installazzjoni issa lesta.\n"
 "Neħħi l-flopi/CD u agħfas Enter biex tirristartja.\n"
 "\n"
 "\n"
 "Għal informazzjoni dwar aġġornamenti li saru għal din il-verżjoni ta' \n"
-"Mandrakelinux, iċċekkja s-sezzjoni \"Errata\" li hemm fuq:\n"
+"Mandrivalinux, iċċekkja s-sezzjoni \"Errata\" li hemm fuq:\n"
 "\n"
 "\n"
 "%s\n"
@@ -6462,7 +6462,7 @@ msgstr ""
 "\n"
 "Informazzjoni dwar kif tissettja s-sistema tinstab fil-kapitlu \"Post-install"
 "\"\n"
-"fil-Mandrakelinux User's Guide uffiċjali."
+"fil-Mandrivalinux User's Guide uffiċjali."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6497,12 +6497,12 @@ msgstr "Dieħel fil-pass \"%s\"\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Is-sistema hija nieqsa mir-riżorsi. Jista' jkollok problema biex tinstalla \n"
-"l-Mandrakelinux. Jekk jiġri dan, ipprova installazzjoni testwali. Għal dan,\n"
+"l-Mandrivalinux. Jekk jiġri dan, ipprova installazzjoni testwali. Għal dan,\n"
 "agħfas F1 meta titla' s-CD, imbagħad ittajpja \"text\"."
 
 #: install_steps_gtk.pm:228 install_steps_interactive.pm:624
@@ -7041,9 +7041,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Qed nikkuntattja l-website ta' Mandrakelinux biex nikseb lista tal-mirja "
+"Qed nikkuntattja l-website ta' Mandrivalinux biex nikseb lista tal-mirja "
 "disponibbli"
 
 #: install_steps_interactive.pm:840
@@ -7268,8 +7268,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Installazzjoni Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Installazzjoni Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9855,13 +9855,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Konfiguratur drakfirewall\n"
 "\n"
-"Dan jikkonfigura firewall personali għal din is-sistema Mandrakelinux.\n"
+"Dan jikkonfigura firewall personali għal din is-sistema Mandrivalinux.\n"
 "Għal kompjuter firewall dedikat, jekk jogħġbok ara d-distribuzzjoni\n"
 "speċjalizzata MandrakeSecurity Firewall."
 
@@ -13881,7 +13881,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -15806,23 +15806,23 @@ msgstr "Ieqaf"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>X'inhu Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>X'inhu Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Merħba għal <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Merħba għal <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux hija <b>distribuzzjoni tal-Linux</b> li jinkludi l-qalba tas-"
+"Mandrivalinux hija <b>distribuzzjoni tal-Linux</b> li jinkludi l-qalba tas-"
 "sistema, magħrufa bħala s-<b>sistema operattiva</b> (ibbażata fuq il-kernel "
 "Linux) flimkien ma' <b>ħafna programmi</b> li għandhom jaqdu kull ħtieġa li "
 "qatt jista' jkollok."
@@ -15830,10 +15830,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux hija l-iżjed distribuzzjoni ta' Linux <b>faċli tużaha</b> "
+"Mandrivalinux hija l-iżjed distribuzzjoni ta' Linux <b>faċli tużaha</b> "
 "illum Hija wkoll waħda mill-iżjed distribuzzjonijiet ta' Linux tintuża "
 "madwar id-dinja!"
 
@@ -15850,15 +15850,15 @@ msgstr "Merħba għad-<b>dinja ta' Sors Miftuħ</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux hija kommessa għall-mudell ta' sors miftuħ. Dan ifisser li din "
+"Mandrivalinux hija kommessa għall-mudell ta' sors miftuħ. Dan ifisser li din "
 "l-edizzjoni ġdida hija riżultat ta' <b>kollaborazzjoni</b> bejn <b>it-tim "
-"ta' żviluppaturi ta' Mandrakesoft</b> u l-<b>komunità dinjija</b> ta' "
-"kontributuri ta' Mandrakelinux."
+"ta' żviluppaturi ta' Mandriva</b> u l-<b>komunità dinjija</b> ta' "
+"kontributuri ta' Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -15878,9 +15878,9 @@ msgstr "<b>Il-GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Ħafna mis-softwer inkluż mad-distribuzzjoni u l-għodda kollha Mandrakelinux "
+"Ħafna mis-softwer inkluż mad-distribuzzjoni u l-għodda kollha Mandrivalinux "
 "huma liċenzjati taħt il-<b>Liċenzja Ġenerali Pubblika (GPL)</b>"
 
 #: share/advertising/03.pl:17
@@ -15911,15 +15911,15 @@ msgstr "<b>Issieħeb mal-Komunità</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux għandha waħda mill-<b>ikbar komunitajiet</b> ta' utenti u "
+"Mandrivalinux għandha waħda mill-<b>ikbar komunitajiet</b> ta' utenti u "
 "żviluppaturi. Ir-rwol ta' din il-komunità huwa wiesa', u jinkludi mir-"
 "rappurtar ta' \"bugs\" sa l-iżvilupp ta' programmi ġodda. Il-komunità "
-"għandha <b>rwol kruċjali</b> fid-dinja ta' Mandrakelinux."
+"għandha <b>rwol kruċjali</b> fid-dinja ta' Mandrivalinux."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -15941,11 +15941,11 @@ msgstr "<b>Verżjoni download</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Int qed tinstalla <b>Mandrakelinux Download</b>. Din hija verżjoni b'xejn li "
-"Mandrakesoft jixtiequ jibqgħu <b>jipprovdu lil kulħadd</b>"
+"Int qed tinstalla <b>Mandrivalinux Download</b>. Din hija verżjoni b'xejn li "
+"Mandriva jixtiequ jibqgħu <b>jipprovdu lil kulħadd</b>"
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -15976,10 +15976,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Anqas m'għandek aċċess għas-<b>servizzi inklużi</b> fi prodotti oħra ta' "
-"Mandrakesoft."
+"Mandriva."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -15988,8 +15988,8 @@ msgstr "<b>Discovery, l-ewwel desktop tal-Linux tiegħek</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Int qed tinstalla <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Int qed tinstalla <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16012,17 +16012,17 @@ msgstr "<b>PowerPack, L-Aqwa Desktop tal-Linux</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Int qed tinstalla <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Int qed tinstalla <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack huwa <b>l-aħjar desktop tal-Linux</b> ta' Mandrakesoft. PowerPack "
+"PowerPack huwa <b>l-aħjar desktop tal-Linux</b> ta' Mandriva. PowerPack "
 "jinkludi <b>eluf ta' programmi</b> - mill-iżjed popolari sa l-iżjed "
 "avvanzati."
 
@@ -16033,8 +16033,8 @@ msgstr "<b>PowerPack+, Is-Soluzzjoni tal-Linux għal Desktops u Servers</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Int qed tinstalla <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Int qed tinstalla <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16050,21 +16050,21 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Prodotti Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Prodotti Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> żviluppaw għażla sħiħa ta' prodotti <b>Mandrakelinux</b>."
+"<b>Mandriva</b> żviluppaw għażla sħiħa ta' prodotti <b>Mandrivalinux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Il-prodotti Mandrakelinux huma:"
+msgid "The Mandrivalinux products are:"
+msgstr "Il-prodotti Mandrivalinux huma:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16085,74 +16085,74 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux għal x86-64</b>, Is-soluzzjoni Mandrakelinux biex tieħu "
+"\t* <b>Mandrivalinux għal x86-64</b>, Is-soluzzjoni Mandrivalinux biex tieħu "
 "l-massimu mill-proċessatur 64-bit tiegħek."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Prodotti Mandrakesoft (Prodotti Nomadi)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Prodotti Mandriva (Prodotti Nomadi)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft żviluppaw żewġ prodotti li jħalluk tuża Mandrakelinux <b>fuq "
+"Mandriva żviluppaw żewġ prodotti li jħalluk tuża Mandrivalinux <b>fuq "
 "kwalinkwa kompjuter</b> mingħajr m'hemm bżonn tinstallah:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, distribuzzjoni ta' Mandrakelinux li taħdem totalment minn "
+"\t* <b>Move</b>, distribuzzjoni ta' Mandrivalinux li taħdem totalment minn "
 "fuq CDROM jibbutja."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, distribuzzjoni ta' Mandrakelinux installata bil-"
+"\t* <b>GlobeTrotter</b>, distribuzzjoni ta' Mandrivalinux installata bil-"
 "lest fuq “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Prodotti Mandrakesoft (Soluzzjonijiet Professjonali)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Prodotti Mandriva (Soluzzjonijiet Professjonali)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Hawn taħt issib il-prodotti Mandrakesoft intenzjonati li jaqdu <b>ħtiġijiet "
+"Hawn taħt issib il-prodotti Mandriva intenzjonati li jaqdu <b>ħtiġijiet "
 "professjonali</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, Id-desktop Mandrakelinux għan-negozju."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Id-desktop Mandrivalinux għan-negozju."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Is-soluzzjoni server ta' Mandrakelinux"
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Is-soluzzjoni server ta' Mandrivalinux"
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 "\t* <b>Multi-Network Firewall</b>, Is-soluzzjoni at' sigurtà ta' "
-"Mandrakelinux"
+"Mandrivalinux"
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16195,10 +16195,10 @@ msgstr "<b>Agħżel l-Ambjent tad-Desktop Favorit</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Bil-PowerPack, int ikollok għażla ta' <b>ambjent grafiku tad-desktop</b>. "
-"Mandrakesoft għażlu <b>KDE</b> bħala dak impliċitu."
+"Mandriva għażlu <b>KDE</b> bħala dak impliċitu."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16222,10 +16222,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Bil-PowerPack+, int ikollok għażla ta' <b>ambjent grafiku tad-desktop</b>. "
-"Mandrakesoft għażlu <b>KDE</b> bħala dak impliċitu."
+"Mandriva għażlu <b>KDE</b> bħala dak impliċitu."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16352,10 +16352,10 @@ msgstr "<b>Ħu Gost bil-Varjetà Kbira ta' Programmi</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Fil-menu Mandrakelinux issib programmi <b>faċli tużahom</b> għax-<b>xogħol "
+"Fil-menu Mandrivalinux issib programmi <b>faċli tużahom</b> għax-<b>xogħol "
 "kollu</b> li trid:"
 
 #: share/advertising/18.pl:16
@@ -16617,18 +16617,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Ċentru tal-Kontroll Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Ċentru tal-Kontroll Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"Iċ-<b>Ċentru ta' Kontroll Mandrakelinux</b> huwa kollezzjoni essenzjali ta' "
-"programmi speċifiċi ta' Mandrakelinux li jissimplifikaw il-konfigurazzjoni "
+"Iċ-<b>Ċentru ta' Kontroll Mandrivalinux</b> huwa kollezzjoni essenzjali ta' "
+"programmi speċifiċi ta' Mandrivalinux li jissimplifikaw il-konfigurazzjoni "
 "tal-kompjuter."
 
 #: share/advertising/25.pl:17
@@ -16652,16 +16652,16 @@ msgstr "<b>Il-Mudell Sors Miftuħ</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Bħal kull programmar tal-kompjuter, softwer sors miftuħ <b>jiħtieġ ħin u "
 "nies</b> biex jiżviluppawh. Sabiex tirrispetta l-filosofija tas-sors miftuħ, "
-"Mandrakesoft ibiegħu prodotti b'valur miżjud u servizzi biex <b>ikomplu "
-"itejbu lil Mandrakelinux</b>. Jekk tixtieq <b>tappoġġja l-filosofija ta' "
-"sors miftuħ</b> u l-iżvilupp ta' Mandrakelinux, <b>jekk jogħġbok</b> "
+"Mandriva ibiegħu prodotti b'valur miżjud u servizzi biex <b>ikomplu "
+"itejbu lil Mandrivalinux</b>. Jekk tixtieq <b>tappoġġja l-filosofija ta' "
+"sors miftuħ</b> u l-iżvilupp ta' Mandrivalinux, <b>jekk jogħġbok</b> "
 "ikkunsidra li tixtri wieħed mill-prodotti jew servizzi tagħna!"
 
 #: share/advertising/27.pl:13
@@ -16672,10 +16672,10 @@ msgstr "<b>Ħanut Online</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Biex issir taf iżjed dwar il-prodotti u servizzi Mandrakesoft, tista' żżur "
+"Biex issir taf iżjed dwar il-prodotti u servizzi Mandriva, tista' żżur "
 "il-<b>pjattaforma e-kummerċ</b> tagħna."
 
 #: share/advertising/27.pl:17
@@ -16701,24 +16701,24 @@ msgstr "Aqbeż qabża llum għand <b>store.mandrakesoft.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> huwa s-<b>sieħeb idejali</b> għall-prodott Mandrakelinux "
+"<b>Mandriva Club</b> huwa s-<b>sieħeb idejali</b> għall-prodott Mandrivalinux "
 "tiegħek.."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Ħu vantaġġ minn <b>benefiċċji</b> billi tissieħeb ma' Mandrakeclub, fosthom:"
+"Ħu vantaġġ minn <b>benefiċċji</b> billi tissieħeb ma' Mandriva Club, fosthom:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -16740,40 +16740,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Parteċipazzjoni fil-<b>forums tal-utenti</b> Mandrakelinux."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Parteċipazzjoni fil-<b>forums tal-utenti</b> Mandrivalinux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Aċċess kmieni u privileġġjat</b>, qabel il-ħarġa pubblika, għal "
-"<b>ISO images</b> Mandrakelinux."
+"<b>ISO images</b> Mandrivalinux."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> huwa servizz ġdid ewlieni li Mandrakesoft kburin "
+"<b>Mandriva Online</b> huwa servizz ġdid ewlieni li Mandriva kburin "
 "joffru lill-klijenti!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline jipprovdi firxa ta' servizzi tajbin biex <b>faċilment "
-"taġġorna</b> s-sistemi Mandrakelinux:"
+"Mandriva Online jipprovdi firxa ta' servizzi tajbin biex <b>faċilment "
+"taġġorna</b> s-sistemi Mandrivalinux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16799,41 +16799,41 @@ msgstr "\t* <b>Skedi</b> flessibbli ta' aġġornamenti."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* L-immaniġġjar tas-<b>sistemi kollha Mandrakelinux</b> minn kont wieħed."
+"\t* L-immaniġġjar tas-<b>sistemi kollha Mandrivalinux</b> minn kont wieħed."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "Għandek bżonn l-<b>għajnuna</b>? Iltaqa' mal-esperti tekniċi ta' "
-"Mandrakesoft fuq il-<b>pjattaforma ta' għajnuna teknika</b> www."
+"Mandriva fuq il-<b>pjattaforma ta' għajnuna teknika</b> www."
 "mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Grazzi għall-għajnuna ta' <b>esperti kwalifikati ta' Mandrakelinux</b>, int "
+"Grazzi għall-għajnuna ta' <b>esperti kwalifikati ta' Mandrivalinux</b>, int "
 "tiffranka ħafna ħin."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Għal kwalinkwa mistoqsija relatata ma' Mandrakelinux, għandek il-possibbiltà "
+"Għal kwalinkwa mistoqsija relatata ma' Mandrivalinux, għandek il-possibbiltà "
 "li tixtri inċidenti ta' sapport minn fuq <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17130,8 +17130,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "<b>Prodotti Mandrakesoft</b>"
+msgid "Mandriva Wizards"
+msgstr "<b>Prodotti Mandriva</b>"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -17240,7 +17240,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17288,7 +17288,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -20064,13 +20064,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Għodda tal-Mandrakelinux biex tirrapporta bugs"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Għodda tal-Mandrivalinux biex tirrapporta bugs"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Ċentru tal-Kontroll Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Ċentru tal-Kontroll Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20090,8 +20090,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20135,7 +20135,7 @@ msgstr "Sħaħar tal-Konfigurazzjoni"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -20560,19 +20560,19 @@ msgstr "Tella' fil-bidu"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Din l-interfaċċja għadha ma ġietx ikkonfigurata.\n"
-"Ħaddem is-saħħar \"Żid interfaċċja\" miċ-Ċentru tal-Kontroll Mandrakelinux"
+"Ħaddem is-saħħar \"Żid interfaċċja\" miċ-Ċentru tal-Kontroll Mandrivalinux"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "M'għandek ebda konnessjoni mal-internet ikkonfigurata.\n"
-"Ħaddem is-saħħar \"%s\" miċ-Ċentru tal-Kontroll Mandrakelinux"
+"Ħaddem is-saħħar \"%s\" miċ-Ċentru tal-Kontroll Mandrivalinux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20622,8 +20622,8 @@ msgstr "KDM (KDE Display Manager)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux Display Manager)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -20922,7 +20922,7 @@ msgstr "Importa"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -20931,7 +20931,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 ta' Mandrakesoft \n"
+"Copyright (C) 2001-2002 ta' Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (verżjoni oriġinali)\n"
@@ -21462,14 +21462,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GPL "
 "GNU.\n"
 "\n"
@@ -21495,8 +21495,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Ċentru ta' l-Għajnuna Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Ċentru ta' l-Għajnuna Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -24717,7 +24717,7 @@ msgid ""
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
-"Dan huwa Harddrake, għodda tal-Mandrakelinux għall-konfigurazzjoni tal-"
+"Dan huwa Harddrake, għodda tal-Mandrivalinux għall-konfigurazzjoni tal-"
 "ħardwer.\n"
 "<span foreground=\"royalblue3\">Verżjoni:</span> %s\n"
 "<span foreground=\"royalblue3\">Awtur:</span> Thierry Vignaud &lt;"
@@ -24829,7 +24829,7 @@ msgstr "Il-bidliet saru, imma biex ikunu effettivi trid tilloggja 'l barra"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Log tal-għodda Mandrake"
 
 #: standalone/logdrake:51
@@ -25343,10 +25343,10 @@ msgstr "Konnessjoni lesta."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Konnessjoni falliet.\n"
-"Ivverifika l-konfigurazzjoni fiċ-Ċentru tal-Kontroll Mandrakelinux."
+"Ivverifika l-konfigurazzjoni fiċ-Ċentru tal-Kontroll Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26220,8 +26220,8 @@ msgstr "Installazzjoni falliet"
 #~ msgstr "Ma għażilt ebda font"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "<b>Prodotti Mandrakesoft</b>"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "<b>Prodotti Mandriva</b>"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Ebda browser disponibbli! Jekk jogħġbok installa wieħed"
diff --git a/perl-install/share/po/nb.po b/perl-install/share/po/nb.po
index 740d5c8cd..80ad58e5b 100644
--- a/perl-install/share/po/nb.po
+++ b/perl-install/share/po/nb.po
@@ -2,7 +2,7 @@
 # translation of DrakX-nb.po to Norwegian Bokmål
 # KTranslator Generated File
 # Translation file of Mandrake graphic install
-# Copyright (C) 1999 Mandrakesoft
+# Copyright (C) 1999 Mandriva
 # Terje Bjerkelia <terje@bjerkelia.com>, 1999-2000.
 # Andreas Bergstrøm <abergstr@halden.net>, 2000.
 # Kenneth Rørvik <kenneth@argon.no-ip.com>, 2003.
@@ -75,7 +75,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "USB-nøkkelen ser ut til å ha skrivebeskyttelse aktivert, men vi kan ikke "
 "plugge\n"
@@ -84,7 +84,7 @@ msgstr ""
 "\n"
 "Klikk knappen for å restarte din maskin, plugg den ut, fjern "
 "skrivebeskyttelsen,\n"
-"plugg i nøkkelen igjen og last Mandrake Move på nytt."
+"plugg i nøkkelen igjen og last Mandriva Move på nytt."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -102,7 +102,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Din USB-nøkkel har ikke noen gyldig Windows- (FAT) partisjon.\n"
@@ -113,14 +113,14 @@ msgstr ""
 "\n"
 "\n"
 "Du kan også fortsette uten en USB-nøkkel - du vil fortsatt være\n"
-"i stand til å bruke Mandrake Move som et normalt live Mandrake\n"
+"i stand til å bruke Mandriva Move som et normalt live Mandriva\n"
 "Operativsystem."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -128,11 +128,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Vi oppdaget ikke noen USB-nøkkel på ditt system. Hvis du\n"
-"plugger inn en USB-nøkkel nå, så vil Mandrake Move ha muligheten\n"
+"plugger inn en USB-nøkkel nå, så vil Mandriva Move ha muligheten\n"
 "til å transparent lagre dataene i din hjemmekatalog og systemvidt\n"
 "oppsett for neste oppstart av denne maskinen eller en annen.\n"
 "Merk: hvis du plugger inn en nøkkel nå, vent flere sekunder før du\n"
@@ -140,7 +140,7 @@ msgstr ""
 "\n"
 "\n"
 "Du kan også fortsette uten en USB-nøkkel - du vil fortsatt være\n"
-"i stand til å bruke Mandrake Move som et normal live Mandrake\n"
+"i stand til å bruke Mandriva Move som et normal live Mandriva\n"
 "Operativsystem."
 
 #: ../move/move.pm:494
@@ -267,7 +267,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -283,7 +283,7 @@ msgstr ""
 "\n"
 "Dette kan komme av korrupte systemoppsettsfiler\n"
 "på USB-nøkkelen, i slike tilfeller så vil det å fjerne dem for\n"
-"så å restarte Mandrake Move fikse problemet. For å gjøre\n"
+"så å restarte Mandriva Move fikse problemet. For å gjøre\n"
 "dette, klikk på den riktige knappen.\n"
 "\n"
 "\n"
@@ -1320,11 +1320,11 @@ msgstr "Spåkvalg"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux kan støtte flere språk. Velg\n"
+"Mandrivalinux kan støtte flere språk. Velg\n"
 "språkene du ønsker å installere. Disse vil bli tilgjengelige\n"
 "når installasjonen er ferdig og du har startet systemet på nytt."
 
@@ -3742,12 +3742,12 @@ msgstr "aktiver radiostøtte"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Før du går videre bør du lese betingelsene i lisensen nøye. Den dekker hele\n"
-"Mandrakelinux-distribusjonen. Hvis du er enig med alle betingelsene,\n"
+"Mandrivalinux-distribusjonen. Hvis du er enig med alle betingelsene,\n"
 "sjekk av \"%s\"-boksen- Hvis ikke, så vil det år trykke på '%s'k-knappen "
 "starte\n"
 "maskinen din på nytt."
@@ -3936,13 +3936,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux-installasjonen er spredd ut over flere CD-ROMer. \n"
+"Mandrivalinux-installasjonen er spredd ut over flere CD-ROMer. \n"
 "Hvis en valgt pakke er på en annen CDROM, vil DrakX løse ut den nåværende\n"
 "CD og be deg sette i en den rette CDen som kreves. Hvis du ikke har den som\n"
 "trengs nå, bare klikk på «%s», pakken(e) vil da ikke bli installert."
@@ -3951,11 +3951,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4007,7 +4007,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Det er nå på tide å spesifisere hvilke programmer du ønsker å installere på\n"
-"systemet ditt. Det er tusenvis av pakker tilgjengelig for Mandrakelinux, "
+"systemet ditt. Det er tusenvis av pakker tilgjengelig for Mandrivalinux, "
 "for\n"
 "å gjøre det enklere å håndtere pakkene så har de blitt plassert i grupper "
 "med\n"
@@ -4015,7 +4015,7 @@ msgstr ""
 "\n"
 "Pakkene er delt inn i grupper som svarer til forskjellig typisk bruk av din "
 "maskin.\n"
-"Mandrakelinux har fire forhåndsdefinerte installasjoner tilgjengelig.\n"
+"Mandrivalinux har fire forhåndsdefinerte installasjoner tilgjengelig.\n"
 "Du kan mikse og matche applikasjoner fra forskjellige grupper, så en\n"
 "``Arbeidsstasjon''-installasjon kan fortsatt ha applikasjoner fra\n"
 "``Utvikling''-gruppa installert.\n"
@@ -4118,10 +4118,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4154,13 +4154,13 @@ msgstr ""
 "eller fordi den var medlem av en gruppe pakker, vil du bli bedt om å "
 "bekrefte at du\n"
 "virkelig ønsker å installere de valgte tjenerne.\n"
-"Som standard i Mandrakelinux vil alle installerte tjenere bli startet ved "
+"Som standard i Mandrivalinux vil alle installerte tjenere bli startet ved "
 "oppstart.\n"
 "Selv om de er sikre og ikke har noen kjente sikkerhetshull når denne "
 "distribusjonen\n"
 "ble sluppet,\n"
 "så kan det være at sikkerhetshull ble oppdaget etter at denne versjonen\n"
-"av Mandrakelinux ble sluppet. Hvis du ikke vet hva en type tjener gjør, "
+"av Mandrivalinux ble sluppet. Hvis du ikke vet hva en type tjener gjør, "
 "eller\n"
 "hvorfor den blir installert, klikk «%s».\n"
 "«%s» vil installere de listede tjenerene og de vil bli\n"
@@ -4318,7 +4318,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4375,7 +4375,7 @@ msgstr ""
 "X (for X Window System) er hjertet i GNU/Linux sitt grafiske grensesnitt "
 "som\n"
 "alle de grafiske miljøene (KDE, GNOME Afterstep, Windowmaker osv.)\n"
-"som følger med Mandrakelinux er avhengige av.\n"
+"som følger med Mandrivalinux er avhengige av.\n"
 "\n"
 "Du vil få en liste med forkjellige parametre som kan forandres for å få et\n"
 "optimalt grafisk grensesnitt: \n"
@@ -4503,12 +4503,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4535,7 +4535,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4544,7 +4544,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4564,14 +4564,14 @@ 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 ""
-"Du må nå avgjøre hvor du ønsker å installere Mandrakelinux-operativsystemet\n"
+"Du må nå avgjøre hvor du ønsker å installere Mandrivalinux-operativsystemet\n"
 "på din harddisk. Hvis din harddisk er tom, eller et eksisterende\n"
 "operativsystem benytter all plassen som er tilgjengelig, vil du bli nødt til "
 "å\n"
 "ompartisjonere disken. Partisjonering av en harddisk vil si å dele den inn "
 "i\n"
 "logiske enheter for å skape plassen som trengs for å installere ditt nye\n"
-"Mandrakelinux-system.\n"
+"Mandrivalinux-system.\n"
 "\n"
 "Ettersom partisjoneringsprosessen ikke kan tilbakestilles, og kan føre til "
 "tapte\n"
@@ -4606,7 +4606,7 @@ msgstr ""
 "har\n"
 "defragmentert Windows-partisjonen. Det anbefales sterkt at du tar \n"
 "sikkerhetskopi av dine data. Dette valget er anbefalt, dersom du ønsker \n"
-"å kjøre både Mandrakelinux og Microsoft Windows på samme maskin.\n"
+"å kjøre både Mandrivalinux og Microsoft Windows på samme maskin.\n"
 "\n"
 "   Før du velger dette valget, må du være klar over at størrelsen på din\n"
 "Microsoft Windows-partisjon vil være mindre enn når du startet. Du vil \n"
@@ -4615,7 +4615,7 @@ msgstr ""
 "\n"
 " * \"%s\": hvis du ønsker å slette alle partisjoner og data, og erstatte dem "
 "med ditt\n"
-"nye Mandrakelinux-system, så velg dette valget. Vær forsiktig, du vil ikke "
+"nye Mandrivalinux-system, så velg dette valget. Vær forsiktig, du vil ikke "
 "kunne gjøre\n"
 "om dette etter at du har bekreftet valget.\n"
 "\n"
@@ -4783,7 +4783,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4807,7 +4807,7 @@ msgstr ""
 "Klikk «%s» når du er klar til å formatere partisjonene.\n"
 "\n"
 "Klikk «%s» om du vil velge andre partisjoner for din nye\n"
-"Mandrakelinux-operativsysteminstallasjon. \n"
+"Mandrivalinux-operativsysteminstallasjon. \n"
 "\n"
 "Klikk på «%s» hvis du ønsker å velge partisjoner som skal sjekkes for\n"
 "ødelagte blokker på disken."
@@ -4824,7 +4824,7 @@ msgstr "Forrige"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4836,7 +4836,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Når du installerer Mandrakelinux, er det sannsynlig at enkelte pakker\n"
+"Når du installerer Mandrivalinux, er det sannsynlig at enkelte pakker\n"
 "er blitt oppdatert siden denne versjonen ble sluppet. Noen feil kan ha\n"
 "blitt fikset, eller sikkerhetsproblemer løst. For at du skal få utnytte\n"
 "disse forbedringene kan du nå laste dem ned fra internett. Kryss av  «%s»\n"
@@ -4864,7 +4864,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4877,7 +4877,7 @@ msgstr ""
 "gjerne på bekostning av brukervennligheten.\n"
 "\n"
 "Hvis du ikke vet hva du skal velge, behold standardvalget. Du vil kunne\n"
-"endre sikkerhetsnivået senere med verktøyet draksec fra Mandrakelinux\n"
+"endre sikkerhetsnivået senere med verktøyet draksec fra Mandrivalinux\n"
 "Kontrollsenter.\n"
 "\n"
 "'%s'-feltet kan informere systemet om den bruker på systemet som\n"
@@ -4893,7 +4893,7 @@ msgstr "Sikkerhetsadministrator"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4964,7 +4964,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "På dette punktet må du velge hvilke partisjon(er) som skal brukes til å\n"
-"installere ditt nye Mandrakelinux-system på. Hvis partisjoner allerede har\n"
+"installere ditt nye Mandrivalinux-system på. Hvis partisjoner allerede har\n"
 "blitt definert enten fra en tidligere installasjon av GNU/Linux eller fra et "
 "annet\n"
 "partisjoneringsverktøy, kan du bruke eksisterende partisjoner. I andre\n"
@@ -5058,7 +5058,7 @@ msgstr "Skift mellom normal-/ekspert-modus"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5090,7 +5090,7 @@ msgstr ""
 "din.\n"
 "Vennligst velg den du ønsker å endre størrelsen på for å installere ditt "
 "nye\n"
-"Mandrakelinux-operativsystem.\n"
+"Mandrivalinux-operativsystem.\n"
 "\n"
 "Hver partisjon er listet som følger: \"Linux-navn\",\n"
 " \"Windows-navn\", \"Kapasitet\".\n"
@@ -5138,7 +5138,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5147,20 +5147,20 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Dette trinnet blir bare aktivert dersom det blir funnet en eksisterende\n"
 "GNU/Linux-partisjon på maskinen din.\n"
 "\n"
 "DrakX trenger nå å vite om du vil utføre en ny installasjon eller en "
 "oppgradering\n"
-"av et eksisterende Mandrakelinux-system:\n"
+"av et eksisterende Mandrivalinux-system:\n"
 "\n"
 " * «%s»: Dette vil stort sett slette hele det gamle systemet. Dersom du\n"
 "ønsker å forandre hvordan harddiskene blir partisjonert, eller forandre på\n"
@@ -5169,12 +5169,12 @@ msgstr ""
 "du avverge at noen av de gamle dataene blir overskrevet.\n"
 "\n"
 " * «%s»: Denne installasjonsklassen lar deg oppgradere pakkene som\n"
-"er installert på ditt nåværende Mandrakelinux-system. Dine nåværende\n"
+"er installert på ditt nåværende Mandrivalinux-system. Dine nåværende\n"
 "partisjonsoppdelinger og brukerdata blir ikke berørt. De fleste andre "
 "oppsettstrinn\n"
 "forblir tilgjengelige, i likhet med en standard installasjon.\n"
 "\n"
-"«Oppgrader»-valget bør fungere fint på Mandrakelinux systemer som kjører\n"
+"«Oppgrader»-valget bør fungere fint på Mandrivalinux systemer som kjører\n"
 "versjon «8.1» eller nyere. Oppgradering av versjoner tidligere enn «8.1» er\n"
 " ikke anbefalt. "
 
@@ -5235,7 +5235,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5277,7 +5277,7 @@ msgstr ""
 "Om UTF-8 (ISO 10646) støtte. ISO 10646 er en ny tegnsettskoding det\n"
 "er ment til å dekke alle eksisterende språk. Men full støtte for det i GNU/"
 "Linux er\n"
-"stadig under utvikling. Av denne grunnen vil Mandrakelinux bruke det\n"
+"stadig under utvikling. Av denne grunnen vil Mandrivalinux bruke det\n"
 "eller ei avhengig av brukerens valg:\n"
 "\n"
 " * Hvis du velger et språk med sterk binding til gammel kodnng (latin1-\n"
@@ -5530,7 +5530,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5551,11 +5551,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Nå er det på tide å velge utskriftsystemet for din maskin. Andre\n"
-"operativsystemer tilbyr kanskje en, men Mandrakelinux tilbyr to.\n"
+"operativsystemer tilbyr kanskje en, men Mandrivalinux tilbyr to.\n"
 "Hvert av systemene er best for et spesiell type oppsett.\n"
 "\n"
 " * «%s» -- som står for ``print, do not queue'', er valget hvis du har en\n"
@@ -5579,7 +5579,7 @@ msgstr ""
 "\n"
 "Hvis du gjør et valg nå, og så senere finner ut at du ikke liker ditt "
 "utskriftssystem,\n"
-"så kan du endre det ved å kjøre PrinterDrake fra Mandrakelinux "
+"så kan du endre det ved å kjøre PrinterDrake fra Mandrivalinux "
 "Kontrollsenter og\n"
 "klikke på «%s»-knappen. "
 
@@ -5701,7 +5701,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5718,7 +5718,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5773,7 +5773,7 @@ msgstr ""
 " * «%s»: hvis du vil sette opp din internett- eller lokale "
 "nettverkstilkobling\n"
 "kan du gjøre det nå. Sjekk den utskrevne dokumentasjonen eller bruk\n"
-"Mandrakelinux Kontrollsenter etter at installasjonen er ferdig for å\n"
+"Mandrivalinux Kontrollsenter etter at installasjonen er ferdig for å\n"
 "få full hjelp med oppsettet.\n"
 "\n"
 " * «%s»: lar deg sette opp HTTP og FTP mellomtjener-adresser hvis maskinen\n"
@@ -5793,7 +5793,7 @@ msgstr ""
 "denne\n"
 "knappen. Dette er kun for avanserte brukere. Sjekk den utskrevne "
 "dokumentasjonen\n"
-"eller innebygd hjelp om oppstartslaster-oppsettet i Mandrakelinux "
+"eller innebygd hjelp om oppstartslaster-oppsettet i Mandrivalinux "
 "Kontrollsenter.\n"
 "\n"
 " * «%s»: igjennom dette valget kan du finjustere hvilke tjenester som skal "
@@ -5857,11 +5857,11 @@ msgstr "Tjenester"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Velg den harddisken du ønsker å slette for å installere din nye\n"
-"Mandrakelinux-partisjon. Vær forsiktig, alle data på denne partisjonen vil "
+"Mandrivalinux-partisjon. Vær forsiktig, alle data på denne partisjonen vil "
 "gå tapt\n"
 "og vil ikke kunne gjenopprettes!"
 
@@ -6218,11 +6218,11 @@ msgstr "Beregner den ledige plassen på Windows-partisjonen"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Windows-partisjonen din er for fragmentert. Vennligst restart maskinen din "
-"under Windows, kjør ``defrag'' -verktøyet, så start Mandrakelinux-"
+"under Windows, kjør ``defrag'' -verktøyet, så start Mandrivalinux-"
 "installasjonen på nytt."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6340,19 +6340,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6374,7 +6374,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6382,14 +6382,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6399,7 +6399,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6419,10 +6419,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6433,11 +6433,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6453,17 +6453,17 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Introduksjon\n"
 "\n"
 "Dette operativsystemet og de forskjellige komponentene som følger med "
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "kalles heretter \"programvareproduktene\". Programvareproduktene inkluderer, "
 "men er ikke\n"
 "begrenset til det settet med programmer, metoder, regler og dokumentasjon "
 "relatert til\n"
-"operativsystemet og de forskjellige komponentene til Mandrakelinux-"
+"operativsystemet og de forskjellige komponentene til Mandrivalinux-"
 "distribusjonen.\n"
 "\n"
 "\n"
@@ -6471,7 +6471,7 @@ msgstr ""
 "\n"
 "Vennligst les dette dokumentet nøye. Dokumentet er en lisensavtale mellom "
 "deg og\n"
-"Mandrakesoft S.A.som gjelder programvareproduktene. Ved å installere, "
+"Mandriva S.A.som gjelder programvareproduktene. Ved å installere, "
 "duplisere eller\n"
 "bruke programvareproduktene godtar du og samtykker i vilkårene i denne "
 "lisensen.\n"
@@ -6490,7 +6490,7 @@ msgstr ""
 "\n"
 "Programvareproduktene og den medfølgende dokumentasjonen er levert \"som de "
 "er\"\n"
-"uten garanti så langt som det er tillatt ved lov. Mandrakesoft S.A. vil "
+"uten garanti så langt som det er tillatt ved lov. Mandriva S.A. vil "
 "under ingen\n"
 "omstendigheter, og så langt som loven tillater det, være ansvarlige for noen "
 "spesielle,\n"
@@ -6500,14 +6500,14 @@ msgstr ""
 "påført tap) som oppstår\n"
 "som følge av bruk av, eller manglende mulighet til å bruke, "
 "programvareproduktene. Dette \n"
-"gjelder også om Mandrakesoft S.A. har blitt informert om slike tap, eller "
+"gjelder også om Mandriva S.A. har blitt informert om slike tap, eller "
 "muligheten for slike tap.\n"
 "\n"
 "BEGRENSET ANSVAR I FORBINDELSE MED BESITTELSE ELLER BRUK AV ULOVLIG "
 "PROGRAMVARE\n"
 "I ENKELTE LAND\n"
 "\n"
-"Mandrakesoft S.A. eller dets distributører vil under ingen omstendigheter, "
+"Mandriva S.A. eller dets distributører vil under ingen omstendigheter, "
 "og så langt som loven\n"
 "tillater det, være ansvarlige for noen spesielle, tilfeldige, direkte eller "
 "indirekte skader (inkludert\n"
@@ -6516,7 +6516,7 @@ msgstr ""
 "straff, eller annet påført tap) som oppstår som følge av besittelse og bruk "
 "av programvareproduktene\n"
 "eller som følge av nedlasting av programvarekomponenter fra noen av "
-"Mandrakelinux-nettstedene\n"
+"Mandrivalinux-nettstedene\n"
 "som er forbudt eller begrenset i enkelte land ved lokal lov. Dette "
 "begrensede\n"
 "ansvaret gjelder, men er ikke begrenset til, sterke kryptografiprodukter som "
@@ -6538,9 +6538,9 @@ msgstr ""
 "du bruker dem.\n"
 "Spørsmål om en gitt komponents lisens skal rettes til forfatteren av "
 "komponenten og ikke til\n"
-"Mandrakesoft S.A. Programmene som er utviklet av Mandrakesoft S.A. er "
+"Mandriva S.A. Programmene som er utviklet av Mandrakesoft S.A. er "
 "regulert av GPL-lisensen.\n"
-"Dokumentasjon skrevet av Mandrakesoft S.A er regulert av en spesifikk "
+"Dokumentasjon skrevet av Mandriva S.A er regulert av en spesifikk "
 "lisens. Vennligst referer\n"
 "til dokumentasjonen for detaljer.\n"
 "\n"
@@ -6549,12 +6549,12 @@ msgstr ""
 "\n"
 "Alle rettigheter til programvareproduktene tilhører deres respektive "
 "forfattere og er beskyttet\n"
-"av opphavrettlover som gjelder for programvare. Mandrakesoft S.A. "
+"av opphavrettlover som gjelder for programvare. Mandriva S.A. "
 "forbeholder seg retten til å\n"
 "modifisere eller tilpasse programvareproduktene helt eller delvis, på alle "
 "måter og for alle formål.\n"
-"\"Mandrake\", \"Mandrakelinux\" og tilhørende logoer er varemerker "
-"tilhørende Mandrakesoft S.A.\n"
+"\"Mandriva\", \"Mandrivalinux\" og tilhørende logoer er varemerker "
+"tilhørende Mandriva S.A.\n"
 "\n"
 "\n"
 "5. Gjeldende lover\n"
@@ -6569,7 +6569,7 @@ msgstr ""
 "utvei vil disputten bli\n"
 "henvist til de riktige rettsinstansene i Paris, Frankrike. Har du noen "
 "spørsmål om dette dokumentet,\n"
-"vennligst kontakt Mandrakesoft S.A. \n"
+"vennligst kontakt Mandriva S.A. \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6661,7 +6661,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6669,14 +6669,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Gratulerer, installasjonen er fullført.\n"
 "Fjern oppstartsmediet og trykk enter for å starte på nytt.\n"
 "\n"
 "\n"
 "For informasjon om fikser som er tilgjengelige for denne utgaven av "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "sjekk errataen tilgjengelig fra:\n"
 "\n"
 "\n"
@@ -6684,7 +6684,7 @@ msgstr ""
 "\n"
 "\n"
 "Informasjon om oppsett av systemet ditt finnes i post\n"
-"install-kapittelet i Official Mandrakelinux User's Guide."
+"install-kapittelet i Official Mandrivalinux User's Guide."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6718,12 +6718,12 @@ msgstr "Entrer trinn `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Systemet ditt har lite ressurser. Du kan muligens oppleve noen problemer\n"
-"ved installering av Mandrakelinux. Hvis dette skjer kan du prøve tekst- "
+"ved installering av Mandrivalinux. Hvis dette skjer kan du prøve tekst- "
 "installering\n"
 "i stedet. Trykk `F1' ved oppstart av CD-ROM, skriv så `text'."
 
@@ -7267,9 +7267,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Kontakter Mandrakelinux-nettstedet for å få liste over tilgjengelige speil..."
+"Kontakter Mandrivalinux-nettstedet for å få liste over tilgjengelige speil..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7493,8 +7493,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux-installasjon %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux-installasjon %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10082,13 +10082,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall-oppsett\n"
 "\n"
-"Dette setter opp en personlig brannmur for denne Mandrakelinux-maskinen.\n"
+"Dette setter opp en personlig brannmur for denne Mandrivalinux-maskinen.\n"
 "For en kraftig dedikert brannmurløsning ta en kikk på den\n"
 "spesialiserte MandrakeSecurity Firewall-distribusjonen."
 
@@ -14158,11 +14158,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"Kjør Scannerdrake (Maskinvare/Scanner i Mandrakelinux Kontrollsenter) for å "
+"Kjør Scannerdrake (Maskinvare/Scanner i Mandrivalinux Kontrollsenter) for å "
 "dele scanneren din på nettverket.\n"
 "\n"
 
@@ -16095,33 +16095,33 @@ msgstr "Stopp"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Hva er Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Hva er Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Velkommen til <b>Mandrakelinux!</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Velkommen til <b>Mandrivalinux!</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux er en <b>Linux-distribusjon</b> som inneholder kjernen i "
+"Mandrivalinux er en <b>Linux-distribusjon</b> som inneholder kjernen i "
 "systemet, kalt <b>operativsystemet</b> (basert på Linux-kjernen) sammen med "
 "<b>mange programmer</b> som møter alle behov du kan tenke på."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux er den mest <b>brukervennlige</b> Linux-distribusjonen i dag. "
+"Mandrivalinux er den mest <b>brukervennlige</b> Linux-distribusjonen i dag. "
 "Det er også en av de <b>mest brukte</b> Linux-distribusjonene i verden!"
 
 #: share/advertising/02.pl:13
@@ -16137,15 +16137,15 @@ msgstr "Velkommen til <b>Open Source-verdenen</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux er og skal fortsette å være basert på åpen kildekode-modellen. "
+"Mandrivalinux er og skal fortsette å være basert på åpen kildekode-modellen. "
 "Dette betyr at hver nye utgivelse er resultatet av <b>samarbeid</b> mellom "
-"<b>Mandrakesoft's utviklergruppe</b> og det <b>verdensomspennende samfunnet</"
-"b> av Mandrakelinux bidragsytere."
+"<b>Mandriva's utviklergruppe</b> og det <b>verdensomspennende samfunnet</"
+"b> av Mandrivalinux bidragsytere."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16165,9 +16165,9 @@ msgstr "<b>GPL-lisensen</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"De fleste programmene inkludert i distribusjonen og alle Mandrakelinux-"
+"De fleste programmene inkludert i distribusjonen og alle Mandrivalinux-"
 "verktøyene er lisensert under <b>General Public License</b>-lisensen."
 
 #: share/advertising/03.pl:17
@@ -16194,20 +16194,20 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Bli med i Mandrakelinux-samfunnet!</b>"
+msgstr "<b>Bli med i Mandrivalinux-samfunnet!</b>"
 
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux har et av de <b>største samfunnene</b> med brukere og "
+"Mandrivalinux har et av de <b>største samfunnene</b> med brukere og "
 "utviklere. Rollen til et slikt samfunn er veldig bred, alt fra "
 "feilrapportering til utvikling av nye programmer. Samfunnet har en "
-"<b>avgjørende rolle</b> i Mandrakelinux-verdenen."
+"<b>avgjørende rolle</b> i Mandrivalinux-verdenen."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16228,11 +16228,11 @@ msgstr "<b>Nedlastingsversjon</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Du installerer nå <b>Mandrakelinux Download</b>. Dette er gratisversjonen "
-"som Mandrakesoft vil ha <b>tilgjengelig for alle</b>."
+"Du installerer nå <b>Mandrivalinux Download</b>. Dette er gratisversjonen "
+"som Mandriva vil ha <b>tilgjengelig for alle</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16262,9 +16262,9 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
-"Du vil ikke ha tilgang til <b>tjenestene inkludert</b> i andre Mandrakesoft-"
+"Du vil ikke ha tilgang til <b>tjenestene inkludert</b> i andre Mandriva-"
 "produkter heller."
 
 #: share/advertising/06.pl:13
@@ -16274,8 +16274,8 @@ msgstr "<b>Discovery, ditt første Linux-system</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Du installerer nå <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Du installerer nå <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16297,17 +16297,17 @@ msgstr "<b>PowerPack, det ultimate Linux-skrivebordet</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Du installerer nå <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Du installerer nå <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack er Mandrakesoft's <b>førsteklasses Linux-skrivebordspakke</b>. "
+"PowerPack er Mandriva's <b>førsteklasses Linux-skrivebordspakke</b>. "
 "PowerPack inkluderer <b>flere tusen programmer</b> - alt fra de mest "
 "populære til de mest avanserte."
 
@@ -16318,8 +16318,8 @@ msgstr "<b>PowerPack+, Linux-løsningen for hjemme-PCer og tjenere</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Du installerer nå <b>Mandrakelinux PowerPack+</b>"
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Du installerer nå <b>Mandrivalinux PowerPack+</b>"
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16335,22 +16335,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesoft-produkter</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva-produkter</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> har utviklet en lang rekke med <b>Mandrakelinux</b>-"
+"<b>Mandriva</b> har utviklet en lang rekke med <b>Mandrivalinux</b>-"
 "produkter."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux-produktene er:"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux-produktene er:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16370,72 +16370,72 @@ msgstr "\t* <b>PowerPack+</b>, Linux-løsningen for hjemme PC-er og tjenere"
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux for x86-64</b>, Mandrakelinux løsningen for å få mest "
+"\t* <b>Mandrivalinux for x86-64</b>, Mandrivalinux løsningen for å få mest "
 "mulig ut av din 64-bits prosessor."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesoft-Produkter (Nomade Produkter)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandriva-Produkter (Nomade Produkter)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft har utviklet to produkter som lar deg bruke Mandrakelinux <b>på "
+"Mandriva har utviklet to produkter som lar deg bruke Mandrivalinux <b>på "
 "hvilken som helst PC</b> uten å trenge å installere det:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, en Mandrakelinux-distribusjon som kjøres helt fra en "
+"\t* <b>Move</b>, en Mandrivalinux-distribusjon som kjøres helt fra en "
 "oppstartbar CD-ROM."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, en Mandrakelinux distribusjon ferdig installert på "
+"\t* <b>GlobeTrotter</b>, en Mandrivalinux distribusjon ferdig installert på "
 "den ultra-kompakte «LaCie Mobile Hard Drive»."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Mandrakesoft-produkter (Profesjonelle løsninger)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Mandriva-produkter (Profesjonelle løsninger)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Under er Mandrakesoft-produktene utformet for å møte <b>profesjonelle behov</"
+"Under er Mandriva-produktene utformet for å møte <b>profesjonelle behov</"
 "b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, Mandrakelinux-systemet for bedrifter."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Mandrivalinux-systemet for bedrifter."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Mandrakelinux-tjenerløsningen."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandrivalinux-tjenerløsningen."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b>, Mandrakelinux-sikkerhetsløsningen."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, Mandrivalinux-sikkerhetsløsningen."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16479,10 +16479,10 @@ msgstr "<b>Velg ditt foretrukne grafiske skrivebordsmiljø</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Med PowerPack vil du ha valget mellom flere <b>grafiske skrivebordsmiljøer</"
-"b>. Mandrakesoft har valgt <b>KDE</b> som standard."
+"b>. Mandriva har valgt <b>KDE</b> som standard."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16506,10 +16506,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Med PowerPack+ vil du ha valget mellom flere <b>grafiske skrivebordsmiljøer</"
-"b>. Mandrakesoft har valgt <b>KDE</b> som standard."
+"b>. Mandriva har valgt <b>KDE</b> som standard."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16636,10 +16636,10 @@ msgstr "<b>Nyt den lange rekken med programmer</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"I Mandrakelinux-menyen vil du finne programmer som er <b>enkle å bruke</b> "
+"I Mandrivalinux-menyen vil du finne programmer som er <b>enkle å bruke</b> "
 "for <b>alle dine oppgaver</b>:"
 
 #: share/advertising/18.pl:16
@@ -16902,17 +16902,17 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux Kontrollsenter</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux Kontrollsenter</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrakelinux Kontrollsenter</b> er en uunværlig samling av Mandrakelinux-"
+"<b>Mandrivalinux Kontrollsenter</b> er en uunværlig samling av Mandrivalinux-"
 "spesifikke verktøy for å forenkle oppsettet av din maskin."
 
 #: share/advertising/25.pl:17
@@ -16937,16 +16937,16 @@ msgstr "<b>Åpen Source-modellen</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Som all dataprogrammering, trenger open source-programvare <b>tid og folk</"
 "b> for utvikling. For å respektere open source-filosofien selger "
-"Mandrakesoft ekstra produkter og tjenester for å <b>fortsette å forbedre "
-"Mandrakelinux</b>. Hvis du vil <b>støtte open source-filosofien</b> og "
-"utviklingen av Mandrakelinux, <b>vennligst</b> vurder å kjøpe et av våre "
+"Mandriva ekstra produkter og tjenester for å <b>fortsette å forbedre "
+"Mandrivalinux</b>. Hvis du vil <b>støtte open source-filosofien</b> og "
+"utviklingen av Mandrivalinux, <b>vennligst</b> vurder å kjøpe et av våre "
 "produkter eller tjenester!"
 
 #: share/advertising/27.pl:13
@@ -16957,10 +16957,10 @@ msgstr "<b>Nettbutikk</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"For å lære mer om Mandrakesoft-produkter og tjenester kan du besøke vår <b>e-"
+"For å lære mer om Mandriva-produkter og tjenester kan du besøke vår <b>e-"
 "handelplattform</b>."
 
 #: share/advertising/27.pl:17
@@ -16985,24 +16985,24 @@ msgstr "Stopp innom i dag på <b>store.mandrakesoft.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> er den <p>perfekte partner</b> til ditt Mandrakelinux-"
+"<b>Mandriva Club</b> er den <p>perfekte partner</b> til ditt Mandrivalinux-"
 "produkt.."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Utnytt våre <b>verdifulle fordeler</b> ved å bli med i Mandrakeclub, som:"
+"Utnytt våre <b>verdifulle fordeler</b> ved å bli med i Mandriva Club, som:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -17024,40 +17024,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Delta i Mandrakelinux-<b>brukerforum</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Delta i Mandrivalinux-<b>brukerforum</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t*<b>Tidlig og priviligert tilgang</b>, før offentlige utgivelser til "
-"Mandrakelinux-<b>ISO-imagefiler</b>."
+"Mandrivalinux-<b>ISO-imagefiler</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> er en flott tjeneste som Mandrakesoft er stolt over å "
+"<b>Mandriva Online</b> er en flott tjeneste som Mandriva er stolt over å "
 "kunne tilby sine kunder!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline tilbyr en lang rekke med verdifulle tjenester for <b>enkel "
-"oppdatering</b> av dine Mandrakelinux-systemer:"
+"Mandriva Online tilbyr en lang rekke med verdifulle tjenester for <b>enkel "
+"oppdatering</b> av dine Mandrivalinux-systemer:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17082,40 +17082,40 @@ msgstr "\t* Fleksible <b>planlagte</b> oppdateringer."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* Håndtering av <b>alle dine Mandrakelinux-systemer</b> med en konto."
+"\t* Håndtering av <b>alle dine Mandrivalinux-systemer</b> med en konto."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Har du behov for <b>assistanse?</b> Mæt Mandrakesoft's tekniske eksperter på "
+"Har du behov for <b>assistanse?</b> Mæt Mandriva's tekniske eksperter på "
 "<b>vår tekniske kundestøtteplattform</b> www.mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Takket være hjelpa fra <b>kvalifiserte Mandrakelinux-eksperter</b>, så vil "
+"Takket være hjelpa fra <b>kvalifiserte Mandrivalinux-eksperter</b>, så vil "
 "du få spart masse tid."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"For alle spørsmål relatert til Mandrakelinux så har du muligheten til å "
+"For alle spørsmål relatert til Mandrivalinux så har du muligheten til å "
 "kjøpe kundestøttetilfeller på <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17415,8 +17415,8 @@ msgstr "Overvårkningsverktøy, prosessbokføring, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesoft-veivisere"
+msgid "Mandriva Wizards"
+msgstr "Mandriva-veivisere"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17570,7 +17570,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17584,7 +17584,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[VALG]...\n"
-"Mandrakelinux Terminaltjener-oppsett\n"
+"Mandrivalinux Terminaltjener-oppsett\n"
 "--enable         : aktiver MTS\n"
 "--disable        : deaktiver MTS\n"
 "--start          : start MTS\n"
@@ -17640,7 +17640,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17648,7 +17648,7 @@ msgid ""
 msgstr ""
 "[VALG]...\n"
 "  --no-confirmation      ikke spør det første bekreftelsesspørsmålet i "
-"MandrakeUpdate-modus\n"
+"Mandriva Update-modus\n"
 "  --no-verify-rpm        ikke kontroller pakkesignaturer\n"
 "  --changelog-first      vis endringslogg før filliste i   "
 "beskrivelsesvinduet\n"
@@ -20411,13 +20411,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux-feilrapporteringsverktøy"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux-feilrapporteringsverktøy"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Kontrollsenter"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux Kontrollsenter"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20437,8 +20437,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20482,8 +20482,8 @@ msgstr "Oppsetssveivisere"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Velg Mandrakesoft-verktøy:"
+msgid "Select Mandriva Tool:"
+msgstr "Velg Mandriva-verktøy:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20908,19 +20908,19 @@ msgstr "Startet ved oppstart"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Dette grensesnittet har ikke blitt satt opp ennå.\n"
-"Kjør \"Legg til et grensesnitt\"-assistenten fra Mandrakelinux Kontrollsenter"
+"Kjør \"Legg til et grensesnitt\"-assistenten fra Mandrivalinux Kontrollsenter"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Du har ikke satt opp en internettilkobling enda.\n"
-"Kjør «%s»-assistenten fra Mandrakelinux Kontrollsenter."
+"Kjør «%s»-assistenten fra Mandrivalinux Kontrollsenter."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20970,8 +20970,8 @@ msgstr "KDM (KDE-Innloggingshåndterer)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux-Innloggingshåndterer)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux-Innloggingshåndterer)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21270,7 +21270,7 @@ msgstr "Importer"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21279,7 +21279,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 ved Mandrakesoft \n"
+"Copyright (C) 2001-2002 ved Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (opprinnelig versjon)\n"
@@ -21825,14 +21825,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "Dette er fri programvare og kan bli redistribuert under vilkårene til GNU "
 "GPL.\n"
 "\n"
@@ -21861,8 +21861,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux hjelpesenter"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux hjelpesenter"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25387,8 +25387,8 @@ msgstr "Endringen er gjort, men for å være effektivisert så må du logge ut"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinuxverktøy-logger"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinuxverktøy-logger"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25904,10 +25904,10 @@ msgstr "Oppkobling ferdig."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Oppkobling feilet.\n"
-"Sjekk oppsettet ditt i Mandrakelinux Kontrollsenter."
+"Sjekk oppsettet ditt i Mandrivalinux Kontrollsenter."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/nl.po b/perl-install/share/po/nl.po
index cfc8f96db..512502669 100644
--- a/perl-install/share/po/nl.po
+++ b/perl-install/share/po/nl.po
@@ -1,6 +1,6 @@
 # Dutch translation of DrakX.
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandrakesoft
+# Copyright (c) 2000 Mandriva
 # Niels Gras <niels.gras@wanadoo.nl>, 2000
 # Jeroen ten Berge <j.ten.berge@twinbit.nl>, 2002
 # Reinout van Schouwen <reinout@cs.vu.nl>, 2002-2005
@@ -69,7 +69,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "De USB-key lijkt schrijfbeschermd te zijn, maar hij kan op dit moment niet\n"
 "veilig ontkoppeld worden.\n"
@@ -77,7 +77,7 @@ msgstr ""
 "\n"
 "Klik op de knop om de computer opnieuw op te starten, ontkoppel de USB-key,\n"
 "maak de schrijfbescherming ongedaan, plug hem opnieuw in, en start\n"
-"Mandrake Move opnieuw."
+"Mandriva Move opnieuw."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -95,7 +95,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Uw USB-key beschikt niet over geldige Windows (FAT) partities.\n"
@@ -106,13 +106,13 @@ msgstr ""
 "\n"
 "\n"
 "U kunt ook zonder een USB-key doorgaan - u kunt dan nog steeds\n"
-"Mandrake Move gebruiken als een normaal Mandrake besturingssysteem."
+"Mandriva Move gebruiken als een normaal Mandrake besturingssysteem."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -120,11 +120,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Er is geen USB-key aan uw systeem gevonden. Als u nu\n"
-"een USB-key inplugt, heeft Mandrake Move de mogelijkheid om de\n"
+"een USB-key inplugt, heeft Mandriva Move de mogelijkheid om de\n"
 "gegevens op transparante wijze in uw persoonlijke map en\n"
 "systeemconfiguratie op te slaan, voor de volgende keer dat u \n"
 "deze computer of een andere opstart. Opmerking: als u nu een \n"
@@ -133,7 +133,7 @@ msgstr ""
 "\n"
 "\n"
 "U kunt ook zonder een USB-key doorgaan - u kunt dan nog steeds\n"
-"Mandrake Move gebruiken als een normaal Mandrake besturingssysteem."
+"Mandriva Move gebruiken als een normaal Mandrake besturingssysteem."
 
 #: ../move/move.pm:494
 #, c-format
@@ -259,7 +259,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -276,7 +276,7 @@ msgstr ""
 "Dit zou veroorzaakt kunnen worden door gecorrumpeerde \n"
 "systeemconfiguratiebestanden op de USB-key. In dit \n"
 "geval kan het probleem opgelost worden door ze te \n"
-"verwijderen en Mandrake Move te herstarten. Klik op de\n"
+"verwijderen en Mandriva Move te herstarten. Klik op de\n"
 "overeenkomstige knop als u dit wilt doen.\n"
 "\n"
 "\n"
@@ -1324,11 +1324,11 @@ msgstr "Taalkeuze"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux kan meerdere talen aan. Selecteer de talen\n"
+"Mandrivalinux kan meerdere talen aan. Selecteer de talen\n"
 "die u wenst te installeren. Ze zullen beschikbaar zijn wanneer\n"
 "de installatie afgerond is en u uw computer opnieuw start."
 
@@ -3768,12 +3768,12 @@ msgstr "activeer radio ondersteuning"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Voordat u verdergaat dient u eerst de voorwaarden in de licentie\n"
-"aandachtig te lezen. Zij beslaan de gehele Mandrakelinux distributie.\n"
+"aandachtig te lezen. Zij beslaan de gehele Mandrivalinux distributie.\n"
 "Indien u akkoord gaat met alle voorwaarden erin kruist u het\n"
 "\"%s\"-vakje aan. Zoniet, dan zal het klikken van de \"%s\"-knop\n"
 "uw computer herstarten."
@@ -3956,13 +3956,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"De Mandrakelinux-installatie is verdeeld over meerdere CD-ROMs. Als een \n"
+"De Mandrivalinux-installatie is verdeeld over meerdere CD-ROMs. Als een \n"
 "geselecteerd pakket te vinden is op een andere CD-ROM, zal het \n"
 "installatieprogramma de huidige CD uitwerpen en u vragen om de\n"
 "correcte CD in te leggen. Mocht u de betreffende CD niet bij de hand "
@@ -3974,11 +3974,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4034,7 +4034,7 @@ msgstr ""
 "Linux, en om het overzichtelijker te maken zijn de pakketten in groepen\n"
 "van vergelijkbare toepassingen geplaatst.\n"
 "\n"
-"Mandrakelinux sorteert groepen pakketten in vier categorieën.\n"
+"Mandrivalinux sorteert groepen pakketten in vier categorieën.\n"
 "U kunt de toepassingen uit de verschillende categorieën uitkiezen\n"
 "en samenvoegen naar eigen inzicht, zodat een ``Werkstation''-installatie\n"
 "nog steeds toepassingen geïnstalleerd kan hebben uit de ``Server''\n"
@@ -4146,10 +4146,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4181,11 +4181,11 @@ msgstr ""
 "!! Als een server-pakket geselecteerd is, ofwel omdat u dat pakket\n"
 "specifiek gekozen heeft ofwel omdat het onderdeel is van een hele groep\n"
 "pakketten, zal u gevraagd worden om te bevestigen dat u deze servers echt\n"
-"wilt installeren. Onder Mandrakelinux worden alle geïnstalleerde servers\n"
+"wilt installeren. Onder Mandrivalinux worden alle geïnstalleerde servers\n"
 "standaard ingeschakeld tijdens het opstarten. Zelfs wanneer zij veilig\n"
 "zijn en geen bekende beveiligingsgebreken hadden op het moment dat de\n"
 "distributie werd uitgebracht, kan het gebeuren dat beveiligingsfouten\n"
-"ontdekt worden nadat deze versie van Mandrakelinux afgemaakt werd.\n"
+"ontdekt worden nadat deze versie van Mandrivalinux afgemaakt werd.\n"
 "Indien u niet weet wat een bepaalde dienst geacht wordt te doen of waarom\n"
 "deze geïnstalleerd wordt, klikt u dan \"%s\". Klikken op \"%s\" zal\n"
 "de getoonde diensten installeren en ze zullen automatisch worden\n"
@@ -4343,7 +4343,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4400,7 +4400,7 @@ msgstr ""
 "X (voor X Window System) is het hart van de grafische interface van GNU/\n"
 "Linux waarvan alle grafische omgevingen (KDE, GNOME, AfterStep, "
 "WindowMaker,\n"
-"etc.) die bij Mandrakelinux worden geleverd, afhankelijk zijn.\n"
+"etc.) die bij Mandrivalinux worden geleverd, afhankelijk zijn.\n"
 "\n"
 "U krijgt een lijst te zien van verschillende parameters die u kunt "
 "aanpassen\n"
@@ -4519,12 +4519,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4551,7 +4551,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4560,7 +4560,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4580,12 +4580,12 @@ 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 ""
-"Op dit punt dient u te kiezen waar op uw harde schijf u uw Mandrakelinux\n"
+"Op dit punt dient u te kiezen waar op uw harde schijf u uw Mandrivalinux\n"
 "besturingssysteem wilt installeren. Als uw harde schijf leeg is of als een\n"
 "ander besturingssysteem alle beschikbare ruimte inneemt, dan zult u\n"
 "de harde schijf moeten partitioneren. Partitioneren houdt in dat u uw harde\n"
 "schijf in logische stukken onderverdeelt om ruimte te creëren voor uw\n"
-"nieuwe Mandrakelinux besturingssysteem.\n"
+"nieuwe Mandrivalinux besturingssysteem.\n"
 "\n"
 "Omdat de effecten van het partitioneringsproces over het algemeen niet\n"
 "terug te draaien zijn en kan leiden tot gegevensverlies als er reeds een\n"
@@ -4618,7 +4618,7 @@ msgstr ""
 "verlies van enige gegevens, vooropgesteld dat u eerst de Windows-partitie\n"
 "gedefragmenteerd heeft. Een reservekopie maken van uw gegevens is\n"
 "uitdrukkelijk aangeraden. Deze optie is aanbevolen indien u zowel\n"
-"Mandrakelinux als Microsoft Windows op dezelfde computer wilt gebruiken.\n"
+"Mandrivalinux als Microsoft Windows op dezelfde computer wilt gebruiken.\n"
 "\n"
 "   Laat het goed tot u doordringen, voordat u deze optie kiest, dat uw\n"
 "Microsoft Windows partitie na afloop van deze procedure minder groot\n"
@@ -4627,7 +4627,7 @@ msgstr ""
 "installeren.\n"
 "\n"
 " * \"%s\": indien u alle gegevens en alle partities op uw\n"
-"harde schijf wilt verwijderen en vervangen door uw nieuwe Mandrakelinux-\n"
+"harde schijf wilt verwijderen en vervangen door uw nieuwe Mandrivalinux-\n"
 "systeem, kiest u deze optie. Weest u voorzichtig met deze oplossing omdat u\n"
 "na bevestiging deze keuze niet meer ongedaan kunt maken.\n"
 "\n"
@@ -4794,7 +4794,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4817,7 +4817,7 @@ msgstr ""
 "Klik op \"%s\" wanneer u klaar bent om de partities te formatteren.\n"
 "\n"
 "Klik op \"%s\" indien u een andere partitie voor uw nieuwe\n"
-"Mandrakelinux besturingssysteem wilt kiezen.\n"
+"Mandrivalinux besturingssysteem wilt kiezen.\n"
 "\n"
 "Klik op \"%s\" indien u partities wenst te selecteren die op\n"
 "onleesbare blokken gecontroleerd moeten worden."
@@ -4834,7 +4834,7 @@ msgstr "Vorige"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4846,7 +4846,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Op het moment dat u Mandrakelinux installeert, is het waarschijnlijk\n"
+"Op het moment dat u Mandrivalinux installeert, is het waarschijnlijk\n"
 "dat sommige pakketten herzien zijn sinds het moment dat het werd\n"
 "uitgebracht. Sommige onvolkomenheden kunnen gerepareerd zijn en\n"
 "beveiligingsproblemen opgelost. Om u te kunnen laten profiteren van\n"
@@ -4877,7 +4877,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4892,7 +4892,7 @@ msgstr ""
 "\n"
 "Als u niet weet wat te kiezen, behoudt u de standaard optie. U zult \n"
 "later nog in staat zijn het beveiligingsniveau te veranderen met het\n"
-"draksec-hulpprogramma vanuit het Mandrakelinux Configuratiecentrum.\n"
+"draksec-hulpprogramma vanuit het Mandrivalinux Configuratiecentrum.\n"
 "\n"
 "Vul in het \"%s\"-veld het e-mailadres in van de persoon die\n"
 "verantwoordelijk is voor de beveiliging. Beveiligingsmeldingen\n"
@@ -4907,7 +4907,7 @@ msgstr "Beveiligingsbeheerder"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4978,7 +4978,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Op dit punt dient u te kiezen welke partitie(s) gebruikt zullen worden voor\n"
-"de installatie van uw Mandrakelinux systeem. Indien er reeds partities\n"
+"de installatie van uw Mandrivalinux systeem. Indien er reeds partities\n"
 "gedefinieerd zijn, van een vorige GNU/Linux installatie of door een\n"
 "ander partitioneringsprogramma, kunt u bestaande partities gebruiken.\n"
 "In andere gevallen moeten er harde schijf-partities gedefinieerd worden.\n"
@@ -5077,7 +5077,7 @@ msgstr "Normale/expert-modus"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5106,7 +5106,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Er is meer dan één Microsoft-partitie op uw harde schijf gevonden.\n"
-"Kiest u degene die u wilt verkleinen om uw nieuwe Mandrakelinux\n"
+"Kiest u degene die u wilt verkleinen om uw nieuwe Mandrivalinux\n"
 "besturingssysteem te kunnen installeren.\n"
 "\n"
 "Elke partitie wordt getoond als volgt: \"Linux naam\", \"Windows naam\"\n"
@@ -5155,7 +5155,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5164,19 +5164,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Deze stap activeert slechts wanneer een bestaande GNU/Linux-partitie\n"
 "gevonden is op uw computer.\n"
 "\n"
 "Nu is het noodzakelijk dat u aangeeft of u een nieuwe installatie\n"
-"of een opwaardering van een bestaand Mandrakelinux-systeem\n"
+"of een opwaardering van een bestaand Mandrivalinux-systeem\n"
 "wilt uitvoeren:\n"
 "\n"
 " * \"%s\". Dit verwijdert het oude systeem vrijwel volledig.\n"
@@ -5187,14 +5187,14 @@ msgstr ""
 "bestandssysteem wenst te wijzigen, dan dient u deze optie te kiezen.\n"
 "\n"
 " * \"%s\". Deze installatieklasse stelt u in staat de pakketten\n"
-"die momenteel op uw Mandrakelinux-systeem zijn geïnstalleerd te verversen.\n"
+"die momenteel op uw Mandrivalinux-systeem zijn geïnstalleerd te verversen.\n"
 "Uw huidige partitioneringsschema en gebruikersgegevens worden niet\n"
 " veranderd. De meeste andere configuratiestappen blijven beschikbaar,\n"
 "zoals bij een gewone installatie.\n"
 "\n"
 "Het gebruik van de ``Opwaardering''-optie zou prima moeten werken op\n"
-"Mandrakelinux versie \"8.1\" of recenter. Het uitvoeren van een\n"
-"opwaardering op versies eerder dan Mandrakelinux versie \"8.1\" is afgeraden."
+"Mandrivalinux versie \"8.1\" of recenter. Het uitvoeren van een\n"
+"opwaardering op versies eerder dan Mandrivalinux versie \"8.1\" is afgeraden."
 
 # Extra stukje toegevoegd over Nederlandse layout
 #: help.pm:591
@@ -5256,7 +5256,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5298,7 +5298,7 @@ msgstr ""
 "Over UTF-8 (unicode)-ondersteuning: Unicode is een nieuwe tekencodering\n"
 "bedoeld om alle bestaande geschreven talen te omvatten. Volledige\n"
 "GNU/Linux-ondersteuning ervoor is echter nog in ontwikkeling.\n"
-"Daarom gebruikt Mandrakelinux het al dan niet, afhankelijk van de keuze\n"
+"Daarom gebruikt Mandrivalinux het al dan niet, afhankelijk van de keuze\n"
 "van de gebruiker:\n"
 "\n"
 " * Indien u talen kiest met een sterke coderingstraditie (latin1\n"
@@ -5546,7 +5546,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5567,11 +5567,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Het is nu tijd een afdruksysteem voor uw computer te selecteren. Andere\n"
-"besturingssystemen geven u er wellicht maar één, maar Mandrakelinux\n"
+"besturingssystemen geven u er wellicht maar één, maar Mandrivalinux\n"
 "biedt er twee. Elk van deze afdruksystemen is het meest geschikt voor\n"
 "bepaalde typen configuraties.\n"
 "\n"
@@ -5597,7 +5597,7 @@ msgstr ""
 "\n"
 "Wanneer u nu een keuze maakt en er later achter komt dat uw afdruksysteem\n"
 "u niet bevalt dan kunt u het veranderen door PrinterDrake uit te voeren\n"
-"vanuit het Mandrakelinux Configuratiecentrum en op de \"%s\"-knop te klikken."
+"vanuit het Mandrivalinux Configuratiecentrum en op de \"%s\"-knop te klikken."
 
 #: help.pm:765
 #, c-format
@@ -5717,7 +5717,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5734,7 +5734,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5787,7 +5787,7 @@ msgstr ""
 "\n"
 " * \"%s\": Als u uw internettoegang of toegang tot het lokale\n"
 "netwerk wilt instellen, kunt u dat nu doen. Raadpleeg de gedrukte\n"
-"documentatie of gebruik het Mandrakelinux Configuratiecentrum nadat\n"
+"documentatie of gebruik het Mandrivalinux Configuratiecentrum nadat\n"
 "de installatie klaar is om te profiteren van volledige on-line hulp.\n"
 "\n"
 " * \"%s\": stelt u in staat HTTP- en FTP-proxy adressen te configureren\n"
@@ -5804,7 +5804,7 @@ msgstr ""
 " * \"%s\": indien u uw opstartlader-configuratie wenst te \n"
 "veranderen, klikt u op deze knop. Alleen aankomen als u een gevorderde\n"
 "gebruiker bent. Raadpleeg de gedrukte documentatie of de on-line hulp\n"
-"over de configuratie van een opstartlader in het Mandrakelinux \n"
+"over de configuratie van een opstartlader in het Mandrivalinux \n"
 "Configuratiecentrum.\n"
 " * \"%s\": U bent hier in staat om de diensten die op uw computer\n"
 "actief zullen zijn, fijn af te regelen. Indien u deze computer als server\n"
@@ -5865,10 +5865,10 @@ msgstr "Diensten"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Kies de harde schijf die u wilt wissen om uw nieuwe Mandrakelinux-\n"
+"Kies de harde schijf die u wilt wissen om uw nieuwe Mandrivalinux-\n"
 "partitie op te installeren. Wees voorzichtig, alle gegevens die\n"
 "op deze schijf staan zullen verloren gaan, en niet terug te halen zijn!"
 
@@ -6227,12 +6227,12 @@ msgstr "Bezig met berekenen grootte van Windows-partitie"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Uw Windows-partitie is te gefragmenteerd. Start uw computer opnieuw op onder "
 "Windows, gebruik het ``defrag''-hulpprogramma, en herstart vervolgens de "
-"installatie van Mandrakelinux."
+"installatie van Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6352,19 +6352,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6386,7 +6386,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6394,14 +6394,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6411,7 +6411,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6431,10 +6431,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6445,11 +6445,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6465,17 +6465,17 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Introductie\n"
 "\n"
 "Het besturingssysteem en de verschillende componenten beschikbaar in de "
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "distributie zullen vanaf nu \" Software Produkten\" heten. De Software "
 "Produkten omvatten,\n"
 "maar zijn niet beperkt tot de programma's, methoden, regels en documentatie "
 "gerelateerd aan\n"
-"het besturingssysteem en de verschillende onderdelen van de Mandrakelinux "
+"het besturingssysteem en de verschillende onderdelen van de Mandrivalinux "
 "distributie.\n"
 "\n"
 "\n"
@@ -6483,7 +6483,7 @@ msgstr ""
 "\n"
 "Lees dit document zorgvuldig. Dit document is een licentieovereenkomst "
 "tussen U en\n"
-"Mandrakesoft S.A. welke van toepassing is op de Software Produkten.\n"
+"Mandriva S.A. welke van toepassing is op de Software Produkten.\n"
 "Door het installeren, dupliceren of gebruiken van de Software Produkten in "
 "welke vorm dan ook,\n"
 "gaat u expliciet akkoord en bent het volledig eens met de voorwaarden van "
@@ -6505,7 +6505,7 @@ msgstr ""
 "De Software Produkten en meegeleverde documentatie zijn geleverd \"als "
 "zodanig\" zonder garantie,\n"
 "voorzover dat dat wettelijk is toegestaan.\n"
-"Mandrakesoft S.A. zal in geen enkele omstandigheid, en voorzover dat "
+"Mandriva S.A. zal in geen enkele omstandigheid, en voorzover dat "
 "wettelijk is toegestaan,\n"
 "aansprakelijk zijn voor elke vorm van speciale, incidentele, directe of "
 "indirecte schade (inclusief\n"
@@ -6515,13 +6515,13 @@ msgstr ""
 "daaruit volgende verliezen)\n"
 "veroorzaakt door het gebruik of het niet kunnen gebruiken van de Software "
 "Produkten, zelfs als\n"
-"Mandrakesoft S.A. op de hoogte was van de mogelijkheid danwel voorkomen van "
+"Mandriva S.A. op de hoogte was van de mogelijkheid danwel voorkomen van "
 "dergelijke schades.\n"
 "\n"
 "BEPERKTE AANSPRAKELIJKHEID GEKOPPELD AAN HET BEZIT OF GEBRUIK VAN\n"
 "VERBODEN SOFTWARE IN SOMMIGE LANDEN\n"
 "\n"
-"Mandrakesoft S.A. of zijn distributeurs zullen, voorzover wettelijk "
+"Mandriva S.A. of zijn distributeurs zullen, voorzover wettelijk "
 "toegestaan, in geen geval aansprakelijk\n"
 "zijn voor welke vorm van speciale, incidentele, directe of indirecte schade "
 "dan ook (inclusief\n"
@@ -6531,7 +6531,7 @@ msgstr ""
 "daaruit volgende verliezen)\n"
 "voortkomend uit het bezit of gebruik van softwarecomponenten of voortkomend "
 "uit het downloaden van\n"
-"softwarecomponenten van één van Mandrakelinux sites, welke verboden of "
+"softwarecomponenten van één van Mandrivalinux sites, welke verboden of "
 "beperkt zijn in sommige\n"
 "landen door lokale wetgeving.\n"
 "Deze beperkte aansprakelijkheid geldt voor, maar is niet beperkt tot de "
@@ -6553,10 +6553,10 @@ msgstr ""
 "deze licentieovereenkomsten\n"
 "alvorens enige component te gebruiken. Elke vraag over een componentlicentie "
 "kunt U richten aan de\n"
-"desbetreffende auteur en niet aan Mandrakesoft.\n"
-"De programmatuur ontwikkeld door Mandrakesoft S.A. valt onder de GPL-"
+"desbetreffende auteur en niet aan Mandriva.\n"
+"De programmatuur ontwikkeld door Mandriva S.A. valt onder de GPL-"
 "licentie. Documentatie\n"
-"geschreven door Mandrakesoft S.A. valt onder een eigen licentie. Zie de "
+"geschreven door Mandriva S.A. valt onder een eigen licentie. Zie de "
 "documentatie voor verdere details.\n"
 "\n"
 "\n"
@@ -6567,11 +6567,11 @@ msgstr ""
 "auteurs en zijn beschermd door intellectuele eigendoms- en copyright-wetten "
 "welke gelden voor\n"
 "computerprogrammatuur.\n"
-"Mandrakesoft S.A. behoudt zich het recht voor om de Software Produkten te "
+"Mandriva S.A. behoudt zich het recht voor om de Software Produkten te "
 "veranderen in hun geheel\n"
 "of in onderdelen, op welke manier dan ook en voor welk doel dan ook.\n"
-"\"Mandrake\", \"Mandrakelinux\" en geassocieerde logo's zijn handelsmerken "
-"van Mandrakesoft S.A.\n"
+"\"Mandriva\", \"Mandrivalinux\" en geassocieerde logo's zijn handelsmerken "
+"van Mandriva S.A.\n"
 "\n"
 "\n"
 "5. Geldende wetten\n"
@@ -6588,7 +6588,7 @@ msgstr ""
 "geschikt. Als een laatste oplossing kan de zaak doorverwezen worden naar de "
 "geschikte\n"
 "gerechtshoven van Parijs - Frankrijk.\n"
-"Bij vragen over dit document, gelieve contact op te nemen met Mandrakesoft S."
+"Bij vragen over dit document, gelieve contact op te nemen met Mandriva S."
 "A.\n"
 "\n"
 "Dit document is vanuit het Engels vertaald door een onbeëdigde vertaler. "
@@ -6690,7 +6690,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6698,13 +6698,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Gefeliciteerd, de installatie is voltooid. \n"
 "Verwijder de opstartmedia en druk op Enter om opnieuw op te starten.\n"
 "\n"
 "\n"
-"Voor informatie over verbeteringen die voor deze versie van Mandrakelinux\n"
+"Voor informatie over verbeteringen die voor deze versie van Mandrivalinux\n"
 "beschikbaar zijn, raadpleegt u de Errata, beschikbaar van:\n"
 "\n"
 "\n"
@@ -6712,7 +6712,7 @@ msgstr ""
 "\n"
 "\n"
 "Informatie over het configureren van uw systeem is beschikbaar in het\n"
-"\"post install\"-hoofdstuk van de Official Mandrakelinux User's Guide."
+"\"post install\"-hoofdstuk van de Official Mandrivalinux User's Guide."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6747,12 +6747,12 @@ msgstr "Overgang naar stap `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Uw systeem heeft weinig bronnen beschikbaar. U zou problemen kunnen\n"
-"ondervinden bij het installeren van Mandrakelinux. Als dit gebeurt,\n"
+"ondervinden bij het installeren van Mandrivalinux. Als dit gebeurt,\n"
 "kunt u een tekstinstallatie proberen. Om dit te doen, drukt u op `F1'\n"
 "terwijl de CDROM opstart, en dan voert u `text' in."
 
@@ -7298,9 +7298,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Bezig te verbinden met de Mandrakelinux-website om de lijst met beschikbare "
+"Bezig te verbinden met de Mandrivalinux-website om de lijst met beschikbare "
 "mirrors op te halen..."
 
 #: install_steps_interactive.pm:840
@@ -7526,8 +7526,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux installatie %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux installatie %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10114,14 +10114,14 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Configuratie van drakfirewall\n"
 "\n"
 "Dit programma configureert een persoonlijke firewall voor deze \n"
-"Mandrakelinux machine. Voor een krachtige, specifieke\n"
+"Mandrivalinux machine. Voor een krachtige, specifieke\n"
 "firewall-oplossing, zie de gespecialiseerde MandrakeSecurity \n"
 "Firewall-distributie."
 
@@ -14218,11 +14218,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"Voer Scannerdrake uit (Apparatuur/Scanner in Mandrakelinux "
+"Voer Scannerdrake uit (Apparatuur/Scanner in Mandrivalinux "
 "Configuratiecentrum) om uw scanner te delen op het netwerk.\n"
 "\n"
 
@@ -16195,23 +16195,23 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Wat is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Wat is Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Welkom bij <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Welkom bij <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux is een <b>Linuxdistributie</b> die bestaat uit het hart van "
+"Mandrivalinux is een <b>Linuxdistributie</b> die bestaat uit het hart van "
 "het systeem, <b>besturingssysteem</b> genoemd (gebaseerd op de Linux-kernel) "
 "tesamen met <b>vele toepassingen</b> die maken dat u alles met uw computer "
 "kunt doen wat u maar kunt verzinnen."
@@ -16219,10 +16219,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux is de meest <b>gebruikersvriendelijke</b> Linuxdistributie die "
+"Mandrivalinux is de meest <b>gebruikersvriendelijke</b> Linuxdistributie die "
 "vandaag de dag bestaat. Het is daarnaast één van de <b>meest gebruikte</b> "
 "Linuxdistributies ter wereld!"
 
@@ -16239,15 +16239,15 @@ msgstr "Welkom in de <b>wereld van open source</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux legt zich toe op het open source-model. Dit betekent dat deze "
+"Mandrivalinux legt zich toe op het open source-model. Dit betekent dat deze "
 "nieuwe uitgave het resultaat is van <b>samenwerking</b> tussen "
-"<b>Mandrakesofts' team van ontwikkelaars</b> en de <b>wereldwijde "
-"gemeenschap</b> van personen die meewerken aan Mandrakelinux."
+"<b>Mandrivas' team van ontwikkelaars</b> en de <b>wereldwijde "
+"gemeenschap</b> van personen die meewerken aan Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16267,10 +16267,10 @@ msgstr "<b>De GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "De meeste software die bijgesloten is in de distributie en alle "
-"Mandrakelinux-hulpprogramma's zijn uitgegven onder de <b>General Public "
+"Mandrivalinux-hulpprogramma's zijn uitgegven onder de <b>General Public "
 "License</b>."
 
 #: share/advertising/03.pl:17
@@ -16303,15 +16303,15 @@ msgstr "<b>Kom bij de community</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux heeft één van de <b>grootste community's</b> van gebruikers en "
+"Mandrivalinux heeft één van de <b>grootste community's</b> van gebruikers en "
 "ontwikkelaars. De rol van zo'n community is erg breed, variërend van het "
 "melden van foutjes tot de ontwikkeling van nieuwe toepassingen. De community "
-"speelt een <b>sleutelrol</b> in de Mandrakelinux-wereld."
+"speelt een <b>sleutelrol</b> in de Mandrivalinux-wereld."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16333,11 +16333,11 @@ msgstr "<b>Downloadversie</b>."
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Momenteel installeert u <b>Mandrakelinux Download</b>. Dit is de gratis "
-"versie die Mandrakesoft <b>beschikbaar voor iedereen</b> wil houden."
+"Momenteel installeert u <b>Mandrivalinux Download</b>. Dit is de gratis "
+"versie die Mandriva <b>beschikbaar voor iedereen</b> wil houden."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16369,10 +16369,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "U zult eveneens geen toegang hebben tot de <b>bijgesloten diensten</b> in de "
-"andere Mandrakesoft-produkten."
+"andere Mandriva-produkten."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16381,8 +16381,8 @@ msgstr "<b>Discovery, Uw eerste Linux-werkomgeving</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "U bent nu <b>Mandrakelinux Discovery</b> aan het installeren."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "U bent nu <b>Mandrivalinux Discovery</b> aan het installeren."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16404,17 +16404,17 @@ msgstr "<b>PowerPack, de ultieme Linux-werkomgeving</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "U bent nu <b>Mandrakelinux PowerPack</b> aan het installeren."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "U bent nu <b>Mandrivalinux PowerPack</b> aan het installeren."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack is Mandrakesofts' <b>werkplek-Linux paradepaardje</b>. PowerPack "
+"PowerPack is Mandrivas' <b>werkplek-Linux paradepaardje</b>. PowerPack "
 "bevat <b>duizenden toepassingen</b> - alles van de populairste tot de meest "
 "geavanceerde."
 
@@ -16425,8 +16425,8 @@ msgstr "<b>PowerPack+, de Linuxoplossing voor werkplekken en servers</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "U installeert nu <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "U installeert nu <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16443,22 +16443,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesoft-produkten</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva-produkten</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> heeft een uitgebreide serie <b>Mandrakelinux</b>-"
+"<b>Mandriva</b> heeft een uitgebreide serie <b>Mandrivalinux</b>-"
 "produkten ontwikkeld."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "De Mandrakelinux-produkten zijn:"
+msgid "The Mandrivalinux products are:"
+msgstr "De Mandrivalinux-produkten zijn:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16478,75 +16478,75 @@ msgstr "\t* <b>PowerPack+</b>, de Linuxoplossing voor werkplekken en servers."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux voor x86-64</b>, de Mandrakelinux-oplossing om het "
+"\t* <b>Mandrivalinux voor x86-64</b>, de Mandrivalinux-oplossing om het "
 "meeste uit uw 64-bit processor te halen."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesoft-produkten (Nomad-produkten)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandriva-produkten (Nomad-produkten)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft heeft twee produkten ontwikkeld die u in staat stellen om "
-"Mandrakelinux <b>op iedere computer</b> te gebruiken, zonder dat u het eerst "
+"Mandriva heeft twee produkten ontwikkeld die u in staat stellen om "
+"Mandrivalinux <b>op iedere computer</b> te gebruiken, zonder dat u het eerst "
 "hoeft te installeren:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, een Mandrakelinux-distributie die geheel vanaf een "
+"\t* <b>Move</b>, een Mandrivalinux-distributie die geheel vanaf een "
 "opstartbare CD-ROM te gebruiken is."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, een Mandrakelinux-distributie voorgeïnstalleerd op "
+"\t* <b>GlobeTrotter</b>, een Mandrivalinux-distributie voorgeïnstalleerd op "
 "de ultra-compacte “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Mandrakesoft-produkten (Professional Solutions)</b>:"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Mandriva-produkten (Professional Solutions)</b>:"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Hieronder de Mandrakesoft-produkten ontworpen om te voldoen aan <b>eisen van "
+"Hieronder de Mandriva-produkten ontworpen om te voldoen aan <b>eisen van "
 "de professional</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
-"\t* <b>Corporate Desktop</b>, de Mandrakelinux-werkomgeving voor bedrijven."
+"\t* <b>Corporate Desktop</b>, de Mandrivalinux-werkomgeving voor bedrijven."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, de Mandrakelinux serveroplossing."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, de Mandrivalinux serveroplossing."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
-"\t* <b>Multi-Network Firewall</b>, de Mandrakelinux beveiligingsoplossing."
+"\t* <b>Multi-Network Firewall</b>, de Mandrivalinux beveiligingsoplossing."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16589,10 +16589,10 @@ msgstr "<b>Kies uw favoriete grafische werkomgeving</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Met PowerPack kunt u de <b>grafische werkomgeving</b> uitkiezen. "
-"Mandrakesoft heeft <b>KDE</b> als de standaardwerkomgeving gekozen."
+"Mandriva heeft <b>KDE</b> als de standaardwerkomgeving gekozen."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16617,10 +16617,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Met PowerPack+ kunt u de <b>grafische werkomgeving</b> uitkiezen. "
-"Mandrakesoft heeft <b>KDE</b> als de standaardwerkomgeving gekozen."
+"Mandriva heeft <b>KDE</b> als de standaardwerkomgeving gekozen."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16746,10 +16746,10 @@ msgstr "<b>Beleef plezier aan de uitgebreide sortering toepassingen</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"In het Mandrakelinux-menu vindt u <b>makkelijk te gebruiken</b> toepassingen "
+"In het Mandrivalinux-menu vindt u <b>makkelijk te gebruiken</b> toepassingen "
 "voor <b>al uw werkzaamheden</b>:"
 
 #: share/advertising/18.pl:16
@@ -17015,18 +17015,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux Configuratiecentrum</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux Configuratiecentrum</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"Het <b>Mandrakelinux Configuratiecentrum</b> is een essentiële verzameling "
-"Mandrakelinux-specifieke hulpprogramma's die het configureren van uw "
+"Het <b>Mandrivalinux Configuratiecentrum</b> is een essentiële verzameling "
+"Mandrivalinux-specifieke hulpprogramma's die het configureren van uw "
 "computer vereenvoudigen."
 
 #: share/advertising/25.pl:17
@@ -17051,16 +17051,16 @@ msgstr "<b>Het Open Source-model</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Zoals bij al het computerprogrammeren, vereist open source-software <b>tijd "
 "en mensen</b> voor ontwikkeling. Teneinde de open source-filosofie te "
-"respecteren, verkoopt Mandrakesoft produkten en diensten met toegevoegde "
-"waarde om <b>Mandrakelinux te blijven verbeteren</b>. Als u de <b>open "
-"source-filosofie wilt steunen</b> alsmede de ontwikkeling van Mandrakelinux, "
+"respecteren, verkoopt Mandriva produkten en diensten met toegevoegde "
+"waarde om <b>Mandrivalinux te blijven verbeteren</b>. Als u de <b>open "
+"source-filosofie wilt steunen</b> alsmede de ontwikkeling van Mandrivalinux, "
 "overweeg dan <b>alstublieft</b> het aanschaffen van één van onze produkten "
 "of diensten!"
 
@@ -17072,10 +17072,10 @@ msgstr "<b>Online winkel</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Om meer te weten te komen over Mandrakesoft produkten en diensten, kunt u "
+"Om meer te weten te komen over Mandriva produkten en diensten, kunt u "
 "ons <b>e-commerce-platform</b> bezoeken."
 
 #: share/advertising/27.pl:17
@@ -17100,25 +17100,25 @@ msgstr "Kom vandaag nog langs op <b>store.mandrakesoft.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> is de <b>perfecte metgezel</b> voor uw Mandrakelinux-"
+"<b>Mandriva Club</b> is de <b>perfecte metgezel</b> voor uw Mandrivalinux-"
 "produkt."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 "Profiteer van <b>waardevolle voordelen</b> door u aan te sluiten bij "
-"Mandrakeclub, zoals:"
+"Mandriva Club, zoals:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -17140,40 +17140,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Deelname aan Mandrakelinux <b>gebruikersfora</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Deelname aan Mandrivalinux <b>gebruikersfora</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Vroege- en voorrangstoegang</b>, vóór publieke uitgave, tot "
-"Mandrakelinux <b>ISO-beeldbestanden</b>."
+"Mandrivalinux <b>ISO-beeldbestanden</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> is een nieuwe premium-dienst die Mandrakesoft met "
+"<b>Mandriva Online</b> is een nieuwe premium-dienst die Mandriva met "
 "trots zijn klanten aanbiedt!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline voorziet in een breed spectrum waardevolle diensten voor het "
-"<b>eenvoudig bijwerken</b> van uw Mandrakelinux-systemen:"
+"Mandriva Online voorziet in een breed spectrum waardevolle diensten voor het "
+"<b>eenvoudig bijwerken</b> van uw Mandrivalinux-systemen:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17198,40 +17198,40 @@ msgstr "\t* Flexibel <b>ingeroosterd</b> bijwerken."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
-msgstr "\t* Beheer van <b>al uw Mandrakelinux-systemen</b> met één account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+msgstr "\t* Beheer van <b>al uw Mandrivalinux-systemen</b> met één account."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "Heeft u <b>assistentie</b> nodig? Ontmoet de technische experts van "
-"Mandrakesoft op <b>ons technisch ondersteuningsplatform</b> www."
+"Mandriva op <b>ons technisch ondersteuningsplatform</b> www."
 "mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Dankzij de hulp van <b>gekwalificeerde Mandrakelinux-experts</b>, zult u "
+"Dankzij de hulp van <b>gekwalificeerde Mandrivalinux-experts</b>, zult u "
 "veel tijd besparen."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Voor elke vraag die met Mandrakelinux te maken heeft bent u in de "
+"Voor elke vraag die met Mandrivalinux te maken heeft bent u in de "
 "gelegenheid om ondersteuningsincidenten te kopen op <b>store.mandrakesoft."
 "com</b>."
 
@@ -17535,8 +17535,8 @@ msgstr "Observatieprogramma's, bijhouden van processen, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesoft-wizards"
+msgid "Mandriva Wizards"
+msgstr "Mandriva-wizards"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17688,7 +17688,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17702,7 +17702,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIES]...\n"
-"Mandrakelinux Terminal Server Configuratieprogramma\n"
+"Mandrivalinux Terminal Server Configuratieprogramma\n"
 "--enable         : MTS inschakelen\n"
 "--disable        : MTS uitschakelen\n"
 "--start          : MTS starten\n"
@@ -17759,7 +17759,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17767,7 +17767,7 @@ msgid ""
 msgstr ""
 "[OPTION]...\n"
 "  --no-confirmation      eerste bevestigingsvraag niet stellen in "
-"MandrakeUpdate modus\n"
+"Mandriva Update modus\n"
 "  --no-verify-rpm        pakket-handtekeningen niet verifiëren\n"
 "  --changelog-first      veranderingenlogboek voor bestandslijst weergeven "
 "in omschrijvingsvenster\n"
@@ -20550,13 +20550,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux foutrapportage-programma"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux foutrapportage-programma"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Configuratiecentrum"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux Configuratiecentrum"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20576,8 +20576,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20621,8 +20621,8 @@ msgstr "Configuratie-wizards"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Selecteer Mandrakesoft-hulpprogramma:"
+msgid "Select Mandriva Tool:"
+msgstr "Selecteer Mandriva-hulpprogramma:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -21052,7 +21052,7 @@ msgstr "Aangezet bij het opstarten"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Deze interface is nog niet geconfigureerd.\n"
 "Start de \"Interface toevoegen\"-assistent vanuit het Mandrake "
@@ -21062,10 +21062,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "U heeft nog geen geconfigureerde Internetverbinding.\n"
-"Start de \"%s\"-assistent vanuit het Mandrakelinux configuratiecentrum."
+"Start de \"%s\"-assistent vanuit het Mandrivalinux configuratiecentrum."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21115,8 +21115,8 @@ msgstr "KDM (KDE displaybeheer)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux displaybeheer)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux displaybeheer)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21418,7 +21418,7 @@ msgstr "Importeren"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21427,7 +21427,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright © 2001-2002 door Mandrakesoft \n"
+"Copyright © 2001-2002 door Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (originele versie)\n"
@@ -21981,14 +21981,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright © 2003-2004 Mandrakesoft.\n"
+"Copyright © 2003-2004 Mandriva.\n"
 "Dit is vrije software en mag verder gedistribueerd worden onder de "
 "voorwaarden van de GNU GPL.\n"
 "\n"
@@ -22017,8 +22017,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux Hulpcentrum"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux Hulpcentrum"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25318,8 +25318,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Logboek van Mandrakelinux-hulpprogramma's"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Logboek van Mandrivalinux-hulpprogramma's"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25844,10 +25844,10 @@ msgstr "Verbinding voltooid."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Verbinding mislukt.\n"
-"Controleer uw configuratie in het Mandrakelinux Configuratiecentrum."
+"Controleer uw configuratie in het Mandrivalinux Configuratiecentrum."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26735,8 +26735,8 @@ msgstr "Installatie mislukt"
 #~ msgstr "Opslaan en sluiten"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Mandrakesoft-wizards"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Mandriva-wizards"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Geen bladerprogramma beschikbaar! Installeert u er alstublieft één."
@@ -26879,13 +26879,13 @@ msgstr "Installatie mislukt"
 #~ "Er is een fout opgetreden bij het openen van %s voor schrijfbewerking: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Dit is HardDrake, een Mandrakelinux apparatuurconfiguratieprogramma.\n"
+#~ "Dit is HardDrake, een Mandrivalinux apparatuurconfiguratieprogramma.\n"
 #~ "<span foreground=\"royalblue3\">Versie:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Auteur:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
@@ -27299,16 +27299,16 @@ msgstr "Installatie mislukt"
 #~ "Het verwijderen van de printer \"%s\" uit Star Office/OpenOffice.org/GIMP "
 #~ "is mislukt."
 
-#~ msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
-#~ msgstr "<b>Gefeliciteerd met het kiezen van Mandrakelinux!</b>"
+#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
+#~ msgstr "<b>Gefeliciteerd met het kiezen van Mandrivalinux!</b>"
 
 #~ 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."
+#~ "Your new Mandrivalinux operating system and its many applications is the "
+#~ "result of collaborative efforts between Mandriva developers and "
+#~ "Mandrivalinux contributors throughout the world."
 #~ msgstr ""
-#~ "Uw nieuwe Mandrakelinux besturingssysteem en haar vele toepassingen zijn "
-#~ "het resultaat van samenwerking en inspanningen van Mandrakesoft-"
+#~ "Uw nieuwe Mandrivalinux besturingssysteem en haar vele toepassingen zijn "
+#~ "het resultaat van samenwerking en inspanningen van Mandriva-"
 #~ "ontwikkelaars en personen vanuit de hele wereld die hebben bijgedragen."
 
 #~ msgid ""
@@ -27412,25 +27412,25 @@ msgstr "Installatie mislukt"
 #~ "Bekijk en bewerk afbeeldingen en foto's met <b>GQview</b> en <b>The Gimp!"
 #~ "</b>"
 
-#~ msgid "Become a <b>Mandrakeclub</b> member!"
-#~ msgstr "Wordt lid van <b>Mandrakeclub</b>!"
+#~ msgid "Become a <b>Mandriva Club</b> member!"
+#~ msgstr "Wordt lid van <b>Mandriva Club</b>!"
 
 #~ msgid ""
 #~ "Take advantage of valuable benefits, products and services by joining "
-#~ "Mandrakeclub, such as:"
+#~ "Mandriva Club, such as:"
 #~ msgstr ""
 #~ "Profiteer van waardevolle voordelen, produkten en diensten door u aan te "
-#~ "sluiten bij Mandrakeclub, zoals:"
+#~ "sluiten bij Mandriva Club, zoals:"
 
 #~ msgid "\t* Full access to commercial applications"
 #~ msgstr "\t* Volledige toegang tot commerciële toepassingen"
 
 #~ msgid ""
-#~ "\t* Special download mirror list exclusively for Mandrakeclub Members"
-#~ msgstr "\t* Speciale downloadmirror-lijst exclusief voor Mandrakeclub-leden"
+#~ "\t* Special download mirror list exclusively for Mandriva Club Members"
+#~ msgstr "\t* Speciale downloadmirror-lijst exclusief voor Mandriva Club-leden"
 
-#~ msgid "\t* Voting for software to put in Mandrakelinux"
-#~ msgstr "\t* Stemmen voor software om bij Mandrakelinux te bundelen"
+#~ msgid "\t* Voting for software to put in Mandrivalinux"
+#~ msgstr "\t* Stemmen voor software om bij Mandrivalinux te bundelen"
 
 #~ msgid "\t* Plus much more"
 #~ msgstr "\t* Plus veel meer"
@@ -27441,15 +27441,15 @@ msgstr "Installatie mislukt"
 #~ msgid "Do you require assistance?"
 #~ msgstr "Kunt u assistentie gebruiken?"
 
-#~ msgid "<b>Mandrakeexpert</b> is the primary source for technical support."
+#~ msgid "<b>Mandriva Expert</b> is the primary source for technical support."
 #~ msgstr ""
-#~ "<b>Mandrakeexpert</b> is de primaire bron voor technische ondersteuning."
+#~ "<b>Mandriva Expert</b> is de primaire bron voor technische ondersteuning."
 
 #~ msgid ""
-#~ "If you have Linux questions, subscribe to Mandrakeexpert at <b>www."
+#~ "If you have Linux questions, subscribe to Mandriva Expert at <b>www."
 #~ "mandrakeexpert.com</b>"
 #~ msgstr ""
-#~ "Indien u Linuxvragen heeft, meldt u zich dan aan bij Mandrakeexpert op "
+#~ "Indien u Linuxvragen heeft, meldt u zich dan aan bij Mandriva Expert op "
 #~ "<b>www.mandrakeexpert.com</b>"
 
 #~ msgid ""
@@ -27467,22 +27467,22 @@ msgstr "Installatie mislukt"
 #~ "op <b>www.mandrakelinux.com</b>!"
 
 #~ msgid ""
-#~ "Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus "
+#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "
 #~ "the latest versions of the most popular Open Source applications."
 #~ msgstr ""
-#~ "Mandrakelinux bevat de beroemde grafische werkomgevingen KDE en GNOME, "
+#~ "Mandrivalinux bevat de beroemde grafische werkomgevingen KDE en GNOME, "
 #~ "plus de laatste versies van de populairste Open Source-toepassingen."
 
 #~ msgid ""
-#~ "Mandrakelinux is widely known as the most user-friendly and the easiest "
+#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "
 #~ "to install and easy to use Linux distribution."
 #~ msgstr ""
-#~ "Mandrakelinux is algemeen bekend als de gebruikersvriendelijkste en "
+#~ "Mandrivalinux is algemeen bekend als de gebruikersvriendelijkste en "
 #~ "makkelijkst te installeren Linuxdistributie."
 
-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with <b>Mandrakemove</b>"
+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandrakemove</b>"
 #~ msgstr ""
-#~ "\t* Ontdek Mandrakelinux op een opstartbare CD met <b>Mandrakemove</b>"
+#~ "\t* Ontdek Mandrivalinux op een opstartbare CD met <b>Mandrakemove</b>"
 
 #~ msgid ""
 #~ "\t* If you use Linux mostly for Office, Internet and Multimedia tasks, "
@@ -27529,12 +27529,12 @@ msgstr "Installatie mislukt"
 #~ 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 "
+#~ "Mandrivalinux distribution. A unique blend for incomparable HPC "
 #~ "performance."
 #~ msgstr ""
 #~ "<b>MandrakeClustering</b>: de kracht en snelheid van een Linuxcluster "
 #~ "gecombineerd met de stabiliteit en het gebruiksgemak van de "
-#~ "wereldberoemde Mandrakelinux-distributie. Een unieke combinatie voor "
+#~ "wereldberoemde Mandrivalinux-distributie. Een unieke combinatie voor "
 #~ "onvergelijkbare HPC-prestaties."
 
 #~ msgid ""
@@ -27546,14 +27546,14 @@ msgstr "Installatie mislukt"
 #~ "standaard- tot professionele ondersteuning, van 1 to 50 incidenten, kies "
 #~ "datgene dat bij uw wensen past!"
 
-#~ msgid "<b>Become a Mandrakeclub member!</b>"
-#~ msgstr "<b>Wordt Mandrakeclub-lid!</b>"
+#~ msgid "<b>Become a Mandriva Club member!</b>"
+#~ msgstr "<b>Wordt Mandriva Club-lid!</b>"
 
 #~ msgid "<b>Do you require assistance?</b>"
 #~ msgstr "<b>Kunt u assistentie gebruiken?</b>"
 
-#~ msgid "This is the Mandrakelinux <b>Download version</b>."
-#~ msgstr "Dit is de Mandrakelinux <b>Downloadversie</b>."
+#~ msgid "This is the Mandrivalinux <b>Download version</b>."
+#~ msgstr "Dit is de Mandrivalinux <b>Downloadversie</b>."
 
 #~ msgid ""
 #~ "The free download version does not include commercial software, and "
@@ -27565,13 +27565,13 @@ msgstr "Installatie mislukt"
 #~ "ADSL en RTC) en videokaarten (zoals ATI® en NVIDIA®)."
 
 #~ msgid ""
-#~ "Your new Mandrakelinux distribution and its many applications are the "
-#~ "result of collaborative efforts between Mandrakesoft developers and "
-#~ "Mandrakelinux contributors throughout the world."
+#~ "Your new Mandrivalinux distribution and its many applications are the "
+#~ "result of collaborative efforts between Mandriva developers and "
+#~ "Mandrivalinux contributors throughout the world."
 #~ msgstr ""
-#~ "Uw nieuwe Mandrakelinux besturingssysteem en haar vele toepassingen zijn "
-#~ "het resultaat van samenwerking en inspanningen van Mandrakesoft-"
-#~ "ontwikkelaars en personen vanuit de hele wereld die aan Mandrakelinux "
+#~ "Uw nieuwe Mandrivalinux besturingssysteem en haar vele toepassingen zijn "
+#~ "het resultaat van samenwerking en inspanningen van Mandriva-"
+#~ "ontwikkelaars en personen vanuit de hele wereld die aan Mandrivalinux "
 #~ "hebben bijgedragen."
 
 #~ msgid "<b>PowerPack+</b>"
@@ -27588,24 +27588,24 @@ msgstr "Installatie mislukt"
 #~ "servertoepassingen bij zit."
 
 #~ msgid ""
-#~ "It is the only Mandrakelinux product that includes the groupware solution."
+#~ "It is the only Mandrivalinux product that includes the groupware solution."
 #~ msgstr ""
-#~ "Het is het enige Mandrakelinux-produkt dat ene groupware-oplossing bevat."
+#~ "Het is het enige Mandrivalinux-produkt dat ene groupware-oplossing bevat."
 
 #~ msgid ""
-#~ "When you log into your Mandrakelinux system for the first time, you can "
+#~ "When you log into your Mandrivalinux system for the first time, you can "
 #~ "choose between several popular graphical desktops environments, "
 #~ "including: KDE, GNOME, WindowMaker, IceWM, and others."
 #~ msgstr ""
-#~ "Wanneer u zich voor de eerste keer aanmeldt op uw Mandrakelinux-systeem, "
+#~ "Wanneer u zich voor de eerste keer aanmeldt op uw Mandrivalinux-systeem, "
 #~ "kunt u kiezen tussen diverse populaire werkomgevingen, waaronder: KDE, "
 #~ "GNOME, WindowMaker, IceWM, en andere."
 
 #~ msgid ""
-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "
+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
 #~ "of your tasks:"
 #~ msgstr ""
-#~ "In het Mandrakelinux-menu vindt u makkelijk te gebruiken toepassingen "
+#~ "In het Mandrivalinux-menu vindt u makkelijk te gebruiken toepassingen "
 #~ "voor alle werkzaamheden:"
 
 #~ msgid ""
@@ -27651,13 +27651,13 @@ msgstr "Installatie mislukt"
 #~ msgstr "\t* Adresboek (server en client)"
 
 #~ msgid ""
-#~ "Your new Mandrakelinux distribution is the result of collaborative "
-#~ "efforts between Mandrakesoft developers and Mandrakelinux contributors "
+#~ "Your new Mandrivalinux distribution is the result of collaborative "
+#~ "efforts between Mandriva developers and Mandrivalinux contributors "
 #~ "throughout the world."
 #~ msgstr ""
-#~ "Uw nieuwe Mandrakelinux besturingssysteem is het resultaat van "
-#~ "samenwerking en inspanningen van Mandrakesoft-ontwikkelaars en personen "
-#~ "vanuit de hele wereld die aan Mandrakelinux hebben bijgedragen."
+#~ "Uw nieuwe Mandrivalinux besturingssysteem is het resultaat van "
+#~ "samenwerking en inspanningen van Mandriva-ontwikkelaars en personen "
+#~ "vanuit de hele wereld die aan Mandrivalinux hebben bijgedragen."
 
 #~ msgid ""
 #~ "We would like to thank everyone who participated in the development of "
@@ -27729,13 +27729,13 @@ msgstr "Installatie mislukt"
 #~ msgid ""
 #~ "Before continuing, you should carefully read the terms of the license. "
 #~ "It\n"
-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "
+#~ "covers the entire Mandrivalinux 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 ""
 #~ "Voordat u verdergaat dient u eerst de voorwaarden in de licentie\n"
-#~ "aandachtig te lezen. Zij beslaan de gehele Mandrakelinux distributie.\n"
+#~ "aandachtig te lezen. Zij beslaan de gehele Mandrivalinux distributie.\n"
 #~ "Indien u akkoord gaat met alle voorwaarden erin kruist u het\n"
 #~ "\"%s\"-vakje aan. Zoniet, dan zal het klikken van de \"%s\"-knop\n"
 #~ "uw computer herstarten."
@@ -27846,26 +27846,26 @@ msgstr "Installatie mislukt"
 #~ "het kruisje bij het vakje \"%s\"."
 
 #~ msgid ""
-#~ "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+#~ "The Mandrivalinux 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 ""
-#~ "De Mandrakelinux-installatie is verdeeld over meerdere CD-ROMs. Als een \n"
+#~ "De Mandrivalinux-installatie is verdeeld over meerdere CD-ROMs. Als een \n"
 #~ "geselecteerd pakket te vinden is op een andere CD-ROM, zal het \n"
 #~ "installatieprogramma de huidige CD uitwerpen en u zonodig vragen om de\n"
 #~ "correcte CD in te leggen."
 
 #~ msgid ""
 #~ "It is now time to specify which programs you wish to install on your\n"
-#~ "system. There are thousands of packages available for Mandrakelinux, and\n"
+#~ "system. There are thousands of packages available for Mandrivalinux, 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. Mandrakelinux sorts packages groups in four categories. You can\n"
+#~ "machine. Mandrivalinux 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"
@@ -27924,7 +27924,7 @@ msgstr "Installatie mislukt"
 #~ "van vergelijkbare toepassingen geplaatst.\n"
 #~ "\n"
 #~ "Pakketten zijn samengebracht in groepen die corresponderen met een\n"
-#~ "bepaald gebruik van uw computer. Mandrakelinux heeft vier "
+#~ "bepaald gebruik van uw computer. Mandrivalinux heeft vier "
 #~ "voorgedefiniëerde\n"
 #~ "installaties beschikbaar. U kunt deze installatieklasses zien als \n"
 #~ "categorieën voor de diverse pakketten. U kunt de toepassingen uit de\n"
@@ -27995,11 +27995,11 @@ msgstr "Installatie mislukt"
 #~ "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 Mandrakelinux will automatically start any "
+#~ "installed. By default Mandrivalinux 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 Mandrakelinux was\n"
+#~ "security holes were discovered after this version of Mandrivalinux 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"
@@ -28041,11 +28041,11 @@ msgstr "Installatie mislukt"
 #~ "specifiek gekozen heeft ofwel omdat het onderdeel is van een hele groep\n"
 #~ "pakketten, zal u gevraagd worden om te bevestigen dat u deze servers "
 #~ "echt\n"
-#~ "wilt installeren. Onder Mandrakelinux worden alle geïnstalleerde servers\n"
+#~ "wilt installeren. Onder Mandrivalinux worden alle geïnstalleerde servers\n"
 #~ "standaard ingeschakeld tijdens het opstarten. Zelfs wanneer zij veilig\n"
 #~ "zijn en geen bekende beveiligingsgebreken hadden op het moment dat de\n"
 #~ "distributie werd uitgebracht, kan het gebeuren dat beveiligingsfouten\n"
-#~ "ontdekt worden nadat deze versie van Mandrakelinux afgemaakt werd.\n"
+#~ "ontdekt worden nadat deze versie van Mandrivalinux afgemaakt werd.\n"
 #~ "Indien u niet weet wat een bepaalde dienst geacht wordt te doen of "
 #~ "waarom\n"
 #~ "deze geïnstalleerd wordt, klikt u dan \"%s\". Klikken op \"%s\" zal\n"
@@ -28073,7 +28073,7 @@ msgstr "Installatie mislukt"
 #~ "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"
-#~ "Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
+#~ "Mandrivalinux 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"
@@ -28094,7 +28094,7 @@ msgstr "Installatie mislukt"
 #~ "modems\n"
 #~ "that require additional software to work compared to Normal modems. Some "
 #~ "of\n"
-#~ "those modems actually work under Mandrakelinux, some others do not. You\n"
+#~ "those modems actually work under Mandrivalinux, 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"
@@ -28104,7 +28104,7 @@ msgstr "Installatie mislukt"
 #~ msgstr ""
 #~ "Het is nu mogelijk om uw internet- of netwerkverbinding in te stellen.\n"
 #~ "Indien u wenst uw computer aan het Internet of aan een lokaal netwerk te\n"
-#~ "verbinden, klik dan op \"%s\". Mandrakelinux zal trachten om\n"
+#~ "verbinden, klik dan op \"%s\". Mandrivalinux zal trachten om\n"
 #~ "netwerkapparaten en modems automatisch te bespeuren. Als deze bespeuring\n"
 #~ "mislukt, deselecteer dan het \"%s\"-vakje. \n"
 #~ "U kunt ook besluiten het netwerk niet te configureren of het later pas\n"
@@ -28127,7 +28127,7 @@ msgstr "Installatie mislukt"
 #~ "eenvoudige modems die extra software vereisen om te kunnen werken, in \n"
 #~ "vergelijking met normale modems. Sommige van deze modems kunnen "
 #~ "functioneren\n"
-#~ "onder Mandrakelinux, sommige andere niet. U kunt de lijst van "
+#~ "onder Mandrivalinux, sommige andere niet. U kunt de lijst van "
 #~ "ondersteunde\n"
 #~ "modems raadplegen op de LinModems-webpagina.\n"
 #~ "\n"
@@ -28262,7 +28262,7 @@ msgstr "Installatie mislukt"
 #~ "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 Mandrakelinux rely upon.\n"
+#~ "WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 #~ "\n"
 #~ "You will be presented with a list of different parameters to change to "
 #~ "get\n"
@@ -28327,7 +28327,7 @@ msgstr "Installatie mislukt"
 #~ "Linux\n"
 #~ "waarvan alle grafische omgevingen (KDE, GNOME, AfterStep, WindowMaker, "
 #~ "etc.)\n"
-#~ "die bij Mandrakelinux worden geleverd, afhankelijk zijn.\n"
+#~ "die bij Mandrivalinux worden geleverd, afhankelijk zijn.\n"
 #~ "\n"
 #~ "U krijgt een lijst te zien van verschillende parameters die u kunt "
 #~ "aanpassen\n"
@@ -28462,7 +28462,7 @@ msgstr "Installatie mislukt"
 #~ "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"
-#~ "Mandrakelinux system.\n"
+#~ "Mandrivalinux 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 "
@@ -28501,7 +28501,7 @@ msgstr "Installatie mislukt"
 #~ "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 Mandrakelinux and Microsoft Windows "
+#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "
 #~ "on\n"
 #~ "the same computer.\n"
 #~ "\n"
@@ -28511,7 +28511,7 @@ msgstr "Installatie mislukt"
 #~ "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 Mandrakelinux system,\n"
+#~ "your hard drive and replace them with your new Mandrivalinux system,\n"
 #~ "choose this option. Be careful, because you will not be able to undo "
 #~ "your\n"
 #~ "choice after you confirm.\n"
@@ -28536,14 +28536,14 @@ msgstr "Installatie mislukt"
 #~ "refer to the ``Managing Your Partitions'' section in the ``Starter "
 #~ "Guide''."
 #~ msgstr ""
-#~ "Op dit punt dient u te kiezen waar op uw harde schijf u uw Mandrakelinux\n"
+#~ "Op dit punt dient u te kiezen waar op uw harde schijf u uw Mandrivalinux\n"
 #~ "besturingssysteem wilt installeren. Als uw harde schijf leeg is of als "
 #~ "een\n"
 #~ "ander besturingssysteem alle beschikbare ruimte inneemt, dan zult u\n"
 #~ "de harde schijf moeten partitioneren. Partitioneren houdt in dat u uw "
 #~ "harde\n"
 #~ "schijf in logische stukken onderverdeelt om ruimte te creëren voor uw\n"
-#~ "nieuwe Mandrakelinux besturingssysteem.\n"
+#~ "nieuwe Mandrivalinux besturingssysteem.\n"
 #~ "\n"
 #~ "Omdat de effecten van het partitioneringsproces over het algemeen niet\n"
 #~ "terug te draaien zijn en kan leiden tot gegevensverlies als er reeds een\n"
@@ -28579,7 +28579,7 @@ msgstr "Installatie mislukt"
 #~ "partitie\n"
 #~ "gedefragmenteerd heeft. Een reservekopie maken van uw gegevens kan\n"
 #~ "bepaald geen kwaad. Deze optie is aanbevolen indien u zowel\n"
-#~ "Mandrakelinux als Microsoft Windows op dezelfde computer wilt gebruiken.\n"
+#~ "Mandrivalinux als Microsoft Windows op dezelfde computer wilt gebruiken.\n"
 #~ "\n"
 #~ "   Laat het goed tot u doordringen, voordat u deze optie kiest, dat uw\n"
 #~ "Microsoft Windows partitie na afloop van deze procedure minder groot\n"
@@ -28588,7 +28588,7 @@ msgstr "Installatie mislukt"
 #~ "installeren.\n"
 #~ "\n"
 #~ " * \"%s\": indien u alle gegevens en alle partities op uw\n"
-#~ "harde schijf wilt verwijderen en vervangen door uw nieuwe Mandrakelinux-\n"
+#~ "harde schijf wilt verwijderen en vervangen door uw nieuwe Mandrivalinux-\n"
 #~ "systeem, kiest u deze optie. Weest u voorzichtig met deze oplossing omdat "
 #~ "u\n"
 #~ "na bevestiging deze keuze niet meer ongedaan kunt maken.\n"
@@ -28709,7 +28709,7 @@ msgstr "Installatie mislukt"
 #~ "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"
-#~ "Mandrakelinux operating system installation.\n"
+#~ "Mandrivalinux operating system installation.\n"
 #~ "\n"
 #~ "Click on \"%s\" if you wish to select partitions that will be checked "
 #~ "for\n"
@@ -28736,13 +28736,13 @@ msgstr "Installatie mislukt"
 #~ "Klik op \"%s\" wanneer u klaar bent om de partities te formatteren.\n"
 #~ "\n"
 #~ "Klik op \"%s\" indien u een andere partitie voor uw nieuwe\n"
-#~ "Mandrakelinux besturingssysteem wilt kiezen.\n"
+#~ "Mandrivalinux besturingssysteem wilt kiezen.\n"
 #~ "\n"
 #~ "Klik op \"%s\" indien u partities wenst te selecteren die op\n"
 #~ "onleesbare blokken gecontroleerd moeten worden."
 
 #~ msgid ""
-#~ "At the time you are installing Mandrakelinux, it is likely that some\n"
+#~ "At the time you are installing Mandrivalinux, 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"
@@ -28757,7 +28757,7 @@ msgstr "Installatie mislukt"
 #~ "the\n"
 #~ "selected package(s), or \"%s\" to abort."
 #~ msgstr ""
-#~ "Op het moment dat u Mandrakelinux installeert, is het waarschijnlijk\n"
+#~ "Op het moment dat u Mandrivalinux installeert, is het waarschijnlijk\n"
 #~ "dat sommige pakketten vernieuwd zijn sinds het moment dat het werd\n"
 #~ "uitgebracht. Sommige onvolkomenheden kunnen gerepareerd zijn en\n"
 #~ "beveiligingsproblemen opgelost. Om u te kunnen laten profiteren van\n"
@@ -28825,7 +28825,7 @@ msgstr "Installatie mislukt"
 #~ "\n"
 #~ "DrakX now needs to know if you want to perform a new install or an "
 #~ "upgrade\n"
-#~ "of an existing Mandrakelinux system:\n"
+#~ "of an existing Mandrivalinux system:\n"
 #~ "\n"
 #~ " * \"%s\": For the most part, this completely wipes out the old system. "
 #~ "If\n"
@@ -28837,22 +28837,22 @@ msgstr "Installatie mislukt"
 #~ "written.\n"
 #~ "\n"
 #~ " * \"%s\": this installation class allows you to update the packages\n"
-#~ "currently installed on your Mandrakelinux system. Your current\n"
+#~ "currently installed on your Mandrivalinux 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 Mandrakelinux systems\n"
+#~ "Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 #~ "running version \"8.1\" or later. Performing an Upgrade on versions "
 #~ "prior\n"
-#~ "to Mandrakelinux version \"8.1\" is not recommended."
+#~ "to Mandrivalinux version \"8.1\" is not recommended."
 #~ msgstr ""
 #~ "Deze stap activeert slechts wanneer een bestaande GNU/Linux-partitie\n"
 #~ "gevonden is op uw computer.\n"
 #~ "\n"
 #~ "Nu is het noodzakelijk dat u het installatieprogramma informeert of u "
 #~ "een \n"
-#~ "nieuwe installatie of een opwaardering van een bestaand Mandrakelinux\n"
+#~ "nieuwe installatie of een opwaardering van een bestaand Mandrivalinux\n"
 #~ "systeem wilt uitvoeren:\n"
 #~ "\n"
 #~ " * \"%s\": Dit verwijdert het oude systeem vrijwel volledig.\n"
@@ -28862,7 +28862,7 @@ msgstr "Installatie mislukt"
 #~ "overschreven. Dit is afhankelijk van uw partitioneringsschema.\n"
 #~ "\n"
 #~ " * \"%s\": deze installatieklasse stelt u in staat de pakketten\n"
-#~ "die momenteel op uw Mandrakelinux-systeem zijn geïnstalleerd te "
+#~ "die momenteel op uw Mandrivalinux-systeem zijn geïnstalleerd te "
 #~ "verversen.\n"
 #~ "Uw huidige partitioneringsschema en gebruikersgegevens worden niet "
 #~ "veranderd.\n"
@@ -28870,8 +28870,8 @@ msgstr "Installatie mislukt"
 #~ "gewone installatie.\n"
 #~ "\n"
 #~ "Het gebruik van de ``Opwaardering''-optie zou prima moeten werken op\n"
-#~ "Mandrakelinux versie \"8.1\" of recenter. Het uitvoeren van een\n"
-#~ "opwaardering op versies eerder dan Mandrakelinux versie \"8.1\" is "
+#~ "Mandrivalinux versie \"8.1\" of recenter. Het uitvoeren van een\n"
+#~ "opwaardering op versies eerder dan Mandrivalinux versie \"8.1\" is "
 #~ "afgeraden."
 
 #~ msgid ""
@@ -28938,7 +28938,7 @@ msgstr "Installatie mislukt"
 #~ "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, Mandrakelinux will be using it\n"
+#~ "still under development. For that reason, Mandrivalinux 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"
@@ -28984,7 +28984,7 @@ msgstr "Installatie mislukt"
 #~ "Over UTF-8 (unicode)-ondersteuning: Unicode is een nieuwe tekencodering\n"
 #~ "bedoeld om alle bestaande geschreven talen te omvatten. Volledige\n"
 #~ "GNU/Linux-ondersteuning ervoor is echter nog in ontwikkeling.\n"
-#~ "Daarom gebruikt Mandrakelinux het al dan niet, afhankelijk van de keuze\n"
+#~ "Daarom gebruikt Mandrivalinux het al dan niet, afhankelijk van de keuze\n"
 #~ "van de gebruiker:\n"
 #~ "\n"
 #~ " * Indien u talen kiest met een sterke coderingstraditie (latin1\n"
@@ -29224,7 +29224,7 @@ msgstr "Installatie mislukt"
 #~ "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 Mandrakelinux\n"
+#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"
 #~ "system! Be sure you know what you are doing before changing any of the\n"
 #~ "options. !!\n"
 #~ "\n"
@@ -29266,7 +29266,7 @@ msgstr "Installatie mislukt"
 #~ "\n"
 #~ "!! Let op dat indien u geen opstartlader installeert (door hier \n"
 #~ "\"%s\" te kiezen) u ervoor moet zorgen dat u een manier heeft om\n"
-#~ "uw Mandrakelinux-systeem op te starten! Zorg ervoor dat u weet wat u "
+#~ "uw Mandrivalinux-systeem op te starten! Zorg ervoor dat u weet wat u "
 #~ "doet\n"
 #~ "voordat u één van de opties wijzigt. !!\n"
 #~ "\n"
@@ -29364,7 +29364,7 @@ msgstr "Installatie mislukt"
 #~ msgid ""
 #~ "Now, it's time to select a printing system for your computer. Other OSs "
 #~ "may\n"
-#~ "offer you one, but Mandrakelinux offers two. Each of the printing "
+#~ "offer you one, but Mandrivalinux offers two. Each of the printing "
 #~ "systems\n"
 #~ "is best suited to particular types of configuration.\n"
 #~ "\n"
@@ -29400,7 +29400,7 @@ msgstr "Installatie mislukt"
 #~ "Center and clicking the expert button."
 #~ msgstr ""
 #~ "Het is nu tijd een afdruksysteem voor uw computer te selecteren. Andere\n"
-#~ "besturingssystemen geven u er wellicht maar één, maar Mandrakelinux\n"
+#~ "besturingssystemen geven u er wellicht maar één, maar Mandrivalinux\n"
 #~ "biedt er twee. Elk van deze afdruksystemen is het meest geschikt voor\n"
 #~ "bepaalde typen configuraties.\n"
 #~ "\n"
@@ -29935,10 +29935,10 @@ msgstr "Installatie mislukt"
 #~ "vereenvoudigen."
 
 #~ msgid ""
-#~ "Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- "
+#~ "Find all Mandriva products and services at <b>MandrakeStore</b> -- "
 #~ "our full service e-commerce platform."
 #~ msgstr ""
-#~ "U kunt alle Mandrakesoft-produkten en diensten vinden op "
+#~ "U kunt alle Mandriva-produkten en diensten vinden op "
 #~ "<b>MandrakeStore</b> -- ons uitgebreide service e-commerce-platform."
 
 #~ msgid "Become a <b>MandrakeClub</b> member!"
@@ -29958,25 +29958,25 @@ msgstr "Installatie mislukt"
 #~ msgid "\t* Special discounts for products and services at MandrakeStore"
 #~ msgstr "\t* Speciale kortingen voor produkten en diensten bij MandrakeStore"
 
-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandriva Move</b>"
 #~ msgstr ""
-#~ "\t* Ontdek Mandrakelinux op een opstartbare CD met <b>MandrakeMove</b>"
+#~ "\t* Ontdek Mandrivalinux op een opstartbare CD met <b>Mandriva Move</b>"
 
 #~ msgid ""
-#~ "Find all Mandrakesoft products at <b>MandrakeStore</b> -- our full "
+#~ "Find all Mandriva products at <b>MandrakeStore</b> -- our full "
 #~ "service e-commerce platform."
 #~ msgstr ""
-#~ "Alle Mandrakesoft-produkten zijn te vinden op <b>MandrakeStore</b> -- ons "
+#~ "Alle Mandriva-produkten zijn te vinden op <b>MandrakeStore</b> -- ons "
 #~ "uitgebreide service/e-commerce platform."
 
 #~ msgid "<b>Become a MandrakeClub member!</b>"
 #~ msgstr "<b>Wordt MandrakeClub-lid!</b>"
 
 #~ msgid ""
-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "
+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
 #~ "tasks:"
 #~ msgstr ""
-#~ "In het Mandrakelinux-menu vindt u makkelijk te gebruiken toepassingen "
+#~ "In het Mandrivalinux-menu vindt u makkelijk te gebruiken toepassingen "
 #~ "voor alle werkzaamheden:"
 
 #~ msgid ""
@@ -30014,8 +30014,8 @@ msgstr "Installatie mislukt"
 #~ "  --report          - moet een mandrake-hulpprogramma zijn\n"
 #~ "  --incident        - moet een mandrake-hulpprogramma zijn"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "This interface has not been configured yet.\n"
@@ -30142,7 +30142,7 @@ msgstr "Installatie mislukt"
 
 #~ msgid ""
 #~ "Take advantage of valuable benefits, products and services by joining "
-#~ "Mandrake Club, such as:"
+#~ "Mandriva Club, such as:"
 #~ msgstr ""
 #~ "Profiteer van waardevolle voordelen, produkten en diensten door u aan te "
 #~ "sluiten bij MandrakeClub, zoals:"
diff --git a/perl-install/share/po/nn.po b/perl-install/share/po/nn.po
index d11ec5f7d..4e6df334a 100644
--- a/perl-install/share/po/nn.po
+++ b/perl-install/share/po/nn.po
@@ -69,7 +69,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "USB-nøkkelen er skriveverna, men du kan ikkje sikkert fjerna han no.\n"
 "\n"
@@ -93,7 +93,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "USB-nøkkelen inneheld ikkje ein Windows-partisjon (FAT-partisjon).\n"
@@ -109,7 +109,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -117,7 +117,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Fann ikkje USB-nøkkel på systemet. Viss du set inn\n"
@@ -250,7 +250,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1296,7 +1296,7 @@ msgstr "Språkval"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3695,7 +3695,7 @@ msgstr "Bruk radiostøtte"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3891,7 +3891,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3906,11 +3906,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4065,10 +4065,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4242,7 +4242,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4414,12 +4414,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4446,7 +4446,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4455,7 +4455,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4685,7 +4685,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4721,7 +4721,7 @@ msgstr "Førre"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4765,7 +4765,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4792,7 +4792,7 @@ msgstr "Tryggleiksansvarleg"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4943,7 +4943,7 @@ msgstr "Byt mellom normal- og ekspertmodus"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5014,7 +5014,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5023,13 +5023,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -5086,7 +5086,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5245,7 +5245,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5266,7 +5266,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -5369,7 +5369,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5386,7 +5386,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5448,7 +5448,7 @@ msgstr "Tenester"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Vel harddisken du ønskjer å sletta for å installera den nye Mandriva Linux-\n"
@@ -5806,7 +5806,7 @@ msgstr "Reknar ut storleik på Windows-partisjon"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Windows-partisjonen for fragmentert. Start maskina på nytt under Windows, og "
@@ -5926,19 +5926,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5960,7 +5960,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5968,14 +5968,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5985,7 +5985,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6005,10 +6005,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6019,11 +6019,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6039,7 +6039,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -6103,7 +6103,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6111,7 +6111,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Gratulerer! Installeringa er fullført.\n"
 "Fjern oppstartsmediet, og trykk «Enter» for å starta maskina på nytt.\n"
@@ -6160,7 +6160,7 @@ msgstr "Køyrer steg «%s»\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -6702,7 +6702,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr "Kontaktar Mandriva Linux-nettstaden for oversikt over speglar ..."
 
 #: install_steps_interactive.pm:840
@@ -6927,7 +6927,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
 msgstr "Mandriva Linux-installering %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -9514,7 +9514,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -13529,7 +13529,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -15390,18 +15390,18 @@ msgstr "Stopp"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr "<b>Kva er Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
 msgstr "Velkommen til <b>Mandriva Linux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -15413,7 +15413,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 "Mandriva Linux er den mest <b>brukarvenlege</b> Linux-distribusjonen "
@@ -15433,9 +15433,9 @@ msgstr "Velkommen til <b>open kjeldekode-verda</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -15456,7 +15456,7 @@ msgstr "<b>GPL-lisensen</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "Dei fleste programma i distribusjonen, samt alle Mandriva Linux-verktøya er "
 "lisensiert under <b>GNU General Public License</b>."
@@ -15484,10 +15484,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -15506,8 +15506,8 @@ msgstr "<b>Nedlastingsversjon</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -15536,7 +15536,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -15546,7 +15546,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15565,13 +15565,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -15583,7 +15583,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15597,19 +15597,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr "<b>Mandriva-produkt</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr "Mandriva Linux-produkta er:"
 
 #: share/advertising/09.pl:18
@@ -15630,61 +15630,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -15722,7 +15722,7 @@ msgstr "<b>Vel grafisk skrivebordsmiljø</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -15743,7 +15743,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -15862,7 +15862,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -16100,14 +16100,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr "<b>Mandriva Linux-kontrollsenter</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -16129,9 +16129,9 @@ msgstr "<b>Open kjeldekode-modellen</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -16143,7 +16143,7 @@ msgstr "<b>Nettbutikk</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 "Du finn alle Mandriva-produkta og -tenestene på <b>e-handelsplattforma</b> "
@@ -16168,20 +16168,20 @@ msgstr "Stikk innom <b>store.mandrakesoft.com</b> i dag!"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
 msgstr "<b>Mandriva-klubben</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -16200,33 +16200,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr "\t– Delta i <b>brukarforum</b> for Mandriva Linux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -16251,32 +16251,32 @@ msgstr "\t– Fleksible <b>oppdateringsplanar</b> updates."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
 msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -16569,7 +16569,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr "Mandriva-vegvisarar"
 
 #: share/compssUsers.pl:197
@@ -16665,7 +16665,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16713,7 +16713,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -19256,12 +19256,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "Feilrapporteringsverktøy for Mandriva Linux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
 msgstr "Kontrollsenter"
 
 #: standalone/drakbug:48
@@ -19282,7 +19282,7 @@ msgstr "Maskinvareoppsett"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
@@ -19327,7 +19327,7 @@ msgstr "Oppsettvegvisarar"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -19738,7 +19738,7 @@ msgstr "Starta ved oppstart"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Grensesnittet er ikkje sett opp enno.\n"
 "Køyr «Legg til grensesnitt»-vegvisaren i kontrollsenteret."
@@ -19747,7 +19747,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Du har ikkje sett opp noko Internett-samband.\n"
 "Køyr «%s»-vegvisaren i Mandriva Linux-kontrollsenteret."
@@ -19800,7 +19800,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20085,7 +20085,7 @@ msgstr "Importer"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -20543,7 +20543,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -20570,7 +20570,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Mandriva Linux-hjelpesenter"
 
 #: standalone/drakhelp:36
@@ -23557,7 +23557,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Loggverktøy for Mandriva Linux"
 
 #: standalone/logdrake:51
@@ -24074,7 +24074,7 @@ msgstr "Har kopla til."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Feil ved tilkopling.\n"
 "Sjå etter at oppsett er rett i kontrollsenteret."
diff --git a/perl-install/share/po/pa_IN.po b/perl-install/share/po/pa_IN.po
index 1f5b62b18..c9cc5e23a 100644
--- a/perl-install/share/po/pa_IN.po
+++ b/perl-install/share/po/pa_IN.po
@@ -66,7 +66,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "USB ਕੁੰਜੀ ਲਿਖਣ ਯੋਗ ਨਹੀਂ ਹੈ, ਪਰ ਅਸੀਂ ਇਸ ਨੂੰ ਲਾ ਨਹੀਂ \n"
 "ਸਕਦੇ।\n"
@@ -91,7 +91,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "ਤੁਹਾਡੀ USB ਕੁੰਜੀ ਕੋਲ ਯੋਗ Windows (FAT) ਭਾਗ ਨਹੀਂ ਹੈ।\n"
@@ -102,14 +102,14 @@ msgstr ""
 "\n"
 "\n"
 "ਤੁਸੀਂ USB ਕੁੰਜੀ ਤੋਂ ਬਿਨਾ ਜਾਰੀ ਕਰ ਸਕਦੇ ਹੋ - ਤੁਸੀਂ ਹਾਲੇ ਵੀ \n"
-"Mandrake Move ਨੂੰ ਸਧਾਰਨ ਲਾਈਵ ਮੈਂਡਰਿਕ ਆਪਰੇਟਿੰਗ ਸਿਸਟਮ \n"
+"Mandriva Move ਨੂੰ ਸਧਾਰਨ ਲਾਈਵ ਮੈਂਡਰਿਕ ਆਪਰੇਟਿੰਗ ਸਿਸਟਮ \n"
 "ਤੌਰ ਤੇ ਵਰਤਣ ਦੇ ਯੋਗ ਹੋ।"
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -117,11 +117,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "ਸਾਨੂੰ ਕੋਈ USB ਕੁੰਜੀ ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ ਨਹੀਂ ਲੱਭੀ। ਜੇ ਤੁਸੀਂ\n"
-"USB ਕੁੰਜੀ ਹੁਣ ਜੋੜ ਦਿੱਤੀ, Mandrake Move ਤੁਹਾਡੀ ਘਰ \n"
+"USB ਕੁੰਜੀ ਹੁਣ ਜੋੜ ਦਿੱਤੀ, Mandriva Move ਤੁਹਾਡੀ ਘਰ \n"
 "ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਡਾਟਾ ਪਾਰਦਰਸ਼ੀ ਹੀ ਸੰਭਾਲਣ ਦੇ ਯੋਗ ਹੈ ਅਤੇ \n"
 "ਇਸ ਕੰਪਿਊਟਰ ਜਾ ਹੋਰ ਨੂੰ ਅਗਲੀ ਵਾਰ ਬੂਟ ਕਰਨ ਲਈ ਸਿਸਟਮ \n"
 "ਲਈ ਸੰਰਚਨਾ। ਸੂਚਨਾ: ਜੇ ਤੁਸੀਂ ਹੁਣ ਕੁੰਜੀ ਜੋੜੀ, ਫਿਰ ਖੋਜ ਲਈ ਕੁਝ\n"
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "\n"
 "ਤੁਸੀਂ USB ਕੁੰਜੀ ਤੋਂ ਬਿਨਾ ਜਾਰੀ ਕਰ ਸਕਦੇ ਹੋ - ਤੁਸੀਂ ਹਾਲੇ ਵੀ \n"
-"Mandrake Move ਨੂੰ ਸਧਾਰਨ ਲਾਈਵ ਮੈਂਡਰਿਕ ਆਪਰੇਟਿੰਗ ਸਿਸਟਮ \n"
+"Mandriva Move ਨੂੰ ਸਧਾਰਨ ਲਾਈਵ ਮੈਂਡਰਿਕ ਆਪਰੇਟਿੰਗ ਸਿਸਟਮ \n"
 "ਤੌਰ ਤੇ ਵਰਤਣ ਦੇ ਯੋਗ ਹੋ।"
 
 #: ../move/move.pm:494
@@ -255,7 +255,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1300,7 +1300,7 @@ msgstr "ਬੋਲੀ ਚੋਣ"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3687,7 +3687,7 @@ msgstr "ਰੇਡੀਓ ਸਹਿਯੋਗ ਯੋਗ"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3801,7 +3801,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3817,11 +3817,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3928,10 +3928,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4044,7 +4044,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4162,12 +4162,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4194,7 +4194,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4203,7 +4203,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4332,7 +4332,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4350,7 +4350,7 @@ msgstr "ਪਿੱਛੇ"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4379,7 +4379,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4395,7 +4395,7 @@ msgstr "ਸੁਰੱਖਿਆ ਪ੍ਰਬੰਧਕ"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4481,7 +4481,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4529,7 +4529,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4538,13 +4538,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4585,7 +4585,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4744,7 +4744,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4765,7 +4765,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4868,7 +4868,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4885,7 +4885,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4947,7 +4947,7 @@ msgstr "ਸੇਵਾਵਾਂ"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "ਤੁਹਾਡਾ ਨਵਾਂ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਭਾਗ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਸਾਫ ਕਰਨ ਵਾਸਤੇ\n"
@@ -5290,7 +5290,7 @@ msgstr "Windows ਭਾਗ ਦਾ ਅਕਾਰ ਪਤਾ ਕਰ ਰਿਹਾ ਹ�
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "ਤੁਹਾਡਾ Windows ਭਾਗ ਬਹੁਤ ਫਰੈਗਮਿੰਟਡ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਕੰਪਿਊਟਰ Windows ਅਧੀਨ ਮੁੜ ਚਲਾਓ, "
@@ -5398,19 +5398,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5432,7 +5432,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5440,14 +5440,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5457,7 +5457,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5477,10 +5477,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5491,11 +5491,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5511,7 +5511,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5573,7 +5573,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5581,7 +5581,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5616,7 +5616,7 @@ msgstr "ਪਗ਼ `%s' ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -6146,7 +6146,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr "ਉਪਲੱਬਧ ਪ੍ਰਤੀਬਿੰਬਾਂ ਦੀ ਸੂਚੀ ਵੇਖਣ ਲਈ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਵੈਬ ਸਾਈਟ ਨਾਲ ਸੰਪਰਕ ਜਾਰੀ ਹੈ..."
 
 #: install_steps_interactive.pm:840
@@ -6364,7 +6364,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
 msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਇੰਸਟਾਲੇਸ਼ਨ %s "
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -8950,7 +8950,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12780,7 +12780,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14605,18 +14605,18 @@ msgstr "ਰੋਕੋ"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr "<b>ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕੀ ਹੈ?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
 msgstr "<b>ਮੈਂਡਰਿਕ-ਲੀਨਕਸ</b> ਵੱਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14628,7 +14628,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਅੱਜ ਇੱਕ <b>ਉਪਭੋਗੀ-ਮਿੱਤਰ</b> ਲੀਨਕਸ ਵੰਡ ਹੈ। ਇਹ <b>ਜਿਆਦਾ ਵਰਤਿਆ ਜਾਣ ਵਾਲਾ</"
@@ -14647,9 +14647,9 @@ msgstr "<b>ਮੁਕਤ ਸਰੋਤ ਦੀ ਦੁਨੀਆਂ</b> ਵੱਲੋ�
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -14669,7 +14669,7 @@ msgstr "<b>GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "ਬਹੁਤੇ ਸਾਫਟਵੇਅਰ ਵੰਢ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹਨ ਅਤੇ ਸਭ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸੰਦ <b>ਜਨਰਲ ਪਬਲਿਕ ਲਾਈਸਿੰਸ</b> "
 "ਅਧੀਨ ਲਾਈਸਿੰਸੀ ਹਨ।"
@@ -14701,10 +14701,10 @@ msgstr "<b>ਸੰਗਠਨ ਨਾਲ ਜੁੜੋ</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14726,8 +14726,8 @@ msgstr "<b>ਵਰਜ਼ਨ ਡਾਊਨਲੋਡ</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 "ਤੁਸੀਂ ਹੁਣ <b>ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਡਾਊਨਲੋਡ</b> ਇੰਸਟਾਲ ਕਰ ਰਹੇ ਹੋ। ਇਹ ਮੁਕਤ ਵਰਜ਼ਨ ਹੈ ਜੋ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ "
 "ਨੇ <b>ਹਰੇਕ ਨੂੰ ਉਪਲੱਬਧ</b> ਕੀਤਾ ਹੈ।"
@@ -14759,7 +14759,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "ਤੁਹਾਨੂੰ ਹੋਰ ਮੈਂਡਰਿਕ-ਸਾਫਟ ਉਤਪਾਦ ਵਿੱਚ <b>ਸ਼ਾਮਿਲ ਸੇਵਾਵਾਂ</b> ਵਰਤਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੋਵੇਗੀ।"
 
@@ -14770,7 +14770,7 @@ msgstr "<b>ਖੋਜ, ਤੁਹਾਡਾ ਪਹਿਲਾ ਲੀਨਕਸ ਵਿ�
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr "ਤੁਸੀਂ ਹੁਣ <b>ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਖੋਜ</b> ਇੰਸਟਾਲ ਕਰ ਰਹੇ ਹੋ।"
 
 #: share/advertising/06.pl:17
@@ -14789,13 +14789,13 @@ msgstr "<b>PowerPack, ਮੁਢਲਾ ਲੀਨਕਸ ਵਿਹੜਾ</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr "ਤੁਸੀਂ ਹੁਣ <b>ਮੈਂਡਰਿਕ-ਲੀਨਕਸ PowerPack</b> ਇੰਸਟਾਲ ਕਰ ਰਹੇ ਹੋ।"
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14809,7 +14809,7 @@ msgstr "<b>PowerPack+, ਵਿਹੜੇ ਅਤੇ ਸਰਵਰਾਂ ਲਈ ਲ�
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr "ਤੁਸੀਂ ਹੁਣ <b>ਮੈਂਡਰਿਕ-ਲੀਨਕਸ PowerPack+</b> ਇੰਸਟਾਲ ਕਰ ਰਹੇ ਹੋ।"
 
 #: share/advertising/08.pl:17
@@ -14823,19 +14823,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr "<b>ਮੈਂਡਰਿਕ-ਸਾਫਟ ਉਤਪਾਦ</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr "<b>ਮੈਂਡਰਿਕ-ਸਾਫਟ</b> ਨੇ ਬਹੁਤ ਸਾਰੇ <b>ਮੈਂਡਰਿਕ-ਲੀਨਕਸ</b> ਉਤਪਾਦਾਂ ਦਾ ਵਿਕਾਸ ਕੀਤਾ।"
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ 10.1 ਦੇ ਉਤਪਾਦ ਹਨ:"
 
 #: share/advertising/09.pl:18
@@ -14856,7 +14856,7 @@ msgstr "\t* <b>PowerPack+</b>, ਵਿਹੜੇ ਅਤੇ ਸਰਵਰਾਂ ਲ�
 #: share/advertising/09.pl:21
 #, fuzzy, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 "\t* <b>x86-64 ਲਈ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ 10.1</b>, ਤੁਹਾਡੇ ਬਹੁਤੇ 64-ਬਿੱਟ ਪਰੋਸੈੱਸਰਾਂ ਲਈ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ "
@@ -14864,13 +14864,13 @@ msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr "<b>ਮੈਂਡਰਿਕ-ਸਾਫਟ ਉਤਪਾਦ (Nomad ਉਤਪਾਦ)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 "ਮੈਂਡਰਿਕ-ਸਾਫਟ ਨੇ ਦੋ ਉਤਪਾਦਾਂ ਦਾ ਵਿਕਾਸ ਕੀਤਾ ਹੈ ਤੁਹਾਨੂੰ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਨੂੰ <b>ਕਿਸੇ ਕੰਪਿਊਟਰ ਤੇ</b> "
@@ -14879,7 +14879,7 @@ msgstr ""
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 "\t* <b>ਲਿਜਾਓ</b>, ਇੱਕ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਵੰਡ ਜੋ ਪੂਰੀ ਤਰਾਂ ਬੂਟ ਹੋਣ ਯੋਗ CD-ROM ਤੋਂ ਚੱਲਦੀ ਹੈ।"
@@ -14887,7 +14887,7 @@ msgstr ""
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 "\t* <b>GlobeTrotter</b>, ਇੱਕ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਵੰਡ ਜੋ ultra-compact “LaCie ਮੋਬਾਈਲ ਹਾਰਡ "
@@ -14895,29 +14895,29 @@ msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr "<b>ਮੈਂਡਰਿਕ-ਸਾਫਟ ਉਤਪਾਦ (ਪੇਸ਼ੇਵਰ ਹੱਲ)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr "ਹੇਠਾਂ <b>ਪੇਸ਼ੇਵਰ ਲੋੜਾਂ</b> ਦੀ ਪੂਰਤੀ ਲਈ ਬਣਾਏ ਉਤਪਾਦ ਹਨ:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr "\t* <b>ਸਹਿਕਾਰੀ ਵਿਹੜਾ</b>, ਕਿੱਤੇ ਲਈ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਵਿਹੜਾ।"
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr "\t* <b>ਸਹਿਕਾਰੀ ਸਰਵਰ</b>, ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸਰਵਰ ਹੱਲ।"
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr "\t* <b>ਬਹੁ-ਨੈੱਟਵਰਕ ਫਾਇਰਵਾਲ</b>, ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸੁਰੱਖਿਆ ਹੱਲ।"
 
 #: share/advertising/12.pl:13
@@ -14961,7 +14961,7 @@ msgstr "<b>ਆਪਣਾ ਪਿਆਰਾ ਵਿਹੜਾ ਵਾਤਾਵਰਨ �
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "PowerPack ਨਾਲ, ਤੁਹਾਡੇ ਕੋਲ <b>ਗਰਾਫੀਕਲ ਵਿਹੜਾ ਵਾਤਾਵਰਨ</b> ਦੀ ਚੋਣ ਹੈ। ਮੈਂਡਰਿਕ-ਸਾਫਟ ਨੇ "
 "<b>ਕੇ ਡੀ ਈ</b> ਨੂੰ ਮੂਲ ਚੁਣਿਆ ਹੈ।"
@@ -14988,7 +14988,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "PowerPack+ ਨਾਲ, ਤੁਹਾਡੇ ਕੋਲ <b>ਗਰਾਫੀਕਲ ਵਿਹੜਾ ਵਾਤਾਵਰਨ</b> ਦੀ ਚੋਣ ਹੋਵੇਗੀ। ਮੈਂਡਰਿਕ-ਸਾਫਟ "
 "ਨੇ <b>ਕੇ ਡੀ ਈ</b> ਮੂਲ ਤੌਰ ਤੇ ਚੁਣਿਆ ਹੈ।"
@@ -15113,7 +15113,7 @@ msgstr "<b>ਕਈ ਕਾਰਜਾਂ ਦਾ ਆਨੰਦ ਮਾਣੋ</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਮੇਨੂ ਵਿੱਚ ਤੁਸੀਂ <b>ਆਪਣੇ ਸਭ ਕਾਰਜਾਂ</b> ਲਈ <b>ਵਰਤਣ-ਲਈ-ਸੌਖੇ</b> ਕਾਰਜ ਵੇਖੋਗੇ:"
@@ -15367,14 +15367,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr "<b>ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 "<b>ਮੈਂਡਰਿਕਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ</b> ਮੈਂਡਰਿਕਲੀਨਕਸ-ਖਾਸ ਸਹੂਲਤਾਂ ਦਾ ਸਮੂਹ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਤੁਹਾਡੇ "
@@ -15398,9 +15398,9 @@ msgstr "<b>ਮੁਕਤ ਸਰੋਤ ਮਾਡਲ</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -15412,7 +15412,7 @@ msgstr "<b>ਆਨਲਾਈਨ ਭੰਡਾਰ</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr "ਮੈਂਡਰਿਕ-ਸਾਫਟ ਅਤੇ ਸੇਵਾਵਾਂ ਬਾਰੇ ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ ਸਾਡਾ <b>ਈ-ਕਮਰਸ ਪਲੇਟਫਾਰਮ</b> ਵੇਖੋ"
 
@@ -15435,20 +15435,20 @@ msgstr "ਅੱਜ <b>store.mandrakesoft.com</b> ਤੇ ਰੁਕੋ!"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
 msgstr "<b>ਮੈਂਡਰਿਕ-ਕਲੱਬ</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr "<b>ਮੈਂਡਰਿਕ-ਕਲੱਬ</b> ਤੁਹਾਡੇ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਉਤਪਾਦ ਲਈ ਇੱਕ <b>ਸੰਪੂਰਣ ਸਾਥੀ</b> ਹੈ.."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr "ਮੈਂਡਰਿਕ-ਕਲੱਬ ਨਾਲ ਜੁੜ ਕੇ <b>ਯੋਗ ਫਾਇਦਿਆਂ</b> ਦਾ ਲਾਭ ਲਵੋ, ਜਿਵੇਂ:"
 
 #: share/advertising/28.pl:20
@@ -15469,27 +15469,27 @@ msgstr "\t* <b>ਵਪਾਰਿਕ ਕਾਰਜਾਂ</b> ਨੂੰ ਪਹੁੰ�
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr "\t* ਮੈਂਡਰਿਕ-ਲੀਨਕਸ <b>ਉਪਭੋਗੀ ਲੋਕ-ਚਰਚਾ-ਸਥਾਨ</b> ਵਿੱਚ ਸਹਿਯੋਗ।"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* ਪਬਲਿਕ ਜਾਰੀ ਤੋਂ ਪਹਿਲਾਂ, ਮੈਂਡਰਿਕ-ਲੀਨਕਸ <b>ISO ਪ੍ਰਤੀਬਿੰਬ</b> ਨੂੰ, <b>ਪਹਿਲੀ ਅਤੇ ਮਨਜੂਰ "
 "ਪਹੁੰਚ</b>।"
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr "<b>ਮੈਂਡਰਿਕ-ਆਨਲਾਈਨ</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 "<b>ਮੈਂਡਰਿਕ-ਆਨਲਾਈਨ</b> ਇੱਕ ਨਵੀਂ ਲਾਭਅੰਸ਼ ਸੇਵਾ ਹੈ ਜਿਸ ਨੂੰ ਮੈਂਡਰਿਕ-ਸਾਫਟ ਆਪਣੇ ਗਾਹਕਾਂ ਨੂੰ ਮੁਹੱਈਆ ਕਰਨ "
@@ -15498,8 +15498,8 @@ msgstr ""
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਤੁਹਾਡੇ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸਿਸਟਮ <b>ਸੌਖੇ ਨਵਿਨੀਕਰਨ</b> ਲਈ ਬਹੁਤ ਸਾਰੀਆਂ ਸੇਵਾਵਾਂ "
 "ਮੁਹੱਈਆ ਕਰਦਾ ਹੈ:"
@@ -15524,18 +15524,18 @@ msgstr "\t* ਲਚਕਦਾਰ <b>ਕ੍ਰਮਬੱਧ</b> ਨਵਿਨੀਕ�
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr "\t* ਇੱਕ ਖਾਤੇ ਨਾਲ <b>ਤੁਹਾਡੇ ਸਭ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸਿਸਟਮਾਂ</b> ਦਾ ਪ੍ਰਬੰਧਨ।"
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
 msgstr "<b>ਮੈਂਡਰਿਕ-ਮਾਹਿਰ</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "ਕੀ ਤੁਹਾਨੂੰ <b>ਸਹਾਇਕ?</b> ਦੀ ਲੋੜ ਹੈ, <b>ਸਾਡੇ ਤਕਨੀਕੀ ਸਹਿਯੋਗ ਪਲੇਟਫਾਰਮ</b> www."
@@ -15544,7 +15544,7 @@ msgstr ""
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 "<b>ਸਿੱਖਿਅਤ ਮੈਡਰਿਕ-ਲੀਨਕਸ ਮਾਹਿਰ</b> ਦੀ ਸਹਾਇਤਾ ਲਈ ਧੰਨਵਾਦ, ਤੁਸੀਂ ਸਮੇਂ ਦੀ ਬਚਤ ਕੀਤੀ।"
@@ -15552,7 +15552,7 @@ msgstr ""
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਨਾਲ ਸੰਬੰਧਿਤ ਕਿਸੇ ਪ੍ਰਸ਼ਨ ਲਈ, ਤੁਹਾਡੇ ਕੋਲ <b>store.mandrakesoft.com</b> ਤੇ "
@@ -15849,7 +15849,7 @@ msgstr "ਪ੍ਰਬੰਧਨ ਸੰਦ, ਕਾਰਜ ਅਕਾਊਂਟਿੰ�
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr "ਮੈਂਡਰਿਕ-ਸਾਫਟ ਤਖਤੀ"
 
 #: share/compssUsers.pl:197
@@ -15951,7 +15951,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16011,7 +16011,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -18600,12 +18600,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਬੱਗ ਰਿਪੋਰਟ ਸੰਦ"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
 msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕੰਟਰੋਲ ਸੈਂਟਰ"
 
 #: standalone/drakbug:48
@@ -18626,7 +18626,7 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "ਮੈਂਡਰਿਕ-ਆਨਲਾਈਨ"
 
 #: standalone/drakbug:52
@@ -18671,7 +18671,7 @@ msgstr "ਸੰਰਚਨਾ ਤਖਤੀ"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr "ਮੈਂਡਰਿਕ-ਸਾਫਟ ਸੰਦ ਚੁਣੋ:"
 
 #: standalone/drakbug:82
@@ -19090,7 +19090,7 @@ msgstr "ਬੂਟ ਦੌਰਾਨ ਚਲਾਓ"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "ਹਾਲੇ ਕੋਈ ਵੀ ਇੰਟਰਫੇਸ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ।\n"
 "ਮੈਂਡਰਿਕਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ \"ਇੰਟਰਫੇਸ ਸ਼ਾਮਲ\" ਚਲਾਓ।"
@@ -19099,7 +19099,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "ਤੁਹਾਡੇ ਕੋਲ ਹਾਲੇ ਕੋਈ ਵੀ ਇੰਟਰਨੈਟ ਕੁਨੈਕਸ਼ਨ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ।\n"
 "ਮੈਂਡਰਿਕਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ \"ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਲ\" ਚਲਾਓ।"
@@ -19152,7 +19152,7 @@ msgstr "KDM (KDE ਦ੍ਰਿਸ਼ ਮੈਨੇਜਰ)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr "MdkKDM (ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਦ੍ਰਿਸ਼ ਮੈਨੇਜਰ)"
 
 #: standalone/drakedm:37
@@ -19452,7 +19452,7 @@ msgstr "ਆਯਾਤ"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19969,7 +19969,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -20002,7 +20002,7 @@ msgstr " --doc <link>          - ਹੋਰ ਵੈਬ ਸਫਿਆਂ ਨੂੰ �
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸਹਾਇਤਾ ਕੇਂਦਰ"
 
 #: standalone/drakhelp:36
@@ -23337,7 +23337,7 @@ msgstr "ਤਬਦੀਲੀ ਕੀਤੀ ਗਈ, ਪਰ ਲਾਗੂ ਕਰਨ �
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸੰਦ ਲਾਗ"
 
 #: standalone/logdrake:51
@@ -23850,7 +23850,7 @@ msgstr "ਕੁਨੈਕਸ਼ਨ ਮੁਕੰਮਲ।"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "ਕੁਨੈਕਸ਼ਨ ਅਸਫਲ।\n"
 "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ ਆਪਣੀ ਸੰਰਚਨਾ ਦੀ ਜਾਂਚ ਕਰੋ।"
diff --git a/perl-install/share/po/pl.po b/perl-install/share/po/pl.po
index 894503cc6..b673d562b 100644
--- a/perl-install/share/po/pl.po
+++ b/perl-install/share/po/pl.po
@@ -69,7 +69,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Wygląda na to, że klucz USB posiada włączone zabezpieczenie przed zapisem,\n"
 "lecz wciąż można go bezpiecznie odłączyć.\n"
@@ -77,7 +77,7 @@ msgstr ""
 "\n"
 "Kliknij przycisk aby uruchomić ponownie komputer, wyłącz klucz, usuń\n"
 "zabezpieczenie przed zapisem oraz włóż go ponownie.\n"
-"Następnie należy ponownie uruchomić Mandrake Move."
+"Następnie należy ponownie uruchomić Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -95,7 +95,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Twój klucz USB nie zawiera żadnych prawidłowych partycji Windows (FAT).\n"
@@ -106,14 +106,14 @@ msgstr ""
 "\n"
 "\n"
 "Można także kontynuować bez klucza USB - wciąż będzie można\n"
-"korzystać z Mandrake Move tak jak z normalnego systemu\n"
+"korzystać z Mandriva Move tak jak z normalnego systemu\n"
 "operacyjnego Mandrake."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -121,11 +121,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "W twoim systemie nie wykryto żadnego klucza USB. Jeśli\n"
-"teraz włożysz klucz USB, Mandrake Move będzie posiadać\n"
+"teraz włożysz klucz USB, Mandriva Move będzie posiadać\n"
 "możliwość przezroczystego zapisu danych w twoim katalogu\n"
 "domowym oraz całą konfigurację systemu, które będą używane\n"
 "podczas uruchomienia tego lub innego komputera.\n"
@@ -134,7 +134,7 @@ msgstr ""
 "\n"
 "\n"
 "Można także kontynuować bez klucza USB - wciąż będzie można\n"
-"korzystać z Mandrake Move tak jak z normalnego systemu\n"
+"korzystać z Mandriva Move tak jak z normalnego systemu\n"
 "operacyjnego Mandrake."
 
 #: ../move/move.pm:494
@@ -261,7 +261,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -277,7 +277,7 @@ msgstr ""
 "\n"
 "Może być to spowodowane uszkodzonymi plikami konfiguracyjnymi\n"
 "systemu zapisanymi na kluczu USB. W tym przypadku usunięcie ich\n"
-"a następnie ponowne uruchomienie Mandrake Move może naprawić\n"
+"a następnie ponowne uruchomienie Mandriva Move może naprawić\n"
 "sytuację. Aby to zrobić, kliknij odpowiedni przycisk.\n"
 "\n"
 "\n"
@@ -1320,11 +1320,11 @@ msgstr "Wybór języka"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux obsługuje wiele języków. Wybierz\n"
+"Mandrivalinux obsługuje wiele języków. Wybierz\n"
 "języki do zainstalowania. Będą one dostępne po zakończeniu\n"
 "instalacji i ponownym uruchomieniu systemu."
 
@@ -3751,12 +3751,12 @@ msgstr "włączona obsługa radia"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Przed kontynuowaniem, należy przeczytać uważnie warunki licencji dotyczącej "
-"całej dystrybucji Mandrakelinux. Jeśli zgadzasz się\n"
+"całej dystrybucji Mandrivalinux. Jeśli zgadzasz się\n"
 "z wszystkimi warunkami w niej zawartymi, zaznacz opcję \"%s\".\n"
 "Jeśli nie kliknij na przycisk \"%s\" w celu ponownego uruchomienia\n"
 "komputera."
@@ -3934,13 +3934,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Instalacja Mandrakelinux jest rozpowszechniana na kilku płytach CD.\n"
+"Instalacja Mandrivalinux jest rozpowszechniana na kilku płytach CD.\n"
 "Jeśli wybrany pakiet jest zlokalizowany na innej płycie CD\n"
 " instalator wysunie bieżącą płytę CD oraz wyświetli prośbę\n"
 "o włożenie wymaganej płyty CD. Jeśli nie posiadasz wymaganej\n"
@@ -3951,11 +3951,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4007,7 +4007,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Nadszedł czas na określenie, jakie programy mają zostać zainstalowane w\n"
-"systemie. Dla Mandrakelinux są dostępne tysiące pakietów. Aby uczynić\n"
+"systemie. Dla Mandrivalinux są dostępne tysiące pakietów. Aby uczynić\n"
 "zarządzanie pakietami łatwiejszym, zostały one uporządkowane na podstawie\n"
 "podobieństwa aplikacji.\n"
 "\n"
@@ -4121,10 +4121,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4155,7 +4155,7 @@ msgstr ""
 "!! Jeśli zostanie wybrany pakiet serwera, niezależnie czy wybrany został\n"
 "on w drodze indywidualnego wyboru pakietów, lub też jako pakiet grupy,\n"
 "zostanie wyświetlona prośba o potwierdzenie wyboru pakietu serwera\n"
-"przed jego instalacją. W systemie Mandrakelinux, wszystkie zainstalowane\n"
+"przed jego instalacją. W systemie Mandrivalinux, wszystkie zainstalowane\n"
 "serwery są uruchamiane domyślnie w trakcie\n"
 "uruchamiania całego systemu. Nawet jeśli dany pakiet jest uważany\n"
 "za bezpieczny i w trakcie instalacji nie są znane żadne problemy z nim\n"
@@ -4313,7 +4313,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4369,7 +4369,7 @@ msgid ""
 msgstr ""
 "X (od systemu X Window) to serce graficznego interfejsu GNU/Linux,\n"
 "z którego korzystają wszystkie środowiska graficzne (KDE, GNOME,\n"
-"AfterStep, WindowMaker, itd.) dostępne w systemie Mandrakelinux.\n"
+"AfterStep, WindowMaker, itd.) dostępne w systemie Mandrivalinux.\n"
 "\n"
 "Zostanie wyświetlona lista różnych parametrów pozwalających\n"
 "na zmianę sposobu wyświetlania.\n"
@@ -4489,12 +4489,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4521,7 +4521,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4530,7 +4530,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4551,11 +4551,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "W tym etapie instalacji należy określić, gdzie na dysku zostanie\n"
-"zainstalowany system operacyjny Mandrakelinux. Jeśli dysk jest pusty\n"
+"zainstalowany system operacyjny Mandrivalinux. Jeśli dysk jest pusty\n"
 "lub istniejące systemy operacyjne zajmują całe dostępne miejsce,\n"
 "należy podzielić dysk na partycje.\n"
 "Partycjonowanie to po prostu logiczny podział twardego dysku na oddzielne\n"
-"obszary w celu zainstalowania systemu Mandrakelinux.\n"
+"obszary w celu zainstalowania systemu Mandrivalinux.\n"
 "\n"
 "Ponieważ efekt partycjonowania jest nieodwracalny, czynność wydaje się\n"
 "niebezpieczna i jest stresująca dla niedoświadczonych użytkowników.\n"
@@ -4592,7 +4592,7 @@ msgstr ""
 "\n"
 " * \"%s\": Jeśli chcesz usunąć z dysku\n"
 "wszystkie dane i wszystkie partycje istniejące na dysku oraz zainstalować\n"
-"w to miejsce nowy system Mandrakelinux, wybierz to rozwiązanie.\n"
+"w to miejsce nowy system Mandrivalinux, wybierz to rozwiązanie.\n"
 "Pamiętaj, że po zatwierdzeniu tego wyboru nie nie będzie możliwości "
 "odwrotu.\n"
 "\n"
@@ -4756,7 +4756,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4778,7 +4778,7 @@ msgstr ""
 "Kliknij \"%s\", jeśli już można przystąpić do formatowania partycji.\n"
 "\n"
 "Kliknij \"%s\", jeśli chcesz wybrać inne partycje dla nowej instalacji\n"
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 "Kliknij \"%s\" jeśli chcesz wybrać sprawdzanie niektórych partycji\n"
 "w poszukiwaniu uszkodzonych sektorów na dysku."
@@ -4795,7 +4795,7 @@ msgstr "Wstecz"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4807,7 +4807,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Podczas instalacji Mandrakelinux, być może niektóre pakiety\n"
+"Podczas instalacji Mandrivalinux, być może niektóre pakiety\n"
 "zostały zaktualizowane od wydania początkowego. Niektóre błędy mogą\n"
 "zostać naprawione, zaś problemy z bezpieczeństwem rozwiązane. Aby\n"
 "skorzystać z możliwości aktualizacji, dobrze jest pobrać część danych\n"
@@ -4836,7 +4836,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4851,7 +4851,7 @@ msgstr ""
 "Jeśli nie wiesz co wybrać, użyj domyślnej opcji. Będzie można zmienić "
 "poziom\n"
 "bezpieczeństwa w późniejszym czasie przy użyciu narzędzia draksec\n"
-"uruchamianego z Centrum Sterowania Mandrakelinux.\n"
+"uruchamianego z Centrum Sterowania Mandrivalinux.\n"
 "\n"
 "Pole \"%s\" może informować system o użytkowniku komputera odpowiedzialnego\n"
 "za bezpieczeństwo. Komunikaty bezpieczeństwa będą przesyłane na ten adres."
@@ -4865,7 +4865,7 @@ msgstr "Administrator zabezpieczeń"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4936,7 +4936,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "W tym etapie instalacji wybierasz partycje, na których będzie instalowany\n"
-"Mandrakelinux. Jeśli istnieją (np. pozostały po poprzedniej instalacji,\n"
+"Mandrivalinux. Jeśli istnieją (np. pozostały po poprzedniej instalacji,\n"
 "lub też zostały założone innym narzędziem), można ich użyć do instalacji.\n"
 "W innym przypadku należy je utworzyć.\n"
 "\n"
@@ -5025,7 +5025,7 @@ msgstr "Przełącz między trybem zwykłym a zaawansowanym"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5054,7 +5054,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Na dysku wykryto więcej niż jedną partycję Windows. Wybierz, którą\n"
-"z nich chcesz zmniejszyć w celu zainstalowania systemu Mandrakelinux\n"
+"z nich chcesz zmniejszyć w celu zainstalowania systemu Mandrivalinux\n"
 "\n"
 "Każda partycja jest określana za pomocą informacji: \"Nazwa linuksowa\",\n"
 "\"Nazwa Windows\" i \"Rozmiar\".\n"
@@ -5100,7 +5100,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5109,19 +5109,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Ten krok jest aktywowany tylko jeśli na twoim komputerze została\n"
 "znaleziona stara partycja GNU/Linux.\n"
 "\n"
 "Instalator musi teraz otrzymać informację czy chcesz przeprowadzić nową\n"
-"instalację, czy też uaktualnić istniejący system Mandrakelinux:\n"
+"instalację, czy też uaktualnić istniejący system Mandrivalinux:\n"
 "\n"
 " * \"%s\": W większości przypadków, ta opcja powoduje całkowite\n"
 "usunięcie starego systemu. Jednak w zależności od schematu\n"
@@ -5131,13 +5131,13 @@ msgstr ""
 "opcji.\n"
 "\n"
 " * \"%s\": Ta klasa instalacji umożliwia uaktualnienie pakietów\n"
-"aktualnie zainstalowanych w systemie Mandrakelinux. Twój bieżący\n"
+"aktualnie zainstalowanych w systemie Mandrivalinux. Twój bieżący\n"
 "schemat partycjonowania oraz dane użytkownika nie zostaną zmienione.\n"
 "Większość z innych kroków konfiguracyjnych pozostanie dostępnych,\n"
 "podobnie do instalacji standardowej.\n"
 "\n"
 "Użycie wersji \"Uaktualnienie\" powinno zadziałać dobrze na systemach\n"
-"Mandrakelinux w wersji \"8.1\" i późniejszych. Przeprowadzanie\n"
+"Mandrivalinux w wersji \"8.1\" i późniejszych. Przeprowadzanie\n"
 "uaktualnienia z wersji wcześniejszych niż \"8.1\" nie jest zalecane."
 
 #: help.pm:591
@@ -5196,7 +5196,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5240,7 +5240,7 @@ msgstr ""
 "Uwaga dotycząca obsługi UTF-8 (unikodu): Unikod jest nowym kodowaniem\n"
 "znaków umożliwiającym równoczesną osługę wszystkich istniejących\n"
 "języków. Jednak pełna obsługa tego standardu jest wciąż w trakcie\n"
-"rozwoju w systemach GNU/Linux. Z tego powodu, Mandrakelinux\n"
+"rozwoju w systemach GNU/Linux. Z tego powodu, Mandrivalinux\n"
 "używa go lub nie w zależności od wyboru użytkownika:\n"
 "\n"
 "* Po wybraniu języków z często używanym kodowaniem (języki latin1,\n"
@@ -5485,7 +5485,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5506,11 +5506,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Nadszedł czas na wybranie systemu drukowania. Inne systemy operacyjne\n"
-"mogą zaoferować jeden, lecz Mandrakelinux oferuje dwa. Każdy z tych\n"
+"mogą zaoferować jeden, lecz Mandrivalinux oferuje dwa. Każdy z tych\n"
 "systemów wydruku jest najlepszy dla określonego typu konfiguracji.\n"
 "\n"
 " * \"%s\" oznaczający \"print, do not queue\" (drukuj, nie buforuj),\n"
@@ -5657,7 +5657,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5674,7 +5674,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5728,7 +5728,7 @@ msgstr ""
 "\n"
 " * \"%s\": jeśli chcesz skonfigurować połączenie z Internetem lub\n"
 "sieć lokalną użyj tej opcji. Zobacz na wydrukowaną dokumentację lub\n"
-"użyj Centrum Sterownia Mandrakelinux po zakończeniu instalacji\n"
+"użyj Centrum Sterownia Mandrivalinux po zakończeniu instalacji\n"
 "aby otrzymać pełną pomoc.\n"
 "\n"
 " * \"%s\": umożliwia konfigurację adresów pośrednika HTTP i FTP,\n"
@@ -5806,11 +5806,11 @@ msgstr "Usługi"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Wybierz dysk, który chcesz wykasować, by założyć na nim\n"
-"partycję Mandrakelinux. Pamiętaj, że wszystkie dane z tego\n"
+"partycję Mandrivalinux. Pamiętaj, że wszystkie dane z tego\n"
 "dysku zostaną utracone bez możliwości odzyskania!"
 
 #: help.pm:863
@@ -6162,12 +6162,12 @@ msgstr "Obliczanie rozmiaru partycji Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Partycja Windows jest zbyt pofragmentowana. Należy uruchomić komputer pod "
 "systemem Windows, uruchomić narzędzie \"defrag\" i następnie ponownie "
-"rozpocząć instalację Mandrakelinux."
+"rozpocząć instalację Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6287,19 +6287,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6321,7 +6321,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6329,14 +6329,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6346,7 +6346,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6366,10 +6366,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6380,11 +6380,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6400,23 +6400,23 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Wprowadzenie\n"
 "\n"
 "System operacyjny wraz z innymi komponentami dostępnymi w dystrybucji "
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "zwany jest dalej \"Oprogramowaniem\". Oprogramowanie zawiera między innymi "
 "zbiór \n"
 "programów, metod, zasad oraz dokumentacji związanej z systemem operacyjnym "
 "oraz \n"
-"innych komponentów dystrybucji Mandrakelinux.\n"
+"innych komponentów dystrybucji Mandrivalinux.\n"
 "\n"
 "1. Umowa licencyjna\n"
 "\n"
 "Należy przeczytać uważnie ten dokument. Jest on umową licencyjną pomiędzy "
 "użytkownikiem\n"
-"a Mandrakesoft S.A. dotyczącą Oprogramowania.\n"
+"a Mandriva S.A. dotyczącą Oprogramowania.\n"
 "Instalacja, kopiowanie lub używanie Oprogramowania w dowolny sposób, oznacza "
 "pełną\n"
 "i wyraźną zgodę na warunki licencyjne tej umowy.\n"
@@ -6435,7 +6435,7 @@ msgstr ""
 "Oprogramowanie oraz dołączona dokumentacja dostarczana jest w formie "
 "\"takiej jaka jest\",\n"
 "bez żadnej gwarancji, w stopniu w jakim pozwala na to prawo.\n"
-"Firma Mandrakesoft S.A. nie będzie, bez względu na okoliczności i w zakresie "
+"Firma Mandriva S.A. nie będzie, bez względu na okoliczności i w zakresie "
 "określonym przez \n"
 "prawo, odpowiedzialna za żadne specjalne, uboczne, bezpośrednie i pośrednie "
 "uszkodzenia\n"
@@ -6444,13 +6444,13 @@ msgstr ""
 "firmy, straty finansowe, zasądzone grzywny i kary prawne lub inne straty) "
 "powstałe w wyniku\n"
 "używania lub niemożności używania Oprogramowania, nawet jeśli firma "
-"Mandrakesoft S.A.\n"
+"Mandriva S.A.\n"
 "została ostrzeżona o możliwości wystąpienia takich uszkodzeń.\n"
 "\n"
 "OGRANICZONA ODPOWIEDZIALNOŚĆ ZWIĄZANA Z POSIADANIEM LUB UŻYWANIEM\n"
 "OPROGRAMOWANIA W NIEKTÓRYCH KRAJACH\n"
 "\n"
-"W zakresie określonym przez prawo firma Mandrakesoft S.A. lub jej "
+"W zakresie określonym przez prawo firma Mandriva S.A. lub jej "
 "dystrybutorzy bez względu\n"
 "na okoliczności nie będą odpowiedzialni za żadne specjalne, uboczne, "
 "bezpośrednie i pośrednie uszkodzenia\n"
@@ -6460,7 +6460,7 @@ msgstr ""
 "powstałe w wyniku\n"
 "używania lub niemożności używania Oprogramowania lub w wyniku pobrania "
 "komponentów\n"
-"oprogramowania z jednej ze stron Mandrakelinux, które są zabronione lub "
+"oprogramowania z jednej ze stron Mandrivalinux, które są zabronione lub "
 "zastrzeżone w niektórych\n"
 "krajach przez lokalne prawo. Ta ograniczona odpowiedzialność dotyczy między "
 "innymi komponentów\n"
@@ -6480,9 +6480,9 @@ msgstr ""
 "komponentu przed\n"
 "jego użyciem. Dowolne pytanie dotyczące licencji powinno być przesyłane do "
 "autora, nie\n"
-"do firmy Mandrakesoft. Programy stworzone przez Mandrakesoft S.A. są wydane "
+"do firmy Mandriva. Programy stworzone przez Mandrakesoft S.A. są wydane "
 "na zasadach\n"
-"licencji GPL. Dokumentacja napisana przez Mandrakesoft S.A. jest wydana na "
+"licencji GPL. Dokumentacja napisana przez Mandriva S.A. jest wydana na "
 "zasadach\n"
 "wybranej licencji. Zajrzyj do dokumentacji, aby uzyskać więcej szczegółów.\n"
 "\n"
@@ -6493,12 +6493,12 @@ msgstr ""
 "chronione\n"
 "przez prawo własności intelektualnej i prawo autorskie stosowane do "
 "programów komputerowych.\n"
-"Firma Mandrakesoft S.A. zastrzega sobie prawo do zmiany lub przystosowania "
+"Firma Mandriva S.A. zastrzega sobie prawo do zmiany lub przystosowania "
 "Oprogramowania,\n"
 "jako całości lub w częściach, w każdym sensie i w dowolny celu.\n"
-"\"Mandrake\", \"Mandrakelinux\" oraz związane znaki graficzne są znakami "
+"\"Mandriva\", \"Mandrivalinux\" oraz związane znaki graficzne są znakami "
 "handlowymi firmy\n"
-"Mandrakesoft S.A.\n"
+"Mandriva S.A.\n"
 "\n"
 "\n"
 "5. Prawa Nadrzędne\n"
@@ -6515,7 +6515,7 @@ msgstr ""
 "Paryża we Francji.\n"
 "W przypadku jakichkolwiek wątpliwości dotyczących tego dokumentu, w celu ich "
 "wyjaśnienia\n"
-"można skontaktować się z firmą Mandrakesoft S.A.\n"
+"można skontaktować się z firmą Mandriva S.A.\n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6609,7 +6609,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6617,13 +6617,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Gratulacje, instalacja została zakończona.\n"
 "Usuń nośniki wymienne i naciśnij enter, by ponownie uruchomić komputer.\n"
 "\n"
 "\n"
-"Informacje o poprawkach dotyczących tej wersji Mandrakelinux\n"
+"Informacje o poprawkach dotyczących tej wersji Mandrivalinux\n"
 "znajdziesz na stronach:\n"
 "\n"
 "\n"
@@ -6631,7 +6631,7 @@ msgstr ""
 "\n"
 "\n"
 "Informacje o konfiguracji systemu znajdują się\n"
-"w Oficjalnym Podręczniku Użytkownika Mandrakelinux."
+"w Oficjalnym Podręczniku Użytkownika Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6666,7 +6666,7 @@ msgstr "Przechodzę do kroku `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -7210,9 +7210,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Łączenie ze stroną Mandrakelinux w celu pobrania listy dostępnych serwerów..."
+"Łączenie ze stroną Mandrivalinux w celu pobrania listy dostępnych serwerów..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7437,8 +7437,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Instalacja Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Instalacja Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10027,7 +10027,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -14099,11 +14099,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"Uruchom Scannerdrake (Sprzęt/Skanery w Centrum Sterowania Mandrakelinux), "
+"Uruchom Scannerdrake (Sprzęt/Skanery w Centrum Sterowania Mandrivalinux), "
 "aby udostępnić skaner w sieci.\n"
 "\n"
 
@@ -16057,23 +16057,23 @@ msgstr "Zatrzymaj"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Czym jest Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Czym jest Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Witamy w systemie <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Witamy w systemie <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux jest <b>dystrybucją Linuksa</b> zawierającą podstawowy system "
+"Mandrivalinux jest <b>dystrybucją Linuksa</b> zawierającą podstawowy system "
 "zwany <b>systemem operacyjnym</b> (opartym o jądro Linuksa) wraz z <b>dużą "
 "liczbą aplikacji</b> realizujących wszystkie zadania o jakich można tylko "
 "pomyśleć."
@@ -16081,10 +16081,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux jest  najbardziej <b>przyjazną dla użytkownika</b> dystrybucją "
+"Mandrivalinux jest  najbardziej <b>przyjazną dla użytkownika</b> dystrybucją "
 "Linuksa. Jest ona także jedną z <b>najczęściej używanych</b> dystrybucji "
 "Linuksa na świecie!"
 
@@ -16101,15 +16101,15 @@ msgstr "Witaj w <b>świecie Otwartego Oprogramowania</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux został wydany na zasadzie Open Source. To oznacza, że to nowe "
+"Mandrivalinux został wydany na zasadzie Open Source. To oznacza, że to nowe "
 "wydanie jest wynikiem <b>współpracy</b> pomiędzy <b>zespołem programistów "
-"Mandrakesoft</b> oraz <b>światową społecznością</b> współpracownikół "
-"Mandrakelinux."
+"Mandriva</b> oraz <b>światową społecznością</b> współpracownikół "
+"Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16129,10 +16129,10 @@ msgstr "<b>Licencja GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "Większość oprogramowania załączonego w dystrybucji oraz wszystkie narzędzia "
-"Mandrakelinux jest licencjonowana na zasadach <b>Powszechnej Licencji "
+"Mandrivalinux jest licencjonowana na zasadach <b>Powszechnej Licencji "
 "Publicznej</b> (GPL)."
 
 #: share/advertising/03.pl:17
@@ -16164,15 +16164,15 @@ msgstr "<b>Dołącz do społeczności</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux posiada jedną z <b>największych społeczności</b> użytkowników "
+"Mandrivalinux posiada jedną z <b>największych społeczności</b> użytkowników "
 "i deweloperów. Rola takiej społeczności jest bardzo szeroka, poczynając od "
 "zgłaszania błędów a kończąc na tworzeniu nowych aplikacji. Społeczność "
-"odgrywa <b>kluczową rolę</b> w świecie Mandrakelinux."
+"odgrywa <b>kluczową rolę</b> w świecie Mandrivalinux."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16194,11 +16194,11 @@ msgstr "<b>Wersja Download</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Właśnie instalujesz <b>Mandrakelinux Download</b>. Ta wersja jest wersją "
-"bezpłatną, którą Mandrakesoft chce utrzymać jako <b>dostępną dla wszystkich</"
+"Właśnie instalujesz <b>Mandrivalinux Download</b>. Ta wersja jest wersją "
+"bezpłatną, którą Mandriva chce utrzymać jako <b>dostępną dla wszystkich</"
 "b>."
 
 #: share/advertising/05.pl:19
@@ -16231,10 +16231,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Użytkownik nie będzie miał dostępu do <b>usług dołączanych</b> do innych "
-"produktów Mandrakesoft."
+"produktów Mandriva."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16243,8 +16243,8 @@ msgstr "<b>Discovery,Twój Pierwszy Linux</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Właśnie instalujesz <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Właśnie instalujesz <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16267,17 +16267,17 @@ msgstr "<b>PowerPack, Potężny System Linuksowy</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Właśnie instalujesz <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Właśnie instalujesz <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack jest <b>głównym produktem Linuksowym</b> firmy Mandrakesoft. "
+"PowerPack jest <b>głównym produktem Linuksowym</b> firmy Mandriva. "
 "PowerPack zawiera <b>tysiące aplikacji</b> - wszystko od najbardziej "
 "popularnych aplikacji do tych najbardziej zaawansowanych."
 
@@ -16288,8 +16288,8 @@ msgstr "<b>PowerPack+, Linuksowe rozwiązanie na biurka i serwery</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Właśnie instalujesz <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Właśnie instalujesz <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16306,22 +16306,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Produkty Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Produkty Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"Firma <b>Mandrakesoft</b> stworzyła szeroką gamę produktów dla dystrybucji "
-"<b>Mandrakelinux</b>."
+"Firma <b>Mandriva</b> stworzyła szeroką gamę produktów dla dystrybucji "
+"<b>Mandrivalinux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Produktami Mandrakelinux są:"
+msgid "The Mandrivalinux products are:"
+msgstr "Produktami Mandrivalinux są:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16341,77 +16341,77 @@ msgstr "\t* <b>PowerPack+</b>,  Linuksowe rozwiązanie na biurka i serwery"
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux dla x86-64</b>, edycja Mandrakelinux dla procesorów 64-"
+"\t* <b>Mandrivalinux dla x86-64</b>, edycja Mandrivalinux dla procesorów 64-"
 "ro bitowych."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Produkty Mandrakesoft (Produkty Nomada)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Produkty Mandriva (Produkty Nomada)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft storzył dwa produkty umożliwiające używanie dystrybucji "
-"Mandrakelinux <b>na dowolnym komputerze</b> bez potrzeby jej instalowania."
+"Mandriva storzył dwa produkty umożliwiające używanie dystrybucji "
+"Mandrivalinux <b>na dowolnym komputerze</b> bez potrzeby jej instalowania."
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, dystrybucja Mandrakelinux uruchamiana bezpośrednio z płyty "
+"\t* <b>Move</b>, dystrybucja Mandrivalinux uruchamiana bezpośrednio z płyty "
 "CD-ROM."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, dystrybucja Mandrakelinux preinstalowana na "
+"\t* <b>GlobeTrotter</b>, dystrybucja Mandrivalinux preinstalowana na "
 "ultrakompaktowym dysku LaCie Mobile."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Produkty Mandrakesoft (Rozwiązania Profesjonalne)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Produkty Mandriva (Rozwiązania Profesjonalne)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Poniżej wymienione są produkty Mandrakesoft zaprojektowane z myślą<b>o "
+"Poniżej wymienione są produkty Mandriva zaprojektowane z myślą<b>o "
 "zastosowaniach profesjonalnych</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
-"\t* <b>Corporate Desktop</b>, Biurkowa edycja Mandrakelinux do zastosowań "
+"\t* <b>Corporate Desktop</b>, Biurkowa edycja Mandrivalinux do zastosowań "
 "biznesowych."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
-"\t* <b>Corporate Server</b>, Serwerowa edycja Mandrakelinux do zastosowań "
+"\t* <b>Corporate Server</b>, Serwerowa edycja Mandrivalinux do zastosowań "
 "biznesowych."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
-"\t* <b>Multi-Network Firewall</b>, Edycja Mandrakelinux do zastosowań w "
+"\t* <b>Multi-Network Firewall</b>, Edycja Mandrivalinux do zastosowań w "
 "zakresie bezpieczeństwa."
 
 #: share/advertising/12.pl:13
@@ -16456,9 +16456,9 @@ msgstr "<b>Wybierz swoje ulubione środowisko graficzne</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"W PowerPacku możesz wybrać <b>środowisko graficzne</b>. Firma Mandrakesoft "
+"W PowerPacku możesz wybrać <b>środowisko graficzne</b>. Firma Mandriva "
 "wybrała <b>KDE</b> jako środowisko domyślne."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -16484,9 +16484,9 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"W PowerPacku+ możesz wybrać <b>środowisko graficzne</b>. Firma Mandrakesoft "
+"W PowerPacku+ możesz wybrać <b>środowisko graficzne</b>. Firma Mandriva "
 "wybrała <b>KDE</b> jako środowisko domyślne."
 
 #: share/advertising/14.pl:15
@@ -16616,10 +16616,10 @@ msgstr "<b>Korzystaj z szerokiej gamy aplikacji</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"W menu systemu Mandrakelinux znajdziesz <b>łatwe w użyciu</b> aplikacje do "
+"W menu systemu Mandrivalinux znajdziesz <b>łatwe w użyciu</b> aplikacje do "
 "<b>wielu swoich zadań</b>:"
 
 #: share/advertising/18.pl:16
@@ -16887,18 +16887,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Centrum Sterowania Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Centrum Sterowania Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Centrum Sterowania Mandrakelinux</b> jest zbiorem autorskich narzędzi "
-"Mandrakelinux ułatwiających konfigurację komputera."
+"<b>Centrum Sterowania Mandrivalinux</b> jest zbiorem autorskich narzędzi "
+"Mandrivalinux ułatwiających konfigurację komputera."
 
 #: share/advertising/25.pl:17
 #, c-format
@@ -16921,16 +16921,16 @@ msgstr "<b>Model Open Source</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Tak jak każde oprogramowanie komputerowe, oprogramowanie Open Source "
 "<b>wymaga czasu i ludzi</b> do tworzenia. W celu uszanowania filozofii Open "
-"Source, Mandrakesoft sprzedaje produkty wartości dodanej oraz usługi aby "
-"<b>ulepszyć dystrybucję Mandrakelinux</b>. Jeśli chcesz <b>wesprzeć ruch "
-"Open Source</b> oraz rozwój dystrybucji Mandrakelinux, <b>rozważ</b> zakup "
+"Source, Mandriva sprzedaje produkty wartości dodanej oraz usługi aby "
+"<b>ulepszyć dystrybucję Mandrivalinux</b>. Jeśli chcesz <b>wesprzeć ruch "
+"Open Source</b> oraz rozwój dystrybucji Mandrivalinux, <b>rozważ</b> zakup "
 "jednego z naszych produktów lub usług!"
 
 #: share/advertising/27.pl:13
@@ -16941,10 +16941,10 @@ msgstr "<b>Sklep internetowy Mandrake</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Aby dowiedzieć się więcej na temat produktów i usług Mandrakesoft, możesz "
+"Aby dowiedzieć się więcej na temat produktów i usług Mandriva, możesz "
 "odwiedzić naszą <b>internetową platformę e-commerce</b>."
 
 #: share/advertising/27.pl:17
@@ -16970,22 +16970,22 @@ msgstr "Zatrzymaj się pod adresem <b>www.mandrakestore.pl</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Klub Mandrake</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Klub Mandriva</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Klub Mandrake</b> jest <b>doskonałym dodatkiem</b> do twojego produktu "
-"Mandrakelinux."
+"<b>Klub Mandriva</b> jest <b>doskonałym dodatkiem</b> do twojego produktu "
+"Mandrivalinux."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 "Skorzystaj z <b>wartościowych korzyści</b> poprzez dołączenie do Klub "
 "Mandrake, są to m.in.:"
@@ -17010,42 +17010,42 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 "\t* Możliwość brania udziału w dyskusjach na <b>forach użytkowników</b> "
-"Mandrakelinux."
+"Mandrivalinux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Wcześniejszy i uprzywilejowany dostęp</b>, przed wydaniem publicznym, "
-"do <b>obrazów ISO</b> dystrybucji Mandrakelinux."
+"do <b>obrazów ISO</b> dystrybucji Mandrivalinux."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> jest nową usługą, którą Mandrakesoft z dumą oferuje "
+"<b>Mandriva Online</b> jest nową usługą, którą Mandriva z dumą oferuje "
 "swoim klientom."
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline dostarcza szeroką gamę wartościowych usług do <b>łatwiejszego "
-"uaktualniania</b> swoich systemów Mandrakelinux:"
+"Mandriva Online dostarcza szeroką gamę wartościowych usług do <b>łatwiejszego "
+"uaktualniania</b> swoich systemów Mandrivalinux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17071,40 +17071,40 @@ msgstr "\t* Elastyczne <b>planowanie czasu</b> aktualizacji."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* Zarządzanie <b>całym systemem Mandrakelinux</b> z użyciem jednego konta."
+"\t* Zarządzanie <b>całym systemem Mandrivalinux</b> z użyciem jednego konta."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Potrzebujesz <b>pomocy?</b>. Nasi eksperci techniczni Mandrakesoft <b>naszej "
+"Potrzebujesz <b>pomocy?</b>. Nasi eksperci techniczni Mandriva <b>naszej "
 "platformy wsparcia technicznego</b> udzielą pomocy: www.mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Dzięki pomocy <b>wykwalifikowanych ekspertów Mandrakelinux</b>, oszczędzisz "
+"Dzięki pomocy <b>wykwalifikowanych ekspertów Mandrivalinux</b>, oszczędzisz "
 "wiele czasu."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"W przypadku dowolnego pytania związanego z dystrybucją Mandrakelinux, masz "
+"W przypadku dowolnego pytania związanego z dystrybucją Mandrivalinux, masz "
 "możliwość zakupu zdarzeń wsparcia pod adresem <b>www.mandrakestore.pl</b>."
 
 #: share/compssUsers.pl:25
@@ -17404,8 +17404,8 @@ msgstr "Narzędzia do monitorowania, księgowania procesów, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Druidy Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Druidy Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17500,8 +17500,8 @@ msgstr ""
 "\n"
 "OPCJE:\n"
 "  --help            - wyświetla ten komunikat pomocy.\n"
-"  --report          - program powinien być jednym z narzędzi Mandrakelinux\n"
-"  --incident        - program powinien być jednym z narzędzi Mandrakelinux"
+"  --report          - program powinien być jednym z narzędzi Mandrivalinux\n"
+"  --incident        - program powinien być jednym z narzędzi Mandrivalinux"
 
 #: standalone.pm:63
 #, c-format
@@ -17555,7 +17555,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17569,7 +17569,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPCJE]...\n"
-"Konfigurator Serwera Terminali Mandrakelinux\n"
+"Konfigurator Serwera Terminali Mandrivalinux\n"
 "--enable         : włącza MTS\n"
 "--disable        : wyłącza MTS\n"
 "--start          : uruchamia MTS\n"
@@ -17623,7 +17623,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17631,7 +17631,7 @@ msgid ""
 msgstr ""
 "[OPCJA]...\n"
 "  --no-confirmation      nie pyta o pierwsze potwierdzenie w trybie "
-"MandrakeUpdate\n"
+"Mandriva Update\n"
 "  --no-verify-rpm        nie sprawdza podpisów pakietów\n"
 "  --changelog-first      wyświetla dziennik zmian przed listą plików w oknie "
 "opisu.\n"
@@ -20411,13 +20411,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Narzędzie raportowania błędów Mandrakelinux"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Narzędzie raportowania błędów Mandrivalinux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centrum Sterowania Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Centrum Sterowania Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20437,8 +20437,8 @@ msgstr "Harddrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20482,8 +20482,8 @@ msgstr "Druidy konfiguracji"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Wybierz narzędzie Mandrakesoft:"
+msgid "Select Mandriva Tool:"
+msgstr "Wybierz narzędzie Mandriva:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20908,19 +20908,19 @@ msgstr "Uruchamiany przy starcie"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Ten interfejs nie został jeszcze skonfigurowany.\n"
-"Uruchom druida \"Dodaj interfejs\" z Centrum Sterowania Mandrakelinux"
+"Uruchom druida \"Dodaj interfejs\" z Centrum Sterowania Mandrivalinux"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Nie posiadasz żadnego skonfigurowanego połączenia internetowego. Uruchom "
-"asystenta \"%s\" z Centrum Sterowania Mandrakelinux"
+"asystenta \"%s\" z Centrum Sterowania Mandrivalinux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20970,8 +20970,8 @@ msgstr "KDM (Menedżer wyświetlania KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Menedżer wyświetlania Mandrakelinux)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Menedżer wyświetlania Mandrivalinux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21270,7 +21270,7 @@ msgstr "Import"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21279,7 +21279,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (oryginalna wersja)\n"
@@ -21825,14 +21825,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "To jest wolnodostępne oprogramowanie i może być rozpowszechniane zgodnie\n"
 "z zasadami licencji GNU GPL.\n"
 "\n"
@@ -21862,8 +21862,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Centrum Pomocy Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Centrum Pomocy Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25296,8 +25296,8 @@ msgstr "Zostały dokonane zmiany, wyloguj się by je zastosować"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Dzienniki narzędzi Mandrakelinux"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Dzienniki narzędzi Mandrivalinux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25821,10 +25821,10 @@ msgstr "Próba połączenia zakończona powodzeniem."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Próba połączenia zakończona niepowodzeniem.\n"
-"Sprawdź konfigurację w Centrum Sterowania Mandrakelinux."
+"Sprawdź konfigurację w Centrum Sterowania Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26706,19 +26706,19 @@ msgstr "Instalacja zakończyła się niepowodzeniem"
 #~ msgid "You've not selected any font"
 #~ msgstr "Nie wybrano żadnego fontu"
 
-#~ msgid "The Mandrakelinux 10.1 products are:"
-#~ msgstr "Produktami Mandrakelinux 10.1 są:"
+#~ msgid "The Mandrivalinux 10.1 products are:"
+#~ msgstr "Produktami Mandrivalinux 10.1 są:"
 
 #~ msgid ""
-#~ "\t* <b>Mandrakelinux 10.1 for x86-64</b>, The Mandrakelinux solution for "
+#~ "\t* <b>Mandrivalinux 10.1 for x86-64</b>, The Mandrivalinux solution for "
 #~ "making the most of your 64-bit processor."
 #~ msgstr ""
-#~ "\t* <b>Mandrakelinux 10.1 dla x86-64</b>, edycja Mandrakelinux dla "
+#~ "\t* <b>Mandrivalinux 10.1 dla x86-64</b>, edycja Mandrivalinux dla "
 #~ "procesorów 64-ro bitowych."
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Druidy Mandrakesoft"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Druidy Mandriva"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Brak dostępnych przeglądarek! Proszę jakąś zainstalować"
diff --git a/perl-install/share/po/pt.po b/perl-install/share/po/pt.po
index 6b11a8229..3698de870 100644
--- a/perl-install/share/po/pt.po
+++ b/perl-install/share/po/pt.po
@@ -7,7 +7,7 @@
 #
 # Latest versions of po files are at http://www.mandrakelinux.com/l10n/pt.php3
 #
-# Copyright (C) 2000 MandrakeSoft
+# Copyright (C) 2000 Mandriva
 # Fernando Moreira <fmoreira@netc.pt>, 1999.
 # Jorge Costa <Jorgercosta@netc.pt>, 2001.
 # José JORGE <jose.jorge@oreka.com>, 2002,2003.
@@ -85,14 +85,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "A chave USB parece ter a protecção de escrita activada, mas não\n"
 "podemos desliga-la com segurança.\n"
 "\n"
 "\n"
 "Clique no botão para reiniciar o computador, desligue-a, retire a\n"
-"protecção de escrita, volte-a a ligar e, execute o Mandrake Move."
+"protecção de escrita, volte-a a ligar e, execute o Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -110,7 +110,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "A sua chave USB não contém nenhuma partição Windows (FAT)\n"
@@ -121,14 +121,14 @@ msgstr ""
 "\n"
 "\n"
 "Pode também proceder sem uma chave USB - continuará na\n"
-"mesma a poder usar o Mandrake Move como um sistema\n"
+"mesma a poder usar o Mandriva Move como um sistema\n"
 "operativo Mandrake normal."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -136,11 +136,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Não foi detectada nenhuma chave USB no seu sistema. Se ligar\n"
-"uma chave USB agora, o Mandrake Move irá ter a capacidade de\n"
+"uma chave USB agora, o Mandriva Move irá ter a capacidade de\n"
 "guardar transparentemente os dados na sua directoria pessoal\n"
 "e na configuração global do sistema, para o próximo arranque\n"
 "neste computador ou num outro. Nota: se ligar agora uma chave,\n"
@@ -148,7 +148,7 @@ msgstr ""
 "\n"
 "\n"
 "Pode também proceder sem uma chave USB - continuará a poder\n"
-"usar na mesma o Mandrake Move como um sistema operativo\n"
+"usar na mesma o Mandriva Move como um sistema operativo\n"
 "Mandrake normal."
 
 #: ../move/move.pm:494
@@ -275,7 +275,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1331,11 +1331,11 @@ msgstr "Escolha da língua"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"O Mandrakelinux suporta várias línguas. Seleccione as\n"
+"O Mandrivalinux suporta várias línguas. Seleccione as\n"
 "linguagens que deseja instalar. Estas estarão disponíveis\n"
 "quando terminar a instalação e reiniciar o seu sistema."
 
@@ -3760,12 +3760,12 @@ msgstr "activar o suporte de rádio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Antes de continuar, deve ler atentamente os termos da licença. Ela\n"
-"cobre toda a distribuição Mandrakelinux. Se concorda com todos os termos\n"
+"cobre toda a distribuição Mandrivalinux. Se concorda com todos os termos\n"
 "presentes, active a caixa \"%s\". Se não, pode clicar no botão \"%s\" para\n"
 "reiniciar o seu computador."
 
@@ -3941,13 +3941,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"A instalação Mandrakelinux é distribuída em vários CD-ROMs. Se um pacote\n"
+"A instalação Mandrivalinux é distribuída em vários CD-ROMs. Se um pacote\n"
 "seleccionado estiver localizado noutro CD-ROM, o DrakX irá ejectar o actual\n"
 "CD e pedir para inserir o CD pedido. Se não tiver o CD em questão à mão,\n"
 "clique apenas em \"%s\", o pacote correspondente não será instalado."
@@ -3956,11 +3956,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4012,10 +4012,10 @@ msgid ""
 "megabytes."
 msgstr ""
 "É agora tempo de especificar que programas deseja instalar no seu\n"
-"sistema. Há centenas de pacotes disponíveis para o Mandrakelinux, e para\n"
+"sistema. Há centenas de pacotes disponíveis para o Mandrivalinux, e para\n"
 " simplificar a gestão, foram colocados em grupos de aplicações similares.\n"
 "\n"
-"O Mandrakelinux classifica os grupos de pacotes em quatro categorias.\n"
+"O Mandrivalinux classifica os grupos de pacotes em quatro categorias.\n"
 "Pode misturar e combinar aplicações de várias categorias, para que a\n"
 "instalação de uma ``Estação de trabalho'' possa ainda ter aplicações da\n"
 "categoria ``Servidor'' instaladas.\n"
@@ -4120,10 +4120,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4154,11 +4154,11 @@ msgstr ""
 "!! Se um pacote servidor foi seleccionado, ou porque escolheu\n"
 "especificamente o pacote individual ou porque fazia parte de um grupo de\n"
 "pacotes, será-lhe pedido para confirmar que realmente quer que esses\n"
-"servidores sejam instalados. Por omissão o Mandrakelinux irá\n"
+"servidores sejam instalados. Por omissão o Mandrivalinux irá\n"
 "automaticamente iniciar qualquer serviço instalado no arranque. Mesmo\n"
 "que sejam seguros e não tenham qualquer problema conhecido na altura\n"
 "da saída da distribuição, é bem possível que sejam descobertos 'buracos'\n"
-"na segurança a seguir à finalização desta versão Mandrakelinux. Se não\n"
+"na segurança a seguir à finalização desta versão Mandrivalinux. Se não\n"
 "souber que serviço particular é suposto fazer ou porque é instalado, então\n"
 "clique em \"%s\". Ao clicar em \"%s\" irá instalar os serviços listados e\n"
 "serºao iniciados automaticamente no arranque. !!\n"
@@ -4309,7 +4309,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4365,7 +4365,7 @@ msgid ""
 msgstr ""
 "X (para Sistema X Window) é o coração do interface gráfico GNU/Linux no\n"
 "qual todos os ambientes gráficos (KDE, GNOME, AfterStep, WindowMaker,\n"
-"etc.) fornecidos com o Mandrakelinux, funcionam.\n"
+"etc.) fornecidos com o Mandrivalinux, funcionam.\n"
 "\n"
 "Irá ver uma lista de parâmetros diferentes para mudar, para poder\n"
 "ter uma boa apresentação gráfica\n"
@@ -4486,12 +4486,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4518,7 +4518,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4527,7 +4527,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4548,11 +4548,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Agora precisa decidir onde deseja instalar o sistema operativo\n"
-"Mandrakelinux no seu disco rígido. Se o seu disco rígido estiver vazio\n"
+"Mandrivalinux no seu disco rígido. Se o seu disco rígido estiver vazio\n"
 "ou, se um sistema operativo existente usa todo o espaço disponível,\n"
 "irá ser preciso particionar o disco. Básicamente, particionar um disco\n"
 "rígido significa dividi-lo de maneira lógica para criar o espaço\n"
-"necessário para instalar o seu novo sistema Mandrakelinux.\n"
+"necessário para instalar o seu novo sistema Mandrivalinux.\n"
 "\n"
 "Como os efeitos da operação de particionamento são geralmente\n"
 "irreversíveis, e pode levar a perda de dados, particionar pode ser\n"
@@ -4589,7 +4589,7 @@ msgstr ""
 "seus dados ou instalar novo software.\n"
 "\n"
 " * \"%s\". Se deseja apagar todos os dados e todas as partições presentes\n"
-"no disco rígido e substituí-los pelo seu novo sistema Mandrakelinux, "
+"no disco rígido e substituí-los pelo seu novo sistema Mandrivalinux, "
 "escolha\n"
 "esta opção. Seja cuidadoso, porque não será mais capaz de desfazer esta\n"
 "operação após ter confirmado.\n"
@@ -4752,7 +4752,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4774,7 +4774,7 @@ msgstr ""
 "Clique em \"%s\" quando estiver pronto para formatar as partições.\n"
 "\n"
 "Clique em \"%s\" se deseja escolher outra partição para o seu novo\n"
-"sistema operativo Mandrakelinux.\n"
+"sistema operativo Mandrivalinux.\n"
 "\n"
 "Clique em \"%s\" se deseja escolher partições para verificar se fisicamente\n"
 "há blocos defeituosos (\"bad blocks\") no disco."
@@ -4791,7 +4791,7 @@ msgstr "Anterior"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4803,7 +4803,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"No momento que instala o Mandrakelinux, é quase certo que alguns\n"
+"No momento que instala o Mandrivalinux, é quase certo que alguns\n"
 "pacotes terão sido actualizados desde a distribuição inicial. Alguns\n"
 "erros podem ter sido corrigidos, e problemas de segurança resolvidos.\n"
 "Para lhe permitir beneficiar destas actualizações, está agora apto a fazer\n"
@@ -4832,7 +4832,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4846,7 +4846,7 @@ msgstr ""
 "\n"
 "Se não sabe o que escolher, deixe o valor predefinido. Poderá alterá-lo\n"
 "mais tarde com a ferramenta draksec, que faz parte do Centro de Controlo\n"
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 "Preencha o campo \"%s\" com o e-mail da pessoa responsável pela\n"
 "segurança. As mensagens de segurança serão enviadas para esse e-mail."
@@ -4860,7 +4860,7 @@ msgstr "Administrador de Segurança"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4931,7 +4931,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Neste fase, precisa escolher que partições vão ser utilizadas para a\n"
-"instalação do seu sistema Mandrakelinux. Se já foram definidas partições,\n"
+"instalação do seu sistema Mandrivalinux. Se já foram definidas partições,\n"
 "seja por uma instalação anterior do GNU/Linux seja por outra ferramenta de\n"
 "particionamento, pode utilizar-las . Senão, precisa definir partições no\n"
 "disco rígido.\n"
@@ -5018,7 +5018,7 @@ msgstr "Alterna entre os modos normal/perito"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5048,7 +5048,7 @@ msgid ""
 msgstr ""
 "Mais do que uma partição Microsoft foi detectada no seu disco rígido.\n"
 "Por favor escolha qual deseja redimencionar para poder instalar o seu\n"
-"novo sistema operativo Mandrakelinux.\n"
+"novo sistema operativo Mandrivalinux.\n"
 "\n"
 "Cada partição é listada da seguinte maneira: \"Nome Linux\",\n"
 "\"Nome Windows\", \"Capacidade\".\n"
@@ -5095,7 +5095,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5104,19 +5104,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Este passo só fica disponível se uma partição GNU/Linux existente for\n"
 "encontrada na sua máquina.\n"
 "\n"
 "O DrakX agora precisa saber se deseja fazer uma nova instalação ou uma\n"
-"actualização num sistema Mandrakelinux existente:\n"
+"actualização num sistema Mandrivalinux existente:\n"
 "\n"
 " * \"%s\": Para a maior parte, isto apaga completamente o sistema antigo.\n"
 "No entanto, dependendo no seu esquema de particionamento, pode prevenir\n"
@@ -5128,14 +5128,14 @@ msgstr ""
 "\n"
 " * \"%s\": Este tipo de instalação permite actualizar os pacotes "
 "actualmente\n"
-"instalados no seu sistema Mandrakelinux. O seu actual esquema de\n"
+"instalados no seu sistema Mandrivalinux. O seu actual esquema de\n"
 "particionamento, assim como os dados dos utilizadores não serão alterados.\n"
 "A maior parte dos outros passos da configuração permanece disponível e "
 "similar a uma instalação standard.\n"
 "\n"
 "A opção ``Actualizar'' deverá funcionar correctamente nos sistemas\n"
-"Mandrakelinux versão \"8.1\" ou superior. É desaconselhável actualizar\n"
-"versões anteriores à versão \"8.1\" do Mandrakelinux."
+"Mandrivalinux versão \"8.1\" ou superior. É desaconselhável actualizar\n"
+"versões anteriores à versão \"8.1\" do Mandrivalinux."
 
 #: help.pm:591
 #, c-format
@@ -5191,7 +5191,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5233,7 +5233,7 @@ msgstr ""
 "Sobre o suporte UTF-8 (unicode): Unicode é uma codificação de caracter\n"
 "feito para cobrir todas as linguagens existentes. No entanto o seu suporte\n"
 "completo em GNU/Linux ainda está a ser desenvolvido. Por essa razão,\n"
-"o uso de UTF-8 em Mandrakelinux depende das escolhas do utilizador:\n"
+"o uso de UTF-8 em Mandrivalinux depende das escolhas do utilizador:\n"
 "\n"
 " * Se escolher uma linguagem com um forte legado de codificação\n"
 "(linguagens latin1, Russo, Japonês, ChinêsCoreano, Tailandês, grego, turco,\n"
@@ -5474,7 +5474,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5495,11 +5495,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Agora, é tempo de escolher o sistema de impressão para o seu computador.\n"
-"Outros sistemas operativos podem oferecer um, mas o Mandrakelinux\n"
+"Outros sistemas operativos podem oferecer um, mas o Mandrivalinux\n"
 "oferece dois. Cada um dos sistemas de impressão é bem servido para tipos\n"
 "particulares de configuração.\n"
 "\n"
@@ -5520,7 +5520,7 @@ msgstr ""
 "interfaces gráficos para imprimir ou escolher as opções de impressão.\n"
 "\n"
 "Poderá mudar a sua escolha de sistema após a instalação correndo o\n"
-"PrinterDrake a partir do Centro de Controlo Mandrakelinux e clicando\n"
+"PrinterDrake a partir do Centro de Controlo Mandrivalinux e clicando\n"
 "no botão \"%s\"."
 
 #: help.pm:765
@@ -5640,7 +5640,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5657,7 +5657,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5706,7 +5706,7 @@ msgstr ""
 "\n"
 " * \"%s\": se deseja configurar a sua internet ou acesso de rede local\n"
 "pode fazê-lo. Refira-se a documentação impressa ou use o Centro de\n"
-"Controlo do Mandrakelinux a seguir a instalação ter terminado de\n"
+"Controlo do Mandrivalinux a seguir a instalação ter terminado de\n"
 "beneficiar da ajuda incluída.\n"
 "\n"
 " * \"%s\": permite-lhe configurar endereços HTTP e FTP proxy se a máquina\n"
@@ -5724,7 +5724,7 @@ msgstr ""
 "clique nesse botão. Isto deveria ser reservado aos utilizadores\n"
 "avançados.Referira-se à documentação impressa, ou à linha de ajuda\n"
 "sobre a configuração de carregador de arranque (bootloader) no\n"
-"Centro de Controlo Mandrakelinux.\n"
+"Centro de Controlo Mandrivalinux.\n"
 "\n"
 " * \"%s\": através desta entrada pode ajustar quais os serviços que serão\n"
 "executados na sua máquina. Se planeia configurar esta máquina como\n"
@@ -5785,11 +5785,11 @@ msgstr "Serviços"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Escolha o disco que deseja apagar para instalar a sua nova partição\n"
-"Mandrakelinux. Tenha cuidado, todos os ficheiros no disco serão\n"
+"Mandrivalinux. Tenha cuidado, todos os ficheiros no disco serão\n"
 "perdidos de forma irrecuperável!"
 
 #: help.pm:863
@@ -6141,12 +6141,12 @@ msgstr "A calcular o tamanho da partição Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "A sua partição Windows está demasiado fragmentada. Por favor reinicie o seu "
 "computador em Windows, execute a utilidade ``defrag'', depois recomece a "
-"instalação Mandrakelinux"
+"instalação Mandrivalinux"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6261,19 +6261,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6295,7 +6295,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6303,14 +6303,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6320,7 +6320,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6340,10 +6340,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6354,11 +6354,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6374,24 +6374,24 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Introdução\n"
 "\n"
 "O sistema operativo e os diferentes elementos disponíveis na distribuição "
-"Mandrakelinux \n"
+"Mandrivalinux \n"
 "deveriam ser chamados os \"Produtos de Software\" a partir daqui. Os "
 "Produtos de Software incluem, \n"
 "mas não se limitam a, o grupo de programas, métodos, regras e documentações "
 "relativos ao sistema operativo \n"
-"assim como os diferentes elementos da distribuição Mandrakelinux.\n"
+"assim como os diferentes elementos da distribuição Mandrivalinux.\n"
 "\n"
 "\n"
 "1. Termo de licença\n"
 "\n"
 "Por favor leia com atenção este documento. Este documento é o termo de "
 "licença entre você e \n"
-"a Mandrakesoft S.A. que se aplica aos Produtos de Software.\n"
+"a Mandriva S.A. que se aplica aos Produtos de Software.\n"
 "Ao instalar, duplicar ou usar os Produtos de Software de qualquer maneira, "
 "aceita explicitamente \n"
 "e completamente os termos e condições desta Licença. \n"
@@ -6412,20 +6412,20 @@ msgstr ""
 "Os Produtos de Software e a documentação são fornecidos \"como estão\", sem "
 "nenhuma garantia, \n"
 "quanto permitido pela lei.\n"
-"Mandrakesoft S.A. não vai ser, em nenhuma circunstância e quanto permitido "
+"Mandriva S.A. não vai ser, em nenhuma circunstância e quanto permitido "
 "pela lei, responsável de qualquer\n"
 "acidente particular, dos danos directos ou indirectos (inclusive os "
 "resultantes de perda de lucros, interrupção\n"
 "de negócios, perda de informações e dividas legais resultando dum julgamento,"
 "ou qualquer ou perca consequente) \n"
 "decorrentes do uso ou da impossibilidade de usar os Produtos de Software, "
-"mesmo se a Mandrakesoft S.A. foi \n"
+"mesmo se a Mandriva S.A. foi \n"
 "avisada da possibilidade de ocorrimento de tais danos.\n"
 "\n"
 "LIMITAÇÃO DE RESPONSABILIDADE LIGADA A POSSESSÃO OU UTILIZAÇÃO DE PROGRAMAS "
 "PROIBIDOS EM CERTOS PAÍSES\n"
 "\n"
-"Pelo que é permitido por lei, a Mandrakesoft S.A. ou os seus distribuidores "
+"Pelo que é permitido por lei, a Mandriva S.A. ou os seus distribuidores "
 "não vão ser, em nenhuma\n"
 "circunstância, ser responsável por quaisque danos directos ou indirectos "
 "(inclusive os resultantes\n"
@@ -6433,7 +6433,7 @@ msgstr ""
 "legais resultado de um\n"
 "julgamento, ou qualquer perca consequente) decorrentes da possessão, do uso "
 "ou do descarregamento\n"
-"dos Produtos de Software a partir de um dos servidores da Mandrakelinux que "
+"dos Produtos de Software a partir de um dos servidores da Mandrivalinux que "
 "sejam proibidos\n"
 "ou limitados pela lei em certos países pelas leis locais.\n"
 "Este limite de responsabilidade inclui, mas não se limita aos elementos de "
@@ -6455,9 +6455,9 @@ msgstr ""
 "usar qualquer\n"
 "componente. Qualquer pergunta sobre uma da licença deve ser endereçada ao "
 "autor do componente\n"
-"e não à Mandrakesoft. O programas desenvolvidos pela Mandrakesoft S.A. são "
+"e não à Mandriva. O programas desenvolvidos pela Mandrakesoft S.A. são "
 "publicados sob os\n"
-"termos da licença GPL. A documentação escrita por Mandrakesoft S.A. é "
+"termos da licença GPL. A documentação escrita por Mandriva S.A. é "
 "publicada sob uma licença\n"
 "especifica. Por favor veja a documentação para mais detalhes.\n"
 "\n"
@@ -6468,11 +6468,11 @@ msgstr ""
 "autores respectivos \n"
 "e são protegidos pela propriedade intelectual e pelas leis de Copyright "
 "aplicáveis a produtos de software.\n"
-"Mandrakesoft S.A. reserva os seus direitos de modificar ou adaptar os "
+"Mandriva S.A. reserva os seus direitos de modificar ou adaptar os "
 "Produtos de Software, como um \n"
 "todo ou parcialmente, em qualquer sentido e para todos os fins.\n"
-"\"Mandrake\", \"Mandrakelinux\" e os logotipos associados são marcas "
-"registradas da Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" e os logotipos associados são marcas "
+"registradas da Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Legislação em Vigor \n"
@@ -6487,7 +6487,7 @@ msgstr ""
 "resolvidos sem tribunal. \n"
 "Como ultima solução, o desacordo será referido ao Tribunal de Paris - "
 "França.\n"
-"Para qualquer pergunta sobre este documento, contacte por favor Mandrakesoft "
+"Para qualquer pergunta sobre este documento, contacte por favor Mandriva "
 "S.A.  \n"
 
 #: install_messages.pm:90
@@ -6579,7 +6579,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6587,14 +6587,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Parabéns, a instalação está completa.\n"
 "Retire a media de arranque e clique em Enter para reiniciar.\n"
 "\n"
 "\n"
 "Para informação das correcções disponíveis para esta versão do "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consulte a Errata disponível em: \n"
 "\n"
 "\n"
@@ -6602,7 +6602,7 @@ msgstr ""
 "\n"
 "\n"
 "Informação em configurar o seu sistema está disponivel no\n"
-"capítulo pós-instalação do Guia Oficial do Utilizador do Mandrakelinux."
+"capítulo pós-instalação do Guia Oficial do Utilizador do Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6637,12 +6637,12 @@ msgstr "A entrar no passo `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "O seu sistema está baixo em recursos. Pode ter algum problema na\n"
-"instalação do Mandrakelinux. Se isso ocorrer, pode tentar instalar usando o\n"
+"instalação do Mandrivalinux. Se isso ocorrer, pode tentar instalar usando o\n"
 "modo texto. Para isso, prima `F1' no quadro de inicialização e escreva "
 "`text'."
 
@@ -7184,9 +7184,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"A contactar o site Mandrakelinux para transferir a lista dos mirrors "
+"A contactar o site Mandrivalinux para transferir a lista dos mirrors "
 "disponíveis..."
 
 #: install_steps_interactive.pm:840
@@ -7411,8 +7411,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Instalação do Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Instalação do Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9998,13 +9998,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Configurador drakfirewall\n"
 "\n"
-"Isto configura uma firewall pessoal para esta máquina Mandrakelinux.\n"
+"Isto configura uma firewall pessoal para esta máquina Mandrivalinux.\n"
 "Para uma solução firewall poderosa e dedicada, por favor veja a \n"
 "distribuição especializada MandrakeSecurity Firewall."
 
@@ -14080,7 +14080,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -16047,23 +16047,23 @@ msgstr "Parar"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>O que é o Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>O que é o Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Bem-vindo ao <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Bem-vindo ao <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"O Mandrakelinux é uma <b>distribuição Linux</b>que abrange o núcleo do "
+"O Mandrivalinux é uma <b>distribuição Linux</b>que abrange o núcleo do "
 "sistema, chamado de<b>sistema operativo</b> (baseado no kernel Linux) junto "
 "com <b>muitas aplicalçoes</b> que vão de encontro a todas as vossas "
 "necessidades."
@@ -16071,10 +16071,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"O Mandrakelinux é a distribuição Lunix que hoje é a mais <b>user-friendly</"
+"O Mandrivalinux é a distribuição Lunix que hoje é a mais <b>user-friendly</"
 "b>. É também uma das <b>mais usadas</b> distribuições Linux a nível mundial!"
 
 #: share/advertising/02.pl:13
@@ -16090,15 +16090,15 @@ msgstr "Bemvindo ao <b>mundo do Open Source</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"O Mandrakelinux está comprometido com o modelo open source. Isto significa "
+"O Mandrivalinux está comprometido com o modelo open source. Isto significa "
 "que as novas versões são o resultado da <b>colaboração</b> entre a <b> "
-"Equipa de programadores da Mandrakesoft</b> e a <b>comunidade mundial</b> de "
-"contribuidores Mandrakelinux."
+"Equipa de programadores da Mandriva</b> e a <b>comunidade mundial</b> de "
+"contribuidores Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16118,7 +16118,7 @@ msgstr "<b>O GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "A maior parte do software incluido na distribuição e todas as ferramentas "
 "Mandraelinux são licensiadas sob a licença <b>GPL</b>."
@@ -16151,15 +16151,15 @@ msgstr "<b>Junte-se à Comunidade</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"O Mandrakelinux tem uma das <b>maiores comunidades</b> de utilizadores e "
+"O Mandrivalinux tem uma das <b>maiores comunidades</b> de utilizadores e "
 "programadores. O papel de tal comunidade é muito variado, indo desde "
 "comunicar um erro, à programação de novas aplicações. A comunidade "
-"desempenha <b>papel chave</b> no mundo Mandrakelinux."
+"desempenha <b>papel chave</b> no mundo Mandrivalinux."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16180,11 +16180,11 @@ msgstr "<b>Versão Download</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Está agora a instalar o <b>Mandrakelinux Download</b>. Esta é a versão livre "
-"que o Mandrakesoft quer manter <b>disponivel para toda a gente</b>."
+"Está agora a instalar o <b>Mandrivalinux Download</b>. Esta é a versão livre "
+"que o Mandriva quer manter <b>disponivel para toda a gente</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16216,10 +16216,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Também não irá ter acesso aos <b>serviçõs incluidos</b> nos outros produtos "
-"Mandrakesoft."
+"Mandriva."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16228,8 +16228,8 @@ msgstr "<b>Discovery, O Seu Primeiro Linux Desktop</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Está agora a instalar o <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Está agora a instalar o <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16251,17 +16251,17 @@ msgstr "<b>PowerPack, O Último Linux Desktop</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Está agora a instalar o <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Está agora a instalar o <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack é o <b>premier</b> Linux desktop da Mandrakesoft. O PowerPack "
+"PowerPack é o <b>premier</b> Linux desktop da Mandriva. O PowerPack "
 "contém <b>milhares de aplicações</b> tudo desde o mais popular ao mais "
 "avançado."
 
@@ -16272,8 +16272,8 @@ msgstr "<b>PowerPack+, A Solução Linux Desktop e Servidores</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Está agora a instalar o <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Está agora a instalar o <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16289,22 +16289,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Produtos Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Produtos Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> desenvolveu uma grande variedade de produtos "
-"<b>Mandrakelinux</b>."
+"<b>Mandriva</b> desenvolveu uma grande variedade de produtos "
+"<b>Mandrivalinux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Os produtos Mandrakelinux são:"
+msgid "The Mandrivalinux products are:"
+msgstr "Os produtos Mandrivalinux são:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16324,74 +16324,74 @@ msgstr "\t* <b>PowerPack+</b>, A Solução Linux para Desktops e Servidores."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux para x86-64</b>, A solução Mandrakelinux para tirar "
+"\t* <b>Mandrivalinux para x86-64</b>, A solução Mandrivalinux para tirar "
 "melhor partido do seu processador 64-bit."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Produtos Mandrakesoft (Produtos Nomad)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Produtos Mandriva (Produtos Nomad)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"A Mandrakesoft desenvolveu dois produtos que lhe permitem usar o "
-"Mandrakelinux<b>em qualquer computer</b> e sem qualquer necessidade de o "
+"A Mandriva desenvolveu dois produtos que lhe permitem usar o "
+"Mandrivalinux<b>em qualquer computer</b> e sem qualquer necessidade de o "
 "instalar:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, uma distribuição Mandrakelinux que corre inteiramente deCD-"
+"\t* <b>Move</b>, uma distribuição Mandrivalinux que corre inteiramente deCD-"
 "Rom de arranque."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, uma distribuição Mandrakelinux pre-instalada no seu "
+"\t* <b>GlobeTrotter</b>, uma distribuição Mandrivalinux pre-instalada no seu "
 "ultra-compacto “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Produtos Mandrakesoft (Soluções Profissionais)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Produtos Mandriva (Soluções Profissionais)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Em baixo estão os produtos Mandrakesoft feitos para ir de encontro às suas "
+"Em baixo estão os produtos Mandriva feitos para ir de encontro às suas "
 "<b>necessidades profissionais</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, O Desktop Mandrakelinux para Negócios."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, O Desktop Mandrivalinux para Negócios."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, A Solução Mandrakelinux para Servidores."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, A Solução Mandrivalinux para Servidores."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
-"\t* <b>Multi-Network Firewall</b>, A Solução Mandrakelinux de Segurança."
+"\t* <b>Multi-Network Firewall</b>, A Solução Mandrivalinux de Segurança."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16434,10 +16434,10 @@ msgstr "<b>Escolha o seu Ambiente de Trabalho Gráfico Favorito</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Com o PowerPack, irá ter a escolha do <b>ambiente de trabalho gráfico</b>. A "
-"Mandrakesoft escolheu o <b>KDE</b> como ambiente padrão."
+"Mandriva escolheu o <b>KDE</b> como ambiente padrão."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16461,10 +16461,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Com o PowerPack+ irá ter a escolher de um <b>ambiente de trabalho gráfico</"
-"b>. A Mandrakesoft escolheu o <b>KDE</b> como ambiente padrão."
+"b>. A Mandriva escolheu o <b>KDE</b> como ambiente padrão."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16590,10 +16590,10 @@ msgstr "<b>Aprecie o Grande Número de Aplicações Disponiveis</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"No menu Mandrakelinux irá encontrar aplicações <b>fáceis de usar</b>para "
+"No menu Mandrivalinux irá encontrar aplicações <b>fáceis de usar</b>para "
 "todas as suas tarefas:"
 
 #: share/advertising/18.pl:16
@@ -16861,18 +16861,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Centro de Controlo Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Centro de Controlo Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"O <b>Centro de Controlo Mandrakelinux</b> é uma colecção essencial de  "
-"utilidades específicas do Mandrakelinux para que simplificar a configuração "
+"O <b>Centro de Controlo Mandrivalinux</b> é uma colecção essencial de  "
+"utilidades específicas do Mandrivalinux para que simplificar a configuração "
 "do seu computador."
 
 #: share/advertising/25.pl:17
@@ -16897,16 +16897,16 @@ msgstr "<b>O Modelo Open Source</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Como todos os programas de computador, o software open source <b>requer "
 "tempo e pessoas</b> para programação. Para respeitar a filosofia open "
-"source, as vendas da Mandrakesoft adicionaram valiosos produtos e serviços "
-"para <b>continuar a melhorar o Mandrakelinux</b>. Se quer dar <b>suporte à "
-"filosofia open source</b> e programação do Mandrakelinux, <b>por favor</b> "
+"source, as vendas da Mandriva adicionaram valiosos produtos e serviços "
+"para <b>continuar a melhorar o Mandrivalinux</b>. Se quer dar <b>suporte à "
+"filosofia open source</b> e programação do Mandrivalinux, <b>por favor</b> "
 "considere comprar um dos nossos produtos ou serviços!"
 
 #: share/advertising/27.pl:13
@@ -16917,10 +16917,10 @@ msgstr "<b>Loja Online</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Para aprender mais acerca dos produtos e serviços Mandrakesoft, pode visitar "
+"Para aprender mais acerca dos produtos e serviços Mandriva, pode visitar "
 "a nossa <b>plataforma comercial</b>."
 
 #: share/advertising/27.pl:17
@@ -16944,24 +16944,24 @@ msgstr "Pare por hoje em <b>store.mandrakesoft.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> é a <b>companhia perfeita</b> para o seu produto "
-"Mandrakelinux."
+"<b>Mandriva Club</b> é a <b>companhia perfeita</b> para o seu produto "
+"Mandrivalinux."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Tire proveito de <b>valiosos benefícios</b>, juntando-se ao Mandrakeclub, "
+"Tire proveito de <b>valiosos benefícios</b>, juntando-se ao Mandriva Club, "
 "tais como:"
 
 #: share/advertising/28.pl:20
@@ -16984,40 +16984,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Participação em <b>foruns para utilizadores</b> Mandrakelinuxe."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Participação em <b>foruns para utilizadores</b> Mandrivalinuxe."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Acesso em primeira mão e priviligeado, antes da saída pública das "
-"<b>imagens ISO</b> Mandrakelinux."
+"<b>imagens ISO</b> Mandrivalinux."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> é um novo serviço premium que a Mandrakesoft está "
+"<b>Mandriva Online</b> é um novo serviço premium que a Mandriva está "
 "orgulhosa de apresentar aos seus clientes!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"A Mandrakeonline fornece uma grande variadade de valiosos serviçõs para "
-"<b>fácilmente actuaçizar</b> os seus sistemas Mandrakelinux."
+"A Mandriva Online fornece uma grande variadade de valiosos serviçõs para "
+"<b>fácilmente actuaçizar</b> os seus sistemas Mandrivalinux."
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17043,40 +17043,40 @@ msgstr "\t* Actualizações flexiveis e <b>programadas</b>."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* Gerenciamento de <b>todo o seu sistema Mandrakelinux</b> com uma conta."
+"\t* Gerenciamento de <b>todo o seu sistema Mandrivalinux</b> com uma conta."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Requer <b>assitência?</b> Conheça os tecnicos da Mandrakesoft peritos no "
+"Requer <b>assitência?</b> Conheça os tecnicos da Mandriva peritos no "
 "suporte tecnico da nossa plataforma</b> www.mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Obirgado pela ajuda dos <b>peritos qualificados Mandrakelinux</b>, irá "
+"Obirgado pela ajuda dos <b>peritos qualificados Mandrivalinux</b>, irá "
 "poupar muito tempo."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Para qualquer questão relacionada com o Mandrakelinux, tem a possibilidade "
+"Para qualquer questão relacionada com o Mandrivalinux, tem a possibilidade "
 "de comprar suporte para os incidentes em <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17378,8 +17378,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Assistentes MandrakeSoft"
+msgid "Mandriva Wizards"
+msgstr "Assistentes Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17529,7 +17529,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17543,7 +17543,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPÇÕES]...\n"
-"Configurador do Servidor de Terminais Mandrakelinux\n"
+"Configurador do Servidor de Terminais Mandrivalinux\n"
 "--enable         : activa o STM\n"
 "--disable        : desactiva o STM\n"
 "--start          : inicia o STM\n"
@@ -17601,7 +17601,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17609,7 +17609,7 @@ msgid ""
 msgstr ""
 "[OPÇÃO]...\n"
 "  --no-confirmation      não pede pela primeira confirmação em modo "
-"MandrakeUpdate\n"
+"Mandriva Update\n"
 "  --no-verify-rpm        não verifica as assinaturas dos pacotes\n"
 "  --changelog-first      mostra o registo das mudanças antes da lista dos "
 "ficheiros na janela de descrições\n"
@@ -20397,13 +20397,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Ferramenta Mandrakelinux para Comunicar Erros"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Ferramenta Mandrivalinux para Comunicar Erros"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centro de Controlo Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Centro de Controlo Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20423,8 +20423,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20468,8 +20468,8 @@ msgstr "Assistentes de Configuração"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Seleccione a Ferramenta Mandrakesoft:"
+msgid "Select Mandriva Tool:"
+msgstr "Seleccione a Ferramenta Mandriva:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20893,20 +20893,20 @@ msgstr "Iniciado no arranque"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Este interface ainda não foi configurado.\n"
 "Use o assistente \"Adicionar um interface\" a partir do Centro de Controlo "
-"Mandrakelinux"
+"Mandrivalinux"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Não tem qualquer conexão Internet configurada.\n"
-"Execute o assistente \"%s\" a partir do Centro de Controlo Mandrakelinux"
+"Execute o assistente \"%s\" a partir do Centro de Controlo Mandrivalinux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20956,8 +20956,8 @@ msgstr "KDM (KDE Display Manager)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux Display Manager)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21258,7 +21258,7 @@ msgstr "Importar"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21267,7 +21267,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright © 2001-2002 por Mandrakesoft \n"
+"Copyright © 2001-2002 por Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versão original)\n"
@@ -21814,14 +21814,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright © 2003-2004 Mandrakesoft.\n"
+"Copyright © 2003-2004 Mandriva.\n"
 "Iste é software livre e pode ser redistribuido sob a licença GNU GPL.\n"
 "\n"
 "Uso: \n"
@@ -21850,8 +21850,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Centro de Ajuda Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Centro de Ajuda Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25390,8 +25390,8 @@ msgstr "A mudança está feita, mas para ser efectiva é preciso sair/logout"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Registos das Ferramentas Mandrakelinux"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Registos das Ferramentas Mandrivalinux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25905,10 +25905,10 @@ msgstr "Conexão completa"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "A conexão falhou.\n"
-"Verifique a sua configuração no Centro de Controlo Mandrakelinux."
+"Verifique a sua configuração no Centro de Controlo Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/pt_BR.po b/perl-install/share/po/pt_BR.po
index 4ae0e9d84..ac51ea271 100644
--- a/perl-install/share/po/pt_BR.po
+++ b/perl-install/share/po/pt_BR.po
@@ -81,14 +81,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "A chave USB deve estar com proteção de gravação e não é possível desconectá\n"
 "-la com segurança agora.\n"
 "\n"
 "\n"
 "Clique no botão para reiniciar o computador, retire a chave USB, remova a\n"
-"proteção de gravação, conecte a chave, e execute o Mandrake Move outra vez."
+"proteção de gravação, conecte a chave, e execute o Mandriva Move outra vez."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -106,7 +106,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Sua chave USB não tem nenhuma partição válida de Windows (FAT).\n"
@@ -115,13 +115,13 @@ msgstr ""
 "máquinas que rodam Windows.\n"
 "\n"
 "Você pode também continuar sem uma chave USB e usar o Mandrake\n"
-"Move como um sistema operacional Live CD do Mandrakelinux."
+"Move como um sistema operacional Live CD do Mandrivalinux."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -129,11 +129,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Nenhuma chave USB foi detectada em seu sistema.  Se você\n"
-"conectar uma chave USB agora, o Mandrake Move terá a\n"
+"conectar uma chave USB agora, o Mandriva Move terá a\n"
 "habilidade de manter transparente seus dados em seu\n"
 "diretório home e configurar inteligentemente o sistema para\n"
 "montá-lo no próximo boot, neste computador ou em outro.\n"
@@ -141,7 +141,7 @@ msgstr ""
 "segundos para detectar novamente.\n"
 "\n"
 "Você pode também continuar sem uma chave USB e usar o Mandrake\n"
-"Move como um sistema operacional Live CD do Mandrakelinux."
+"Move como um sistema operacional Live CD do Mandrivalinux."
 
 #: ../move/move.pm:494
 #, c-format
@@ -269,7 +269,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -285,7 +285,7 @@ msgstr ""
 "\n"
 "Pode ser configuração corrompida do sistema de arquivos\n"
 "da chave USB, neste caso remoera a chave e reiniciar o\n"
-"Mandrake Move resolverá o problema.  Para fazer assim,\n"
+"Mandriva Move resolverá o problema.  Para fazer assim,\n"
 "clique no botão correspondente.\n"
 "\n"
 "\n"
@@ -1327,11 +1327,11 @@ msgstr "Escolha de linguagem"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux tem suporte a múltiplos idiomas. Selecione\n"
+"Mandrivalinux tem suporte a múltiplos idiomas. Selecione\n"
 "os que você deseja instalar. Eles estarão disponíveis após a\n"
 "instalação e quando você reiniciar o seu sistema"
 
@@ -3757,12 +3757,12 @@ msgstr "habilita o suporte a rádio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Antes de continuar você deve ler com atenção os termos da Licença. Ela \n"
-"cobre a distribuição Mandrakelinux. Se você concorda com todos os termos,\n"
+"cobre a distribuição Mandrivalinux. Se você concorda com todos os termos,\n"
 "clique em \"%s\". Se não concordar, clique no botão \"%s\"\n"
 "para reiniciar seu computador."
 
@@ -3949,13 +3949,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"O instalador do Mandrakelinux está espalhado em diferentes CD-ROMS.\n"
+"O instalador do Mandrivalinux está espalhado em diferentes CD-ROMS.\n"
 "Se o pacote selecionado estiver localizado em outro CD-ROM, O DrakX irá\n"
 "ejetar o CD atual e pedir para você inserir o CD necessário. Se você não "
 "tiver\n"
@@ -3966,11 +3966,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4022,11 +4022,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "Agora você deverá especificar quais programas deseja instalar no seu\n"
-"sistema. Existem centenas de pacotes disponíveis para o Mandrakelinux, e\n"
+"sistema. Existem centenas de pacotes disponíveis para o Mandrivalinux, e\n"
 "para facilitar sua escolha eles foram agrupados em grupos de aplicações\n"
 "similares.\n"
 "\n"
-"Mandrakelinux separou os pacotes em quatro categorias. Você pode\n"
+"Mandrivalinux separou os pacotes em quatro categorias. Você pode\n"
 "misturar as aplicações de vários grupos, assim a \"Estação de Trabalho\" "
 "pode ter aplicações do grupo \"Servidor\".\n"
 "\n"
@@ -4134,10 +4134,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4168,11 +4168,11 @@ msgstr ""
 "!! Quando um pacote de servidor foi selecionado, intencionalmente ou por\n"
 "ser parte de um grupo, você será solicitado para confirmar se realmente "
 "deseja\n"
-"estes servidores instalados. Por padrão, no Mandrakelinux qualquer\n"
+"estes servidores instalados. Por padrão, no Mandrivalinux qualquer\n"
 "serviço instalado será iniciado no boot.\n"
 "Mesmo que sejam seguros e não possuam quaisquer dúvidas a respeito\n"
 "quando da distribuição do pacote, é possível que brechas de segurança\n"
-"sejam descobertas depois que esta versão do Mandrakelinux foi concluída.\n"
+"sejam descobertas depois que esta versão do Mandrivalinux foi concluída.\n"
 "Se você não sabe o que um determinado serviço faz ou porque está sendo\n"
 "instalado, clique em \"%s\". Clicando em \"%s\", os serviços listados\n"
 "serão instalados e serão iniciados automaticamente por Padrão quando o\n"
@@ -4328,7 +4328,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4384,7 +4384,7 @@ msgid ""
 msgstr ""
 "X (para Sistema X Window) é o coração da interface gráfica do GNU/Linux\n"
 "no qual todos os ambientes gráficos (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) fornecidos com o Mandrakelinux funcionam.\n"
+"WindowMaker, etc.) fornecidos com o Mandrivalinux funcionam.\n"
 "\n"
 "Você será apresentado a uma lista de parâmetros que pode alterar para\n"
 "obter uma ótima resolução gráfica. \n"
@@ -4501,12 +4501,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4533,7 +4533,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4542,7 +4542,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4563,11 +4563,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Neste ponto, você precisa escolher onde você quer instalar o seu sistema\n"
-"Mandrakelinux no seu disco rígido. Se seu disco estiver vazio ou se um\n"
+"Mandrivalinux no seu disco rígido. Se seu disco estiver vazio ou se um\n"
 "sistema operacional existente usa todo o espaço disponível, você terá que\n"
 "particioná-lo. Basicamente, particionar um disco rígido consiste em\n"
 "dividi-lo logicamente para criar espaço para o seu novo sistema "
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 "Como os efeitos de um processo de particionamento são normalmente\n"
 "irreversíveis, podendo levar à perda de dados do sistema operacional atual,\n"
@@ -4595,7 +4595,7 @@ msgstr ""
 "Windows. O redimensionamento pode ser feito sem a perda de dados, desde\n"
 "que você tenha desfragmentado previamente sua partição e a mesma esteja\n"
 "formatada em FAT ou NTFS. Recomendamos veementemente fazer backup de seus\n"
-"dados. Essa solução é útil se você quiser usar o Mandrakelinux e o\n"
+"dados. Essa solução é útil se você quiser usar o Mandrivalinux e o\n"
 "Microsoft Windows no mesmo computador.\n"
 "\n"
 "Antes de escolher essa solução, compreenda que o tamanho de sua partição\n"
@@ -4605,7 +4605,7 @@ msgstr ""
 "\n"
 "* \"%s\": se você quiser apagar todos os dados e todas as partições\n"
 "existentes no disco rígido e substituí-las pelo seu novo sistema "
-"Mandrakelinux, você pode escolher essa opção. Tenha cuidado\n"
+"Mandrivalinux, você pode escolher essa opção. Tenha cuidado\n"
 "você não pode reverter sua escolha após a confirmação.\n"
 "\n"
 "!! Se você escolher essa opção, todos seus dados atuais serão perdidos. !!\n"
@@ -4770,7 +4770,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4791,7 +4791,7 @@ msgstr ""
 "Clique em \"%s\" quando estiver pronto para formatar as partições.\n"
 "\n"
 "Clique em \"%s\" se você desejar escolher outras partições para instalar\n"
-"o seu novo sistema operacional Mandrakelinux.\n"
+"o seu novo sistema operacional Mandrivalinux.\n"
 "\n"
 "Clique em \"%s\" se você quiser selecionar partições para serem\n"
 "verificadas por bad blocks no disco."
@@ -4808,7 +4808,7 @@ msgstr "Anterior"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4820,7 +4820,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Neste momento em que você está instalando o Mandrakelinux é possível que\n"
+"Neste momento em que você está instalando o Mandrivalinux é possível que\n"
 "alguns pacotes tenham sido atualizados após o lançamento inicial. Alguns\n"
 "erros e falhas de seguranças podem ter sido corrigidos. Para poder se\n"
 "beneficiar destas atualizações, você pode fazer o download destes pacotes\n"
@@ -4850,7 +4850,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4865,7 +4865,7 @@ msgstr ""
 "\n"
 "Se você não souber o que escolher, fique com a opção padrão. Você poderá\n"
 "trocar o nível de segurança depois usando a ferramenta draksec no Centro\n"
-"de Controle Mandrakelinux.\n"
+"de Controle Mandrivalinux.\n"
 "\n"
 "O campo \"%s\" pode informar ao sistema qual usuário será responsável\n"
 "pela segurança. Mensagens de segurança serão enviadas para esse endereço."
@@ -4879,7 +4879,7 @@ msgstr "Administrador de Segurança"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4950,7 +4950,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Agora você precisa escolher qual(is) partição(ões) usará para instalar o\n"
-"seu novo sistema Mandrakelinux. Se as partições já estiverem definidas \n"
+"seu novo sistema Mandrivalinux. Se as partições já estiverem definidas \n"
 "(através de uma instalação anterior do GNU/Linux ou outro software\n"
 "particionador), você pode utilizá-las. Caso contrário, as partições\n"
 "devem ser definidas.\n"
@@ -5035,7 +5035,7 @@ msgstr "Mudar para modo normal/ expert"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5065,7 +5065,7 @@ msgid ""
 msgstr ""
 "Mais de uma partição Microsoft Windows foi detectada em seu disco\n"
 "rígido. Favor escolher a que você quer redimensionar para instalar o seu\n"
-"novo sistema operacional Mandrakelinux.\n"
+"novo sistema operacional Mandrivalinux.\n"
 "\n"
 "Cada partição é listada da seguinte forma: \"Nome Linux\", \"Nome\n"
 "Windows\" \"Capacidade\".\n"
@@ -5113,7 +5113,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5122,19 +5122,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Este passo só é mostrado se uma partição antiga do GNU/Linux foi\n"
 "encontrada em seu computador.\n"
 "\n"
 "O DrakX precisa saber agora se você quer executar uma nova instalação\n"
-"ou fazer um upgrade no Mandrakelinux existente no seu sistema:\n"
+"ou fazer um upgrade no Mandrivalinux existente no seu sistema:\n"
 "\n"
 " * \"%s\": A maioria das vezes, isto remove completamente o sistema antigo.\n"
 "Porém, dependendo do seu modo de particionamento, você pode prevenir que\n"
@@ -5143,14 +5143,14 @@ msgstr ""
 "sistema de arquivos, você deveria usar esta opção.\n"
 "\n"
 " * \"%s\": este método de instalação lhe permite atualizar os pacotes\n"
-"atualmente instalado em seu sistema Mandrakelinux. Seu esquema\n"
+"atualmente instalado em seu sistema Mandrivalinux. Seu esquema\n"
 "atual de particionamento e dados de usuário não serão alterados. A maioria\n"
 "dos outro passos de configuração permanecem disponíveis, semelhantes a uma "
 "instalação normal.\n"
 "\n"
-"Usando a opção 'Upgrade' deve funcionar bem em sistemas Mandrakelinux da\n"
+"Usando a opção 'Upgrade' deve funcionar bem em sistemas Mandrivalinux da\n"
 "versão \"8.1\" ou superior. Executar um Upgrade para versões anteriores\n"
-"ao Mandrakelinux \"8.1\" não é recomendado."
+"ao Mandrivalinux \"8.1\" não é recomendado."
 
 #: help.pm:591
 #, c-format
@@ -5207,7 +5207,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5248,7 +5248,7 @@ msgstr ""
 "\n"
 "Sobre o suporte a UTF-8 (unicode): Unicode é o novo conjunto de caracteres\n"
 "para todas as linguagens existentes. O suporte completo em GNU/Linux ainda\n"
-"está em desenvolvimento. Por essa razão, Mandrakelinux irá usá-lo ou não\n"
+"está em desenvolvimento. Por essa razão, Mandrivalinux irá usá-lo ou não\n"
 "dependendo da escolha do usuário:\n"
 "\n"
 "* Se você escolher linguagens legadas com uma forte codificação (linguagens\n"
@@ -5501,7 +5501,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5522,11 +5522,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Aqui você seleciona o sistema de impressão para o seu computador.\n"
-"Outros S.O.s podem oferecer-lhe apenas um, mas o Mandrakelinux \n"
+"Outros S.O.s podem oferecer-lhe apenas um, mas o Mandrivalinux \n"
 "oferece dois.\n"
 "\n"
 " * \"%s\" -- que significa 'print, do not queue', é a escolha caso você\n"
@@ -5551,7 +5551,7 @@ msgstr ""
 "gerenciar a impressão.\n"
 "\n"
 "Você poderá mudar a sua escolha após a instalação utilizando o\n"
-"PrinterDrake no Centro de Controle Mandrakelinux, e clicando no botão \"%s\"."
+"PrinterDrake no Centro de Controle Mandrivalinux, e clicando no botão \"%s\"."
 
 #: help.pm:765
 #, c-format
@@ -5674,7 +5674,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5691,7 +5691,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5738,7 +5738,7 @@ msgstr ""
 "\n"
 " * \"%s\": se você deseja configurar a Internet ou o acesso a uma rede\n"
 "local, você pode fazê-lo agora. Verifique documentação impressa ou use\n"
-"o Centro de Controle Mandrakelinux após a instalação ter terminado para "
+"o Centro de Controle Mandrivalinux após a instalação ter terminado para "
 "utilizar\n"
 "total help in-line.\n"
 "\n"
@@ -5756,7 +5756,7 @@ msgstr ""
 " * \"%s\": se você deseja mudar sua configuração do gerenciador de\n"
 "inicialização, clique no botão. Recomendado apenas aos usuários avançados.\n"
 "Veja documentação impressa ou help in-line sobre configuração de bootloader\n"
-"no Centro de Controle do Mandrakelinux.\n"
+"no Centro de Controle do Mandrivalinux.\n"
 "\n"
 " * \"%s\": você poderá escolher aqui quais serviços que serão iniciados\n"
 "em sua máquina. Se você pretende usar sua máquina como servidor, é uma\n"
@@ -5817,11 +5817,11 @@ msgstr "Serviços"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Escolha o disco rígido que você quer apagar para instalar sua nova\n"
-"partição Mandrakelinux. Tenha cuidado, pois todos os dados existentes\n"
+"partição Mandrivalinux. Tenha cuidado, pois todos os dados existentes\n"
 "serão perdidos e não poderão ser recuperados!"
 
 #: help.pm:863
@@ -6176,12 +6176,12 @@ msgstr "Calculando o tamanho da partição Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Sua partição Windows está muito fragmentada. Por favor reinicie seu "
 "computador no modo Windows, execute o utilitário 'defrag' e então reinicie a "
-"instalação do Mandrakelinux."
+"instalação do Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6298,19 +6298,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6332,7 +6332,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6340,14 +6340,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6357,7 +6357,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6377,10 +6377,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6391,11 +6391,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6411,24 +6411,24 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Introdução\n"
 "\n"
 "O sistema operacional e os diferentes elementos disponíveis na distribuição "
-"Mandrakelinux \n"
+"Mandrivalinux \n"
 "deveriam ser chamados os \"Softwares\" a partir daqui. Os softwares "
 "incluem, \n"
 "mas não se limitam a eles, o grupo de programas, métodos, regras e "
 "documentações relativos ao sistema operacional \n"
-"assim como os diferentes elementos da distribuição Mandrakelinux.\n"
+"assim como os diferentes elementos da distribuição Mandrivalinux.\n"
 "\n"
 "\n"
 "1. Termo de licença\n"
 "\n"
 "Por favor leia com atenção este documento. Este documento é o termo de "
 "licença entre você e \n"
-"a Mandrakesoft S.A. que se aplica aos Programas de Informática.\n"
+"a Mandriva S.A. que se aplica aos Programas de Informática.\n"
 "Ao instalar, duplicar ou utilizar os Programas Informativos de qualquer "
 "maneira, aceita explicitamente \n"
 "e completamente os termos e condições desta Licença. \n"
@@ -6449,20 +6449,20 @@ msgstr ""
 "Os Programas Informativos e a documentação são fornecidos \"assim como\", "
 "com nenhuma garantia, \n"
 "quanto permitido pela lei.\n"
-"Mandrakesoft S.A. não vai ser, em nenhuma circunstância e quanto permitido "
+"Mandriva S.A. não vai ser, em nenhuma circunstância e quanto permitido "
 "pela lei, responsável de qualquer\n"
 "acidente particular, dos danos diretos ou indiretos (inclusive os "
 "resultantes de perda de lucros, interrupção\n"
 "de negócios, perda de informações e dividas legais resultando dum julgamento,"
 "ou qualquer ou perca conseqüente) \n"
 "decorrentes do uso ou da impossibilidade de usar os Programas de "
-"Informática, mesmo se a Mandrakesoft S.A. foi \n"
+"Informática, mesmo se a Mandriva S.A. foi \n"
 "avisada da possibilidade de ocorrimento de tais danos.\n"
 "\n"
 "LIMITAÇÃO DE RESPONSABILIDADE LIGADA A POSSE OU UTILIZAÇÃO DE PROGRAMAS "
 "PROIBIDOS EM CERTOS PAÍSES\n"
 "\n"
-"Mandrakesoft S.A. e os seus distribuidores não vão ser, em nenhuma "
+"Mandriva S.A. e os seus distribuidores não vão ser, em nenhuma "
 "circunstância e quanto permitido \n"
 "pela lei, responsável de quaisqueres danos diretos ou indiretos (inclusive "
 "os resultantes de perda de lucros, interrupção\n"
@@ -6470,7 +6470,7 @@ msgstr ""
 "ou qualquer ou perca conseqüente) \n"
 "decorrentes da posse, do uso ou do descarregamento dos Programas  a partir "
 "dum dos servidores da \n"
-"Mandrakelinux que sejam proibidos ou limitados pela lei em certos países "
+"Mandrivalinux que sejam proibidos ou limitados pela lei em certos países "
 "pelas leis locais.\n"
 "Esta limitação de responsabilidade inclui, mas não se limita aos elementos "
 "de codificação inclusos nos \n"
@@ -6490,10 +6490,10 @@ msgstr ""
 "os termos e condições de licença de cada elemento antes de o utilizar. "
 "qualquer pergunta sobre a \n"
 "licença dum elemento devera ser feita ao autor do elemento e não á "
-"Mandrakesoft.\n"
-"O programas desenvolvidos por Mandrakesoft S.A. são publicados sob os termos "
+"Mandriva.\n"
+"O programas desenvolvidos por Mandriva S.A. são publicados sob os termos "
 "da licença GPL. \n"
-"A documentação escrita por Mandrakesoft S.A. é publicada sob uma licença "
+"A documentação escrita por Mandriva S.A. é publicada sob uma licença "
 "especifica. Por favor veja \n"
 "a documentação para mais detalhes.\n"
 "\n"
@@ -6504,11 +6504,11 @@ msgstr ""
 "respectivos \n"
 "e são protegidos pela propriedade intelectual e pelas leis de Copyright "
 "aplicáveis a programas de informática.\n"
-"Mandrakesoft S.A. reserva os seus direitos de modificar ou adaptar os "
+"Mandriva S.A. reserva os seus direitos de modificar ou adaptar os "
 "Programas de informática, como um \n"
 "tudo ou por partes, em qualquer sentido e para todos fins.\n"
-"\"Mandrake\", \"Mandrakelinux\" e os logotipos associados são marcas "
-"registradas da Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" e os logotipos associados são marcas "
+"registradas da Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Leis Governando \n"
@@ -6523,7 +6523,7 @@ msgstr ""
 "resolvidos sem tribunal. \n"
 "Como ultima solução, o desacordo será referido ao Tribunal de Paris - "
 "França.\n"
-"Para qualquer pergunta sobre este documento, contate por favor Mandrakesoft "
+"Para qualquer pergunta sobre este documento, contate por favor Mandriva "
 "S.A.  \n"
 
 #: install_messages.pm:90
@@ -6614,7 +6614,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6622,13 +6622,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Parabéns, a instalação foi completada.\n"
 "Remova a mídia de inicialização e pressione enter para reiniciar.\n"
 "\n"
 "Para informações sobre correções disponíveis para essa versão do "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consulte a Errata disponível em:.\n"
 "\n"
 "\n"
@@ -6636,7 +6636,7 @@ msgstr ""
 "\n"
 "\n"
 "Informações sobre a configuração do sistema estão disponíveis no\n"
-"capítulo pós-instalação do Guia Oficial de Usuário Mandrakelinux."
+"capítulo pós-instalação do Guia Oficial de Usuário Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6670,12 +6670,12 @@ msgstr "Entrando no passo `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Seu sistema está com poucos recursos. Você pode ter algum problema na\n"
-"instalação do Mandrakelinux. Se isso ocorrer, você pode tentar instalar "
+"instalação do Mandrivalinux. Se isso ocorrer, você pode tentar instalar "
 "usando o\n"
 "modo texto. Para isso, aperte 'F1' na tela de inicialização e escreva 'text'."
 
@@ -7221,9 +7221,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Contatando o site da Mandrakelinux para pegar a lista de mirrors (espelhos) "
+"Contatando o site da Mandrivalinux para pegar a lista de mirrors (espelhos) "
 "disponíveis..."
 
 #: install_steps_interactive.pm:840
@@ -7448,8 +7448,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Instalação do Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Instalação do Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10066,13 +10066,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Configurador do DrakFirewall\n"
 "\n"
-"Isso configura um firewall pessoal para essa máquina Mandrakelinux.\n"
+"Isso configura um firewall pessoal para essa máquina Mandrivalinux.\n"
 "Para um firewall dedicado potente, favor procurar a distribuição\n"
 "especializada MandrakeSecurity Firewall."
 
@@ -14145,11 +14145,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"Execute Scannerdrake (Hardware/Scanner no Centro de Controle Mandrakelinux) "
+"Execute Scannerdrake (Hardware/Scanner no Centro de Controle Mandrivalinux) "
 "para compartilhar seu scanner na rede.\n"
 "\n"
 
@@ -16106,23 +16106,23 @@ msgstr "Parar"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>O que é Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>O que é Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Bem-vindo ao <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Bem-vindo ao <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux é uma <b>Distribuição Linux</b> que compreende o core do "
+"Mandrivalinux é uma <b>Distribuição Linux</b> que compreende o core do "
 "sistema, chamado de <b>sistema operacional</b> (baseado no kernel Linux) "
 "junto com <b> uma série de aplicações</b> envolvendo todas as necessidades "
 "que você poderia imaginar."
@@ -16130,10 +16130,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux é a mais importante distribuição Linux <b>amigável</b>de hoje. "
+"Mandrivalinux é a mais importante distribuição Linux <b>amigável</b>de hoje. "
 "Ela é também uma das distribuições <b>mais usadas</b> no mundo!"
 
 #: share/advertising/02.pl:13
@@ -16149,15 +16149,15 @@ msgstr "Seja bem-vindo ao <b>mundo do código aberto</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux é comprometida com o Modelo de Código Aberto e respeita "
+"Mandrivalinux é comprometida com o Modelo de Código Aberto e respeita "
 "integralmente a General Public License (GPL). Esta nova versão é o resultado "
-"da <b>colaboração</b> entre a <b>equipe de desenvolvedores da Mandrakesoft</"
-"b> e a <b>comunidade mundial</b> de colaboradores do Mandrakelinux."
+"da <b>colaboração</b> entre a <b>equipe de desenvolvedores da Mandriva</"
+"b> e a <b>comunidade mundial</b> de colaboradores do Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16177,10 +16177,10 @@ msgstr "<b>A GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "A maior parte do software inclusa na distribuição e todas as ferramentas "
-"Mandrakelinux são licenciadas pela <b>General Public License</b>."
+"Mandrivalinux são licenciadas pela <b>General Public License</b>."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16210,15 +16210,15 @@ msgstr "<b>Junte-se à Comunidade</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux possui uma das <b>maiores comunidades</b> de usuários e "
+"Mandrivalinux possui uma das <b>maiores comunidades</b> de usuários e "
 "desenvolvedores. O seu papel como comunidade é bastante amplo, envolvendo "
 "desde reports de bugs ao desenvolvimento de novas aplicações. A comunidade "
-"participa como <b>papel chave</b> no mundo Mandrakelinux."
+"participa como <b>papel chave</b> no mundo Mandrivalinux."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16240,11 +16240,11 @@ msgstr "<b>Versão Download</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Você esta instalando agora <b>Mandrakelinux Download<b/>. Esta é a versão "
-"gratuíta que a Mandrakesoft quer manter <b>disponível para todo mundo</b>."
+"Você esta instalando agora <b>Mandrivalinux Download<b/>. Esta é a versão "
+"gratuíta que a Mandriva quer manter <b>disponível para todo mundo</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16275,10 +16275,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Você não terá acesso aos <b>serviços incluídos</b> em qualquer outro produto "
-"Mandrakesoft."
+"Mandriva."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16287,8 +16287,8 @@ msgstr "<b>Discovery, Seu Primeiro Desktop Linux</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Você agora esta instalando <b>Mandrakelinux Discovery</b>"
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Você agora esta instalando <b>Mandrivalinux Discovery</b>"
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16309,17 +16309,17 @@ msgstr "<b>PowerPack, O Máximo em Desktop Linux</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Você esta instalando agora <b> Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Você esta instalando agora <b> Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack é o produto <b>Desktop Linux premier</b> da Mandrakesoft. Além de "
+"PowerPack é o produto <b>Desktop Linux premier</b> da Mandriva. Além de "
 "ser a  distribuição Linux mais fácil de usar e a mais amigável, PowerPack "
 "inclui também <b>milhares de aplicações</b> - todas das mais populares às "
 "mais técnicas."
@@ -16331,8 +16331,8 @@ msgstr "<b>PowerPack+, A Solução Linux para Desktops e Servidores</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Você esta instalando agora <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Você esta instalando agora <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16348,22 +16348,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Produtos Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Produtos Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> tem desenvolvido uma larga série de produtos "
-"<b>Mandrakelinux</b>."
+"<b>Mandriva</b> tem desenvolvido uma larga série de produtos "
+"<b>Mandrivalinux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Os produtos Mandrakelinux são:"
+msgid "The Mandrivalinux products are:"
+msgstr "Os produtos Mandrivalinux são:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16383,74 +16383,74 @@ msgstr "\t* <b>PowerPack+</b>, A Solução Linux para Desktops e Servidores."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux para x86-64</b>, A solução Mandrakelinux para usar ao "
+"\t* <b>Mandrivalinux para x86-64</b>, A solução Mandrivalinux para usar ao "
 "máximo seu processador de 64-bit."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Produtos Mandrakesoft (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Produtos Mandriva (Nomad Products)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft tem desenvolvido dois produtos que permitem a você utilizar "
-"Mandrakelinux <b>em qualquer computador</b> sem precisar instalá-lo:"
+"Mandriva tem desenvolvido dois produtos que permitem a você utilizar "
+"Mandrivalinux <b>em qualquer computador</b> sem precisar instalá-lo:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, uma distribuição Mandrakelinux que roda totalmente a partir "
+"\t* <b>Move</b>, uma distribuição Mandrivalinux que roda totalmente a partir "
 "de um CD-ROM bootável."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, uma distribuição Mandrakelinux pré-instalada em um "
+"\t* <b>GlobeTrotter</b>, uma distribuição Mandrivalinux pré-instalada em um "
 "ultra-compacto disco rígido móvel LaCie."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Produtos Mandrakesoft (Soluções Profissionais)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Produtos Mandriva (Soluções Profissionais)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Abaixo estão os produtos Mandrakesoft desenhados para reunir as "
+"Abaixo estão os produtos Mandriva desenhados para reunir as "
 "<b>necessidades profissionais</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>Desktop Corporativo</b>, O Desktop Mandrakelinux para negócios."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgstr "\t* <b>Desktop Corporativo</b>, O Desktop Mandrivalinux para negócios."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
-"\t* <b>Servidor Corporativo</b>, A Solução Mandrakelinux para Servidor."
+"\t* <b>Servidor Corporativo</b>, A Solução Mandrivalinux para Servidor."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
-"\t* <b>Firewall Multi-Network</b>, A solução de Segurança Mandrakelinux."
+"\t* <b>Firewall Multi-Network</b>, A solução de Segurança Mandrivalinux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16494,10 +16494,10 @@ msgstr "<b>Escolha seu ambiente gráfico de Desktop favorito!</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Com PowerPack, você terá a escolha de um <b>ambiente de desktop gráfico</b>. "
-"Mandrakesoft tem escolhido <b>KDE</b>como padrão."
+"Mandriva tem escolhido <b>KDE</b>como padrão."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16521,10 +16521,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Com PowerPack+, você terá a escolha de um <b>ambiente de desktop gráfico</"
-"b>. Mandrakesoft tem escolhido <b>KDE</b>como padrão."
+"b>. Mandriva tem escolhido <b>KDE</b>como padrão."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16651,10 +16651,10 @@ msgstr "<b>Divirta-se com sua larga extensão de Aplicações</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"No menu do Mandrakelinux você encontrará aplicações <b>fácil de usar</b> "
+"No menu do Mandrivalinux você encontrará aplicações <b>fácil de usar</b> "
 "para <b>todas as suas necessidades</b>:"
 
 #: share/advertising/18.pl:16
@@ -16923,18 +16923,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Centro de Controle Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Centro de Controle Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"O <b>Centro de Controle Mandrakelinux</b> é uma coleção essencial de "
-"utilitários específicos da Mandrakelinux elaborados para simplificar a "
+"O <b>Centro de Controle Mandrivalinux</b> é uma coleção essencial de "
+"utilitários específicos da Mandrivalinux elaborados para simplificar a "
 "configuração de seu computador."
 
 #: share/advertising/25.pl:17
@@ -16959,17 +16959,17 @@ msgstr "<b>O Modelo de Código Aberto<b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Como qualquer outro programa de computador, software open source (software "
 "de código aberto) <b>requer tempo e pessoal</b> para seu desenvolvimento. "
 "Com o objetivo de respeitar a filosofia open source, os vendedores da "
-"Mandrakesoft adicionaram importantes produtos e serviços para <b>continuar "
-"melhorando o Mandrakelinux</b>. Se você deseja <b>adotar a filosofia open "
-"source</b> e o desenvolvimento do Mandrakelinux, <b>por favor</b> considere "
+"Mandriva adicionaram importantes produtos e serviços para <b>continuar "
+"melhorando o Mandrivalinux</b>. Se você deseja <b>adotar a filosofia open "
+"source</b> e o desenvolvimento do Mandrivalinux, <b>por favor</b> considere "
 "comprar um de nossos produtos ou serviços."
 
 #: share/advertising/27.pl:13
@@ -16980,10 +16980,10 @@ msgstr "<b>Loja Online</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Encontre todos os produtos da Mandrakesoft na <b>Mandrakestore</b> - nossa "
+"Encontre todos os produtos da Mandriva na <b>Mandriva Store</b> - nossa "
 "plataforma de serviços em e-commece."
 
 #: share/advertising/27.pl:17
@@ -17008,25 +17008,25 @@ msgstr "Passe na <b>store.mandrakesoft.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> é a <b>companhia perfeita</b> para seu produto "
-"Mandrakelinux."
+"<b>Mandriva Club</b> é a <b>companhia perfeita</b> para seu produto "
+"Mandrivalinux."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 "Obtenha vantagens e <b>valiosos benefícios</b>, de produtos e de serviços, "
-"associando-se ao Mandrakeclub. Benefícios como:"
+"associando-se ao Mandriva Club. Benefícios como:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -17048,40 +17048,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Participação nos <b>fóruns para usuários</b> Mandrakelinux."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Participação nos <b>fóruns para usuários</b> Mandrivalinux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Acesso com antecedência e privilegiado</b>, antes mesmo de seu "
-"lançamento público, às <b>imagens ISO</b> do Mandrakelinux. "
+"lançamento público, às <b>imagens ISO</b> do Mandrivalinux. "
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> é um novo serviço premiado que a Mandrakesoft se "
+"<b>Mandriva Online</b> é um novo serviço premiado que a Mandriva se "
 "orgulha em oferecer para seus clientes!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline provê uma grande quantidade de serviços importantes para "
-"<b>fácil atualização</b> de seus sistema Mandrakelinux:"
+"Mandriva Online provê uma grande quantidade de serviços importantes para "
+"<b>fácil atualização</b> de seus sistema Mandrivalinux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17107,41 +17107,41 @@ msgstr "\t* Atualização <b>programada</b> flexível."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* Gerenciamento de <b>todo o seu sistema Mandrakelinux</b> com uma conta."
+"\t* Gerenciamento de <b>todo o seu sistema Mandrivalinux</b> com uma conta."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "Você precisa de <b>ajuda</b>? Conheça os experientes técnicos da "
-"Mandrakesoft em <b>nossa plataforma de suporte técnico</b> www."
+"Mandriva em <b>nossa plataforma de suporte técnico</b> www."
 "mandrakeexpert.com"
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Recorra a ajuda dos <b>qualificados experts Mandrakelinux</b>, você irá "
+"Recorra a ajuda dos <b>qualificados experts Mandrivalinux</b>, você irá "
 "economizar mais tempo."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Para qualquer questão relacionada ao Mandrakelinux, você tem a possibilidade "
+"Para qualquer questão relacionada ao Mandrivalinux, você tem a possibilidade "
 "de comprar suporte em <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17443,8 +17443,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "<b>Assistentes Mandrakesoft</b>"
+msgid "Mandriva Wizards"
+msgstr "<b>Assistentes Mandriva</b>"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17595,7 +17595,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17609,7 +17609,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPÇÕES]...\n"
-"Configurador do Mandrakelinux Terminal Server (MTS)\n"
+"Configurador do Mandrivalinux Terminal Server (MTS)\n"
 "--enable         : ativa MTS\n"
 "--disable        : desativa MTS\n"
 "--start          : inicia MTS\n"
@@ -17668,7 +17668,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17676,7 +17676,7 @@ msgid ""
 msgstr ""
 "[OPÇÃO]...\n"
 "  --no-confirmation      não pergunta a primeira confirmação no modo "
-"MandrakeUpdate\n"
+"Mandriva Update\n"
 "  --no-verify-rpm        não verifica as assinaturas dos pacotes\n"
 "  --changelog-first      exibe o changelog antes da lista de arquivos na "
 "janela de descrição\n"
@@ -17757,7 +17757,7 @@ msgstr "%s: %s requer nome do host...\n"
 #: standalone/drakTermServ:211 standalone/drakTermServ:214
 #, c-format
 msgid "Terminal Server Configuration"
-msgstr "Configuração do Mandrakelinux Terminal Server"
+msgstr "Configuração do Mandrivalinux Terminal Server"
 
 #: standalone/drakTermServ:220
 #, c-format
@@ -20445,13 +20445,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Ferramenta de Relatório de Erro Mandrakelinux"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Ferramenta de Relatório de Erro Mandrivalinux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centro de Controle Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Centro de Controle Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20471,8 +20471,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20516,8 +20516,8 @@ msgstr "Assistentes de Configuração"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Selecione a ferramenta Mandrakesoft:"
+msgid "Select Mandriva Tool:"
+msgstr "Selecione a ferramenta Mandriva:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20942,20 +20942,20 @@ msgstr "Iniciado na inicialização"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Esta interface ainda não foi configurada.\n"
 "Execute o assistente \"Adicionar uma interface\" no Centro de Controle "
-"Mandrakelinux"
+"Mandrivalinux"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Você não possui nenhuma conexão de Internet configurada.\n"
-"Execute o assistente \"%s\" no Centro de Controle Mandrakelinux"
+"Execute o assistente \"%s\" no Centro de Controle Mandrivalinux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21005,8 +21005,8 @@ msgstr "KDM (gerenciador de display do KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (gerenciador de display do Mandrakelinux)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (gerenciador de display do Mandrivalinux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21304,7 +21304,7 @@ msgstr "Importar"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21313,7 +21313,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright © 2001-2002 by Mandrakesoft \n"
+"Copyright © 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versão original)\n"
@@ -21856,14 +21856,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright © 2003-2004 Mandrakesoft.\n"
+"Copyright © 2003-2004 Mandriva.\n"
 "Este é um software livre e pode ser redistribuído sob os termos da GNU GPL.\n"
 "\n"
 "Uso: \n"
@@ -21892,8 +21892,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Centro de Ajuda Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Centro de Ajuda Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25364,8 +25364,8 @@ msgstr "A alteração foi feita, mas para ser efetivada você deve fazer logout.
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Logs das ferramentas Mandrakelinux"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Logs das ferramentas Mandrivalinux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25886,10 +25886,10 @@ msgstr "Conexão completa."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Conexão falhou.\n"
-"Verifique sua configuração no Centro de Controle Mandrakelinux."
+"Verifique sua configuração no Centro de Controle Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26781,8 +26781,8 @@ msgstr "Falha na instalação"
 #~ msgid "You've not selected any font"
 #~ msgstr "Você não selecionou nenhuma fonte"
 
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Assistentes MandrakeSoft"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Assistentes Mandriva"
 
 #~ msgid "http://www.mandrakelinux.com/en/101errata.php3"
 #~ msgstr "http://www.mandrakelinux.com/en/101errata.php3"
diff --git a/perl-install/share/po/ro.po b/perl-install/share/po/ro.po
index 9c858a913..47170d01d 100644
--- a/perl-install/share/po/ro.po
+++ b/perl-install/share/po/ro.po
@@ -1,5 +1,5 @@
-# Translation file of Mandrakelinux graphic install
-# Copyright (c) 2000 Mandrakesoft
+# Translation file of Mandrivalinux graphic install
+# Copyright (c) 2000 Mandriva
 # Florin Grad <florin@mandrakesoft.com>, 1999-2000
 # Dragos Marian Barbu <dragosb@softhome.net>, 2000
 # Ovidiu Constantin <ovidiu.constantin@gmx.net>, 2002, 2003
@@ -62,7 +62,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -81,7 +81,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -89,7 +89,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -97,7 +97,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -223,7 +223,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1247,11 +1247,11 @@ msgstr "Myanmar"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux permite folosirea mai multor limbi.\n"
+"Mandrivalinux permite folosirea mai multor limbi.\n"
 "Selectaţi limbile pe care doriţi să le instalaţi. Ele vor fi disponibile\n"
 "după terminarea instalării şi repornirea sistemului."
 
@@ -3565,7 +3565,7 @@ msgstr "activare sprijin radio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3675,7 +3675,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3686,11 +3686,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3797,10 +3797,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3909,7 +3909,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4007,12 +4007,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4039,7 +4039,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4048,7 +4048,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4177,7 +4177,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4195,7 +4195,7 @@ msgstr "Precedentul"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4224,7 +4224,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4240,7 +4240,7 @@ msgstr "Administrator de securitate:"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4326,7 +4326,7 @@ msgstr "Schimbă între modul normal/expert"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4371,7 +4371,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4380,13 +4380,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4427,7 +4427,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4586,7 +4586,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4607,7 +4607,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4707,7 +4707,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4724,7 +4724,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4786,7 +4786,7 @@ msgstr "Servicii"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Alegeţi discul fix pe care doriţi să îl ştergeţi pentru a instala noua "
@@ -5129,7 +5129,7 @@ msgstr "Calculez dimensiunea partiţiei Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 
@@ -5246,19 +5246,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5280,7 +5280,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5288,14 +5288,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5305,7 +5305,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5325,10 +5325,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5339,11 +5339,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5359,7 +5359,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5416,7 +5416,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5424,14 +5424,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Felicitări, instalarea e completă.\n"
 "Scoateţi media de demaraj şi apăsaţi Enter pentru redemaraj.\n"
 "\n"
 "\n"
 "Pentru informaţii asupra corecţiilor disponibile pentru aceasta versiune\n"
-"Mandrakelinux, consultaţi Erata disponibilă la \n"
+"Mandrivalinux, consultaţi Erata disponibilă la \n"
 "\n"
 "\n"
 "%s\n"
@@ -5439,7 +5439,7 @@ msgstr ""
 "\n"
 "Informaţiile asupra configurării sistemului sunt disponibile în \n"
 "capitolul referitor la post instalare din \n"
-"Official Mandrakelinux User's Guide."
+"Official Mandrivalinux User's Guide."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -5475,7 +5475,7 @@ msgstr "Începe etapa `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -5992,9 +5992,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Contactez situl Mandrakelinux pentru obţinerea listei oglinzilor "
+"Contactez situl Mandrivalinux pentru obţinerea listei oglinzilor "
 "disponibile..."
 
 #: install_steps_interactive.pm:840
@@ -6206,8 +6206,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Instalare Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Instalare Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8780,7 +8780,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12412,7 +12412,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14157,18 +14157,18 @@ msgstr "Opreşte"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Bun venit la <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Bun venit la <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14177,7 +14177,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -14194,9 +14194,9 @@ msgstr "Bine aţi venit în lumea Open Source (surse deschise)"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -14216,7 +14216,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14242,10 +14242,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14264,8 +14264,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14292,7 +14292,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14302,7 +14302,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14321,13 +14321,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14339,7 +14339,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14353,20 +14353,20 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "Centrul de control Mandrakelinux"
+msgid "<b>Mandriva Products</b>"
+msgstr "Centrul de control Mandrivalinux"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux Updates Applet"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux Updates Applet"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -14386,61 +14386,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14478,7 +14478,7 @@ msgstr "Selectaţi cheia de criptare pt. sistemul de fişiere"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14499,7 +14499,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -14529,7 +14529,7 @@ msgstr ""
 #: share/advertising/15.pl:13
 #, fuzzy, c-format
 msgid "<b>Kontact</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/15.pl:15
 #, c-format
@@ -14616,7 +14616,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -14851,14 +14851,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Centrul de control Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Centrul de control Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -14880,21 +14880,21 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
 #: share/advertising/27.pl:13
 #, fuzzy, c-format
 msgid "<b>Online Store</b>"
-msgstr "Centrul de control Mandrakelinux"
+msgstr "Centrul de control Mandrivalinux"
 
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -14917,20 +14917,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -14949,33 +14949,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -14998,32 +14998,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15308,7 +15308,7 @@ msgstr "Webcam-uri"
 #: share/compssUsers.pl:187
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "Configurare Mandrakelinux Terminal Server"
+msgstr "Configurare Mandrivalinux Terminal Server"
 
 #: share/compssUsers.pl:191
 #, fuzzy, c-format
@@ -15322,8 +15322,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Centrul de control Mandrakelinux"
+msgid "Mandriva Wizards"
+msgstr "Centrul de control Mandrivalinux"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -15418,7 +15418,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15466,7 +15466,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -15539,7 +15539,7 @@ msgstr ""
 #: standalone/drakTermServ:211 standalone/drakTermServ:214
 #, fuzzy, c-format
 msgid "Terminal Server Configuration"
-msgstr "Configurare Mandrakelinux Terminal Server"
+msgstr "Configurare Mandrivalinux Terminal Server"
 
 #: standalone/drakTermServ:220
 #, c-format
@@ -15684,7 +15684,7 @@ msgstr ""
 #: standalone/drakTermServ:509
 #, fuzzy, c-format
 msgid "Terminal Server Overview"
-msgstr "Configurare Mandrakelinux Terminal Server"
+msgstr "Configurare Mandrivalinux Terminal Server"
 
 #: standalone/drakTermServ:510
 #, c-format
@@ -17933,13 +17933,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Centrul de control Mandrakelinux"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Centrul de control Mandrivalinux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centrul de control Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Centrul de control Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -17959,8 +17959,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -18004,7 +18004,7 @@ msgstr "Asistenţi de configurare"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -18413,7 +18413,7 @@ msgstr "Pornit la demaraj"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Această interfaţă nu a fost configurată încă.\n"
 "Lansaţi asistentul de configurare în fereastra principală"
@@ -18422,7 +18422,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Această interfaţă nu a fost configurată încă.\n"
 "Lansaţi asistentul de configurare în fereastra principală"
@@ -18475,7 +18475,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18766,7 +18766,7 @@ msgstr "Import"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19240,7 +19240,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -19267,8 +19267,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Centrul de control Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Centrul de control Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22297,8 +22297,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Explicaţii utilitare Mandrakelinux"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Explicaţii utilitare Mandrivalinux"
 
 #: standalone/logdrake:51
 #, fuzzy, c-format
@@ -22806,10 +22806,10 @@ msgstr "Conectare reuşită."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Conectare eşuată.\n"
-"Verificaţi configurarea în Centrul de control Mandrakelinux."
+"Verificaţi configurarea în Centrul de control Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -23042,7 +23042,7 @@ msgstr "Re-generez lista de scannere configurate ..."
 #: standalone/scannerdrake:101
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "%s nu are susţinere în această versiune a Mandrakelinux."
+msgstr "%s nu are susţinere în această versiune a Mandrivalinux."
 
 #: standalone/scannerdrake:104
 #, c-format
@@ -23082,7 +23082,7 @@ msgstr ""
 #: standalone/scannerdrake:144
 #, fuzzy, c-format
 msgid "The %s is not supported under Linux."
-msgstr "%s nu are susţinere în această versiune a Mandrakelinux."
+msgstr "%s nu are susţinere în această versiune a Mandrivalinux."
 
 #: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
@@ -23184,7 +23184,7 @@ msgid ""
 msgstr ""
 "Scanner-ul %s trebuie configurat de către PrinterDrake.\n"
 "Puteţi lansa PrinterDrake în secţiunea Echipamente a Centrului de control "
-"Mandrakelinux."
+"Mandrivalinux."
 
 #: standalone/scannerdrake:308 standalone/scannerdrake:315
 #: standalone/scannerdrake:345
@@ -23654,8 +23654,8 @@ msgstr "Instalarea a eşuat"
 #~ msgstr "Nu aţi selectat nici un font"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Centrul de control Mandrakelinux"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Centrul de control Mandrivalinux"
 
 #~ msgid ""
 #~ "No browser is installed on your system, Please install one if you want to "
@@ -23764,13 +23764,13 @@ msgstr "Instalarea a eşuat"
 #~ msgstr "Eroare la citirea  %s pentru a scrie: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Acesta este HardDrake, o unealtă Mandrakelinux de configurare a "
+#~ "Acesta este HardDrake, o unealtă Mandrivalinux de configurare a "
 #~ "echipamentelor.\n"
 #~ "<span foreground=\"royalblue3\">Versiune:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
@@ -24108,8 +24108,8 @@ msgstr "Instalarea a eşuat"
 #~ msgid "mkraid failed"
 #~ msgstr "mkraid a eşuat"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "Connection failed.\n"
diff --git a/perl-install/share/po/ru.po b/perl-install/share/po/ru.po
index 318449d6c..95eca5bae 100644
--- a/perl-install/share/po/ru.po
+++ b/perl-install/share/po/ru.po
@@ -3,7 +3,7 @@
 # translation of DrakX-ru.po to
 # Translation of DrakX-ru.po to Russian
 # Russian translation of drakX messages
-# Copyright (C) 1999-2003 Mandrakesoft
+# Copyright (C) 1999-2003 Mandriva
 # Pavel Maryanov <acid_jack@ukr.net>, 2002,2003, 2005.
 # Alice Lafox <alice@lafox.com.ua>, 2003.
 # Alice Lafox <alice@lafox.net>, 2004, 2005.
@@ -72,7 +72,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Похоже, что на ключе USB установлена защита от записи, но сейчас\n"
 "невозможно безопасно извлечь его.\n"
@@ -80,7 +80,7 @@ msgstr ""
 "\n"
 "Нажмите на кнопку, чтобы перезагрузить машину, извлеките его,\n"
 "снимите защиту от записи, снова подключите ключ, и еще раз\n"
-"запустите Mandrake Move."
+"запустите Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -98,7 +98,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Ваш USB-ключ не имеет ни одного нормального раздела Windows (FAT).\n"
@@ -109,14 +109,14 @@ msgstr ""
 "\n"
 "\n"
 "Вы также можете продолжить без USB-ключа - в этом случае вы\n"
-"сможете использовать Mandrake Move просто как live Mandrake\n"
+"сможете использовать Mandriva Move просто как live Mandriva\n"
 "Operating System."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -124,11 +124,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "В вашей системе не было обнаружено каких-либо ключей USB.\n"
-"Если вы подключите ключ USB сейчас, Mandrake Move будет иметь\n"
+"Если вы подключите ключ USB сейчас, Mandriva Move будет иметь\n"
 "возможность явно сохранить данные в вашем домашнем каталоге\n"
 "и конфигурацию всей системы для следующей загрузки на этом\n"
 "или другом компьютере. Примечание: если вы подключили ключ\n"
@@ -136,7 +136,7 @@ msgstr ""
 "\n"
 "\n"
 "Вы также можете продолжить и без ключа USB - вы все еще будете\n"
-"в состоянии использовать Mandrake Move как обычную операционную\n"
+"в состоянии использовать Mandriva Move как обычную операционную\n"
 "систему Mandrake."
 
 #: ../move/move.pm:494
@@ -265,7 +265,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -282,7 +282,7 @@ msgstr ""
 "Это может быть вызвано повреждением\n"
 "конфигурационных файлов системы на ключе USB,\n"
 "в этом случае его извлечение с последующей\n"
-"перезагрузкой Mandrake Move решит проблему.\n"
+"перезагрузкой Mandriva Move решит проблему.\n"
 "Для этого нажмите на соответствующую кнопку.\n"
 "\n"
 "\n"
@@ -1331,11 +1331,11 @@ msgstr "Выбор языка"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux может поддерживать несколько языков. Выберите\n"
+"Mandrivalinux может поддерживать несколько языков. Выберите\n"
 "языки, которые вы хотите установить. Они будут доступны, когда\n"
 "завершится установка и вы перезапустите свою систему."
 
@@ -3761,12 +3761,12 @@ msgstr "включить поддержку радио"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Прежде чем продолжить, вы должны внимательно прочитать условия лицензии.\n"
-"Лицензия распространяется на весь дистрибутив Mandrakelinux. Если вы\n"
+"Лицензия распространяется на весь дистрибутив Mandrivalinux. Если вы\n"
 "согласны со всеми условиями лицензии, отметьте пункт \"%s\". Если нет -\n"
 "нажатие на кнопку \"%s\" приведет к перезагрузке вашего компьютера."
 
@@ -3945,13 +3945,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Инсталляция Mandrakelinux размещена на нескольких CD-ROMах. Если выбранный\n"
+"Инсталляция Mandrivalinux размещена на нескольких CD-ROMах. Если выбранный\n"
 "пакет находится на другом CD-ROM, DrakX будет отдавать текущий CD и просить\n"
 "вас вставить другой по мере надобности. Если у вас нет требуемого CD под "
 "руками,\n"
@@ -3963,11 +3963,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4019,11 +4019,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "Теперь настало время определить, какие программы вы хотите установить в\n"
-"вашу систему. С Mandrakelinux поставляются тысячи пакетов и, для упрощения\n"
+"вашу систему. С Mandrivalinux поставляются тысячи пакетов и, для упрощения\n"
 "выбора, они разбиты на группы.\n"
 "\n"
 "Пакеты сортированы по группам, которые соответствуют специфике\n"
-"использования вашей машины. В Mandrakelinux пакеты сортируются по четырем\n"
+"использования вашей машины. В Mandrivalinux пакеты сортируются по четырем\n"
 "категориям. Вы можете смешивать и сочетать приложения из различных\n"
 "категорий, например, вариант установки ``Рабочая станция'' может иметь\n"
 "приложения из категории ``Разработка''.\n"
@@ -4124,10 +4124,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4157,10 +4157,10 @@ msgstr ""
 "\n"
 "!! Если был выбран какой-либо серверный пакет, специально или он был частью\n"
 "какой-либо группы, вас попросят подтвердить, действительно ли вы желаете\n"
-"установить эти сервера. Под Mandrakelinux все установленные сервера\n"
+"установить эти сервера. Под Mandrivalinux все установленные сервера\n"
 "запускаются по умолчанию в процессе загрузки. Даже если они безопасны и не\n"
 "имеют известных проблем на момент выпуска дистрибутива, в них могут быть\n"
-"обнаружены дыры в безопасности после выпуска данной версии Mandrakelinux.\n"
+"обнаружены дыры в безопасности после выпуска данной версии Mandrivalinux.\n"
 "Если вы не знаете, зачем нужен данная служба и что она делает, нажмите\n"
 "\"%s\". Если вы нажмете \"%s\", тогда все службы из списка будут\n"
 "установлены и автоматически запущены при загрузке системы. !!\n"
@@ -4317,7 +4317,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4373,7 +4373,7 @@ msgid ""
 msgstr ""
 "X (для системы X Window) это сердце графического интерфейса GNU/Linux, на\n"
 "базе которого работают все графические среды (KDE, GNOME, AfterStep,\n"
-"WindowMaker, и т.д..), входящие в Mandrakelinux.\n"
+"WindowMaker, и т.д..), входящие в Mandrivalinux.\n"
 "\n"
 "Вам будет представлен список различных параметров для получения\n"
 "оптимального графического отображения: Видеокарта\n"
@@ -4496,12 +4496,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4528,7 +4528,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4537,7 +4537,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4558,11 +4558,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "На этом шаге вам прийдется решить, куда вы хотите установить операционную\n"
-"систему Mandrakelinux на вашем жестком диске. Если ваш жесткий диск пуст,\n"
+"систему Mandrivalinux на вашем жестком диске. Если ваш жесткий диск пуст,\n"
 "или существующая операционная система на нем занимает все дисковое\n"
 "пространство, вам прийдется диск переразбить (partition). Разделение диска\n"
 "в основном состоит в том, чтобы логически выделить на нем свободное\n"
-"пространство для установки вашей новой системы Mandrakelinux.\n"
+"пространство для установки вашей новой системы Mandrivalinux.\n"
 "\n"
 "Поскольку разделение диска - это обычно необратимый процесс и может\n"
 "привести к потере данных, если на диске уже есть установленная операционная\n"
@@ -4589,7 +4589,7 @@ msgstr ""
 "потери данных, особенно если вы предварительно провели дефрагментацию\n"
 "раздела Windows. Резервное копирование ваших данных настойчиво\n"
 "рекомендуется.. Рекомендуем выбрать эту опцию, если вы собираетесь\n"
-"использовать Mandrakelinux и Microsoft Windows на одном компьютере.\n"
+"использовать Mandrivalinux и Microsoft Windows на одном компьютере.\n"
 "\n"
 "   Перед тем, как выбрать эту опцию, вы должны осознать, что размер вашего\n"
 "раздела Microsoft Windows станет меньше, чем был. У вас будет меньше\n"
@@ -4597,7 +4597,7 @@ msgstr ""
 "новых программ.\n"
 "\n"
 " * \"%s\" выберите эту опцию, если вы хотите удалить все данные на всех\n"
-"разделах вашего жесткого диска и заменить их новой системой Mandrakelinux.\n"
+"разделах вашего жесткого диска и заменить их новой системой Mandrivalinux.\n"
 "Будьте осторожны в этом решении, потому что после подтверждения вы не\n"
 "сможете вернуть обратно все как было.\n"
 "\n"
@@ -4760,7 +4760,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4785,7 +4785,7 @@ msgstr ""
 "Нажмите \"%s\", когда будете готовы начать форматирование разделов.\n"
 "\n"
 "Нажмите \"%s\", если вы хотите выбрать другой раздел для установки\n"
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 "Нажмите \"%s\", если хотите выбрать разделы, которые следует проверить на\n"
 "сбойные блоки (bad blocks)."
@@ -4804,7 +4804,7 @@ msgstr "Назад"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4816,7 +4816,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"В данный момент установки Mandrakelinux было бы неплохо обновить некоторые\n"
+"В данный момент установки Mandrivalinux было бы неплохо обновить некоторые\n"
 "пакеты из исходного релиза. Некоторые баги могут быть уже исправлены и\n"
 "решены проблемы безопасности. Чтобы получить пользу от этих обновлений,\n"
 "сейчас вы можете загрузить их из Интернет. Нажмите \"%s\", если у вас есть\n"
@@ -4846,7 +4846,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4860,7 +4860,7 @@ msgstr ""
 "\n"
 "Если вы не знаете что выбрать, оставьте выбор по умолчанию. Вы сможете\n"
 "изменить этот уровень безопасности потом с помощью утилиты draksec из\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 "В поле \"%s\" системе указывается пользователь, который будет отвечать за\n"
 "безопасность. На этот адрес будут посылаться сообщения по безопасности."
@@ -4876,7 +4876,7 @@ msgstr "Администратор по безопасности"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4947,7 +4947,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Здесь вам предложат выбрать, какие разделы будут использоваться для\n"
-"установки вашей системы Mandrakelinux. Если разделы были уже определены\n"
+"установки вашей системы Mandrivalinux. Если разделы были уже определены\n"
 "ранее, например, предыдущей инсталляцией GNU/Linux или другой утилитой\n"
 "разбиения дисков, вы можете воспользоваться существующими разделами. В\n"
 "противном случае, разделы жесткого диска должны быть определены.\n"
@@ -5035,7 +5035,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5065,7 +5065,7 @@ msgid ""
 msgstr ""
 "На вашем жестом диске обнаружено несколько разделов Microsoft. Выберите\n"
 "необходимый раздел для изменения его размера с целью установки вашей новой\n"
-"операционной системы Mandrakelinux.\n"
+"операционной системы Mandrivalinux.\n"
 "\n"
 "Каждый раздел перечислен так: \"Linux имя\", \"Windows имя\" \"Размер\".\n"
 "\n"
@@ -5116,7 +5116,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5125,19 +5125,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Этот шаг появляется только в случае, если на вашей машине найден старый\n"
 "раздел GNU/Linux.\n"
 "\n"
 "DrakX теперь должен узнать, хотите ли вы провести новую установку или\n"
-"обновление существующей системы Mandrakelinux:\n"
+"обновление существующей системы Mandrivalinux:\n"
 "\n"
 " * \"%s\": в большинстве случаев этот вариант приведет к уничтожению старой\n"
 "системы. Если вы желаете изменить разделы вашего жесткого диска или\n"
@@ -5146,12 +5146,12 @@ msgstr ""
 "от перезаписи некоторые свои данные.\n"
 "\n"
 " * \"%s\": этот класс установки позволит вам обновить пакеты, установленные\n"
-"в вашей системе Mandrakelinux. Текущая схема разделов диска и\n"
+"в вашей системе Mandrivalinux. Текущая схема разделов диска и\n"
 "пользовательские данные останутся нетронутыми. Большинство других шагов\n"
 "будут доступны, как и при стандартной установке.\n"
 "\n"
-"``Обновление'' будет неплохо работать на системах Mandrakelinux начиная с\n"
-"\"8.1\" и выше. Проведение обновления на системах Mandrakelinux старше\n"
+"``Обновление'' будет неплохо работать на системах Mandrivalinux начиная с\n"
+"\"8.1\" и выше. Проведение обновления на системах Mandrivalinux старше\n"
 "\"8.1\" не рекомендуется."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -5213,7 +5213,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5251,7 +5251,7 @@ msgstr ""
 "\n"
 "О поддержке UTF-8 (unicode): Unicode это новая кодировка, которая включает\n"
 "в себя все существующие языки. Однако ее полная поддержка в GNU/Linux пока\n"
-"находится в стадии разработки. Поэтому Mandrakelinux будет определять\n"
+"находится в стадии разработки. Поэтому Mandrivalinux будет определять\n"
 "использовать ее или нет в зависимости от выбора пользователя:\n"
 "\n"
 " * Если вы выбираете языки, которые имеют свою традиционную устоявшуюся\n"
@@ -5502,7 +5502,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5523,11 +5523,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Теперь пришло время выбрать систему печати для вашего компьютера. Другие OS\n"
-"могут предложить вам одну, а Mandrakelinux предлагает две. Каждая из систем\n"
+"могут предложить вам одну, а Mandrivalinux предлагает две. Каждая из систем\n"
 "является лучшей для определенной конфигурации.\n"
 "\n"
 " * \"%s\" -- что означает ``печатать, не ставить в очередь'' (``print,\n"
@@ -5550,7 +5550,7 @@ msgstr ""
 "\n"
 "Если вы сделаете свой выбор сейчас, а позже обнаружите, что система печати\n"
 "вам не подходит, вы сможете изменить ее, запустив PrinterDrake из Центра\n"
-"Управления Mandrakelinux и нажав на кнопку  \"%s\"."
+"Управления Mandrivalinux и нажав на кнопку  \"%s\"."
 
 #: help.pm:765
 #, c-format
@@ -5674,7 +5674,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5691,7 +5691,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5743,7 +5743,7 @@ msgstr ""
 "\n"
 " * \"%s\": если вы хотите настроить доступ в Интернет или локальную сеть\n"
 "прямо сейчас. Обратитесь к печатной документации или используйте\n"
-"Центр управления Mandrakelinux после установки чтобы почитать\n"
+"Центр управления Mandrivalinux после установки чтобы почитать\n"
 "встроенную справку.\n"
 "\n"
 " * \"%s\": позволяет настроить адреса HTTP и FTP прокси если машина,\n"
@@ -5760,7 +5760,7 @@ msgstr ""
 " * \"%s\": если вы желаете изменить конфигурацию начального загрузчика,\n"
 "нажмите эту кнопку. Эта опция предназначена для опытных пользователей.\n"
 "Обратитесь к печатной документации или встроенной справке о настройке\n"
-"загрузчика в Центре управления Mandrakelinux.\n"
+"загрузчика в Центре управления Mandrivalinux.\n"
 " * \"%s\": здесь вы сможете проконтролировать какие службы будут запущены\n"
 "на вашей машине. Если ваша машина будет сервером, вам стоит проверить эти\n"
 "установки."
@@ -5822,11 +5822,11 @@ msgstr "Службы"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Выберите жесткий диск, который нужно очистить для инсталляции вашего нового\n"
-"раздела Mandrakelinux. Будьте осторожны, все данные на нем будут потеряны\n"
+"раздела Mandrivalinux. Будьте осторожны, все данные на нем будут потеряны\n"
 "и их нельзя будет восстановить!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -6185,12 +6185,12 @@ msgstr "Вычисляется размер раздела Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Ваш раздел Windows слишком фрагментирован. Пожалуйста, перезагрузите свой "
 "компьютер под Windows, запустите утилиту ``defrag'', а затем повторно "
-"запустите установку Mandrakelinux."
+"запустите установку Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6307,19 +6307,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6341,7 +6341,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6349,14 +6349,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6366,7 +6366,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6386,10 +6386,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6400,11 +6400,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6420,21 +6420,21 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Введение\n"
 "\n"
 "Операционная система и различные компоненты, доступные в дистрибутиве\n"
-"Mandrakelinux далее будут называться \"Программными Продуктами\".\n"
+"Mandrivalinux далее будут называться \"Программными Продуктами\".\n"
 "Программные Продукты включают, но не ограничиваются, набор программ, \n"
 "методы, правила и документацию, связанную с операционной системой\n"
-"и различными компонентами дистрибутива Mandrakelinux.\n"
+"и различными компонентами дистрибутива Mandrivalinux.\n"
 "\n"
 "\n"
 "1. Лицензионное соглашение\n"
 "\n"
 "Пожалуйста, внимательно прочтите этот документ. Данный документ является\n"
-"лицензионным соглашением, заключаемым между вами и Mandrakesoft S.A.,\n"
+"лицензионным соглашением, заключаемым между вами и Mandriva S.A.,\n"
 "применимо к Программным Продуктам. Устанавливая, тиражируя или\n"
 "используя Программные Продукты в любых других целях, вы тем самым всецело\n"
 "принимаете и полностью соглашаетесь с условиями и положениями данной\n"
@@ -6453,7 +6453,7 @@ msgstr ""
 "\n"
 "Программные Продукты и прилагаемая документация предоставляются \"как есть\","
 "безо всякой гарантии в пределах, дозволенных законом.\n"
-"Mandrakesoft S.A. ни при каких условиях и в пределах, дозволенных\n"
+"Mandriva S.A. ни при каких условиях и в пределах, дозволенных\n"
 "законом, не несет ответственности за любой какой бы то ни было "
 "определенный,\n"
 "случайный, прямой или косвенный ущерб (включая неограниченный ущерб от\n"
@@ -6462,13 +6462,13 @@ msgstr ""
 "судебных издержек и штрафов, являющихся результатом судебных "
 "разбирательств,\n"
 "или любых других косвенных потерь), являющийся результатом использования\n"
-"Программных Продуктов, даже, если Mandrakesoft S.A. было известно\n"
+"Программных Продуктов, даже, если Mandriva S.A. было известно\n"
 "о возможности или случаях такого ущерба.\n"
 "\n"
 "ОГРАНИЧЕННАЯ ОТВЕТСТВЕННОСТЬ, СВЯЗАННАЯ С ВЛАДЕНИЕМ ИЛИ ИСПОЛЬЗОВАНИЕМ "
 "ЗАПРЕЩЕННОГО ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ В НЕКОТОРЫХ СТРАНАХ\n"
 "\n"
-"В пределах, дозволенных законом, Mandrakesoft S.A. или ее распространители\n"
+"В пределах, дозволенных законом, Mandriva S.A. или ее распространители\n"
 "ни при каких условиях не несут ответственности за любой, какой бы то ни "
 "было\n"
 "определенный, случайный, прямой или косвенный ущерб (включая неограниченный\n"
@@ -6478,7 +6478,7 @@ msgstr ""
 "разбирательств, или любых других косвенных потерь), являющихся результатом\n"
 "владения и использования компонентов программного обеспечения,\n"
 "или являющихся результатом скачивания компонентов программного обеспечения\n"
-"с одного из сайтов Mandrakelinux, запрещенных или ограниченных в некоторых\n"
+"с одного из сайтов Mandrivalinux, запрещенных или ограниченных в некоторых\n"
 "странах местными законами.\n"
 "Ограниченная ответственность применяется, но не ограничивается,\n"
 "к компонентам сильной криптографии, включаемых в Программные Продукты.\n"
@@ -6494,10 +6494,10 @@ msgstr ""
 "они распространяются. Пожалуйста, внимательно читайте условия и положения\n"
 "лицензионного соглашения для каждого из компонент перед использованием\n"
 "любого компонента. Любые вопросы по лицензии компонента должны быть\n"
-"адресованы автору компонента, а не Mandrakesoft.\n"
-"Программы, разработанные Mandrakesoft S.A., находятся под действием "
+"адресованы автору компонента, а не Mandriva.\n"
+"Программы, разработанные Mandriva S.A., находятся под действием "
 "лицензии\n"
-"GPL. Документация, написанная Mandrakesoft S.A., находится под действием\n"
+"GPL. Документация, написанная Mandriva S.A., находится под действием\n"
 "особой лицензии. Пожалуйста, обратитесь к документации за дополнительной\n"
 "информацией.\n"
 "\n"
@@ -6507,11 +6507,11 @@ msgstr ""
 "соответствующим\n"
 "авторам и защищены законами об интеллектуальной собственности и авторском\n"
 "праве, применительно к программному обеспечению.\n"
-"Mandrakesoft S.A. сохраняет за собой право изменять или адаптировать\n"
+"Mandriva S.A. сохраняет за собой право изменять или адаптировать\n"
 "Программные Продукты, как целиком, так и по частям, любым способом и для\n"
 "любых целей.\n"
-"\"Mandrake\", \"Mandrakelinux\" и соответствующие логотипы являются "
-"торговыми марками Mandrakesoft S.A.\n"
+"\"Mandriva\", \"Mandrivalinux\" и соответствующие логотипы являются "
+"торговыми марками Mandriva S.A.\n"
 "\n"
 "\n"
 "5. Основные законы\n"
@@ -6526,7 +6526,7 @@ msgstr ""
 "будут оспариваться в суде. В последнюю очередь оспаривание вопроса будет "
 "передано в соответствующий Законодательный Суд Парижа - Франция. По любым "
 "вопросам, касающимся этого документа, пожалуйста, свяжитесь\n"
-"с Mandrakesoft S.A.\n"
+"с Mandriva S.A.\n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6620,7 +6620,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6628,13 +6628,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Поздравляем, установка завершена.\n"
 "Извлеките загрузочный диск и нажмите Enter для перезагрузки.\n"
 "\n"
 "\n"
-"За информацией о фиксах, доступных для этой версии Mandrakelinux,\n"
+"За информацией о фиксах, доступных для этой версии Mandrivalinux,\n"
 "обращайтесь к Списку ошибок (Errata) , доступном на:\n"
 "\n"
 "\n"
@@ -6642,7 +6642,7 @@ msgstr ""
 "\n"
 "\n"
 "Информация о настройке вашей системы доступна в главе post install\n"
-"Официального Руководства Пользователя Mandrakelinux."
+"Официального Руководства Пользователя Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6677,12 +6677,12 @@ msgstr "Осуществляется переход на этап `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "На вашей системе мало ресурсов. У вас могут возникнуть проблемы при\n"
-"установке Mandrakelinux. Если это случится, вы можете попробовать\n"
+"установке Mandrivalinux. Если это случится, вы можете попробовать\n"
 "установку в текстовом режиме. Для этого нажмите `F1' при загрузке с\n"
 "CDROM'а, и затем наберите `text'."
 
@@ -7229,9 +7229,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Выполняется подключение к веб-сайту Mandrakelinux для получения списка "
+"Выполняется подключение к веб-сайту Mandrivalinux для получения списка "
 "доступных пакетов..."
 
 #: install_steps_interactive.pm:840
@@ -7458,8 +7458,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Установка Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Установка Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10046,13 +10046,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Конфигуратор drakfirewall\n"
 "\n"
-"Он настраивает персональный файервол для этой машины Mandrakelinux.\n"
+"Он настраивает персональный файервол для этой машины Mandrivalinux.\n"
 "Для создания специализированного мощного файервола, пожалуйста, загляните\n"
 "в специализированный дистрибутив MandrakeSecurity Firewall."
 
@@ -14125,12 +14125,12 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
 "Запустите Scannerdrake (Оборудование/Сканер в Центре управления "
-"Mandrakelinux) чтобы раздать ваш сканер на сеть.\n"
+"Mandrivalinux) чтобы раздать ваш сканер на сеть.\n"
 "\n"
 
 #: printer/printerdrake.pm:3933
@@ -16098,33 +16098,33 @@ msgstr "Остановить"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Что такое Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Что такое Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Добро пожаловать в <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Добро пожаловать в <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux это <b>дистрибутив Linux</b>, который содержит ядро системы,"
+"Mandrivalinux это <b>дистрибутив Linux</b>, который содержит ядро системы,"
 "именуемой <b>операционная система</b> (основана на ядре Linux) вместе со "
 "<b>множеством приложений</b>, отвечающих всем вашим потребностям."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux это самый <b>дружественный к пользователю </b> дистрибутив "
+"Mandrivalinux это самый <b>дружественный к пользователю </b> дистрибутив "
 "Linux на сегодняшний день. Он также является одним из <b>самых используемых</"
 "b> дистрибутивов Linux в мире!"
 
@@ -16141,15 +16141,15 @@ msgstr "Добро пожаловать в мир <b>Открытых Исход
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux придерживается модели open source. Это означает что данный "
+"Mandrivalinux придерживается модели open source. Это означает что данный "
 "новый релиз есть результат <b>сотрудничества</b> команды <b>разработчиков "
-"Mandrakesoft</b> и <b>международного сообщества</b> контрибьюторов "
-"Mandrakelinux."
+"Mandriva</b> и <b>международного сообщества</b> контрибьюторов "
+"Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16169,10 +16169,10 @@ msgstr "<b>GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "Большинство программного обеспечения, входящего в дистрибутив и все "
-"утилитыMandrakelinux поставляются по лицензии <b>General Public License</b>."
+"утилитыMandrivalinux поставляются по лицензии <b>General Public License</b>."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16204,15 +16204,15 @@ msgstr "<b>Присоединяйтесь к Сообществу!</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"У Mandrakelinux <b>самое большое сообщество</b> пользователей и "
+"У Mandrivalinux <b>самое большое сообщество</b> пользователей и "
 "разработчиков. Роль этого сообщества очень широка, от сообщений об ошибках "
 "до разработки новых приложений. Сообщество играет <b>ключевую роль</b> в "
-"мире Mandrakelinux ."
+"мире Mandrivalinux ."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16233,11 +16233,11 @@ msgstr "<b>Download версия</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Вы устанавливаете версию <b>Mandrakelinux Download</b>. Это свободная "
-"версия, которую Mandrakesoft делает <b>доступной всем</b>."
+"Вы устанавливаете версию <b>Mandrivalinux Download</b>. Это свободная "
+"версия, которую Mandriva делает <b>доступной всем</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16269,10 +16269,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Вы не получите доступ к <b>службам, включенным</b> в другие продукты "
-"Mandrakesoft. "
+"Mandriva. "
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16281,8 +16281,8 @@ msgstr "<b>Discovery, Ваш первый Linux Desktop</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Вы устанавливаете <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Вы устанавливаете <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16305,17 +16305,17 @@ msgstr "<b>PowerPack, The Ultimate Linux Desktop</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Вы устанавливаете <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Вы устанавливаете <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack это <b>главный десктопный продукт</b> Mandrakesoft. PowerPack "
+"PowerPack это <b>главный десктопный продукт</b> Mandriva. PowerPack "
 "включает <b>тысячи приложений </b>  все от наиболее популярных до наиболее "
 "расширенных."
 
@@ -16326,8 +16326,8 @@ msgstr "<b>PowerPack+, Решение Linux для рабочих столов �
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Вы устанавливаете <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Вы устанавливаете <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16343,21 +16343,21 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Продукты Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Продукты Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> разработал широкий круг продуктов <b>Mandrakelinux</b>."
+"<b>Mandriva</b> разработал широкий круг продуктов <b>Mandrivalinux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Продукты Mandrakelinux:"
+msgid "The Mandrivalinux products are:"
+msgstr "Продукты Mandrivalinux:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16377,74 +16377,74 @@ msgstr "\t* <b>PowerPack+</b>, Решение Linux для рабочих сто
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux для x86-64</b>, Решение Mandrakelinux для успешной "
+"\t* <b>Mandrivalinux для x86-64</b>, Решение Mandrivalinux для успешной "
 "работы на вашем 64-битном процессоре."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Продукты Mandrakesoft (Nomad продукты)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Продукты Mandriva (Nomad продукты)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft разработал два продукта, которые позволяют вам использовать "
-"Mandrakelinux <b>на любом компьютере</b> не прибегая к установке:"
+"Mandriva разработал два продукта, которые позволяют вам использовать "
+"Mandrivalinux <b>на любом компьютере</b> не прибегая к установке:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, это дистрибутив Mandrakelinux, который запускается "
+"\t* <b>Move</b>, это дистрибутив Mandrivalinux, который запускается "
 "непосредственно с загрузочного CD-диска."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, это дистрибутив Mandrakelinux, который "
+"\t* <b>GlobeTrotter</b>, это дистрибутив Mandrivalinux, который "
 "предустановлен на ультра-компактный “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Продукты Mandrakesoft (профессиональные решения)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Продукты Mandriva (профессиональные решения)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Ниже представлены продукты Mandrakesoft, разработанные для удовлетворения "
+"Ниже представлены продукты Mandriva, разработанные для удовлетворения "
 "<b>нужд профессионалов</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
-"\t* <b>Corporate Desktop</b>, Рабочий стол Mandrakelinux для предприятий."
+"\t* <b>Corporate Desktop</b>, Рабочий стол Mandrivalinux для предприятий."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Серверное решение Mandrakelinux."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Серверное решение Mandrivalinux."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
-"\t* <b>Multi-Network Firewall</b>, Решение Mandrakelinux для безопасности."
+"\t* <b>Multi-Network Firewall</b>, Решение Mandrivalinux для безопасности."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16487,10 +16487,10 @@ msgstr "<b>Выберите свою среду рабочего стола</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "В PowerPack вы сможете выбирать в каком <b>рабочем столе</b> работать. "
-"Mandrakesoft установил <b>KDE</b> по умолчанию."
+"Mandriva установил <b>KDE</b> по умолчанию."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16515,10 +16515,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "В PowerPack+ вам прийдется выбрать свой <b>графический рабочий стол</b>. По "
-"умолчанию Mandrakesoft выбрал <b>KDE</b>."
+"умолчанию Mandriva выбрал <b>KDE</b>."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16645,10 +16645,10 @@ msgstr "<b>Наслаждайтесь множеством приложений<
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"В меню Mandrakelinux вы найдете <b>простые в использовании</b> приложения "
+"В меню Mandrivalinux вы найдете <b>простые в использовании</b> приложения "
 "для <b>всех ваших задач</b>:"
 
 #: share/advertising/18.pl:16
@@ -16920,17 +16920,17 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Центр управления Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Центр управления Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Центр управления Mandrakelinux</b> это особый набор утилит Mandrakelinux "
+"<b>Центр управления Mandrivalinux</b> это особый набор утилит Mandrivalinux "
 "для упрощения настройки вашего компьютера."
 
 #: share/advertising/25.pl:17
@@ -16955,17 +16955,17 @@ msgstr "<b>Модель Open Source</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Как и все компьютерное программирование, программное обеспечение с открытыми "
 "исходниками <b>требует время и людские ресурсы</b> для разработки. Чтобы "
-"сохранить философию открытых исходников, Mandrakesoft продает дополнительные "
+"сохранить философию открытых исходников, Mandriva продает дополнительные "
 "продукты и услуги, что дает возможность поддерживать<b>развитие "
-"Mandrakelinux</b>. Если вы желаете <b>поддержать философию открытых "
-"исходников</b> и разработку Mandrakelinux, <b>пожалуйста</b> приобретите что-"
+"Mandrivalinux</b>. Если вы желаете <b>поддержать философию открытых "
+"исходников</b> и разработку Mandrivalinux, <b>пожалуйста</b> приобретите что-"
 "нибудь из наших продуктов или услуг!"
 
 #: share/advertising/27.pl:13
@@ -16976,10 +16976,10 @@ msgstr "<b>Интернет-магазин</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Чтобы узнать больше о продуктах и услугах Mandrakesoft, посетите нашу "
+"Чтобы узнать больше о продуктах и услугах Mandriva, посетите нашу "
 "<b>платформу электронной коммерции</b>."
 
 #: share/advertising/27.pl:17
@@ -17005,24 +17005,24 @@ msgstr "Зайдите сегодня на <b>store.mandrakesoft.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> это <b>отличный помощник</b> для ваших продуктов "
-"Mandrakelinux.."
+"<b>Mandriva Club</b> это <b>отличный помощник</b> для ваших продуктов "
+"Mandrivalinux.."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Получите выгоду от <b>множества привилегий</b>, вступив в Mandrakeclub, "
+"Получите выгоду от <b>множества привилегий</b>, вступив в Mandriva Club, "
 "например:"
 
 #: share/advertising/28.pl:20
@@ -17045,40 +17045,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Участие в <b>форумах пользователей</b> Mandrakelinux."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Участие в <b>форумах пользователей</b> Mandrivalinux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Ранний и привилегированный доступ</b>, перед общедоступным релизом к  "
-"<b>ISO образам</b>Mandrakelinux."
+"<b>ISO образам</b>Mandrivalinux."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> - это новый высококачественный сервис, который "
-"Mandrakesoft с гордостью предоставляет своим клиентам!"
+"<b>Mandriva Online</b> - это новый высококачественный сервис, который "
+"Mandriva с гордостью предоставляет своим клиентам!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline предоставляет множество отличных услуг для <b>легкого "
-"обновления</b> ваших систем Mandrakelinux:"
+"Mandriva Online предоставляет множество отличных услуг для <b>легкого "
+"обновления</b> ваших систем Mandrivalinux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17102,41 +17102,41 @@ msgstr "\t* Гибкие <b>запланированные</b> обновлен�
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* Управление <b>всеми вашими системами Mandrakelinux</b> с одного аккаунта."
+"\t* Управление <b>всеми вашими системами Mandrivalinux</b> с одного аккаунта."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "Требуется <b>консультация?</b> Пообщайтесь с техническими экспертами "
-"Mandrakesoft с помощью <b>нашей платформы тех-поддержки</b> www."
+"Mandriva с помощью <b>нашей платформы тех-поддержки</b> www."
 "mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Благодаря помощи <b>квалифицированных экспертов Mandrakelinux</b>, вы "
+"Благодаря помощи <b>квалифицированных экспертов Mandrivalinux</b>, вы "
 "сэкономите уйму времени."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"По любым вопросам в отношении Mandrakelinux вы можете приобрести инциденты "
+"По любым вопросам в отношении Mandrivalinux вы можете приобрести инциденты "
 "поддержки в <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17436,8 +17436,8 @@ msgstr "Утилиты мониторинга, учет процессов, tcpd
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Мастера настройки от Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Мастера настройки от Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17586,7 +17586,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17600,7 +17600,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[ОПЦИИ]...\n"
-"Конфигуратор Сервера терминалов Mandrakelinux\n"
+"Конфигуратор Сервера терминалов Mandrivalinux\n"
 "--enable         : включить MTS\n"
 "--disable        : выключить MTS\n"
 "--start          : запустить MTS\n"
@@ -17659,7 +17659,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17667,7 +17667,7 @@ msgid ""
 msgstr ""
 "[ОПЦИЯ]...\n"
 "  --no-confirmation      не просить первого подтверждения в режиме "
-"MandrakeUpdate\n"
+"Mandriva Update\n"
 "  --no-verify-rpm        не проверять подписи пакетов\n"
 "  --changelog-first      показывать журнал изменений перед списком файлов в "
 "окне описания\n"
@@ -20460,13 +20460,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Утилита создания отчета об ошибке Mandrakelinux"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Утилита создания отчета об ошибке Mandrivalinux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Центр управления Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Центр управления Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20486,8 +20486,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20531,8 +20531,8 @@ msgstr "Мастера настройки"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Выберите утилиту Mandrakesoft:"
+msgid "Select Mandriva Tool:"
+msgstr "Выберите утилиту Mandriva:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20956,19 +20956,19 @@ msgstr "Запущен при загрузке"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Этот интерфейс еще не был настроен.\n"
-"Запустите помощника \"Добавить интерфейс\" из Центра Управления Mandrakelinux"
+"Запустите помощника \"Добавить интерфейс\" из Центра Управления Mandrivalinux"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "У вас еще нет ни одного настроенного соединения с Интернет.\n"
-"Запустите помощника \"%s\" из Центра Управления Mandrakelinux"
+"Запустите помощника \"%s\" из Центра Управления Mandrivalinux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21018,8 +21018,8 @@ msgstr "KDM (менеджер экрана KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Менеджер экрана Mandrakelinux)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Менеджер экрана Mandrivalinux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21318,7 +21318,7 @@ msgstr "Импорт"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21327,7 +21327,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (оригинальная версия)\n"
@@ -21879,14 +21879,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "Это свободное программное обеспечение и оно может распространяться в "
 "соответствии с условиями лицензии GNU GPL.\n"
 "\n"
@@ -21916,7 +21916,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Центр справки Mandrake"
 
 #: standalone/drakhelp:36
@@ -25449,8 +25449,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Журналы утилит Mandrakelinux"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Журналы утилит Mandrivalinux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25963,10 +25963,10 @@ msgstr "Подключение выполнено."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Подключение завершилось неудачей.\n"
-"Проверьте свои настройки в Центре управления Mandrakelinux."
+"Проверьте свои настройки в Центре управления Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/sc.po b/perl-install/share/po/sc.po
index 2cb53006e..fa4ceac7e 100644
--- a/perl-install/share/po/sc.po
+++ b/perl-install/share/po/sc.po
@@ -66,14 +66,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Sa crai USB parit ki tenjat amparu de scriidura, ma no da podeus bogai\n"
 "in siguresa imoi.\n"
 "\n"
 "\n"
 "Crica su butoni po torrai a allui sa màkina, bogadda, boga s'amparu de\n"
-"scriidura, torradda a ponni e a lançai Mandrake Move."
+"scriidura, torradda a ponni e a lançai Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -91,7 +91,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Sa crai USB no tenit pratziduras Windows (FAT) bàlidas.\n"
@@ -102,14 +102,14 @@ msgstr ""
 "\n"
 "\n"
 "Podis sighiri finas sentza de crai USB - as a podi ancora\n"
-"imprea Mandrake Move ke unu Sistema Obradori Mandrake\n"
+"imprea Mandriva Move ke unu Sistema Obradori Mandrake\n"
 "normali live."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -117,11 +117,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "No eus agatau crai USB in su sistema. Ki ponis\n"
-"una crai USB imoi, Mandrake Move at a podi sarvai\n"
+"una crai USB imoi, Mandriva Move at a podi sarvai\n"
 "is dadus in siguresa in sa directory home tua e in su\n"
 "assètiu generali de sistema, po atra alluidura in custa\n"
 "computadora o in d-una atra. Mi': ki ponis una crai imoi,\n"
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "\n"
 "Podis sighiri finas sentza de crai USB - as a podi ancora\n"
-"imprea Mandrake Move ke unu Sistema Obradori Mandrake\n"
+"imprea Mandriva Move ke unu Sistema Obradori Mandrake\n"
 "normali live."
 
 #: ../move/move.pm:494
@@ -254,7 +254,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1262,11 +1262,11 @@ msgstr "Sçoberu de sa lìngua"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux podit suportai prus lìnguas a sa borta. Sçobera\n"
+"Mandrivalinux podit suportai prus lìnguas a sa borta. Sçobera\n"
 "is lìnguas ki bolis aposentai. Ndi as a podi disponni candu as a\n"
 "essi acabau s'aposentadura e torrau a allui su sistema."
 
@@ -3532,7 +3532,7 @@ msgstr "abiva su suportu arràdiu"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3642,7 +3642,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3653,11 +3653,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3764,10 +3764,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3876,7 +3876,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -3974,12 +3974,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4006,7 +4006,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4015,7 +4015,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4144,7 +4144,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4162,7 +4162,7 @@ msgstr "Agoa"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4191,7 +4191,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4207,7 +4207,7 @@ msgstr "Aministradori de Siguresa"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4293,7 +4293,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4338,7 +4338,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4347,13 +4347,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4394,7 +4394,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4551,7 +4551,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4572,7 +4572,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4672,7 +4672,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4689,7 +4689,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4751,7 +4751,7 @@ msgstr "Serbìtzius"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -5072,7 +5072,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 
@@ -5177,19 +5177,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5211,7 +5211,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5219,14 +5219,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5236,7 +5236,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5256,10 +5256,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5270,11 +5270,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5290,7 +5290,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5347,7 +5347,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5355,13 +5355,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Cumprimentus, s'aposentadura est acabada.\n"
 "Boga su mèdiu de alluidura e craca return po torrai a allui.\n"
 "\n"
 "\n"
-"Po sciri de ajorronus disponiditzus po custa versioni de Mandrakelinux,\n"
+"Po sciri de ajorronus disponiditzus po custa versioni de Mandrivalinux,\n"
 "ligi is Errata a disposta de:\n"
 "\n"
 "\n"
@@ -5369,7 +5369,7 @@ msgstr ""
 "\n"
 "\n"
 "Imparus po assetiai su sistema funt a disposta in su cabìtulu\n"
-"post install de sa Official Mandrakelinux User's Guide."
+"post install de sa Official Mandrivalinux User's Guide."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -5400,7 +5400,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -5910,9 +5910,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Cuntatu su jassu web de Mandrakelinux po tenni sa lista de is sprigus..."
+"Cuntatu su jassu web de Mandrivalinux po tenni sa lista de is sprigus..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -6116,8 +6116,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Aposentadura de Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Aposentadura de Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8678,7 +8678,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12233,7 +12233,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -13897,18 +13897,18 @@ msgstr ""
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
 msgstr ""
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -13917,7 +13917,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -13934,9 +13934,9 @@ msgstr ""
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -13956,7 +13956,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -13982,10 +13982,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14004,8 +14004,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14032,7 +14032,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14042,7 +14042,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14061,13 +14061,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14079,7 +14079,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14093,19 +14093,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr ""
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -14126,61 +14126,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14218,7 +14218,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14239,7 +14239,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -14356,7 +14356,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -14591,14 +14591,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr ""
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -14620,9 +14620,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -14634,7 +14634,7 @@ msgstr ""
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -14657,20 +14657,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
 msgstr ""
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -14689,33 +14689,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr ""
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -14738,32 +14738,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
 msgstr ""
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15054,7 +15054,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr ""
 
 #: share/compssUsers.pl:197
@@ -15150,7 +15150,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15198,7 +15198,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17648,12 +17648,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr ""
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakbug:48
@@ -17674,7 +17674,7 @@ msgstr ""
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr ""
 
 #: standalone/drakbug:52
@@ -17719,7 +17719,7 @@ msgstr ""
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -18123,14 +18123,14 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18181,7 +18181,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18466,7 +18466,7 @@ msgstr ""
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -18924,7 +18924,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -18951,7 +18951,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr ""
 
 #: standalone/drakhelp:36
@@ -21925,7 +21925,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr ""
 
 #: standalone/logdrake:51
@@ -22429,7 +22429,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
diff --git a/perl-install/share/po/sk.po b/perl-install/share/po/sk.po
index b0d4cae16..d8758600e 100644
--- a/perl-install/share/po/sk.po
+++ b/perl-install/share/po/sk.po
@@ -68,14 +68,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Zdá sa, že USB kľúč je chránený proti zápisu, takže nie je možné ho\n"
 "bezpečne odpojiť.\n"
 "\n"
 "\n"
 "Kliknite na tlačidlo reštart, odpojte ho, zrušte ochranu proti zápisu,\n"
-"pripojte opäť kľúč a spustite Mandrake Move znova."
+"pripojte opäť kľúč a spustite Mandriva Move znova."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -93,7 +93,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Váš USB disk neobsahuje platný oddiel s FAT.\n"
@@ -105,14 +105,14 @@ msgstr ""
 "\n"
 "\n"
 "Môžete tiež pokračovať bez USB disku - stále potom môžete používať\n"
-"vašu distribúciu MandrakeMove ako bežný produkčný operačný\n"
+"vašu distribúciu Mandriva Move ako bežný produkčný operačný\n"
 "systém."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -120,11 +120,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Na vašom systéme nebol nájdený žiadny USB disk. Ak ho teraz\n"
-"zasuniete, Mandrake Move bude mať možnosť transparentne\n"
+"zasuniete, Mandriva Move bude mať možnosť transparentne\n"
 "ukadať dáta vo vašom domovskom adresári a systémové nastavenia,\n"
 "ktoré budú dostupné pri ďalšom štarte tohoto alebo iného\n"
 "počítača. Poznámka: ak disk zasuniete teraz, počkajte pred ďalším hľadaním "
@@ -132,7 +132,7 @@ msgstr ""
 "\n"
 "\n"
 "Tiež môžete pokračovať bez USB disku - stále budete môcť používať vašu "
-"distribúciu Mandrake Move ako bežný produkčný operačný\n"
+"distribúciu Mandriva Move ako bežný produkčný operačný\n"
 "systém."
 
 #: ../move/move.pm:494
@@ -258,7 +258,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -275,7 +275,7 @@ msgstr ""
 "Táto chyba môže pochádzať z narušených systémových\n"
 "súborov s nastavením na USB disku; v tomto prípade by problém\n"
 "vyriešilo odstránenie týchto súborov a opätovné naštartovanie systému\n"
-"Mandrake Move. Ak to chcete urobiť, stlačte zodpovedajúce tlačidlo.\n"
+"Mandriva Move. Ak to chcete urobiť, stlačte zodpovedajúce tlačidlo.\n"
 "\n"
 "\n"
 "Tiež môžete systém reštartovať a vybrať USB disk, alebo si\n"
@@ -1310,7 +1310,7 @@ msgstr "Výber jazyka"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 "Môžete zvoliť ďalšie jazyky použiteľné po inštalácii"
@@ -3725,12 +3725,12 @@ msgstr "povoliť podporu pre rádia"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Pred tým než budete pokračovať, mali by ste si pozorne prečítať\n"
-"licenčné podmienky. Pokrývajú celú distribúciu Mandrakelinux\n"
+"licenčné podmienky. Pokrývajú celú distribúciu Mandrivalinux\n"
 "Ak súhlasíte so všetkými jej bodmi kliknite na tlačidlo \"%s\".\n"
 "Ak nesúhlasíte kliknite na tlačidlo \"%s\" a váš počítač bude reštartovaný."
 
@@ -3912,13 +3912,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Inštalácia Mandrakelinuxu je distribuovaná na viacerých CD-ROM diskoch. "
+"Inštalácia Mandrivalinuxu je distribuovaná na viacerých CD-ROM diskoch. "
 "DrakX\n"
 "vie zistiť, ak je vybraný balík umiestnený na inom CD-ROM disku, vysunie\n"
 "aktuálne CD a vypýta si od vás to ktoré je práve potrebné. Ak toto CD "
@@ -3928,11 +3928,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3984,7 +3984,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Teraz je možné vybrať, ktoré programy chcete nainštalovať na váš systém.\n"
-"Mandrakelinux obsahuje tisíce balčkov s programami. Pre jednoduchšiu "
+"Mandrivalinux obsahuje tisíce balčkov s programami. Pre jednoduchšiu "
 "orientáciu\n"
 "boly rozdelené do skupín, ktoré združujú podobné aplikácie.\n"
 "\n"
@@ -4095,10 +4095,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4128,12 +4128,12 @@ msgstr ""
 "\n"
 "!! Ak boli vybrané balíky, ktoré sú určené pre server, buď zámerne alebo\n"
 "preto že sú súčasťou celej skupiny, budete musieť potvrdiť, či skutočne\n"
-"chcete tieto služby nainštalovať. V prípade Mandrakelinuxu, sú štandardne "
+"chcete tieto služby nainštalovať. V prípade Mandrivalinuxu, sú štandardne "
 "všetky\n"
 "nainštalované služby spúšťané pri štarte systému. Aj keď sú bezpečné\n"
 "a v čase keď bola distribúcia vydaná neobsahovali žiadne známe problémy\n"
 "je možné, že tieto bezpečnostné problémy budú odhalené až po dokončení\n"
-"tejto verzie Mandrakelinuxu. Ak neviete čo jednotlivé servisy znamenajú, "
+"tejto verzie Mandrivalinuxu. Ak neviete čo jednotlivé servisy znamenajú, "
 "alebo\n"
 "prečo boli nainštalované tak kliknite na \"%s\". Kliknutím na \"%s\" budú\n"
 "vypísané služby nainštalované a automaticky naštartované pri spustení\n"
@@ -4294,7 +4294,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4350,7 +4350,7 @@ msgid ""
 msgstr ""
 "X (X Window System) je srdcom grafického rozhrania GNU/Linux systému\n"
 "spolu so všetkými grafickými prostrediami (KDE, GNOME, AfterStep,\n"
-"WindowMaked, atď.) distribuovanými s Mandrakelinux systémom.\n"
+"WindowMaked, atď.) distribuovanými s Mandrivalinux systémom.\n"
 "\n"
 "Zmenou nasledovných parametrov môžete dosiahnuť optimálne nastavenie\n"
 "vášho grafického systému.\n"
@@ -4474,12 +4474,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4506,7 +4506,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4515,7 +4515,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4535,7 +4535,7 @@ 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 ""
-"Teraz si môžete zvoliť, kam si želáte nainštalovať Mandrakelinux\n"
+"Teraz si môžete zvoliť, kam si želáte nainštalovať Mandrivalinux\n"
 "na váš disk. Ak je váš disk prázdny alebo ak na ňom\n"
 "už existuje operačný systém, ktorý zaberá všetko dostupné miesto, bude\n"
 "potrebné ho prerozdeliť. Prerozdeľovanie pozostáva z logického\n"
@@ -4574,7 +4574,7 @@ msgstr ""
 "po predchádzajúcom defragmentovaní Windows oblasti, ak obsahuje FAT "
 "súborový\n"
 "systém. Je veľmi odporúčané si najprv odzálohovať údaje. Toto riešenie je\n"
-"odporúčané použiť ak si chcete používať spoločne Mandrakelinux aj Microsoft "
+"odporúčané použiť ak si chcete používať spoločne Mandrivalinux aj Microsoft "
 "Windows\n"
 "na jednom počítači.\n"
 "\n"
@@ -4586,7 +4586,7 @@ msgstr ""
 "Vaším Microsoft Windows systémom.\n"
 "\n"
 " * \"%s\": ak si želáte vymazať všetky údaje a všetky oddiely\n"
-"prítomné na vašom pevnom disku a nahradiť ich vašim novým Mandrakelinux\n"
+"prítomné na vašom pevnom disku a nahradiť ich vašim novým Mandrivalinux\n"
 "systémom, zvoľte si túto voľbu. Buďte opatrní pri tejto možnosti, pretože "
 "nebude\n"
 "žiadna možnosť zvrátiť vaše rozhodnutie keď ho potvrdíte.\n"
@@ -4755,7 +4755,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4780,7 +4780,7 @@ msgstr ""
 "Kliknite na \"%s\" ak ste pripravený formátovať vybrané oddiely.\n"
 "\n"
 "Kliknite na \"%s\" ak si chcete zvoliť iné oddiely pre inštaláciu vášho\n"
-"nového Mandrakelinux systému.\n"
+"nového Mandrivalinux systému.\n"
 "\n"
 "Kliknite na \"%s\" ak si chcete vybrať oddiely, ktoré budú kontrolované\n"
 "na prítomnosť chybných blokov na disku."
@@ -4797,7 +4797,7 @@ msgstr "Späť"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4809,7 +4809,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Po nainštalovaní Mandrakelinux systému je pravdepodobné, že niektoré\n"
+"Po nainštalovaní Mandrivalinux systému je pravdepodobné, že niektoré\n"
 "balíky ktoré sa nachádzali v distribúcii, nezodpovedajú ich aktuálnym\n"
 "verziám. Môžu v nich byť opravené chyby alebo bezpečnostné nedostatky.\n"
 "Aby ste mohli tieto opravy aplikovať, budete si ich teraz môcť stiahnuť\n"
@@ -4838,7 +4838,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4853,7 +4853,7 @@ msgstr ""
 "\n"
 "Ak si neviete vybrať, ponechajte štandardné nastavenie.Budete ju však\n"
 "mať možnosť zmeniť pomocou programu drakcec, ktorý je súčasťou\n"
-"Kontrolného Centra Mandrakelinuxu\n"
+"Kontrolného Centra Mandrivalinuxu\n"
 "\n"
 "Do políčka \"%s\" zadajte e-mailovú adresu osoby zodpovednej za\n"
 "bezpečnosť vášho PC. Na túto adresu budú zasielané\n"
@@ -4868,7 +4868,7 @@ msgstr "Bezpečnostný administrátor"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4939,7 +4939,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Na tomto mieste je potrebné aby ste si vybrali oblasti, ktoré budú použité\n"
-"na inštaláciu Mandrakelinuxu. Ak už boli oddiely definované,\n"
+"na inštaláciu Mandrivalinuxu. Ak už boli oddiely definované,\n"
 "napríklad pri predchádzajúcej inštalácii GNU/Linux-u alebo iným nástrojom\n"
 "pre správu oblastí, môžete použiť už existujúce oblasti. Inak musia byť\n"
 "oblasti teraz definované.\n"
@@ -5036,7 +5036,7 @@ msgstr "Prepnúť medzi normálnym/expertným režimom"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5066,7 +5066,7 @@ msgid ""
 msgstr ""
 "Bol nájdený viac ako jeden Microsoft oddiel na vašom pevnom disku.\n"
 "Vyberte si prosím jeden, ktorý chcete nastaviť pre inštaláciu vášho\n"
-"nového Mandrakelinux operačného systému.\n"
+"nového Mandrivalinux operačného systému.\n"
 "\n"
 "Všetky oddiely sú zobrazené nasledovne: \"Linux meno\", \"Windows meno\",\n"
 "\"Kapacita\".\n"
@@ -5115,7 +5115,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5124,20 +5124,20 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Tento krok sa aktivuje iba vtedy, ak sú na vašom systéme nájdené staršie\n"
 "GNU/Linux oddiely.\n"
 "\n"
 "DrakX teraz potrebuje vedieť či si želáte vykonať novú inštaláciu alebo "
 "aktualizáciu\n"
-"existujúceho Mandrakelinux systému:\n"
+"existujúceho Mandrivalinux systému:\n"
 "\n"
 " * \"%s\": Pomocou tejto voľby môžete kompletne zrušiť váš predchádzajúci\n"
 "operačný systém. Ak si želáte zmeniť rozloženie oddielov na vašich diskoch "
@@ -5148,13 +5148,13 @@ msgstr ""
 "údajov.\n"
 "\n"
 " * \"%s\": táto trieda inštalácie vám umožňuje aktualizovať balíky, ktoré\n"
-"sú momentálne nainštalované vo vašom Mandrakelinux systéme. Aktuálne\n"
+"sú momentálne nainštalované vo vašom Mandrivalinux systéme. Aktuálne\n"
 "rozdelenie oddielov a používateľské údaje nebudú prepísané. Mnohé ostatné "
 "kroky\n"
 "inštalácie ostanú dostupné, podobne ako pri štandardnej inštalácii.\n"
 "\n"
 "Použitie voľby ``Aktualizácia'' by malo fungovať správne pre systémy\n"
-"Mandrakelinux \"8.1\" a novšie. Vykonanie Aktualizácie pre staršie verzie "
+"Mandrivalinux \"8.1\" a novšie. Vykonanie Aktualizácie pre staršie verzie "
 "ako\n"
 "\"8.1\" nie je odporúčané.\""
 
@@ -5211,7 +5211,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5507,7 +5507,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5528,11 +5528,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Teraz nastal čas výberu tlačového systému pre váš počítač. Iné operačné\n"
-"systémy vám poskytujú zvyčajne iba jediný, Mandrakelinux vám poskytuje dva.\n"
+"systémy vám poskytujú zvyčajne iba jediný, Mandrivalinux vám poskytuje dva.\n"
 "Kazdý z nich je vhodný pre iný typ konfigurácie.\n"
 "\n"
 " * \"%s\" - čo znamená ``tlačiť, neukladať do fronty'', je vhodný výber ak\n"
@@ -5555,7 +5555,7 @@ msgstr ""
 "nástroje na tlačenie, pre výber tlačiarní alebo ich manažovanie.\n"
 "\n"
 "Ak neskôr budete chciet svoju voľbu zmeniť alebo budete chcieť odstrániť\n"
-"tlačový systém môžete tak spraviť za pomoci PrinterDrake z Mandrakelinux\n"
+"tlačový systém môžete tak spraviť za pomoci PrinterDrake z Mandrivalinux\n"
 "Kontrolného centra kliknutím na tlačidlo \"%s\"."
 
 #: help.pm:765
@@ -5673,7 +5673,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5690,7 +5690,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5743,7 +5743,7 @@ msgstr ""
 " * \"%s\": ak si teraz želáte nastaviť vaše Internetové pripojenie\n"
 "alebo prístup do lokálnej siete. Prezrite si tlačenú dokumentáciu alebo "
 "použite\n"
-"Kontrolné centrum Mandrakelinux ak už bude inštalácia ukončená aby ste mali\n"
+"Kontrolné centrum Mandrivalinux ak už bude inštalácia ukončená aby ste mali\n"
 "prístup k dokumentácii.\n"
 " * \"%s\": vám umožní nastaviť HTTP alebo FTP proxy ak je počítač\n"
 "umiestnený za proxy serverom.\n"
@@ -5759,7 +5759,7 @@ msgstr ""
 " * \"%s\": ak si želáte zmeniť konfiguráciu zavádzača, kliknite na toto\n"
 "tlačidlo. Táto možnosť je rezervovaná pre skúsených používateľov. Prezrite\n"
 "si tlačenú dokumentáciu alebo internú dokumentáciu vrámci Kontrolného\n"
-"centra Mandrakelinux.\n"
+"centra Mandrivalinux.\n"
 "\n"
 " * \"%s\": máte možnosť definitívne nastaviť služby, ktoré budú\n"
 "spúšťané na vašom počítači. Ak plánujete používať tento počítač ako\n"
@@ -5820,11 +5820,11 @@ msgstr "Služby"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Vyberte si pevný disk, ktorý chcete vymazať aby ste mohli vytvoriť\n"
-"nový oddiel pre Mandrakelinux. Buďte opatrní, všetky údaje ktoré sa\n"
+"nový oddiel pre Mandrivalinux. Buďte opatrní, všetky údaje ktoré sa\n"
 "na disku nachádzajú budú odstránené a nebude možné ich obnoviť!"
 
 #: help.pm:863
@@ -6179,7 +6179,7 @@ msgstr "Použiť voľné miesto z Windows oddielu"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Váš oddiel s Windows je veľmi fragmentovaný, prosím spustite najprv  "
@@ -6299,19 +6299,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6333,7 +6333,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6341,14 +6341,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6358,7 +6358,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6378,10 +6378,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6392,11 +6392,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6412,7 +6412,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "VAROVANIE: Toto je voľný neautorizovaný preklad originálnej licencie v "
 "anglickom jazyku.\n"
@@ -6422,20 +6422,20 @@ msgstr ""
 "\n"
 "Úvod\n"
 "\n"
-"Operačný systém a rôzne iné súčasti dostupné v distribúcii Mandrakelinux, "
+"Operačný systém a rôzne iné súčasti dostupné v distribúcii Mandrivalinux, "
 "budú ďalej\n"
 "nazvané \"softvérové produkty\". Softvérové produkty, ktoré obvykle  "
 "obsahujú, ale\n"
 "nie sú obmedzené len na súbor programov, metód, pravidiel a dokumentácie, "
 "vzťahujúcej sa\n"
-"k operačnému systému a rôznych súčastí distribúcie Mandrakelinux.\n"
+"k operačnému systému a rôznych súčastí distribúcie Mandrivalinux.\n"
 "\n"
 "\n"
 "1. Licenčná zmluva\n"
 "\n"
 "Prosíme vás, aby ste si nasledujúci dokument pozorne prečítali. Tento "
 "dokument je licenčnou zmluvou\n"
-"medzi vami a Mandrakesoft S.A., ktorý sa vzťahuje k softvérovým produktom.\n"
+"medzi vami a Mandriva S.A., ktorý sa vzťahuje k softvérovým produktom.\n"
 "Nainštalovaním, vytváraním kópií alebo používaním softvérového produktu za "
 "akýmkoľvek účelom,\n"
 "automaticky akceptujete a plne súhlasíte so všetkými bodmi tejto licencie.\n"
@@ -6456,7 +6456,7 @@ msgstr ""
 "Softvérové produkty a priložená dokumentácia sú poskytovaná \"tak ako je\", "
 "bez akejkoľvek\n"
 "záruky v medziach umožnených zákonom.\n"
-"Mandrakesoft S.A. nebude za žiadnych okolností a v medziach umožnených "
+"Mandriva S.A. nebude za žiadnych okolností a v medziach umožnených "
 "zákonom zodpovedať\n"
 "za žiadne zvláštne, náhodné, priame alebo nepriame škody (vrátane straty "
 "obchodných pohľadávok,\n"
@@ -6466,11 +6466,11 @@ msgstr ""
 "vzniknuté používaním,\n"
 "alebo z dôvodu používateľovej neschopnosti používať Softvérové produkty a to "
 "i v prípade, že\n"
-"Mandrakesoft S.A. bol upozornený na možnosť výskytu takýchto škôd.\n"
+"Mandriva S.A. bol upozornený na možnosť výskytu takýchto škôd.\n"
 "\n"
 "OBMEDZENÁ ZODPOVEDNOSŤ SPOJENÁ S VLASTNÍCTVOM ALEBO POUŽITÍM ZAKÁZANÉHO "
 "SOFTVÉRU V NIEKTORÝCH KRAJINÁCH\n"
-"Mandrakesoft S.A. alebo jeho distribútori, v medziach umožnených zákonom, "
+"Mandriva S.A. alebo jeho distribútori, v medziach umožnených zákonom, "
 "nie sú zodpovedný\n"
 "za žiadne zvláštne, náhodné, priame alebo nepriame škody (vrátane straty "
 "obchodných pohľadávok,\n"
@@ -6480,7 +6480,7 @@ msgstr ""
 "vlastneniu alebo\n"
 "používaniu softvérových komponentov alebo vzniknuté stiahnutím softvérových "
 "komponentov z niektorého\n"
-"servera Mandrakelinux, ktoré sú zakázané alebo obmedzené v niektorých "
+"servera Mandrivalinux, ktoré sú zakázané alebo obmedzené v niektorých "
 "krajinách miernymi zákonmi.\n"
 "Táto obmedzená zodpovednosť sa vzťahuje ale nie je obmedzená len na "
 "komponenty obsahujúce\n"
@@ -6499,11 +6499,11 @@ msgstr ""
 "prečítajte si pozorne\n"
 "podmienky licenčnej zmluvy pre každý komponent pred jeho používaním. "
 "Adresátom akýchkoľvek otázok\n"
-"ohľadne licencie ku komponentu by mal byť jeho autor a nie Mandrakesoft. "
+"ohľadne licencie ku komponentu by mal byť jeho autor a nie Mandriva. "
 "Programy vyvinuté\n"
-"Mandrakesoft S.A. sú poskytované pod podmienkami GPL Licencie. Dokumentácia "
+"Mandriva S.A. sú poskytované pod podmienkami GPL Licencie. Dokumentácia "
 "napísaná\n"
-"Mandrakesoft S.A. je poskytovaná pod špecifickou licenciou. Prosíme, "
+"Mandriva S.A. je poskytovaná pod špecifickou licenciou. Prosíme, "
 "preštudujte si dokumentáciu\n"
 "pre ďalšie detaily.\n"
 "\n"
@@ -6514,12 +6514,12 @@ msgstr ""
 "sú chránené právami\n"
 "na duševné vlastníctvo a zákonmi vzťahujúcimi sa k vlastníckym právam k "
 "softvérovým programom.\n"
-"Mandrakesoft S.A. si vyhradzuje právo upraviť alebo prispôsobiť Softvérové "
+"Mandriva S.A. si vyhradzuje právo upraviť alebo prispôsobiť Softvérové "
 "produkty ako celok\n"
 "alebo jednotlivé časti, akýmkoľvek spôsobom a za akýmikoľvek účelmi. "
-"\"Mandrake\", \"Mandrake\n"
+"\"Mandriva\", \"Mandrake\n"
 "Linux\" a pridružené logá sú chránenými obchodnými značkami spoločnosti "
-"Mandrakesoft S.A.\n"
+"Mandriva S.A.\n"
 "\n"
 "\n"
 "5. Zákony vzťahujúce sa k tejto zmluve\n"
@@ -6535,7 +6535,7 @@ msgstr ""
 "bude spor\n"
 "zverený na prejednanie príslušným súdom v Paríži - Francúzsko. Ak máte "
 "akékoľvek otázky k tomuto\n"
-"dokumentu, prosíme, kontaktujte Mandrakesoft S.A.\n"
+"dokumentu, prosíme, kontaktujte Mandriva S.A.\n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6629,7 +6629,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6637,13 +6637,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Gratulujeme, inštalácia je ukončená.\n"
 "Vyberte spúšťacie médium a stačte Enter pre reštart.\n"
 "\n"
 "\n"
-"Informácie o aktuálnych opravách pre túto verziu Mandrakelinuxu,\n"
+"Informácie o aktuálnych opravách pre túto verziu Mandrivalinuxu,\n"
 "sú dostupné na:\n"
 "\n"
 "\n"
@@ -6651,7 +6651,7 @@ msgstr ""
 "\n"
 "\n"
 "Informácie o konfigurovaní vášho systému sa\n"
-"nachádzajú v oficiálnej Mandrakelinux používateľskej príručke.\n"
+"nachádzajú v oficiálnej Mandrivalinux používateľskej príručke.\n"
 "\n"
 "\n"
 "Ak ste našli chybu (alebo nájdete neskôr) v preklade, kontaktujte prosím\n"
@@ -6689,12 +6689,12 @@ msgstr "Spúšťam krok %s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Váš systém má nedostatok prostriedkov. Možno budete mať problémy s\n"
-"inštaláciou Mandrakelinux. Ak sa tak stane, skúste textovú inštaláciu. Pre "
+"inštaláciou Mandrivalinux. Ak sa tak stane, skúste textovú inštaláciu. Pre "
 "jej\n"
 "spustenie stlačte `F1' po naštartovaní z CDROMky a zadajte `text'."
 
@@ -7235,9 +7235,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Pripájam sa k web stránke Mandrakelinux pre stiahnutie zoznamu zrkadiel..."
+"Pripájam sa k web stránke Mandrivalinux pre stiahnutie zoznamu zrkadiel..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7457,8 +7457,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Inštalácia Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Inštalácia Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10044,7 +10044,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -14093,7 +14093,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -16034,33 +16034,33 @@ msgstr "Zastaviť"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Čo je to Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Čo je to Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Vitajte v <b>Mandrakelinux</b>-e!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Vitajte v <b>Mandrivalinux</b>-e!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux je <b>Linux distribúcia</b> ktorá pozostáva z jadra systému, "
+"Mandrivalinux je <b>Linux distribúcia</b> ktorá pozostáva z jadra systému, "
 "nazývaného <b>operačný systém</b> (založený na jadre Linux), spolu s "
 "<b>množstvom aplikácií</b> poskytujúcich všetko čo by ste si mohli želať."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux je jedna z najviac <b>používateľsky prívetivých</b> Linux "
+"Mandrivalinux je jedna z najviac <b>používateľsky prívetivých</b> Linux "
 "distribúcií v súčastnosti. Je taktiež jedna z celosvetovo <b>najviac "
 "používaných</b> Linux distribúcií!"
 
@@ -16077,14 +16077,14 @@ msgstr "Vitajte vo <b>svete open source</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux je príspevok do modelu open source. Znamená to, že táto nová "
-"verzia je výsledkom <b>spolupráce</b> medzi <b>týmom vývojárov Mandrakesoft</"
-"b> a <b>celosvetovou komunitou</b> prispievateľov do projektu Mandrakelinux."
+"Mandrivalinux je príspevok do modelu open source. Znamená to, že táto nová "
+"verzia je výsledkom <b>spolupráce</b> medzi <b>týmom vývojárov Mandriva</"
+"b> a <b>celosvetovou komunitou</b> prispievateľov do projektu Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16104,9 +16104,9 @@ msgstr "<b>GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Množstvo softvéru zahrnutého v tejto distribúcii a všetky Mandrakelinux "
+"Množstvo softvéru zahrnutého v tejto distribúcii a všetky Mandrivalinux "
 "špecifické nástroje sú pokryté licenciou <b>GPL</b>."
 
 #: share/advertising/03.pl:17
@@ -16137,14 +16137,14 @@ msgstr "<b>Pridajte sa ku komunite</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux má jednu z <b>najväčších komunít</b> používateľov a vývojárov. "
+"Mandrivalinux má jednu z <b>najväčších komunít</b> používateľov a vývojárov. "
 "Rola komunity je veľmi široká, od hlásenia problémov a chých až po vývoj "
-"nových aplikácií. Komunita hrá <b>kľúčovú rolu</b> vo svete Mandrakelinux."
+"nových aplikácií. Komunita hrá <b>kľúčovú rolu</b> vo svete Mandrivalinux."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16165,11 +16165,11 @@ msgstr "<b>Download verzia</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Práve inštalujete <b>Mandrakelinux download verziu</b>. Toto je voľne "
-"dostupná verzia ktorú Mandrakesoft dáva k <b>dispozízii každému</b>."
+"Práve inštalujete <b>Mandrivalinux download verziu</b>. Toto je voľne "
+"dostupná verzia ktorú Mandriva dáva k <b>dispozízii každému</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16201,9 +16201,9 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
-"Nemáte prístup k <b>službám obsiahnutých</b> v iných Mandrakesoft produktoch."
+"Nemáte prístup k <b>službám obsiahnutých</b> v iných Mandriva produktoch."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16212,7 +16212,7 @@ msgstr "<b>Discovery, vaša prvá Linux pracovná stanica</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr "Práve inštalujete <b>Mandralinux Discovery</b>."
 
 #: share/advertising/06.pl:17
@@ -16235,13 +16235,13 @@ msgstr "<b>PowerPack, skvelý Linux pre pracovnú stanicu</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr "Práve inštalujete <b>Mandralinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -16256,8 +16256,8 @@ msgstr "<b>PowerPack+, Linuxové riešenie pre pracovné stanice a servery</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Práve inštalujete <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Práve inštalujete <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16273,21 +16273,21 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesoft produkty</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva produkty</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> vyvíja široké spektrum <b>Mandrakelinux</b> produktov."
+"<b>Mandriva</b> vyvíja široké spektrum <b>Mandrivalinux</b> produktov."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Produkty rady Mandrakelinux sú:"
+msgid "The Mandrivalinux products are:"
+msgstr "Produkty rady Mandrivalinux sú:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16308,73 +16308,73 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux pre x86-64</b>, Mandrakelinux riešenie pre váš 64bitový "
+"\t* <b>Mandrivalinux pre x86-64</b>, Mandrivalinux riešenie pre váš 64bitový "
 "procesor."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesoft produkty (bežné produkty)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandriva produkty (bežné produkty)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft vyvíja dva produkty ktoré umožňujú použiť Mandrakelinux <b>na "
+"Mandriva vyvíja dva produkty ktoré umožňujú použiť Mandrivalinux <b>na "
 "akomkoľvek počítači</b> bez potreby inštalácie."
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, Mandrakelinux distribúcia kompletne bežiaca z bootovacieho "
+"\t* <b>Move</b>, Mandrivalinux distribúcia kompletne bežiaca z bootovacieho "
 "CD-ROM média."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, Mandrakelinux distribúcia predinštalovaná na "
+"\t* <b>GlobeTrotter</b>, Mandrivalinux distribúcia predinštalovaná na "
 "kompaktnom prenosnom pevnom disku."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Mandrakesoft produkty (profesionálne služby)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Mandriva produkty (profesionálne služby)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Nasleduje zoznam produktov Mandrakesoft určených pre <b>profesionálne "
+"Nasleduje zoznam produktov Mandriva určených pre <b>profesionálne "
 "potreby</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
-"\t* <b>Corporate Desktop</b>, Mandrakelinux Desktop pre firemné nasadenie."
+"\t* <b>Corporate Desktop</b>, Mandrivalinux Desktop pre firemné nasadenie."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, serverové riešenie Mandrakelinux."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, serverové riešenie Mandrivalinux."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b>, bezpečnostné riešenie Mandrakelinux"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, bezpečnostné riešenie Mandrivalinux"
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16417,10 +16417,10 @@ msgstr "<b>Zvoľte si vaše obľúbené grafické prostredie</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Pomocou PowerPack-u máte možnosť výberu spomedzi <b>správcov grafického "
-"prostredia</b>. Mandrakesoft si vybral <b>KDE</b> ako predvolené."
+"prostredia</b>. Mandriva si vybral <b>KDE</b> ako predvolené."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16445,10 +16445,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Pomocou PowerPack+ získate možnosť výberu rôznych <b>grafických rozhraní</"
-"b>. Mandrakesoft preferuje <b>KDE</b> ako predvolené."
+"b>. Mandriva preferuje <b>KDE</b> ako predvolené."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16575,10 +16575,10 @@ msgstr "<b>Tešiť sa z širokého množstva aplikácií</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Pomocou Mandrakelinux menu dokážete <b>ľahko používať</b> aplikáce pre "
+"Pomocou Mandrivalinux menu dokážete <b>ľahko používať</b> aplikáce pre "
 "<b>správu vašich úloh</b>:"
 
 #: share/advertising/18.pl:16
@@ -16846,18 +16846,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Kontrolné centrum Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Kontrolné centrum Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Kontrolné centrum Mandrakelinux</b> je zbierka základných nástrojov "
-"vytvorených pre Mandrakelinux k uľahčeniu nastavovania vášho počítača."
+"<b>Kontrolné centrum Mandrivalinux</b> je zbierka základných nástrojov "
+"vytvorených pre Mandrivalinux k uľahčeniu nastavovania vášho počítača."
 
 #: share/advertising/25.pl:17
 #, c-format
@@ -16881,16 +16881,16 @@ msgstr "<b>Model Open Source</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Podobne ako písanie programov, otvorený softvér <b>vyžaduje čas a ľudí</b> "
-"pre vývoj. Aby zostala zachovaná koncepcia otvoreného softvéru, Mandrakesoft "
+"pre vývoj. Aby zostala zachovaná koncepcia otvoreného softvéru, Mandriva "
 "predáva pridanú hodnotu produktov a služby pre <b>trvalé vylepšovanie "
-"Mandrakelinux</b>. Ak chcete <b>podporiť koncepciu otvoreného softvéru</b> a "
-"podporiť vývoj Mandrakelinux, <b>prosíme</b> zvážte nákup niektorého z "
+"Mandrivalinux</b>. Ak chcete <b>podporiť koncepciu otvoreného softvéru</b> a "
+"podporiť vývoj Mandrivalinux, <b>prosíme</b> zvážte nákup niektorého z "
 "našich produktov alebo služieb!"
 
 #: share/advertising/27.pl:13
@@ -16901,10 +16901,10 @@ msgstr "<b>Online obchod</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Pre informácie o produktoch a službách Mandrakesoft navštívte náš "
+"Pre informácie o produktoch a službách Mandriva navštívte náš "
 "<b>elektronický obchod</b>."
 
 #: share/advertising/27.pl:17
@@ -16928,24 +16928,24 @@ msgstr "Zastavte sa ešte dnes na <b>store.mandrakesoft.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> je <b>skvelá možnosť</b> prezentovať vaše produkty pre "
-"Mandrakelinux."
+"<b>Mandriva Club</b> je <b>skvelá možnosť</b> prezentovať vaše produkty pre "
+"Mandrivalinux."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Získate <b>zaujímavé výhody</b> vstupom do Mandrakeclub, ako napríklad:"
+"Získate <b>zaujímavé výhody</b> vstupom do Mandriva Club, ako napríklad:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -16967,40 +16967,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Zúčastňovať sa <b>používateľských fór</b> Mandrakelinux."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Zúčastňovať sa <b>používateľských fór</b> Mandrivalinux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Skorý a privilegovaný prístup</b> k ISO obrazom, ešte pred ich "
 "verejnou dostupnosťou."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> je nová služba, ktorú Mandrakesoft ponúka svojim "
+"<b>Mandriva Online</b> je nová služba, ktorú Mandriva ponúka svojim "
 "zákazníkom!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline ponúka široké možnosti pre <b>jednoduchú aktualizáciu</b> "
-"vášho Mandrakelinux systému:"
+"Mandriva Online ponúka široké možnosti pre <b>jednoduchú aktualizáciu</b> "
+"vášho Mandrivalinux systému:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17026,41 +17026,41 @@ msgstr "\t* Flexibilné <b>naplánované</b> aktualizácie."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* Menežment <b>všetkých vašich Mandrakelinux systémov</b> pomocou jedného "
+"\t* Menežment <b>všetkých vašich Mandrivalinux systémov</b> pomocou jedného "
 "účtu."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Požadujete <b>asistenciu?</b>. Stretnite technických expertov Mandrakesoft "
+"Požadujete <b>asistenciu?</b>. Stretnite technických expertov Mandriva "
 "na <b>našej platforme pre technickú pomoc</b> www.mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Vďaka pomoci <b>kvalifikovaných expertov na Mandrakelinux</b> si môžete "
+"Vďaka pomoci <b>kvalifikovaných expertov na Mandrivalinux</b> si môžete "
 "ušetriť množstvo času."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Ak chcete vedieť odpoveď na akúkoľvek otázku o Mandrakelinuxe, môžete si "
+"Ak chcete vedieť odpoveď na akúkoľvek otázku o Mandrivalinuxe, môžete si "
 "zakúpiť podporu na <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17357,8 +17357,8 @@ msgstr "Monitorovacie nástroje, účtovanie procesov, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Sprievodcovia Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Sprievodcovia Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17514,7 +17514,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17528,7 +17528,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[VOĽBY]...\n"
-"Konfigurácia Mandrakelinux Terminal Servera\n"
+"Konfigurácia Mandrivalinux Terminal Servera\n"
 "--enable         : povoliť MTS\n"
 "--disable        : zakázať MTS\n"
 "--start          : spustiť MTS\n"
@@ -17585,7 +17585,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17593,7 +17593,7 @@ msgid ""
 msgstr ""
 "[VOĽBY]...\n"
 "  --no-confirmation      nepýtať sa na prvú potvrdzujúcu optázku v "
-"MandrakeUpdate režime\n"
+"Mandriva Update režime\n"
 "  --no-verify-rpm        nekontrolovať podpisy balíkov\n"
 "  --changelog-first      zobraziť changelog pred zobrazením súborov v okne s "
 "popisom\n"
@@ -20364,13 +20364,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Nástroj pre oznámenie chýb Mandrakelinuxu"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Nástroj pre oznámenie chýb Mandrivalinuxu"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Kontrolné centrum Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Kontrolné centrum Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20390,8 +20390,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20435,8 +20435,8 @@ msgstr "Sprievodca konfiguráciou"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Vyberte si nástroj od Mandrakesoft:"
+msgid "Select Mandriva Tool:"
+msgstr "Vyberte si nástroj od Mandriva:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20861,7 +20861,7 @@ msgstr "Spustené pri štarte"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Toto rozhranie ešte nebolo nastavené.\n"
 "Spustite sprievodcu \"Pridanie rozhrania\" z Mandrake kontrolného centra"
@@ -20870,10 +20870,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Nemáte nakonfigurované žiadne pripojenie k Internetu.\n"
-"Spustite sprievodcu \"%s\" z Mandrakelinux kontrolného centra"
+"Spustite sprievodcu \"%s\" z Mandrivalinux kontrolného centra"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20923,8 +20923,8 @@ msgstr "KDM (KDE správca prihlásenia)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux správca prihlásenia)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux správca prihlásenia)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21223,7 +21223,7 @@ msgstr "Import"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21232,7 +21232,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21778,14 +21778,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "Toto je slobodný softvér a musí byť redistribuovaný pod licenciou GNU GPL.\n"
 "\n"
 "Použitie: \n"
@@ -21813,8 +21813,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Centrum pomoci Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Centrum pomoci Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25347,8 +25347,8 @@ msgstr "Táto zmena je v poriadku, ale pre jej uplatnenie sa musíte odhlásiť"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Logy Mandrakelinux nástrojov"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Logy Mandrivalinux nástrojov"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25868,10 +25868,10 @@ msgstr "Pripojenie je ukončené."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Chyba pri spojení.\n"
-"Skontrolujte konfiguráciu v Mandrakelinux Kontrolnom Centre."
+"Skontrolujte konfiguráciu v Mandrivalinux Kontrolnom Centre."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/sl.po b/perl-install/share/po/sl.po
index 0c29e9aee..a039e4090 100644
--- a/perl-install/share/po/sl.po
+++ b/perl-install/share/po/sl.po
@@ -72,14 +72,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Izgleda, da ima ključ omogočeno zaščito pred pisanjem, vendar ga trenutno\n"
 "ni mogoče odklopiti.\n"
 "\n"
 "\n"
 "Kliknite gumb za ponoven zagon računalnika, odklopite ključ, odstranite\n"
-"zaščito, priklopite USB ključ in ponovno zaženite Mandrake Move."
+"zaščito, priklopite USB ključ in ponovno zaženite Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -97,7 +97,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Na vašem USB ključu ni veljavnega razdelka FAT za Okna,\n"
@@ -107,14 +107,14 @@ msgstr ""
 "\n"
 "\n"
 "Nadaljujete lahko tudi brez USB ključa. Še vedno boste lahko\n"
-"Mandrake Move uporabljali kot normalno živo distribucijo\n"
-"operacijskega sistema Mandrakelinux."
+"Mandriva Move uporabljali kot normalno živo distribucijo\n"
+"operacijskega sistema Mandrivalinux."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -122,11 +122,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Sistem na vašem računalniku ni zaznal USB ključa. Če ga priključite\n"
-" sedaj, bo lahko Mandrake Move shranil podatke v vašem domačem\n"
+" sedaj, bo lahko Mandriva Move shranil podatke v vašem domačem\n"
 "imeniku in vaše sistemske nastavitve, ki jih bo uporabil ob naslednjem\n"
 "zagonu na tem ali kakšnem drugem računalniku.\n"
 "Opozorilo: Če ključ priključite zdaj, počakajte nekaj sekund preden\n"
@@ -134,8 +134,8 @@ msgstr ""
 "\n"
 "\n"
 "Nadaljujete lahko tudi brez USB ključa. Še vedno boste lahko\n"
-"Mandrake Move uporabljali kot normalno živo distribucijo\n"
-"operacijskega sistema Mandrakelinux."
+"Mandriva Move uporabljali kot normalno živo distribucijo\n"
+"operacijskega sistema Mandrivalinux."
 
 #: ../move/move.pm:494
 #, c-format
@@ -263,7 +263,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -279,7 +279,7 @@ msgstr ""
 "\n"
 "Do tega lahko pride zaradi poškodovanih nastavitvenih\n"
 "datotek na USB ključu. V tem primeru bo pomagalo, če jih\n"
-"odstranite in ponovno zaženete Mandrake Move. To storite\n"
+"odstranite in ponovno zaženete Mandriva Move. To storite\n"
 "tako, da kliknete ustrezen gumb.\n"
 "\n"
 "\n"
@@ -1309,11 +1309,11 @@ msgstr "Izbira jezika"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux omogoča večjezično podporo. Izberite\n"
+"Mandrivalinux omogoča večjezično podporo. Izberite\n"
 "jezike, ki jih želite namestiti. Nameščeni jeziki bodo dosegljivi,\n"
 "ko boste dokončali namestitev in znova zagnali računalnik."
 
@@ -3731,12 +3731,12 @@ msgstr "omogoči radio podporo"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Preden nadaljujete, pozorno preberite pogoje licenčne pogodbe,\n"
-"ki se nanaša na celotno distribucijo Mandrakelinux. Če se strinjate z vsemi\n"
+"ki se nanaša na celotno distribucijo Mandrivalinux. Če se strinjate z vsemi\n"
 "pogoji licenčne pogodbe, označite okence \"%s\". Če se s pogoji pogodbe\n"
 "ne strinjate, pa označite okence \"%s\" in vaš računalnik se bo ponovno "
 "zagnal."
@@ -3918,13 +3918,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Namestitev za Mandrakelinux je shranjena na več zgoščenkah.\n"
+"Namestitev za Mandrivalinux je shranjena na več zgoščenkah.\n"
 "Če je izbrani paket shranjen na drugi zgoščeniki, bo DrakX izvrgel\n"
 "trenutno in vas pozval, da v pogon vstavite pravo zgoščenko.\n"
 "če prave zgoščenke nimate, kliknite \"%s\" in željeni paketi ne\n"
@@ -3934,11 +3934,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3989,7 +3989,7 @@ msgid ""
 "command-line interface. The total size of this installation is about 65\n"
 "megabytes."
 msgstr ""
-"Za Mandrakelinux je dostopnih na tisoče različnih programskih paketov.\n"
+"Za Mandrivalinux je dostopnih na tisoče različnih programskih paketov.\n"
 "Da bi bilo upravljanje s paketi bolj preprosto, so razvrščeni v skupine\n"
 "vsebinsko povezanih paketov.\n"
 "\n"
@@ -4104,10 +4104,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4138,9 +4138,9 @@ msgstr ""
 "\n"
 "!! Če izberete paket ali skupino paketov, ki vsebuje strežnik,\n"
 "boste morali namestitev takšnega paketa na izrecno vprašanje\n"
-"potrditi. Mandrakelinux namreč kot privzeto vključi vse\n"
+"potrditi. Mandrivalinux namreč kot privzeto vključi vse\n"
 " nameščene storitve ob zagonu sistema. Čeprav ob izdaji\n"
-"te različice Mandrakelinuxa ni bilo znanih težav v zvezi z varnostjo,\n"
+"te različice Mandrivalinuxa ni bilo znanih težav v zvezi z varnostjo,\n"
 "je mogoče, da so bile odkrite varnostne luknje kasneje. Če za \n"
 "določeno storitev ne veste, kaj je njena naloga, kliknite \"%s\" S klikom\n"
 "na \"%s\"bodo nameščene naštete storitve, sistem pa jih bo samodejno\n"
@@ -4299,7 +4299,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4466,12 +4466,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4498,7 +4498,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4507,7 +4507,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4528,11 +4528,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Določite, na katerem delu trdega diska naj bo nameščen operacijski\n"
-"sistem Mandrakelinux. Če je trdi disk prazen ali če na njem nameščeni\n"
+"sistem Mandrivalinux. Če je trdi disk prazen ali če na njem nameščeni\n"
 "operacijski sistem zaseda celoten prostor, boste morali disk razdeliti na\n"
 "posamezne razdelke. Razdeljevanje trdega diska izvede logično\n"
 "razdelitev, ki zagotovi potrebni prostor za namestitev operacijskega\n"
-"sistema Mandrakelinux.\n"
+"sistema Mandrivalinux.\n"
 "\n"
 "Trdega diska po izvršenem razdeljevanju običajno ni mogoče povrniti v "
 "prejšnje stanje.\n"
@@ -4565,7 +4565,7 @@ msgstr ""
 "razdelku ne boste izgubili, če najprej v Oknih defragmentirate disk.\n"
 "Vsekakor pa priporočamo, da pred nadaljevanjem napravite varnostno\n"
 "kopijo podatkov. Če želite uporabljati oba operacijska sistema, "
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "in Okna (Windows™), vam priporočamo, da izberete to možnost.\n"
 "\n"
 "   Če se odločite za to možnost, morate vedeti, da bo po končanem postopku\n"
@@ -4575,7 +4575,7 @@ msgstr ""
 "\n"
 " * \"%s\": Če želite izbrisati vse obstoječe razdelke z vsemi podatki in "
 "jih \n"
-"nadomestiti s sistemom Mandrakelinux, izberite to možnost.\n"
+"nadomestiti s sistemom Mandrivalinux, izberite to možnost.\n"
 "Bodite previdni, ko boste potrdili to izbiro, prejšnjega stanja ne bo več "
 "mogoče vzpostaviti.\n"
 "\n"
@@ -4679,7 +4679,7 @@ msgstr ""
 "    * \"%s\": Povsem samodejna namestitev. Z diska bodo izbrisani vsi\n"
 "podatki.\n"
 "   To je zelo uporabno za namestitev sistema na več podobnih\n"
-"računalnikov. Več o tem najdete na spletni strani Mandrakesoft.\n"
+"računalnikov. Več o tem najdete na spletni strani Mandriva.\n"
 "\n"
 " * \"%s\"(*):S tem shranite seznam paketov, ki so bili izbrani med to\n"
 "namestitvijo. Če želite izvesti namestitev z enakim naborom paketov,\n"
@@ -4730,7 +4730,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4749,7 +4749,7 @@ msgstr ""
 "\n"
 "Kliknite na \"%s\",ko boste pripravljeni na razdeljevanje.\n"
 "\n"
-"Kliknite na \"%s\", če želite za namestitev sistema Mandrakelinux\n"
+"Kliknite na \"%s\", če želite za namestitev sistema Mandrivalinux\n"
 "izbrati drug razdelek.\n"
 "\n"
 "Kliknite na \"%s\", če želite določiti razdelke, na katerih naj sistem\n"
@@ -4767,7 +4767,7 @@ msgstr "Nazaj"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4780,7 +4780,7 @@ msgid ""
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
 "Verjetno so bili od njegove izdaje pa do časa, ko nameščate\n"
-"Mandrakelinux na svoj računalnik, nekateri paketi popravljeni\n"
+"Mandrivalinux na svoj računalnik, nekateri paketi popravljeni\n"
 "ali nadgrajeni z varnostnimi popravki ali z odstranitvijo hroščev.\n"
 "Te popravke lahko prenesete z interneta. Če imate vzpostavljeno\n"
 "internetno povezavo, označite \"%s\", če pa želite namestiti\n"
@@ -4807,7 +4807,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4835,7 +4835,7 @@ msgstr "Upravitelj varnostnih nastavitev"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4906,7 +4906,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Izbrati morate razdelke, na katere boste namestitli sistem\n"
-"Mandrakelinux. Če ste razdelke že izbrali ob kakšni predhodni\n"
+"Mandrivalinux. Če ste razdelke že izbrali ob kakšni predhodni\n"
 "namestitvi GNU/Linux sistema s kakim drugim orodjem za\n"
 "razdeljevanje, lahko uporabite obstoječe razdelke, sicer pa morate\n"
 "razdelke trdega diska za namestitev določiti sedaj.\n"
@@ -4969,7 +4969,7 @@ msgstr ""
 "Vse nadaljnje informacije o datotečnih sistemih boste našli v\n"
 "dokumentaciji.\n"
 "\n"
-"Če Mandrakelinux nameščate na PPC računalnik, morate ustvariti\n"
+"Če Mandrivalinux nameščate na PPC računalnik, morate ustvariti\n"
 "zagonski \"bootstrap'\" razdelek z velikostjo najmanj 1MB, ki ga\n"
 "uporablja zagonski nalagalnik yaboot. Če ta razdelek nekoliko\n"
 "povečate in mu namenite vsaj 50MB, boste nanj lahko shranjevali\n"
@@ -4990,7 +4990,7 @@ msgstr "Preklapljanje med normalnim in izvedenskim načinom"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5020,7 +5020,7 @@ msgid ""
 msgstr ""
 "Na vašem trdem disku je več kot en razdelek za Okna (Windows™).\n"
 "Izberite razdelek, ki ga želite zmanjšati, da bi pridobili prostor za\n"
-"namestitev sistema Mandrakelinux.\n"
+"namestitev sistema Mandrivalinux.\n"
 "\n"
 "Na seznamu so razdelki s podatki: \"Ime v Linuxu\", \"Ime v Oknih\"\n"
 "\"Velikost\" \n"
@@ -5067,7 +5067,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5076,19 +5076,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Ta korak se zažene samo v primeru, da na vašem računalniku že obstaja\n"
 "razdelek  zaGNU/Linux.\n"
 "\n"
 "Lahko izbirate med novo namestitvijo in med posodobitvijo obstoječega\n"
-"sistema Mandrakelinux.\n"
+"sistema Mandrivalinux.\n"
 "\n"
 " * \"%s\": S tem boste obstoječi sistem povsem odstranili. Če želite\n"
 "spremeniti razdelitev trdega diska ali datotečni sistem, izberite to\n"
@@ -5101,7 +5101,7 @@ msgstr ""
 "podobno kot pri običajni novi namestitvi.\n"
 "\n"
 "Možnost \"Posodobitev\" deluje, če imate nameščeno različico\n"
-"sistema Mandrakelinux  \"8.1\" ali novejšo. Posodobitve starejših\n"
+"sistema Mandrivalinux  \"8.1\" ali novejšo. Posodobitve starejših\n"
 "različic od \"8.1\" ne priporočamo."
 
 #: help.pm:591
@@ -5157,7 +5157,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5436,7 +5436,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5457,11 +5457,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Izberite sistem za tiskanje. Drugi operacijski sistemi navadno nudijo\n"
-"en sistem, Mandrakelinux pa vam daje na izbiro dva.\n"
+"en sistem, Mandrivalinux pa vam daje na izbiro dva.\n"
 "Od obeh sistemov je vsak primeren za svojo vrsto namestitve.\n"
 "\n"
 " * \"%s\"--je kratica za ``print, do not queue\" (tiskaj, ne vnesi v čakalno "
@@ -5604,7 +5604,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5621,7 +5621,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5744,12 +5744,12 @@ msgstr "Storitve"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Izberite trdi disk, ki ga želite izbrisati, da bi dobili prostor za "
 "razdelek\n"
-"za Mandrakelinux.\n"
+"za Mandrivalinux.\n"
 "Vsi podatki na izbranem disku bodo izbrisani in jih ne bo mogoče\n"
 "obnoviti!"
 
@@ -6102,7 +6102,7 @@ msgstr "Preračunavam velikost razdelka za Okna (Windows)."
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Vaš razdelek za Okna (Windows) je preveč razdrobljen. Poženite ``defrag'' v "
@@ -6220,19 +6220,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6254,7 +6254,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6262,14 +6262,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6279,7 +6279,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6299,10 +6299,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6313,11 +6313,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6333,21 +6333,21 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "PREDSTAVITEV\n"
 "\n"
-"Operacijski sistem in druge sestavine distribucije Mandrakelinux \n"
+"Operacijski sistem in druge sestavine distribucije Mandrivalinux \n"
 "bomo v nadaljnjem besedilu imenovali \"Programje\".  Programje vsebuje "
 "programe, metode, pravila in dokumentacijo, \n"
 "ki se nanašajo na operacijski sistem in na različne sestavine distribucije "
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 "\n"
 "1. LICENČNA POGODBA\n"
 "\n"
 "Prosimo, pazljivo preberite ta dokument. To je licenčna pogodba med vami in "
-"Mandrakesoft d.d.,ki se nanaša na programje.\n"
+"Mandriva d.d.,ki se nanaša na programje.\n"
 "Vsaka namestitev, razmnoževanje ali uporaba programja pomeni, da izrecno "
 "sprejemate pogoje te pogodbe in da se z njimi v celoti strinjate.\n"
 "Če zavračate katerokoli pogodbeno določilo, programja ne smete namestiti,\n"
@@ -6365,7 +6365,7 @@ msgstr ""
 "Programje in priložena dokumentacija sta na voljo v obliki, v kakršni sta, "
 "brez jamstva,\n"
 "ki presega z zakonom določeno odgovornost.\n"
-"Mandrakesoft d.d. v nobenem primeru, razen kadar to izrecno določa pravni "
+"Mandriva d.d. v nobenem primeru, razen kadar to izrecno določa pravni "
 "red,\n"
 "ne prevzema odgovornosti za kakršnokoli naključno, posredno ali neposredno "
 "škodo,\n"
@@ -6373,14 +6373,14 @@ msgstr ""
 "izgub, sodnih taks\n"
 "in izrečenih kazni ali drugih oblik posredne škode, ki bi nastala zaradi "
 "uporabe ali\n"
-"nezmožnosti uporabe programja, tudi če je bila Mandrakesoft d.d. opozorjena "
+"nezmožnosti uporabe programja, tudi če je bila Mandriva d.d. opozorjena "
 "na možnost nastanka takšne škode.\n"
 "\n"
 "\n"
 "OMEJENA ODGOVORNOST ZA POSEDOVANJE ALI UPORABO PROGRAMJA, KI JE V NEKATERIH "
 "DRŽAVAH PREPOVEDANO\n"
 "\n"
-"Mandrakesoft d.d. v nobenem primeru, razen kadar to izrecno določa pravni "
+"Mandriva d.d. v nobenem primeru, razen kadar to izrecno določa pravni "
 "red,\n"
 "ne prevzema odgovornosti za kakršnokoli naključno, posredno ali neposredno "
 "škodo,\n"
@@ -6388,7 +6388,7 @@ msgstr ""
 "izgub, sodnih taks\n"
 "in izrečenih kazni ali drugih oblik posredne škode, ki bi nastala zaradi "
 "posedovanja\n"
-"ali uporabe programja oziroma zardi pridobivanja programja z Mandrakelinux "
+"ali uporabe programja oziroma zardi pridobivanja programja z Mandrivalinux "
 "spletnih strani,\n"
 "če je to v nasprotju z veljavnim pravnim redom države, v kateri bivate.\n"
 "Navedena omejitev odgovornosti se nanaša tudi, vendar ne izključno, na "
@@ -6412,10 +6412,10 @@ msgstr ""
 " sestavino programja, preden jo uporabite.\n"
 "Obenem vas prosimo, da vsa vprašanja, ki se nanašajo na licenčne pogodbe za "
 "posamezne\n"
-"sestavine programja,naslovite na njenega avtorja in ne na Mandrakesoft d.d.\n"
-"Vsako programje, ki ga razvije Mandrakesoft d.d., je zaščiteno s splošnim "
+"sestavine programja,naslovite na njenega avtorja in ne na Mandriva d.d.\n"
+"Vsako programje, ki ga razvije Mandriva d.d., je zaščiteno s splošnim "
 "dovoljenjem GPL.\n"
-"Dokumentacija, napisana pri Mandrakesoft d.d., je zaščitena s posebnim "
+"Dokumentacija, napisana pri Mandriva d.d., je zaščitena s posebnim "
 "dovoljenjem.\n"
 "Prosimo, da podrobnosti preberete v dokumentaciji.\n"
 "\n"
@@ -6425,11 +6425,11 @@ msgstr ""
 "Avtorske in druge pravice intelektualne lastnine, ki se nanašajo na "
 "programje, pripadaj avtorjem\n"
 " programja in so zaščitene z zakonom.\n"
-"Mandrakesoft d.d. si pridržuje pravico do spreminjanja programja v celoti "
+"Mandriva d.d. si pridržuje pravico do spreminjanja programja v celoti "
 "ali deloma\n"
 "v kakršnem koli smislu in za kakršen koli namen.\n"
-"\"Mandrake\", \"Mandrakelinux\" in pripadajoči logotipi so blagovne znamke "
-"Mandrakesoft d.d.\n"
+"\"Mandriva\", \"Mandrivalinux\" in pripadajoči logotipi so blagovne znamke "
+"Mandriva d.d.\n"
 "\n"
 "\n"
 "5. Končne določbe\n"
@@ -6537,7 +6537,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6545,7 +6545,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Čestitamo!\n"
 "Uspešno ste dokončali namestitev.\n"
@@ -6557,7 +6557,7 @@ msgstr ""
 "\n"
 "\n"
 "Navodila za nastavljanje sistema po namestitvi boste našli v poglavju\n"
-"\"post install\" uradnih navodil za uporabnike. (Official Mandrakelinux "
+"\"post install\" uradnih navodil za uporabnike. (Official Mandrivalinux "
 "User's Guide)"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6593,12 +6593,12 @@ msgstr "Pričenjam s korakom `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Vaš sistem ni dovolj zmogljiv. Lahko, da boste imeli pri namestitvi\n"
-"Mandrakelinux težave. V tem primeru lahko poskusite z namestitvijo v "
+"Mandrivalinux težave. V tem primeru lahko poskusite z namestitvijo v "
 "besedilnem načinu. \n"
 "Po zagonu z zgoščenke pritisnite `F1' in vpišite `text'."
 
@@ -7139,9 +7139,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Vzpostavljam povezavo s spletno stranjo Mandrakelinux, in pridobivanje "
+"Vzpostavljam povezavo s spletno stranjo Mandrivalinux, in pridobivanje "
 "seznama dosegljivih strežnikov...."
 
 #: install_steps_interactive.pm:840
@@ -7369,8 +7369,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Namestitev Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Namestitev Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9959,7 +9959,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -11303,7 +11303,7 @@ msgid ""
 "work, you might want to relaunch the configuration."
 msgstr ""
 "Med nastavljanjem se je pojavila napaka.\n"
-"Preizkusite povezavo v Mandrakelinux nadzornem središču. Če povezava ne "
+"Preizkusite povezavo v Mandrivalinux nadzornem središču. Če povezava ne "
 "deluje, ponovno zaženite nastavitve."
 
 #: network/netconnect.pm:1537
@@ -14002,7 +14002,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -15928,33 +15928,33 @@ msgstr "Ustavi"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Kaj je Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Kaj je Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Dobrodošli v <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Dobrodošli v <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux je <b>distribucija Linuxa</b>, ki združuje jedro, imenovano "
+"Mandrivalinux je <b>distribucija Linuxa</b>, ki združuje jedro, imenovano "
 "<b>operacijski sistem</b>, skupaj z <b>mnogimi programi</b>, ki vam služijo "
 "pri vsakodnevnih opravilih."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux je trenutno <b>uporabniku najprijaznejša</b>distribucija "
+"Mandrivalinux je trenutno <b>uporabniku najprijaznejša</b>distribucija "
 "Linuxa.  Obenem je ena od <b>najbolj razširjenih</b> distribucij."
 
 #: share/advertising/02.pl:13
@@ -15970,13 +15970,13 @@ msgstr "Pozdravljeni v <b>svetu odprte kode</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux temelji na odprtokodnem modelu, kar pomeni, da je nova "
-"različica plod <b>sodelovanja</b> med <b>razvojnim oddelkom Mandrakesofta</"
+"Mandrivalinux temelji na odprtokodnem modelu, kar pomeni, da je nova "
+"različica plod <b>sodelovanja</b> med <b>razvojnim oddelkom Mandrivaa</"
 "b> in <b>skupnostjo razvijalcev</b> z vsega sveta."
 
 #: share/advertising/02.pl:19
@@ -15997,9 +15997,9 @@ msgstr "<b>GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Večina programov, ki so del distribucije, in vsa orodja Mandrakelinuxa so "
+"Večina programov, ki so del distribucije, in vsa orodja Mandrivalinuxa so "
 "zajeta v <b>licenci GPL</b>"
 
 #: share/advertising/03.pl:17
@@ -16029,15 +16029,15 @@ msgstr "<b>Pridruži se skupnosti</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux ima eno <b>največjih skupnosti</b> uporabnikov in razvijalcev. "
+"Mandrivalinux ima eno <b>največjih skupnosti</b> uporabnikov in razvijalcev. "
 "Vloga te skupnosti je izjemno velika, saj sega od prijavljanja napak do "
 "razvoja novih programov. Skupnost igra <b>ključno vlogo</b> v svetu "
-"Mandrakelinuxa. "
+"Mandrivalinuxa. "
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16058,11 +16058,11 @@ msgstr "<b>Različica Download</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Trenutno se namešča <b>Mandrakelinux Download</b>. To je brezplačna "
-"različica, ki jo želi Mandrakesoft obdržati <b>prosto dostopno</b> vsakomur."
+"Trenutno se namešča <b>Mandrivalinux Download</b>. To je brezplačna "
+"različica, ki jo želi Mandriva obdržati <b>prosto dostopno</b> vsakomur."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16093,9 +16093,9 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
-"Ne boste imeli dostopa do <b>storitev, vključenih</b> v druge Mandrakesoft "
+"Ne boste imeli dostopa do <b>storitev, vključenih</b> v druge Mandriva "
 "izdelke."
 
 #: share/advertising/06.pl:13
@@ -16105,8 +16105,8 @@ msgstr "<b>Discovery, vaše prvo Linux namizje</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Trenutno se namešča <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Trenutno se namešča <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16128,17 +16128,17 @@ msgstr "<b>PowerPack, najpopolnejše Linux namizje</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Trenutno se namešča <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Trenutno se namešča <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack je Mandrakesoftov <b>'paradni konj' med namizji</b>. PowerPack "
+"PowerPack je Mandrivaov <b>'paradni konj' med namizji</b>. PowerPack "
 "vključuje <b>tisoče programov</b> - od najbolj priljubljenih do "
 "najnaprednejših."
 
@@ -16149,8 +16149,8 @@ msgstr "<b>PowerPack+, Linux rešitve za namizja in strežnike</b> "
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Trenutno se namešča <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Trenutno se namešča <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16166,21 +16166,21 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesoftovi izdelki</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandrivaovi izdelki</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> je razvil široko paleto <b>Mandrakelinux</b> izdelkov."
+"<b>Mandriva</b> je razvil široko paleto <b>Mandrivalinux</b> izdelkov."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Izdelki Mandrakelinux:"
+msgid "The Mandrivalinux products are:"
+msgstr "Izdelki Mandrivalinux:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16200,70 +16200,70 @@ msgstr "\t* <b>PowerPack+</b>, Linux rešitev za namizja in strežnike."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux za x86-64</b>, Mandrakelinuxova rešitev za 64-bitne "
+"\t* <b>Mandrivalinux za x86-64</b>, Mandrivalinuxova rešitev za 64-bitne "
 "procesorje."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesoftovi izdelki</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandrivaovi izdelki</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft je razvil dva izdelka, ki omogočata uporabo Mandrakelinuxa "
+"Mandriva je razvil dva izdelka, ki omogočata uporabo Mandrivalinuxa "
 "<b>na kateremkoli računalniku</b> brez potrebe po namestitvi:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, distribucija Mandrakelinuxa, ki jo poženete s CD-ROM-a."
+"\t* <b>Move</b>, distribucija Mandrivalinuxa, ki jo poženete s CD-ROM-a."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, distribucija Mandrakelinuxa, prednameščena na "
+"\t* <b>GlobeTrotter</b>, distribucija Mandrivalinuxa, prednameščena na "
 "zunanjem disku “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Mandrakesoftovi izdelki (Profesionalne rešitve)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Mandrivaovi izdelki (Profesionalne rešitve)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
-msgstr "Mandrakesoftovi izdelki, ki zadoščajo <b>profesionalnim potrebam</b>:"
+msgstr "Mandrivaovi izdelki, ki zadoščajo <b>profesionalnim potrebam</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
-"\t* <b>Corporate Desktop</b>, Mandrakelinux namizje, namenjeno podjetjem."
+"\t* <b>Corporate Desktop</b>, Mandrivalinux namizje, namenjeno podjetjem."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Mandrakelinux strežniške rešitve."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandrivalinux strežniške rešitve."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b>, Mandrakelinux varnostne rešitve."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, Mandrivalinux varnostne rešitve."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16306,9 +16306,9 @@ msgstr "<b>Izberite svoje najljubše grafično okolje</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"PowerPack omogoča izbiro <b>namizja</b>. Mandrakesoft je kot privzeto izbral "
+"PowerPack omogoča izbiro <b>namizja</b>. Mandriva je kot privzeto izbral "
 "<b>KDE</b>."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -16333,9 +16333,9 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"PowerPack+ omogoča izbiro <b>namizja</b>. Mandrakesoft je kot privzeto "
+"PowerPack+ omogoča izbiro <b>namizja</b>. Mandriva je kot privzeto "
 "izbral <b>KDE</b>. "
 
 #: share/advertising/14.pl:15
@@ -16461,10 +16461,10 @@ msgstr "<b>Uživajte v široki paleti programov</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"V meniju Mandrakelinuxa boste našli programe <b>za vsa vaše potrebe</b>:"
+"V meniju Mandrivalinuxa boste našli programe <b>za vsa vaše potrebe</b>:"
 
 #: share/advertising/18.pl:16
 #, c-format
@@ -16716,17 +16716,17 @@ msgstr "\t* <b>Postfix</b> in <b>Sendmail</b>: zmogljiva mail strežnika."
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinuxov nadzorni center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinuxov nadzorni center</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrakelinuxov nadzorni center</b> je zbirko nepogrešljivih programov, "
+"<b>Mandrivalinuxov nadzorni center</b> je zbirko nepogrešljivih programov, "
 "ki omogočajo upravljanje s sistemom."
 
 #: share/advertising/25.pl:17
@@ -16750,15 +16750,15 @@ msgstr "<b>Model odprte kode</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Kot vsako programiranje tudi odprta koda <b>zahteva čas in ljudi</b> za "
-"razvoj. S spoštovanjem do te filozofije Mandrakesoft trži dodatno "
-"izpopolnjene izdelke in nenehno <b>izboljšuje Mandrakelinux.</b> Če "
-"<b>podpirate</b> filozofijo odprte kode in razvoj Mandrakelinuxa, premislite "
+"razvoj. S spoštovanjem do te filozofije Mandriva trži dodatno "
+"izpopolnjene izdelke in nenehno <b>izboljšuje Mandrivalinux.</b> Če "
+"<b>podpirate</b> filozofijo odprte kode in razvoj Mandrivalinuxa, premislite "
 "o nakupu naših izdelkov in storitev."
 
 #: share/advertising/27.pl:13
@@ -16769,10 +16769,10 @@ msgstr "<b>Spletna prodajalna</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Če želite izvedeti več o Mandrakesoftovih izdelkih obiščite našo <b>spletno "
+"Če želite izvedeti več o Mandrivaovih izdelkih obiščite našo <b>spletno "
 "prodajalno</b>."
 
 #: share/advertising/27.pl:17
@@ -16796,21 +16796,21 @@ msgstr "Še danes obiščite <b>store.mandrakesoft.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
-msgstr "<b>Mandrakeclub</b> je <b>dopolnitev</b> vašega Mandrakelinuxa."
+msgstr "<b>Mandriva Club</b> je <b>dopolnitev</b> vašega Mandrivalinuxa."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
-msgstr "Izkoristite <b>prednosti</b>, ki vam jih nudi Mandrakeclub:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
+msgstr "Izkoristite <b>prednosti</b>, ki vam jih nudi Mandriva Club:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -16831,38 +16831,38 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Sodelovanje v Mandrakelinuxovih <b>uporabniških forumih</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Sodelovanje v Mandrivalinuxovih <b>uporabniških forumih</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
-"\t* <b>Predčasen dostop</b> do Mandrakelinuxovih ISO datotek, še pred "
+"\t* <b>Predčasen dostop</b> do Mandrivalinuxovih ISO datotek, še pred "
 "uradnim izidom."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
-msgstr "<b>Mandrakeonline</b> je nova storitev, ki jo ponujamo našim strankam."
+msgstr "<b>Mandriva Online</b> je nova storitev, ki jo ponujamo našim strankam."
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline nudi vrsto storitev za <b>preprosto nadgradnjo</b> vašega "
-"Mandrakelinux sistema"
+"Mandriva Online nudi vrsto storitev za <b>preprosto nadgradnjo</b> vašega "
+"Mandrivalinux sistema"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16886,20 +16886,20 @@ msgstr "\t* <b>Hitri</b> popravki."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* Upravljanje <b>vseh vaših Mandrakelinux sistemov</b> z enim uporabniškim "
+"\t* Upravljanje <b>vseh vaših Mandrivalinux sistemov</b> z enim uporabniškim "
 "imenom."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "Potrebujete <b>pomoč</b>? Obrnite se na naše strokovnjake na www."
@@ -16908,19 +16908,19 @@ msgstr ""
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"S pomočjo strokovnjakov v <b>Mandrakelinux experts</b> boste prihranili "
+"S pomočjo strokovnjakov v <b>Mandrivalinux experts</b> boste prihranili "
 "veliko časa."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Za vsa vprašanja o Mandrakelinuxu vam je na voljo plačljiva podpore na "
+"Za vsa vprašanja o Mandrivalinuxu vam je na voljo plačljiva podpore na "
 "<b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17217,8 +17217,8 @@ msgstr "Nadzorna orodja, knjigovodstvo procesov, tcpdump, nmap ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr " Mandrakesoftovi čarovniki"
+msgid "Mandriva Wizards"
+msgstr " Mandrivaovi čarovniki"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17368,7 +17368,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17382,7 +17382,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[MOŽNOSTI]...\n"
-"Nastavitev terminalskega strežnika Mandrakelinux\n"
+"Nastavitev terminalskega strežnika Mandrivalinux\n"
 "--enable         : omogoči MTS\n"
 "--disable        : onemogoči MTS\n"
 "--start          : poženi MTS\n"
@@ -17443,14 +17443,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[MOŽNOST]...\n"
-"  --no-confirmation      v MandrakeUpdate načinu ne zahtevaj prve potrditve\n"
+"  --no-confirmation      v Mandriva Update načinu ne zahtevaj prve potrditve\n"
 "  --no-verify-rpm        brez preverjanja podpisov paketov\n"
 "  --changelog-first      v oknu z opisom najprej prikaži dnevnik sprememb\n"
 "  --merge-all-rpmnew     predlog za združitev vseh najdenih datotek ."
@@ -20221,13 +20221,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinuxovo orodje za poročanje o hroščih"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinuxovo orodje za poročanje o hroščih"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Nadzorno središče Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Nadzorno središče Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20247,8 +20247,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20292,8 +20292,8 @@ msgstr "Nastavitveni Čarovniki"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Izberite Mandrakesoftovo orodje"
+msgid "Select Mandriva Tool:"
+msgstr "Izberite Mandrivaovo orodje"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20718,19 +20718,19 @@ msgstr "Vključeno ob zagonu"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Ta omrežna naprava še ni nastavljena.\n"
-"Zaženite \"Dodaj omrežno napravo\" v Mandrakelinux nadzornem središču"
+"Zaženite \"Dodaj omrežno napravo\" v Mandrivalinux nadzornem središču"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Nobena internetna povezava ni nastavljena.\n"
-"Zaženite \"%s\" v Mandrakelinux nadzornem središču"
+"Zaženite \"%s\" v Mandrivalinux nadzornem središču"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20780,8 +20780,8 @@ msgstr "KDM (Upravitelj prikazovalnika KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Upravitelj prikazovalnika Mandrakelinux)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Upravitelj prikazovalnika Mandrivalinux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21080,7 +21080,7 @@ msgstr "Uvozi"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21089,7 +21089,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Avtorske pravice (C) 2001-2002 Mandrakesoft. \n"
+"Avtorske pravice (C) 2001-2002 Mandriva. \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (originalna različica)\n"
@@ -21637,14 +21637,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "To je prosto programje in se lahko razširja pod pogoji splošnega dovoljenja "
 "GPL.\n"
 "Uporaba: \n"
@@ -21671,8 +21671,8 @@ msgstr " --doc <link>          - povezava na drugo spletno stran\n"
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinuxovo središče za pomoč"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinuxovo središče za pomoč"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25195,7 +25195,7 @@ msgstr "Da bi uveljavili spremembe, se morate odjaviti."
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Logi mandrakelinuxovih orodij"
 
 #: standalone/logdrake:51
@@ -25710,10 +25710,10 @@ msgstr "Povezovanje je opravljeno."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Povezavanje je spodletelo.\n"
-"Preverite nastavitve v Nadzornem središču Mandrakelinux "
+"Preverite nastavitve v Nadzornem središču Mandrivalinux "
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/sq.po b/perl-install/share/po/sq.po
index a98234680..71bdc2add 100644
--- a/perl-install/share/po/sq.po
+++ b/perl-install/share/po/sq.po
@@ -59,7 +59,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -78,7 +78,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -86,7 +86,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -94,7 +94,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -220,7 +220,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1254,11 +1254,11 @@ msgstr "manuelë"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux mund ti përmbahen një numër të madhë të gjuhëve.\n"
+"Mandrivalinux mund ti përmbahen një numër të madhë të gjuhëve.\n"
 "Zgjedheni gjuhën në të cilën dëshironi ta instaloni. E cila do të\n"
 "jetë në përdorim e sipër kur ta instaloni kompletisht\n"
 "dhe ta rinisni sistemin tuaj nga fillimi."
@@ -3676,12 +3676,12 @@ msgstr "aktivizoje përkrahjen radio"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Para se të vazhdoni më tutje, ju duhet ti lexoni termet dhe kushtet për\n"
-"përdorimin e licencës. Kjo mbulon tërë shpërndarjen e Mandrakelinux,\n"
+"përdorimin e licencës. Kjo mbulon tërë shpërndarjen e Mandrivalinux,\n"
 "nëse ju pajtoheni me këto kushte, klikoni mbi mbi kopsën \"%s\".\n"
 "Nëse ju nuk pajtoheni atëher thjeshtë ndaleni komjuterin tuaj."
 
@@ -3866,7 +3866,7 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3884,11 +3884,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3940,12 +3940,12 @@ msgid ""
 "megabytes."
 msgstr ""
 "Tani është momenti që ti zgjedhni pakot që duhet të instalohen në sistemin\n"
-"tuaj. Duhet ta dini se Mandrakelinux përmban me mijëra pako instaluese,\n"
+"tuaj. Duhet ta dini se Mandrivalinux përmban me mijëra pako instaluese,\n"
 "dhe nuk është me rendësi që ti njifti të gjitha për mendësh.\n"
 "\n"
 "Pakot janë të radhitura në grupe përkatëse për përdorim të veçant në "
 "makinën\n"
-"tuaj. Mandrakelinux posedon katër instalime të përcaktuara. Ju mund të\n"
+"tuaj. Mandrivalinux posedon katër instalime të përcaktuara. Ju mund të\n"
 "mendoni mbi këto klasa instaluese si kontainer të pakove të ndryshme.\n"
 "Ju keni mundësi ti përzini (mix) dhe ti barazoni aplikacionet nga "
 "kontainerët\n"
@@ -4045,10 +4045,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4239,7 +4239,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4295,7 +4295,7 @@ msgid ""
 msgstr ""
 "X (për Sistemin Windows X) është zemra e interfacit grafik për GNU/Linux\n"
 "në të cilin të gjitha mjediset grafike (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etj.) janë të denguara mbi Mandrakelinux.\n"
+"WindowMaker, etj.) janë të denguara mbi Mandrivalinux.\n"
 "\n"
 "Juve do të ju prezentohet lista e parametrave të ndryshëm për të ndryshuar,\n"
 "dhe për të pranuar çfaqjet grafike optimale: Kartelë Grafike\n"
@@ -4420,12 +4420,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4452,7 +4452,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4461,7 +4461,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4482,7 +4482,7 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Kjo etapë do të ju mundësoj që të përcaktoni me precizitet vendosjen dhe\n"
-"instalimin e Mandrakelinux. Nëse disku i juaj i fortë është zbrazët apo i\n"
+"instalimin e Mandrivalinux. Nëse disku i juaj i fortë është zbrazët apo i\n"
 "përdorur nga një sistem tjetër eksploatimi, ju duhet ta shpërndani\n"
 "diskun tuaj në pjesë. Ndarje e diskut d.m.th. ta shpërndani me precizitet\n"
 "që më fund të krijoni një hapësire për instalimin e sistemit Mandrake "
@@ -4527,7 +4527,7 @@ msgstr ""
 "\n"
 " * \"%s\": nëse ju dëshironi ti zhdukni të gjitha\n"
 "të dhënat dhe aplikacionet e instaluara në sistemin tuaj, dhe ti\n"
-"zëvendësoni me një sistem të ri Mandrakelinux, zgjedheni këtë mundësi.\n"
+"zëvendësoni me një sistem të ri Mandrivalinux, zgjedheni këtë mundësi.\n"
 "Keni kujDES, sepse kjo mundësi është e pa kthyeshme mbrapa. Është e pa\n"
 "mundur të gjindet të dhënat e zhdukura.\n"
 "\n"
@@ -4687,7 +4687,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4708,7 +4708,7 @@ msgstr ""
 "Klikoni mbi \"%s\" kur ju jeni i gatshëm që ti formatoni ndarjet.\n"
 "\n"
 "Klikoni mbi \"%s\" nëse ju dëshironi të zgjedhni një ndarje tjetër apo\n"
-"të instaloni një sistemi të ri eksploatues Mandrakelinux.\n"
+"të instaloni një sistemi të ri eksploatues Mandrivalinux.\n"
 "\n"
 "Klikoni mbi \"%s\" nëse ju dëshironi ti zgjedhni ndarjet, për një\n"
 "verifikim të sektorëve të dëmtuar në disk."
@@ -4725,7 +4725,7 @@ msgstr "Mbrapa"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4737,7 +4737,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Nga momenti kur ju jeni duke instaluar Mandrakelinux, është e mundur që\n"
+"Nga momenti kur ju jeni duke instaluar Mandrivalinux, është e mundur që\n"
 "disa pako janë azhurnuar prej daljes së atij prodhimi. Disa buge mund\n"
 "të korigjohen, njashtu dhe probleme tjera të sigurisë. Për të ju\n"
 "mundësuar të përfitoni një azhurnim, do të jenë të propozuara që të\n"
@@ -4767,7 +4767,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4794,7 +4794,7 @@ msgstr "Siguria e Administratorit:"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4865,7 +4865,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Në këtë etapë ju duhet të zgjedhni se cila(t) ndarje(t) do të përdoret(n)\n"
-"për sistemin tuaj Mandrakelinux. Nëse ndarja e diskut është bërë më heret,\n"
+"për sistemin tuaj Mandrivalinux. Nëse ndarja e diskut është bërë më heret,\n"
 "nga një instalim tjetër GNU/Linux apo nga nji vegël tjetër ndarëse, ju\n"
 "mund të përdorni ndarjet e bëra. Mes tjerash ndarjet duhen të jenë të\n"
 "përcaktuara\n"
@@ -4954,7 +4954,7 @@ msgstr "Kalo mes modit normal/ekspert"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4984,7 +4984,7 @@ msgid ""
 msgstr ""
 "Janë gjetur më shumë se një ndarje Windows në diskun tuaj të fort, ju\n"
 "lutemi zgjedheni njërin për ta ridimenziunuar, dhe për të instaluar\n"
-"sistemin të ri eksploatues Mandrakelinux.\n"
+"sistemin të ri eksploatues Mandrivalinux.\n"
 "\n"
 "Çdo ndarje është listuar simbas: \"Emri Linux\",  \"Emri Windows\"\n"
 "\"Kapaciteti\".\n"
@@ -5033,7 +5033,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5042,19 +5042,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Kjo etapë aktivizohet automatikisht nëse ju posedoni një ndarje të vjetër\n"
 "GNU/Linux, në makinën tuaj.\n"
 "\n"
 "DrakX tani ka nevojë të dijë nëse ju dëshironi të çfaqni një instalim,\n"
-"apo azhurnim të ri, në sistemin ekzistues Mandrakelinux:\n"
+"apo azhurnim të ri, në sistemin ekzistues Mandrivalinux:\n"
 "\n"
 " * \"%s\": Për shumicën e rasteve, ky kompletisht shlyhet nga sistemet\n"
 "e vjetra. Nëse ju dëshironi ta ndërroni shpërndarjen e diskut tuaj të "
@@ -5073,8 +5073,8 @@ msgstr ""
 "\n"
 "Duke përdorur mundësinë ``Azhurno'' duhet të funksionoj shumë mirë në "
 "sistemin\n"
-"Mandrakelinux ndër versionin \"8.1\" apo më të ri. Tentimi i Azhurnimit të\n"
-"një versioni më të vjetër se versioni Mandrakelinux \"8.1\" nuk rekomandohet."
+"Mandrivalinux ndër versionin \"8.1\" apo më të ri. Tentimi i Azhurnimit të\n"
+"një versioni më të vjetër se versioni Mandrivalinux \"8.1\" nuk rekomandohet."
 
 #: help.pm:591
 #, fuzzy, c-format
@@ -5129,7 +5129,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5391,7 +5391,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5412,7 +5412,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Këtu, ne e zgjedhim një sistem stampues për kompjuterin tuaj. Sistemet "
@@ -5561,7 +5561,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5578,7 +5578,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5705,11 +5705,11 @@ msgstr "Serviset"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Zgjedheni diskun e fort (hard drive) që dëshironi ta zhdukni, për të\n"
-"instaluar një ndarje të re Mandrakelinux. Keni kujDES, të gjitha të dhënat\n"
+"instaluar një ndarje të re Mandrivalinux. Keni kujDES, të gjitha të dhënat\n"
 "do të zhduken, dhe nuk mund të rekuperohen!"
 
 #: help.pm:863
@@ -6058,12 +6058,12 @@ msgstr "Përdorni hapësirën e ndarjes Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Ndarja e juaj Windows është e pa defragmentuar. Ju lutemi riniseni "
 "kompjuterin tuaj në Windows, the niseni programin për defragmentim "
-"``defrag'', mandej riniseni instalimin e Mandrakelinux "
+"``defrag'', mandej riniseni instalimin e Mandrivalinux "
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6180,19 +6180,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6214,7 +6214,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6222,14 +6222,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6239,7 +6239,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6259,10 +6259,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6273,11 +6273,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6293,23 +6293,23 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Parathënie\n"
 "\n"
 "Sistemi eksploatues dhe i komponimeve të tjera në disponibilitet në \n"
-"shpërndarjen Mandrakelinux janë të emruar \"Produkte Software\".\n"
+"shpërndarjen Mandrivalinux janë të emruar \"Produkte Software\".\n"
 "Produketet Softver përmbajnë, mirëpo nuk i nënshtrohen bashkësisë \n"
 "së programeve, të më parme, rregullave dhe dukumentacionit \n"
 "mbi eksploatimin e sistemeve dhe komponimeve të ndryshme të \n"
-"shpërndarjes Mandrakelinux.\n"
+"shpërndarjes Mandrivalinux.\n"
 "\n"
 "\n"
 "1. Licenca\n"
 "\n"
 "Ju lutemi lexoni me vëmendje dokumentin vijues. Ky dokument përmban \n"
 "kontratën e licencës mes jush dhe \n"
-"Mandrakesoft S.A. i përmbajtur në programe.\n"
+"Mandriva S.A. i përmbajtur në programe.\n"
 "Duke instaluar, riprodhuar apo përdoruar programet në çfarëdo \n"
 "mënyre \n"
 "që janë shënuar, dhe ju e njifni, i pranoni kontratat, termet \n"
@@ -6331,19 +6331,19 @@ msgstr ""
 "Produktet Software dhe dokumnetacionet e bashkangjitura janë të furnizuara "
 "\"siq janë\" pa garancë, dhe \n"
 "përgjegjësitë vijuese me ligj.\n"
-"Mandrakesoft S.A. nuk merrë kurrëfarë përgjegjësie në prodhimin e ndonji "
+"Mandriva S.A. nuk merrë kurrëfarë përgjegjësie në prodhimin e ndonji "
 "porblemi, dëmi direkt, (duke mos marrë parasysh kufizimet e dëmeve \n"
 "në humbje të biznisit, ndaljen e biznisit, humbjes finaciare dhe dënimet nga "
 "gjykata, \n"
 "apo çfarëdo hymbje tjetër) me shlyerjen e jashtë përdorimit apo mos lejimin "
 "e përdorimit të Softverëve, dëmshpërblimet duhet \n"
-"të kthehen nga vendosmëria Produkteve, edhe nëse Mandrakesoft S.A. është i "
+"të kthehen nga vendosmëria Produkteve, edhe nëse Mandriva S.A. është i "
 "informuar \n"
 "për arritjen e një dëmi.\n"
 "\n"
 "KËSHILLË NË MBAJTJEN APO PËRDORIMIN E PROGRAMEVE TË NDALUARA NË DISA SHTETE\n"
 "\n"
-"Në asnjë mënyrë, as Mandrakesoft S.A. apo furnizuesit e tij nuk mund të "
+"Në asnjë mënyrë, as Mandriva S.A. apo furnizuesit e tij nuk mund të "
 "jenë \n"
 "përgjegjës, për arësye të një dëmi special, direkt apo indirekt (duke mos "
 "përfshirë \n"
@@ -6351,7 +6351,7 @@ msgstr ""
 "informacioneve komercializuese apo humbje tjera njashtu dënimet dhe "
 "damshpërblimet duhet të derdhen simbas\n"
 "një vendimi gjygjësor) i cili do të bëjë një përdorim \n"
-"apo transferim të Mandrakelinux të programeve të ndaluara me legjitimitet, "
+"apo transferim të Mandrivalinux të programeve të ndaluara me legjitimitet, "
 "nga i cili ju bëni pjesë.\n"
 "Ky njoftim i përketë njashtu edhe disa programeve të \n"
 "kriptografisë të furnizuar me programe.\n"
@@ -6368,10 +6368,10 @@ msgstr ""
 "dhe kushtet e licencës, pajtimet për secilin komponent para se ta përdorni "
 "njërin nga ta. Secila pyetje \n"
 "për licencat e komponeneteve duhet ti adresohet autorit dhe jo tek "
-"Mandrakesoft.\n"
-"Program Zhvilluesi nga Mandrakesoft S.A. është i qeverisur nga Licencat GPL. "
+"Mandriva.\n"
+"Program Zhvilluesi nga Mandriva S.A. është i qeverisur nga Licencat GPL. "
 "Shkrimet në Dokumentacionet \n"
-"nga Mandrakesoft S.A. janë të qeverisura nga licenca e specifikuar. Ju "
+"nga Mandriva S.A. janë të qeverisura nga licenca e specifikuar. Ju "
 "lutemi referohuni në dokumentacion për \n"
 "më shumë detaje.\n"
 "\n"
@@ -6382,11 +6382,11 @@ msgstr ""
 "autorëve dhe janë \n"
 "të mbrojtura nga përparësitë intelektuale, të drejtat e botimit, dhe "
 "aplikimi i ligjeve në programet softver.\n"
-"Mandrakesoft S.A. rezervon të drejtat për ndryshimin dhe adaptimin e "
+"Mandriva S.A. rezervon të drejtat për ndryshimin dhe adaptimin e "
 "Produkteve Softver, në tërësi apo në një \n"
 "pjesë, d.m.th. të gjitha propozimet e mundshme.\n"
-"\"Mandrake\", \"Mandrakelinux\" dhe logot e shoqëruara janë markë "
-"shpërndarëse e Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" dhe logot e shoqëruara janë markë "
+"shpërndarëse e Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Ligjet Qeveritare\n"
@@ -6401,7 +6401,7 @@ msgstr ""
 "në mënyrë miqësore. Nëse nuk jeni dakord \n"
 "rasti duhet ti parqitet gjykatës tribunale në Paris - France.\n"
 "Për më shumë pyetje në lidhje me këtë dokument, ju lutemi kontaktone "
-"Mandrakesoft S.A.  \n"
+"Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6496,7 +6496,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6504,7 +6504,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Urime, instalimi mori fund.\n"
 "Nxerreni disketën apo CD-ROM(in) dhe shtypni mbi Enter.\n"
@@ -6519,7 +6519,7 @@ msgstr ""
 "\n"
 "\n"
 "Informacionet mbi konfigurimin e sistemit tuaj janë të lira\n"
-"në kapitullin e doracakut për përdorimin e Mandrakelinux"
+"në kapitullin e doracakut për përdorimin e Mandrivalinux"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6554,12 +6554,12 @@ msgstr "Nisja e etapës `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Kompjuteri i juaj posedon sasi të vogël të memorisë. Ju mund të ndesheni me\n"
-"disa probleme gjatë instalimit të Mandrakelinux. Nëse kjo ndodhë, ju\n"
+"disa probleme gjatë instalimit të Mandrivalinux. Nëse kjo ndodhë, ju\n"
 "mund të vazhdoni në një instalim në modë teksti. Për këtë shtypni mbi\n"
 "`F1' kut të niseni me një nisje të udhëzuar në CDROM, dhe fytni urdhërin "
 "`text'."
@@ -7101,9 +7101,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Lidhje në sitin Mandrakelinux për të pranuar listën e lirë të pasqyreve..."
+"Lidhje në sitin Mandrivalinux për të pranuar listën e lirë të pasqyreve..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7325,8 +7325,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Instalimi i Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Instalimi i Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9913,7 +9913,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -13918,7 +13918,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -15848,18 +15848,18 @@ msgstr "Ndale"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Mirësevini në <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Mirësevini në <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -15868,7 +15868,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -15885,9 +15885,9 @@ msgstr "Mirësevini në botën Open Source"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -15907,7 +15907,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -15933,10 +15933,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -15955,8 +15955,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -15983,7 +15983,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -15993,7 +15993,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -16012,13 +16012,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -16030,7 +16030,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -16044,19 +16044,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "Qendra Kontrolluese Mandrakelinux"
+msgid "<b>Mandriva Products</b>"
+msgstr "Qendra Kontrolluese Mandrivalinux"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -16077,61 +16077,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -16169,7 +16169,7 @@ msgstr "Zgjedheni çelësin kriptues të sistemit të skedareve"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -16190,7 +16190,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -16220,7 +16220,7 @@ msgstr ""
 #: share/advertising/15.pl:13
 #, fuzzy, c-format
 msgid "<b>Kontact</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/15.pl:15
 #, c-format
@@ -16307,7 +16307,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -16542,14 +16542,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Qendra Kontrolluese Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Qendra Kontrolluese Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -16571,21 +16571,21 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
 #: share/advertising/27.pl:13
 #, fuzzy, c-format
 msgid "<b>Online Store</b>"
-msgstr "Qendra Kontrolluese Mandrakelinux"
+msgstr "Qendra Kontrolluese Mandrivalinux"
 
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -16608,20 +16608,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -16640,33 +16640,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -16689,32 +16689,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -17014,8 +17014,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Qendra Kontrolluese Mandrakelinux"
+msgid "Mandriva Wizards"
+msgstr "Qendra Kontrolluese Mandrivalinux"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -17152,7 +17152,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17223,7 +17223,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -19997,13 +19997,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "Vegël Sinjalizuese bug në Mandrake"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Qendra Kontrolluese Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Qendra Kontrolluese Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20023,8 +20023,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20068,7 +20068,7 @@ msgstr "Asistentët Konfigurues"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -20490,7 +20490,7 @@ msgstr "Nise në Nisje të Udhëzuar"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Ky interfac nuk është i konfiguruar ende.\n"
 "Nise asistentin konfigurues në dritaren kryesore"
@@ -20499,7 +20499,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Ky interfac nuk është i konfiguruar ende.\n"
 "Nise asistentin konfigurues në dritaren kryesore"
@@ -20552,7 +20552,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20852,7 +20852,7 @@ msgstr "Importo"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21390,14 +21390,14 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"E drejtë e autorit (C) 2003 Mandrakesoft.\n"
+"E drejtë e autorit (C) 2003 Mandriva.\n"
 "Ky është një software gratis dhe mund të shpërndahet ndër termet e GNU GPL.\n"
 "\n"
 "Përdorimi: \n"
@@ -21426,7 +21426,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Qendra Kontrolluese Mandrake"
 
 #: standalone/drakhelp:36
@@ -24570,7 +24570,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Shpjegimet e Veglave Mandrake"
 
 #: standalone/logdrake:51
@@ -25083,10 +25083,10 @@ msgstr "Lidhja përfundoi."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Lidhja dështoi.\n"
-"Verifikoje konfigurimin në Qendrën Kontrolluese Mandrakelinux."
+"Verifikoje konfigurimin në Qendrën Kontrolluese Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -25323,7 +25323,7 @@ msgstr "Ri-prodhimi i listës së skanerve konfigurues ..."
 #: standalone/scannerdrake:101
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "%s nuk përkrahet nga ky version i Mandrakelinux."
+msgstr "%s nuk përkrahet nga ky version i Mandrivalinux."
 
 #: standalone/scannerdrake:104
 #, c-format
@@ -25363,7 +25363,7 @@ msgstr ""
 #: standalone/scannerdrake:144
 #, fuzzy, c-format
 msgid "The %s is not supported under Linux."
-msgstr "%s nuk përkrahet nga ky version i Mandrakelinux."
+msgstr "%s nuk përkrahet nga ky version i Mandrivalinux."
 
 #: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
@@ -25941,8 +25941,8 @@ msgstr "Instalimi dështio"
 #~ msgstr "Ju nuk keni zgjedhur ndonji polisë"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Qendra Kontrolluese Mandrakelinux"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Qendra Kontrolluese Mandrivalinux"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Asnjë shfletues i lirë! Ju lutemi instalone njërin"
@@ -26080,13 +26080,13 @@ msgstr "Instalimi dështio"
 #~ msgstr "Gabim gjatë hapjes së %s për shkruarjen: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Ky është HardDrake, një vegël konfigurimi për material Mandrakelinux.\n"
+#~ "Ky është HardDrake, një vegël konfigurimi për material Mandrivalinux.\n"
 #~ "<span foreground=\"royalblue3\">Versioni:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Authori:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
@@ -26802,8 +26802,8 @@ msgstr "Instalimi dështio"
 #~ "  --report          - ky program duhet të jetë një nga veglat mandrake\n"
 #~ "  --incident        - ky program duhet të jetë një nga veglat mandrake"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "Connection failed.\n"
diff --git a/perl-install/share/po/sr.po b/perl-install/share/po/sr.po
index 5ac31d45d..d8353620a 100644
--- a/perl-install/share/po/sr.po
+++ b/perl-install/share/po/sr.po
@@ -60,7 +60,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -79,7 +79,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -87,7 +87,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -95,7 +95,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1245,7 +1245,7 @@ msgstr "упуство"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 "Можете изабрати други језик који ће бити доступан после инсталације "
@@ -3633,12 +3633,12 @@ msgstr "омогући подршку за радио"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Пре него што наставите пажљиво прочитајте услове лиценце. Она\n"
-"покрива целу Mandrakelinux дистрибуцију, и уколико се  слажете\n"
+"покрива целу Mandrivalinux дистрибуцију, и уколико се  слажете\n"
 "са свим условима који се налазе у њој, кликните на \"Прихватам\" тастер\n"
 "Уколико не прихватате, једноставно искључите \n"
 "рачунар."
@@ -3830,13 +3830,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux инсталација се налази на неколико дискова илити CDROM-ова. "
+"Mandrivalinux инсталација се налази на неколико дискова илити CDROM-ова. "
 "DrakX\n"
 "зна уколико да уколико је селктовани пакет лоциран на другом CDROM-у и "
 "избациће\n"
@@ -3846,11 +3846,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3902,7 +3902,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Сада је време да одредимо које програме желите да инсталирате на ваш\n"
-"систем. Постоје хиљаде пакета доступних за инсталацију на Mandrakelinux, и \n"
+"систем. Постоје хиљаде пакета доступних за инсталацију на Mandrivalinux, и \n"
 "да би их учинили доступнијим, смеђтени су у групе сличних апликација.\n"
 "\n"
 "Пакети су сортирани у групе у односу на одговарајућу употребу на вашој\n"
@@ -4009,10 +4009,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4042,7 +4042,7 @@ msgstr ""
 "\n"
 "!! Уколико је сервер пакет изабран случајно или као део\n"
 "целе групе, бићете упитани да ли заиста желите да инсталирате\n"
-"понуђене сервере. Под Mandrakelinux-ом, сви инсталирани\n"
+"понуђене сервере. Под Mandrivalinux-ом, сви инсталирани\n"
 "сервери се стартују по default-у за време подизања система. Чак и ако су "
 "сигурни и немају\n"
 "познатих безбедносних пропуста до времена изласка дистрибуције, може се "
@@ -4207,7 +4207,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4263,7 +4263,7 @@ msgid ""
 msgstr ""
 "X (или  X Window Систем) је срце GNU/Linux графичког интерфејса\n"
 "на који се ослањају сва графичка окружења (KDE, GNOME, AfterStep,\n"
-"WindowMaker, итд.) која се налазе у Mandrakelinux-у.\n"
+"WindowMaker, итд.) која се налазе у Mandrivalinux-у.\n"
 "\n"
 "Биће вам приказана листа са различитим параметрима чијом изменом\n"
 "можете добити оптималан графички приказ: Графичка картица\n"
@@ -4380,12 +4380,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4412,7 +4412,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4421,7 +4421,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4442,11 +4442,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "У овом тренутку, морате да изаберете где ћете инсталирати\n"
-"Mandrakelinux оперативни систем на ваш хард диск. Уколико је празан или\n"
+"Mandrivalinux оперативни систем на ваш хард диск. Уколико је празан или\n"
 "постојећи оперативни систем користи сав постојећи простор на диску, треба да "
 "га\n"
 "партиционирате. У основи, партиционирање хард диска се састоји логичког\n"
-"дељења да би обезбедили простор за инсталацију ваш нови Mandrakelinux "
+"дељења да би обезбедили простор за инсталацију ваш нови Mandrivalinux "
 "систем.\n"
 "\n"
 "Пошто су ефекти процеса партиционирања обично неповратни,\n"
@@ -4455,7 +4455,7 @@ msgstr ""
 "журите.\n"
 "\n"
 "Уколико сте покренули инсталацију у Експерт моду, покренућете\n"
-"DiskDrake, Mandrakelinux-ов алат за партиције, који вам дозвољавав да\n"
+"DiskDrake, Mandrivalinux-ов алат за партиције, који вам дозвољавав да\n"
 "фино подесите ваше партиције. Погледајте DiskDrake секцију у ``User "
 "Guide''.\n"
 "Из инсталационог интерфејса, можете користити чаробњаке као што је описано "
@@ -4493,7 +4493,7 @@ msgstr ""
 "дефрагментирате\n"
 "Windows партицију из самог Windows-а. Backup података такође није лоша "
 "идеја..\n"
-"Ово решење се препоручује уколико желите да користите Mandrakelinux и\n"
+"Ово решење се препоручује уколико желите да користите Mandrivalinux и\n"
 "Microsoft Windows на истом компјутеру.\n"
 "\n"
 "   Пре него што изаберете ову опцију, морате да разумете да након ове "
@@ -4504,7 +4504,7 @@ msgstr ""
 "\n"
 " * \"Брисање цвелог диска\": уколико желите да избришете све податке и све\n"
 "партиције који постоје на вашем хард диску и замените их вашим\n"
-"новим Mandrakelinux системом, можете да изаберете ову оцију. Будите\n"
+"новим Mandrivalinux системом, можете да изаберете ову оцију. Будите\n"
 "пажљивиса овом опцијом, јер нећете бити у могућности\n"
 "да повратите старо стање након потврде.\n"
 "\n"
@@ -4675,7 +4675,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4702,7 +4702,7 @@ msgstr ""
 "\n"
 "Кликните на \"<- Претходно\" ако желите да изаберете другу партицију за свој "
 "нови\n"
-"Mandrakelinux систем.\n"
+"Mandrivalinux систем.\n"
 "\n"
 "Кликните на \"Напредно\" уколико желите да изаберете партиције које ће бити "
 "проверене\n"
@@ -4720,7 +4720,7 @@ msgstr "Претходни"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4732,7 +4732,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"У време када будете инсталирали Mandrakelinux, врло је могуће да ће неки\n"
+"У време када будете инсталирали Mandrivalinux, врло је могуће да ће неки\n"
 "пакети бити ажурирани у односу на иницијално издање. Неки багови могу \n"
 "бити исправљени, а сигурносни пропусти затворене. Да би могли да користите "
 "ове новије верзије\n"
@@ -4764,7 +4764,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4789,7 +4789,7 @@ msgstr "Администратор за сигурност:"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4860,7 +4860,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "На овој тачки, морате избрати коју партицију(e) желите да користите за\n"
-"инсталацију новог Mandrakelinux система. Уколико су партиције\n"
+"инсталацију новог Mandrivalinux система. Уколико су партиције\n"
 "већ дефинисане (од предходне инсталације или од стране\n"
 "другог алата за партиције), можете да користите постојеће партиције.\n"
 "У другим случајевима,\n"
@@ -4947,7 +4947,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4977,7 +4977,7 @@ msgid ""
 msgstr ""
 "Једна или више Microsoft Windows партиција је детектовано \n"
 "на хард диску. Изаберите коју од њих желите да смањите да би инсталирали\n"
-"нови Mandrakelinux оперативни систем.\n"
+"нови Mandrivalinux оперативни систем.\n"
 "\n"
 "Свака партиција је исписана на следећи начин: \"Име Linux-а\",\"Име Windows-а"
 "\"\n"
@@ -5025,7 +5025,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5034,13 +5034,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Овај корак се активира само у случају да постоји стара GNU/Linux партиција "
 "на\n"
@@ -5048,7 +5048,7 @@ msgstr ""
 "\n"
 "DrakX сада треба да зна да ли желите да изведете чисту инсталацију или "
 "ажурирање\n"
-"постојећег Mandrakelinux система:\n"
+"постојећег Mandrivalinux система:\n"
 "\n"
 " * \"Инсталација\": У већини случајева, ова опција комплетно брише стари\n"
 "систем. Уколико желите да измените број партиција, или\n"
@@ -5059,7 +5059,7 @@ msgstr ""
 "\n"
 " * \"Ажурирање\": ова инсталациона класа вам дозвољава да урадите ажурирање "
 "пакета\n"
-"на тренутно инсталираном Mandrakelinux систему. Ваша тренутна\n"
+"на тренутно инсталираном Mandrivalinux систему. Ваша тренутна\n"
 "шема партиција и кориснички подаци се не мењају. Већина других\n"
 "конфигурационих корака и даље остаје доступна, слично стандардној "
 "инсталацији.\n"
@@ -5067,7 +5067,7 @@ msgstr ""
 "Употреба опције ``Ажурирање'' би требало да буде без проблема на Mandrake "
 "Linux системима\n"
 "од верзије \"8.1\" или новије. Извођење ажурирања на верзијама \n"
-"Mandrakelinux пре \"8.1\" није препоручљиво."
+"Mandrivalinux пре \"8.1\" није препоручљиво."
 
 #: help.pm:591
 #, fuzzy, c-format
@@ -5122,7 +5122,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5368,7 +5368,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5389,11 +5389,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Сада треба да изаберемо систем за штампање за ваш рачунар. Други OS-ови вам\n"
-"нуде један, али вам Mandrakelinux нуди чак три.\n"
+"нуде један, али вам Mandrivalinux нуди чак три.\n"
 "\n"
 " * \"pdq\" што значи ``print, do not queue'', је избор за оне који имају\n"
 "директни конекцију са својим штампачем и желите да избегнете\n"
@@ -5551,7 +5551,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5568,7 +5568,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5630,7 +5630,7 @@ msgstr "Сервиси"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Изаберите хард диск који желите да избришете да би инсталирали нову Mandrake "
@@ -5989,7 +5989,7 @@ msgstr "Прорачунавам величину Windows партиције"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Ваша Windows партиција је превише фрагментирана, прво покрените ``defrag''"
@@ -6107,19 +6107,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6141,7 +6141,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6149,14 +6149,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6166,7 +6166,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6186,10 +6186,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6200,11 +6200,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6220,23 +6220,23 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Упознавање\n"
 "\n"
-"Оперативни систем и друге компоненте доступне у Mandrakelinux дистрибуцији \n"
+"Оперативни систем и друге компоненте доступне у Mandrivalinux дистрибуцији \n"
 "на даље ће бити зване \"Софтверски Производи\" . Софтверски производи "
 "укључују, али нису и \n"
 "ограничени на, скуп програма, метода, правила и документацију која је "
 "везаназа оперативни \n"
-"систем и друге компоненте Mandrakelinux дистрибуције.\n"
+"систем и друге компоненте Mandrivalinux дистрибуције.\n"
 "\n"
 "\n"
 "1. Лиценцни уговор\n"
 "\n"
 "Пажљиво прочитајте овај документ. Овај документ је лиценцни уговор "
 "измеђуизмеђу вас и   \n"
-"Mandrakesoft S.A. који полаже право на Софтверске Производе.\n"
+"Mandriva S.A. који полаже право на Софтверске Производе.\n"
 "Инсталирањем, копирањем или употребом Софтверских Производа у било ком виду, "
 "ви експлицитно \n"
 "прихватате и потпуно се слажете са прихватањем поставки и услова и стања у "
@@ -6256,7 +6256,7 @@ msgstr ""
 "Софтверски Производи и пратећа документрација су омогућене \"као такве\", и "
 "без гаранције, до граница \n"
 "које су дозвољене законом.\n"
-"Mandrakesoft S.A. неће, у свим условима и у границама закона, бити оговоран "
+"Mandriva S.A. неће, у свим условима и у границама закона, бити оговоран "
 "за било које специјалне,\n"
 "случајне, директне или индиректне штете (укључујући неограниченештете или "
 "губитке \n"
@@ -6264,14 +6264,14 @@ msgstr ""
 "казне које су резултат судске \n"
 "одлуке, или за било који други губитак) које произилазе из употребе или "
 "немогућности коришћења Софтверских \n"
-"Производа, чак иако је Mandrakesoft S.A. саветовао и указивао на могућност "
+"Производа, чак иако је Mandriva S.A. саветовао и указивао на могућност "
 "појаве такве \n"
 "штете.\n"
 "\n"
 "Ограничена одговорности везане за поседовање или употребу забрањеног "
 "софтвера у неким земљама\n"
 "\n"
-"До граница које су условљене законом, Mandrakesoft S.A. или његови "
+"До граница које су условљене законом, Mandriva S.A. или његови "
 "дистрибутери неће, ни под којим условима, бити \n"
 "одговорни за специјалне, намерне директне или индиректне штете(укључујући "
 "неограничене \n"
@@ -6281,7 +6281,7 @@ msgstr ""
 "произилазе \n"
 "из употребе или немогућности коришћења Софтверских Компоненти или које "
 "произилазе download-ованих софтверских компоненти \n"
-"било ког Mandrakelinux сајта који су забрањени или ограничени у неким "
+"било ког Mandrivalinux сајта који су забрањени или ограничени у неким "
 "земљама по локалним законима.\n"
 "Ова ограничена права се примењују, али нису и ограничена на,криптографске "
 "компоненте \n"
@@ -6300,10 +6300,10 @@ msgstr ""
 "и услове лиценцног уговора за сваку компоненту пре употребе било које "
 "компоненете. Било које питање \n"
 "везано за лиценцу компоненти треба да буде адресирано на аутора компоненте а "
-"нена Mandrakesoft.\n"
-"Програми које је развио Mandrakesoft S.A. подлежу под GPL Лиценцу. "
+"нена Mandriva.\n"
+"Програми које је развио Mandriva S.A. подлежу под GPL Лиценцу. "
 "Документација писана од \n"
-"стране Mandrakesoft S.A. подлеже под посебну лиценцу. Молим да погледате "
+"стране Mandriva S.A. подлеже под посебну лиценцу. Молим да погледате "
 "документацију  \n"
 "за детаље.\n"
 "\n"
@@ -6314,10 +6314,10 @@ msgstr ""
 "она \n"
 "су заштићена законима о интелектуалној својини и правима који се примењују "
 "на софтверске програме.\n"
-"Mandrakesoft S.A. је резервисао своја права на модификовање или адаптацију "
+"Mandriva S.A. је резервисао своја права на модификовање или адаптацију "
 "СофтверскихПроизвода, како за целину тако и за \n"
 "делове, за све све сврхе и све употребе.\n"
-"\"Mandrake\", \"Mandrakelinux\" и придружени логотипи и ознаке Mandrakesoft "
+"\"Mandriva\", \"Mandrivalinux\" и придружени логотипи и ознаке Mandriva "
 "S.A.  \n"
 "\n"
 "\n"
@@ -6333,7 +6333,7 @@ msgstr ""
 "средство, неспоразуми ће бити упућени на одговарајуће Судске установе у "
 "Паризу - Француска.\n"
 "За било које питање које је везано за овај документ, контактирајте  "
-"Mandrakesoft S.A.  \n"
+"Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6422,7 +6422,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6430,21 +6430,21 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Честитамо, инсталација је завршена.\n"
 "Извадите дискету из драјва и притисните <Enter> да се рачунар ресетује.\n"
 "\n"
 "\n"
 "За информације о поправкама које су на располагању за ово издање\n"
-"Mandrakelinux Линукса, прочитајте део 'Errata' који можете наћи на\n"
+"Mandrivalinux Линукса, прочитајте део 'Errata' који можете наћи на\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Информације о конфигурисању вашег система можете наћи у пост-инсталационом\n"
-"поглављу званичног Mandrakelinux 'Водича за кориснике'."
+"поглављу званичног Mandrivalinux 'Водича за кориснике'."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6479,13 +6479,13 @@ msgstr "Покрећем корак `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Ваш систем има мањак снаге. Услед тога можете имати проблема при "
 "инсталацији\n"
-"Mandrakelinux. Уколико се они појаве, можете пробати текстуалну инсталацију. "
+"Mandrivalinux. Уколико се они појаве, можете пробати текстуалну инсталацију. "
 "Да би то постигли,\n"
 "притисните `F1' при стартању са CDROM-а, а онда укуцајте  `text'."
 
@@ -7017,9 +7017,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"КОнтактирајте Mandrakelinux web сајт да би добили листу доступних mirror-а"
+"КОнтактирајте Mandrivalinux web сајт да би добили листу доступних mirror-а"
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7239,8 +7239,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux Инсталација %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux Инсталација %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9822,13 +9822,13 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall конфигуратор\n"
 "\n"
-"Он конфигурише лични firewall за ову Mandrakelinux машину.\n"
+"Он конфигурише лични firewall за ову Mandrivalinux машину.\n"
 "За моћно firewall решење, погледајте\n"
 "специјализовану MandrakeSecurity Firewall дистрибуцију."
 
@@ -13765,7 +13765,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -15763,18 +15763,18 @@ msgstr "Стоп"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Добродошли у <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Добродошли у <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -15783,7 +15783,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -15800,9 +15800,9 @@ msgstr "Добродошли у Свет Open Source-а"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -15822,7 +15822,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -15848,10 +15848,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -15870,8 +15870,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -15898,7 +15898,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -15908,7 +15908,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15927,13 +15927,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -15945,7 +15945,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15959,19 +15959,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "Mandrakelinux Контролни Центар"
+msgid "<b>Mandriva Products</b>"
+msgstr "Mandrivalinux Контролни Центар"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -15992,61 +15992,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -16084,7 +16084,7 @@ msgstr "Изаберите кључ за енкрипцију фајл сист�
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -16105,7 +16105,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -16135,7 +16135,7 @@ msgstr ""
 #: share/advertising/15.pl:13
 #, fuzzy, c-format
 msgid "<b>Kontact</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/15.pl:15
 #, c-format
@@ -16222,7 +16222,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -16457,14 +16457,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux Контролни Центар</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux Контролни Центар</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -16486,21 +16486,21 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
 #: share/advertising/27.pl:13
 #, fuzzy, c-format
 msgid "<b>Online Store</b>"
-msgstr "Mandrakelinux Контролни Центар"
+msgstr "Mandrivalinux Контролни Центар"
 
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -16523,20 +16523,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -16555,33 +16555,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -16604,32 +16604,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -16929,8 +16929,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakelinux Контролни Центар"
+msgid "Mandriva Wizards"
+msgstr "Mandrivalinux Контролни Центар"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -17069,7 +17069,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17142,14 +17142,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPTION]...\n"
-"  --no-confirmation      не поставља питање о потврди у MandrakeUpdate моду\n"
+"  --no-confirmation      не поставља питање о потврди у Mandriva Update моду\n"
 "  --no-verify-rpm        не проверава сигнатуре пакета\n"
 "  --changelog-first      прикаѕује запис о изменама пре листе фајлова у "
 "прозору ѕа опис\n"
@@ -19757,13 +19757,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "Mandrake Програм за Пријављивање Грешака"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Контролни Центар"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux Контролни Центар"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19783,8 +19783,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -19828,7 +19828,7 @@ msgstr "Чаробњаци за конфигурацију"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -20245,7 +20245,7 @@ msgstr "Покренуто при стартању"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Овај интерфејс још увек није подешен.\n"
 "Покрените конфигурационог чаробњака у главном прозору"
@@ -20254,7 +20254,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Овај интерфејс још увек није подешен.\n"
 "Покрените конфигурационог чаробњака у главном прозору"
@@ -20307,7 +20307,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20605,7 +20605,7 @@ msgstr "Увези"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21133,7 +21133,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -21160,7 +21160,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Mandrake Контролни Центар"
 
 #: standalone/drakhelp:36
@@ -24123,7 +24123,7 @@ msgid ""
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
-"Ово је HardDrake, Mandrakelinux-ов алат за подешавање хардвера.\n"
+"Ово је HardDrake, Mandrivalinux-ов алат за подешавање хардвера.\n"
 "<span foreground=\"royalblue3\">Верзија:</span> %s\n"
 "<span foreground=\"royalblue3\">Аутор:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
@@ -24234,7 +24234,7 @@ msgstr "Измене су завршене, али да би их примени
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Mandrake Алати за објашњења"
 
 #: standalone/logdrake:51
@@ -24741,7 +24741,7 @@ msgstr "Повезивање завршено."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "повезивање неуспело.\n"
 "Проверите вашу конфигурацију у Mandrake Контролном Центру."
@@ -24979,7 +24979,7 @@ msgstr "Освежавање листе подешених скенера ..."
 #: standalone/scannerdrake:101
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "%s није подржан у овој верзији Mandrakelinux-а."
+msgstr "%s није подржан у овој верзији Mandrivalinux-а."
 
 #: standalone/scannerdrake:104
 #, c-format
@@ -25021,7 +25021,7 @@ msgstr ""
 #: standalone/scannerdrake:144
 #, fuzzy, c-format
 msgid "The %s is not supported under Linux."
-msgstr "%s није подржан у овој верзији Mandrakelinux-а."
+msgstr "%s није подржан у овој верзији Mandrivalinux-а."
 
 #: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
@@ -25600,8 +25600,8 @@ msgstr "Инсталација није успела"
 #~ msgstr "не могу да пронађен ниједан фонт.\n"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Mandrakelinux Контролни Центар"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Mandrivalinux Контролни Центар"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Нема доступног претраживача! Молим Вас да инсталирате барем једног"
@@ -26125,8 +26125,8 @@ msgstr "Инсталација није успела"
 #~ "  --report          - програм треба да буде један од mandrake алата\n"
 #~ "  --incident        - програм треба да буде један од mandrake алата"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "Connection failed.\n"
diff --git a/perl-install/share/po/sr@Latn.po b/perl-install/share/po/sr@Latn.po
index 3375990a5..90c9084ca 100644
--- a/perl-install/share/po/sr@Latn.po
+++ b/perl-install/share/po/sr@Latn.po
@@ -60,7 +60,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -79,7 +79,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -87,7 +87,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -95,7 +95,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1245,7 +1245,7 @@ msgstr "upustvo"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 "Možete izabrati drugi jezik koji će biti dostupan posle instalacije "
@@ -3634,12 +3634,12 @@ msgstr "omogući podršku za radio"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Pre nego što nastavite pažljivo pročitajte uslove licence. Ona\n"
-"pokriva celu Mandrakelinux distribuciju, i ukoliko se  slažete\n"
+"pokriva celu Mandrivalinux distribuciju, i ukoliko se  slažete\n"
 "sa svim uslovima koji se nalaze u njoj, kliknite na \"Prihvatam\" taster\n"
 "Ukoliko ne prihvatate, jednostavno isključite \n"
 "računar."
@@ -3833,13 +3833,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux instalacija se nalazi na nekoliko diskova iliti CDROM-ova. "
+"Mandrivalinux instalacija se nalazi na nekoliko diskova iliti CDROM-ova. "
 "DrakX\n"
 "zna ukoliko da ukoliko je selktovani paket lociran na drugom CDROM-u i "
 "izbaciće\n"
@@ -3849,11 +3849,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3905,7 +3905,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Sada je vreme da odredimo koje programe želite da instalirate na vaš\n"
-"sistem. Postoje hiljade paketa dostupnih za instalaciju na Mandrakelinux, "
+"sistem. Postoje hiljade paketa dostupnih za instalaciju na Mandrivalinux, "
 "i \n"
 "da bi ih učinili dostupnijim, smeđteni su u grupe sličnih aplikacija.\n"
 "\n"
@@ -4013,10 +4013,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4046,7 +4046,7 @@ msgstr ""
 "\n"
 "!! Ukoliko je server paket izabran slučajno ili kao deo\n"
 "cele grupe, bićete upitani da li zaista želite da instalirate\n"
-"ponuđene servere. Pod Mandrakelinux-om, svi instalirani\n"
+"ponuđene servere. Pod Mandrivalinux-om, svi instalirani\n"
 "serveri se startuju po default-u za vreme podizanja sistema. Čak i ako su "
 "sigurni i nemaju\n"
 "poznatih bezbednosnih propusta do vremena izlaska distribucije, može se "
@@ -4211,7 +4211,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4267,7 +4267,7 @@ msgid ""
 msgstr ""
 "X (ili  X Window Sistem) je srce GNU/Linux grafičkog interfejsa\n"
 "na koji se oslanjaju sva grafička okruženja (KDE, GNOME, AfterStep,\n"
-"WindowMaker, itd.) koja se nalaze u Mandrakelinux-u.\n"
+"WindowMaker, itd.) koja se nalaze u Mandrivalinux-u.\n"
 "\n"
 "Biće vam prikazana lista sa različitim parametrima čijom izmenom\n"
 "možete dobiti optimalan grafički prikaz: Grafička kartica\n"
@@ -4384,12 +4384,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4416,7 +4416,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4425,7 +4425,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4446,11 +4446,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "U ovom trenutku, morate da izaberete gde ćete instalirati\n"
-"Mandrakelinux operativni sistem na vaš hard disk. Ukoliko je prazan ili\n"
+"Mandrivalinux operativni sistem na vaš hard disk. Ukoliko je prazan ili\n"
 "postojeći operativni sistem koristi sav postojeći prostor na disku, treba da "
 "ga\n"
 "particionirate. U osnovi, particioniranje hard diska se sastoji logičkog\n"
-"deljenja da bi obezbedili prostor za instalaciju vaš novi Mandrakelinux "
+"deljenja da bi obezbedili prostor za instalaciju vaš novi Mandrivalinux "
 "sistem.\n"
 "\n"
 "Pošto su efekti procesa particioniranja obično nepovratni,\n"
@@ -4459,7 +4459,7 @@ msgstr ""
 "žurite.\n"
 "\n"
 "Ukoliko ste pokrenuli instalaciju u Ekspert modu, pokrenućete\n"
-"DiskDrake, Mandrakelinux-ov alat za particije, koji vam dozvoljavaw da\n"
+"DiskDrake, Mandrivalinux-ov alat za particije, koji vam dozvoljavaw da\n"
 "fino podesite vaše particije. Pogledajte DiskDrake sekciju u ``User "
 "Guide''.\n"
 "Iz instalacionog interfejsa, možete koristiti čarobnjake kao što je opisano "
@@ -4497,7 +4497,7 @@ msgstr ""
 "defragmentirate\n"
 "Windows particiju iz samog Windows-a. Backup podataka takođe nije loša "
 "ideja..\n"
-"Ovo rešenje se preporučuje ukoliko želite da koristite Mandrakelinux i\n"
+"Ovo rešenje se preporučuje ukoliko želite da koristite Mandrivalinux i\n"
 "Microsoft Windows na istom kompjuteru.\n"
 "\n"
 "   Pre nego što izaberete ovu opciju, morate da razumete da nakon ove "
@@ -4508,7 +4508,7 @@ msgstr ""
 "\n"
 " * \"Brisanje cvelog diska\": ukoliko želite da izbrišete sve podatke i sve\n"
 "particije koji postoje na vašem hard disku i zamenite ih vašim\n"
-"novim Mandrakelinux sistemom, možete da izaberete ovu ociju. Budite\n"
+"novim Mandrivalinux sistemom, možete da izaberete ovu ociju. Budite\n"
 "pažljivisa ovom opcijom, jer nećete biti u mogućnosti\n"
 "da povratite staro stanje nakon potvrde.\n"
 "\n"
@@ -4680,7 +4680,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4707,7 +4707,7 @@ msgstr ""
 "\n"
 "Kliknite na \"<- Prethodno\" ako želite da izaberete drugu particiju za svoj "
 "novi\n"
-"Mandrakelinux sistem.\n"
+"Mandrivalinux sistem.\n"
 "\n"
 "Kliknite na \"Napredno\" ukoliko želite da izaberete particije koje će biti "
 "proverene\n"
@@ -4725,7 +4725,7 @@ msgstr "Prethodni"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4737,7 +4737,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"U vreme kada budete instalirali Mandrakelinux, vrlo je moguće da će neki\n"
+"U vreme kada budete instalirali Mandrivalinux, vrlo je moguće da će neki\n"
 "paketi biti ažurirani u odnosu na inicijalno izdanje. Neki bagovi mogu \n"
 "biti ispravljeni, a sigurnosni propusti zatvorene. Da bi mogli da koristite "
 "ove novije verzije\n"
@@ -4769,7 +4769,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4794,7 +4794,7 @@ msgstr "Administrator za sigurnost:"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4865,7 +4865,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Na ovoj tački, morate izbrati koju particiju(e) želite da koristite za\n"
-"instalaciju novog Mandrakelinux sistema. Ukoliko su particije\n"
+"instalaciju novog Mandrivalinux sistema. Ukoliko su particije\n"
 "već definisane (od predhodne instalacije ili od strane\n"
 "drugog alata za particije), možete da koristite postojeće particije.\n"
 "U drugim slučajevima,\n"
@@ -4954,7 +4954,7 @@ msgstr "Pređi na normalni mod"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4984,7 +4984,7 @@ msgid ""
 msgstr ""
 "Jedna ili više Microsoft Windows particija je detektovano \n"
 "na hard disku. Izaberite koju od njih želite da smanjite da bi instalirali\n"
-"novi Mandrakelinux operativni sistem.\n"
+"novi Mandrivalinux operativni sistem.\n"
 "\n"
 "Svaka particija je ispisana na sledeći način: \"Ime Linux-a\",\"Ime Windows-a"
 "\"\n"
@@ -5032,7 +5032,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5041,13 +5041,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Ovaj korak se aktivira samo u slučaju da postoji stara GNU/Linux particija "
 "na\n"
@@ -5055,7 +5055,7 @@ msgstr ""
 "\n"
 "DrakX sada treba da zna da li želite da izvedete čistu instalaciju ili "
 "ažuriranje\n"
-"postojećeg Mandrakelinux sistema:\n"
+"postojećeg Mandrivalinux sistema:\n"
 "\n"
 " * \"Instalacija\": U većini slučajeva, ova opcija kompletno briše stari\n"
 "sistem. Ukoliko želite da izmenite broj particija, ili\n"
@@ -5066,7 +5066,7 @@ msgstr ""
 "\n"
 " * \"Ažuriranje\": ova instalaciona klasa vam dozvoljava da uradite "
 "ažuriranje paketa\n"
-"na trenutno instaliranom Mandrakelinux sistemu. Vaša trenutna\n"
+"na trenutno instaliranom Mandrivalinux sistemu. Vaša trenutna\n"
 "šema particija i korisnički podaci se ne menjaju. Većina drugih\n"
 "konfiguracionih koraka i dalje ostaje dostupna, slično standardnoj "
 "instalaciji.\n"
@@ -5074,7 +5074,7 @@ msgstr ""
 "Upotreba opcije ``Ažuriranje'' bi trebalo da bude bez problema na Mandrake "
 "Linux sistemima\n"
 "od verzije \"8.1\" ili novije. Izvođenje ažuriranja na verzijama \n"
-"Mandrakelinux pre \"8.1\" nije preporučljivo."
+"Mandrivalinux pre \"8.1\" nije preporučljivo."
 
 #: help.pm:591
 #, fuzzy, c-format
@@ -5129,7 +5129,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5375,7 +5375,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5396,12 +5396,12 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Sada treba da izaberemo sistem za štampanje za vaš računar. Drugi OS-ovi "
 "vam\n"
-"nude jedan, ali vam Mandrakelinux nudi čak tri.\n"
+"nude jedan, ali vam Mandrivalinux nudi čak tri.\n"
 "\n"
 " * \"pdq\" što znači ``print, do not queue'', je izbor za one koji imaju\n"
 "direktni konekciju sa svojim štampačem i želite da izbegnete\n"
@@ -5560,7 +5560,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5577,7 +5577,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5639,7 +5639,7 @@ msgstr "Servisi"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Izaberite hard disk koji želite da izbrišete da bi instalirali novu Mandrake "
@@ -5998,7 +5998,7 @@ msgstr "Proračunavam veličinu Windows particije"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Vaša Windows particija je previše fragmentirana, prvo pokrenite ``defrag''"
@@ -6116,19 +6116,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6150,7 +6150,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6158,14 +6158,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6175,7 +6175,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6195,10 +6195,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6209,11 +6209,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6229,23 +6229,23 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Upoznavanje\n"
 "\n"
-"Operativni sistem i druge komponente dostupne u Mandrakelinux distribuciji \n"
+"Operativni sistem i druge komponente dostupne u Mandrivalinux distribuciji \n"
 "na dalje će biti zvane \"Softverski Proizvodi\" . Softverski proizvodi "
 "uključuju, ali nisu i \n"
 "ograničeni na, skup programa, metoda, pravila i dokumentaciju koja je "
 "vezanaza operativni \n"
-"sistem i druge komponente Mandrakelinux distribucije.\n"
+"sistem i druge komponente Mandrivalinux distribucije.\n"
 "\n"
 "\n"
 "1. Licencni ugovor\n"
 "\n"
 "Pažljivo pročitajte ovaj dokument. Ovaj dokument je licencni ugovor "
 "izmeđuizmeđu vas i   \n"
-"Mandrakesoft S.A. koji polaže pravo na Softverske Proizvode.\n"
+"Mandriva S.A. koji polaže pravo na Softverske Proizvode.\n"
 "Instaliranjem, kopiranjem ili upotrebom Softverskih Proizvoda u bilo kom "
 "vidu, vi eksplicitno \n"
 "prihvatate i potpuno se slažete sa prihvatanjem postavki i uslova i stanja u "
@@ -6265,7 +6265,7 @@ msgstr ""
 "Softverski Proizvodi i prateća dokumentracija su omogućene \"kao takve\", i "
 "bez garancije, do granica \n"
 "koje su dozvoljene zakonom.\n"
-"Mandrakesoft S.A. neće, u svim uslovima i u granicama zakona, biti ogovoran "
+"Mandriva S.A. neće, u svim uslovima i u granicama zakona, biti ogovoran "
 "za bilo koje specijalne,\n"
 "slučajne, direktne ili indirektne štete (uključujući neograničeneštete ili "
 "gubitke \n"
@@ -6273,14 +6273,14 @@ msgstr ""
 "kazne koje su rezultat sudske \n"
 "odluke, ili za bilo koji drugi gubitak) koje proizilaze iz upotrebe ili "
 "nemogućnosti korišćenja Softverskih \n"
-"Proizvoda, čak iako je Mandrakesoft S.A. savetovao i ukazivao na mogućnost "
+"Proizvoda, čak iako je Mandriva S.A. savetovao i ukazivao na mogućnost "
 "pojave takve \n"
 "štete.\n"
 "\n"
 "Ograničena odgovornosti vezane za posedovanje ili upotrebu zabranjenog "
 "softvera u nekim zemljama\n"
 "\n"
-"Do granica koje su uslovljene zakonom, Mandrakesoft S.A. ili njegovi "
+"Do granica koje su uslovljene zakonom, Mandriva S.A. ili njegovi "
 "distributeri neće, ni pod kojim uslovima, biti \n"
 "odgovorni za specijalne, namerne direktne ili indirektne štete(uključujući "
 "neograničene \n"
@@ -6290,7 +6290,7 @@ msgstr ""
 "proizilaze \n"
 "iz upotrebe ili nemogućnosti korišćenja Softverskih Komponenti ili koje "
 "proizilaze download-ovanih softverskih komponenti \n"
-"bilo kog Mandrakelinux sajta koji su zabranjeni ili ograničeni u nekim "
+"bilo kog Mandrivalinux sajta koji su zabranjeni ili ograničeni u nekim "
 "zemljama po lokalnim zakonima.\n"
 "Ova ograničena prava se primenjuju, ali nisu i ograničena na,kriptografske "
 "komponente \n"
@@ -6309,10 +6309,10 @@ msgstr ""
 "i uslove licencnog ugovora za svaku komponentu pre upotrebe bilo koje "
 "komponenete. Bilo koje pitanje \n"
 "vezano za licencu komponenti treba da bude adresirano na autora komponente a "
-"nena Mandrakesoft.\n"
-"Programi koje je razvio Mandrakesoft S.A. podležu pod GPL Licencu. "
+"nena Mandriva.\n"
+"Programi koje je razvio Mandriva S.A. podležu pod GPL Licencu. "
 "Dokumentacija pisana od \n"
-"strane Mandrakesoft S.A. podleže pod posebnu licencu. Molim da pogledate "
+"strane Mandriva S.A. podleže pod posebnu licencu. Molim da pogledate "
 "dokumentaciju  \n"
 "za detalje.\n"
 "\n"
@@ -6323,10 +6323,10 @@ msgstr ""
 "ona \n"
 "su zaštićena zakonima o intelektualnoj svojini i pravima koji se primenjuju "
 "na softverske programe.\n"
-"Mandrakesoft S.A. je rezervisao svoja prava na modifikovanje ili adaptaciju "
+"Mandriva S.A. je rezervisao svoja prava na modifikovanje ili adaptaciju "
 "SoftverskihProizvoda, kako za celinu tako i za \n"
 "delove, za sve sve svrhe i sve upotrebe.\n"
-"\"Mandrake\", \"Mandrakelinux\" i pridruženi logotipi i oznake Mandrakesoft "
+"\"Mandriva\", \"Mandrivalinux\" i pridruženi logotipi i oznake Mandriva "
 "S.A.  \n"
 "\n"
 "\n"
@@ -6342,7 +6342,7 @@ msgstr ""
 "sredstvo, nesporazumi će biti upućeni na odgovarajuće Sudske ustanove u "
 "Parizu - Francuska.\n"
 "Za bilo koje pitanje koje je vezano za ovaj dokument, kontaktirajte  "
-"Mandrakesoft S.A.  \n"
+"Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6431,7 +6431,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6439,21 +6439,21 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Čestitamo, instalacija je završena.\n"
 "Izvadite disketu iz drajva i pritisnite <Enter> da se računar resetuje.\n"
 "\n"
 "\n"
 "Za informacije o popravkama koje su na raspolaganju za ovo izdanje\n"
-"Mandrakelinux Linux-a, pročitajte deo 'Errata' koji možete naći na\n"
+"Mandrivalinux Linux-a, pročitajte deo 'Errata' koji možete naći na\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Informacije o konfigurisanju vašeg sistema možete naći u post-instalacionom\n"
-"poglavlju zvaničnog Mandrakelinux 'Vodiča za korisnike'."
+"poglavlju zvaničnog Mandrivalinux 'Vodiča za korisnike'."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6488,13 +6488,13 @@ msgstr "Pokrećem korak `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Vaš sistem ima manjak snage. Usled toga možete imati problema pri "
 "instalaciji\n"
-"Mandrakelinux. Ukoliko se oni pojave, možete probati tekstualnu instalaciju. "
+"Mandrivalinux. Ukoliko se oni pojave, možete probati tekstualnu instalaciju. "
 "Da bi to postigli,\n"
 "pritisnite `F1' pri startanju sa CDROM-a, a onda ukucajte  `text'."
 
@@ -7026,9 +7026,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"KOntaktirajte Mandrakelinux web sajt da bi dobili listu dostupnih mirror-a"
+"KOntaktirajte Mandrivalinux web sajt da bi dobili listu dostupnih mirror-a"
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7248,8 +7248,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux Instalacija %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux Instalacija %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9831,13 +9831,13 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall konfigurator\n"
 "\n"
-"On konfiguriše lični firewall za ovu Mandrakelinux mašinu.\n"
+"On konfiguriše lični firewall za ovu Mandrivalinux mašinu.\n"
 "Za moćno firewall rešenje, pogledajte\n"
 "specijalizovanu MandrakeSecurity Firewall distribuciju."
 
@@ -13776,7 +13776,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -15781,18 +15781,18 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Dobrodošli u <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Dobrodošli u <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -15801,7 +15801,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -15818,9 +15818,9 @@ msgstr "Dobrodošli u Svet Open Source-a"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -15840,7 +15840,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -15866,10 +15866,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -15888,8 +15888,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -15916,7 +15916,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -15926,7 +15926,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15945,13 +15945,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -15963,7 +15963,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15977,19 +15977,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgid "<b>Mandriva Products</b>"
+msgstr "Mandrivalinux Kontrolni Centar"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -16010,61 +16010,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -16102,7 +16102,7 @@ msgstr "Izaberite ključ za enkripciju fajl sistema"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -16123,7 +16123,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -16240,7 +16240,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -16475,14 +16475,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux Kontrolni Centar</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux Kontrolni Centar</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -16504,21 +16504,21 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
 #: share/advertising/27.pl:13
 #, fuzzy, c-format
 msgid "<b>Online Store</b>"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgstr "Mandrivalinux Kontrolni Centar"
 
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -16541,20 +16541,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -16573,33 +16573,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -16622,32 +16622,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -16947,8 +16947,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgid "Mandriva Wizards"
+msgstr "Mandrivalinux Kontrolni Centar"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -17087,7 +17087,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17161,14 +17161,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPTION]...\n"
-"  --no-confirmation      ne postavlja pitanje o potvrdi u MandrakeUpdate "
+"  --no-confirmation      ne postavlja pitanje o potvrdi u Mandriva Update "
 "modu\n"
 "  --no-verify-rpm        ne proverava signature paketa\n"
 "  --changelog-first      prikadzuje zapis o izmenama pre liste fajlova u "
@@ -19777,13 +19777,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "Mandrake Program za Prijavljivanje Grešaka"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux Kontrolni Centar"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19803,8 +19803,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -19848,7 +19848,7 @@ msgstr "Čarobnjaci za konfiguraciju"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -20265,7 +20265,7 @@ msgstr "Pokrenuto pri startanju"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Ovaj interfejs još uvek nije podešen.\n"
 "Pokrenite konfiguracionog čarobnjaka u glavnom prozoru"
@@ -20274,7 +20274,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Ovaj interfejs još uvek nije podešen.\n"
 "Pokrenite konfiguracionog čarobnjaka u glavnom prozoru"
@@ -20327,7 +20327,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20626,7 +20626,7 @@ msgstr "Uvezi"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21154,7 +21154,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -21181,7 +21181,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Mandrake Kontrolni Centar"
 
 #: standalone/drakhelp:36
@@ -24144,7 +24144,7 @@ msgid ""
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
-"Ovo je HardDrake, Mandrakelinux-ov alat za podešavanje hardvera.\n"
+"Ovo je HardDrake, Mandrivalinux-ov alat za podešavanje hardvera.\n"
 "<span foreground=\"royalblue3\">Verzija:</span> %s\n"
 "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
@@ -24255,7 +24255,7 @@ msgstr "Izmene su završene, ali da bi ih primenili morate se izlogovati"
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Mandrake Alati za objašnjenja"
 
 #: standalone/logdrake:51
@@ -24762,7 +24762,7 @@ msgstr "Povezivanje završeno."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "povezivanje neuspelo.\n"
 "Proverite vašu konfiguraciju u Mandrake Kontrolnom Centru."
@@ -25000,7 +25000,7 @@ msgstr "Osvežavanje liste podešenih skenera ..."
 #: standalone/scannerdrake:101
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "%s nije podržan u ovoj verziji Mandrakelinux-a."
+msgstr "%s nije podržan u ovoj verziji Mandrivalinux-a."
 
 #: standalone/scannerdrake:104
 #, c-format
@@ -25042,7 +25042,7 @@ msgstr ""
 #: standalone/scannerdrake:144
 #, fuzzy, c-format
 msgid "The %s is not supported under Linux."
-msgstr "%s nije podržan u ovoj verziji Mandrakelinux-a."
+msgstr "%s nije podržan u ovoj verziji Mandrivalinux-a."
 
 #: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
@@ -25621,8 +25621,8 @@ msgstr "Instalacija nije uspela"
 #~ msgstr "ne mogu da pronađen nijedan font.\n"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Mandrakelinux Kontrolni Centar"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Mandrivalinux Kontrolni Centar"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Nema dostupnog pretraživača! Molim Vas da instalirate barem jednog"
@@ -26158,8 +26158,8 @@ msgstr "Instalacija nije uspela"
 #~ "  --report          - program treba da bude jedan od mandrake alata\n"
 #~ "  --incident        - program treba da bude jedan od mandrake alata"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "Connection failed.\n"
diff --git a/perl-install/share/po/sv.po b/perl-install/share/po/sv.po
index 90e0b0f00..d23cee079 100644
--- a/perl-install/share/po/sv.po
+++ b/perl-install/share/po/sv.po
@@ -3,7 +3,7 @@
 # Översättning av DrakX-sv.po till Svenska
 #
 # Copyright (C) 2000,2002,2003, 2004, 2005 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandrakesoft
+# Copyright (c) 2000 Mandriva
 # Fuad Sabanovic <manijak@telia.com>, 2000.
 # Mattias Dahlberg <voz@home.se>, 2001, 2002.
 # Mattias Newzella <newzella@linux.nu>, 2001, 2002,2003.
@@ -77,14 +77,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "USB nyckeln verkar vara skrivskyddad, men det är ej säkert att ta\n"
 "ut den nu.\n"
 "\n"
 "\n"
 "Klicka på knappen för att starta om datorn, ta ut nyckeln och ta\n"
-"bort skrivskyddet. Sätt sedan in den och starta om Mandrake Move."
+"bort skrivskyddet. Sätt sedan in den och starta om Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -102,7 +102,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Din USB nyckel har inga giltiga Windows (FAT) partitioner.\n"
@@ -113,14 +113,14 @@ msgstr ""
 "\n"
 "\n"
 "Du kan även fortsätta utan någon USB nyckel. Du kommer då\n"
-"kunna använda Mandrake Move som en vanlig \"live\" (bootbar) \n"
+"kunna använda Mandriva Move som en vanlig \"live\" (bootbar) \n"
 "operativsystem CD."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -128,11 +128,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Ingen USB nyckel kunde hittas på din dator. Om du kopplar\n"
-"in en USB nyckel nu kommer Mandrake Move kunna spara\n"
+"in en USB nyckel nu kommer Mandriva Move kunna spara\n"
 "alla dina dokument och inställningar för denna och andra \n"
 "datorer på nyckeln. Om du väljer att koppla in en nyckel nu,\n"
 " vänta flera sekunder innan du försöker hitta den, då det tar \n"
@@ -140,7 +140,7 @@ msgstr ""
 "\n"
 "\n"
 "Du kan även fortsätta utan någon USB nyckel. Du kommer då\n"
-"kunna använda Mandrake Move som en vanlig \"live\" (bootbar) \n"
+"kunna använda Mandriva Move som en vanlig \"live\" (bootbar) \n"
 "operativsystem CD."
 
 #: ../move/move.pm:494
@@ -267,7 +267,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -283,7 +283,7 @@ msgstr ""
 "\n"
 "Detta kan ha uppstått på grund av korrupta \n"
 "systemkonfigurationsfiler på USB nyckeln. Radera dom \n"
-"i så fall och starta om Mandrake Move för att åtgärda \n"
+"i så fall och starta om Mandriva Move för att åtgärda \n"
 "problemet. Du kommer då förstås förlora informationen\n"
 "i filerna. För att göra detta, klicka på motsvarande knapp.\n"
 "\n"
@@ -1318,7 +1318,7 @@ msgstr "Språkval"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3749,12 +3749,12 @@ msgstr "aktivera radiostöd"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Innan du fortsätter bör du noga läsa licensen. Den täcker hela\n"
-"Mandrakelinux-distributionen. Om du samtycker med den,\n"
+"Mandrivalinux-distributionen. Om du samtycker med den,\n"
 "kryssa i rutan \"%s\". Om du ej samtycker så klicka på \"%s\"\n"
 "knappen så kommer installationen avbrytas och din dator att\n"
 "startas om."
@@ -3932,13 +3932,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Installationen av Mandrakelinux är utspridd på flera cd-skivor. DrakX\n"
+"Installationen av Mandrivalinux är utspridd på flera cd-skivor. DrakX\n"
 "vet om ett valt paket finns på en annan cd-skiva och kommer att mata ut\n"
 "den aktuella cd:n och be dig sätta in en annan om det blir nödvändigt.\n"
 "Om du inte har efterfrågad CD tillgänglig, klicka på \"%s\" så hoppas\n"
@@ -3948,11 +3948,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4004,12 +4004,12 @@ msgid ""
 "megabytes."
 msgstr ""
 "Det är nu dags att ange vilka program du vill installera på\n"
-"systemet. Det finns flera tusen paket tillgängliga för Mandrakelinux och\n"
+"systemet. Det finns flera tusen paket tillgängliga för Mandrivalinux och\n"
 "för att det ska bli enklare att hantera paketen har de placerats i grupper\n"
 "om liknande program.\n"
 "\n"
 "Paketen är sorterade i grupper som motsvarar olika användningsområden\n"
-"för din dator. Mandrakelinux har fyra fördefinierade kategorier\n"
+"för din dator. Mandrivalinux har fyra fördefinierade kategorier\n"
 " tillgängliga. Du kan blanda program från olika kategorier så att \n"
 "t ex en arbetsstationsinstallation fortfarande kan ha program från \n"
 "kategorin Utveckling installerade.\n"
@@ -4026,7 +4026,7 @@ msgstr ""
 "att program utvecklade på en distribution även\n"
 "kommer att fungera på andra distributioner.)\n"
 "   Om du väljer \"LSB\" gruppen kommer 2.4 kernel serien installeras\n"
-"istället för 2.6 som annars är standard för Mandrakelinux. Detta är\n"
+"istället för 2.6 som annars är standard för Mandrivalinux. Detta är\n"
 "för att uppfylla LSB stöd maximalt. Om du inte väljer \"LSB\" \n"
 "kommer du ändå att ha ett system som är LSB kompatibelt nästan\n"
 "till 100%%.\n"
@@ -4121,10 +4121,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4304,7 +4304,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4359,7 +4359,7 @@ msgid ""
 "not successful in getting the display configured."
 msgstr ""
 "X (som står för X Window System) är hjärtat i det grafiska gränssnittet\n"
-"i GNU/Linux. Alla grafiska miljöer som följer med Mandrakelinux\n"
+"i GNU/Linux. Alla grafiska miljöer som följer med Mandrivalinux\n"
 "(KDE, GNOME, AfterStep, WindowMaker osv) är beroende av det\n"
 "för att fungera.\n"
 "\n"
@@ -4483,12 +4483,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4515,7 +4515,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4524,7 +4524,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4548,7 +4548,7 @@ msgstr ""
 "Linux. Om den är tom eller om ett befintligt operativsystem använder\n"
 "allt tillgängligt utrymme behöver du partitionera den. Att partitionera en\n"
 "hårddisk går ut på att man delar upp den i logiska enheter för att skapa \n"
-"utrymmen åt det nya Mandrakelinux-systemet.\n"
+"utrymmen åt det nya Mandrivalinux-systemet.\n"
 "\n"
 "Eftersom resultatet av en partitionering vanligtvis inte går att ångra\n"
 "kan partitionering kännas skrämmande om du är en ovan användare.\n"
@@ -4576,7 +4576,7 @@ msgstr ""
 "att du nyligen defragmenterat Windows-partitionen och att den använder.\n"
 "formatet FAT. Du rekommenderas dock starkt att först säkerhetskopiera \n"
 "data från Windows-partitionen. Denna lösning rekommenderas om du vill\n"
-" använda både Mandrakelinux och Microsoft Windows på samma dator.\n"
+" använda både Mandrivalinux och Microsoft Windows på samma dator.\n"
 "\n"
 "   Innan du väljer denna lösning måste du vara införstådd med att\n"
 " storleken på Microsoft Windows-partitionen kommer att bli mindre\n"
@@ -4586,7 +4586,7 @@ msgstr ""
 "\n"
 " * \"%s\": Om du vill ta bort alla data och alla\n"
 "partitioner som finns på hårddisken och ersätta dem med ditt nya\n"
-"Mandrakelinux-system, väljer du detta alternativ. Var försiktig med\n"
+"Mandrivalinux-system, väljer du detta alternativ. Var försiktig med\n"
 "detta alternativ eftersom du kan inte ångra dig efteråt.\n"
 "\n"
 "   !! Om du väljer detta alternativ kommer alla data på disken att tas "
@@ -4745,7 +4745,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4767,7 +4767,7 @@ msgstr ""
 "Klicka på \"%s\" när du är redo att formatera partitionerna.\n"
 "\n"
 "Klicka på \"%s\" om du vill välja andra partitioner att installera ditt\n"
-"nya Mandrakelinux-system på.\n"
+"nya Mandrivalinux-system på.\n"
 "\n"
 "Klicka på \"%s\" för att välja på vilka partitioner du vill leta\n"
 "efter felaktiga block."
@@ -4784,7 +4784,7 @@ msgstr "Föregående"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4796,7 +4796,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Sedan denna version av Mandrakelinux gavs ut är det troligt att\n"
+"Sedan denna version av Mandrivalinux gavs ut är det troligt att\n"
 "några paket har uppdaterats. Fel kan ha rättats till och\n"
 "säkerhetsrelaterade problem kan ha lösts. För att du ska kunna ta\n"
 "del av dessa uppdateringar ges du nu möjligheten att ladda ner dem\n"
@@ -4826,7 +4826,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4839,7 +4839,7 @@ msgstr ""
 "påverkar hur lättanvänd datorn blir.\n"
 "Om du inte är säker på vad du ska välja, behåll det förvalda alternativet.\n"
 "Du kan ändra det senare med draksec verktyget, vilket är en del av av\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 "Skriv in email adressen till personen som är ansvarig för säkerheten\n"
 "i \"%s\" fältet. Säkerhetsmeddelanden kommer att mailas till den\n"
@@ -4854,7 +4854,7 @@ msgstr "Säkerhetsadministratör"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4925,7 +4925,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Nu måste du välja vilka partitioner som ska användas för installationen av\n"
-"Mandrakelinux-systemet. Om partitioner redan har definierats, antingen\n"
+"Mandrivalinux-systemet. Om partitioner redan har definierats, antingen\n"
 "från en tidigare installation av GNU/Linux eller av ett annat\n"
 "partitionsverktyg, kan du använda dessa. Annars måste hårddiskpartitioner\n"
 "definieras.\n"
@@ -5012,7 +5012,7 @@ msgstr "Byt mellan normal/expert läge"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5042,7 +5042,7 @@ msgid ""
 msgstr ""
 "Fler än en Microsoft Windows-partition har hittats på hårddisken.\n"
 "Välj vilken av dem du vill ändra storlek på för att kunna installera\n"
-"operativsystemet Mandrakelinux.\n"
+"operativsystemet Mandrivalinux.\n"
 "\n"
 "Varje partition listas som följer: \"Linux-namn\", \"Windows-namn\"\n"
 "\"Kapacitet\".\n"
@@ -5091,7 +5091,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5100,19 +5100,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Detta steg startas endast om en gammal GNU/Linux-partition har hittats\n"
 "på datorn.\n"
 "\n"
 "DrakX behöver veta om du önskar starta en ny installation eller uppdatera\n"
-"ett redan existerande Mandrakelinux-system:\n"
+"ett redan existerande Mandrivalinux-system:\n"
 "\n"
 " * \"%s\" Detta raderar oftast helt det gamla systemet. Om du vill ändra\n"
 "hur hårddiskarna är partitionerade eller ändra filsystemet ska du använda\n"
@@ -5123,11 +5123,11 @@ msgstr ""
 "\n"
 " * \"%s\" detta installationsalternativ uppdaterar de paket som är "
 "installerade\n"
-"på ditt Mandrakelinux-system. Dina nuvarande partitioner och dina\n"
+"på ditt Mandrivalinux-system. Dina nuvarande partitioner och dina\n"
 "användares data kommer inte att förändras. De flesta installationssteg\n"
 "kommer att vara tillgängliga precis som på en vanlig installation.\n"
 "\n"
-"Uppdateringsalternativet bör fungera utmärkt på Mandrakelinux-system\n"
+"Uppdateringsalternativet bör fungera utmärkt på Mandrivalinux-system\n"
 "som är version \"8.1\" eller senare. Att göra en uppdatering av tidigare\n"
 "versioner än \"8.1\" rekommenderas ej."
 
@@ -5187,7 +5187,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5481,7 +5481,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5502,7 +5502,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Här väljer du vilket skrivarsystem du ska använda. Andra operativsystem\n"
@@ -5645,7 +5645,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5662,7 +5662,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5713,7 +5713,7 @@ msgstr ""
 "\n"
 " * \"%s\": konfigurera din anslutning till Internet eller ett\n"
 "lokalt nätverk. Använd eventuell tryckt dokumentation eller använd\n"
-"Mandrakelinux Control Center efter installationen har slutförts för att\n"
+"Mandrivalinux Control Center efter installationen har slutförts för att\n"
 "få tillgång till dokumentation och hjälp med inställningar.\n"
 "\n"
 " * \"%s\" ställa in HTTP- och FTP-proxy inställingar om din\n"
@@ -5729,7 +5729,7 @@ msgstr ""
 "\n"
 " * \"%s\" ändra konfigurationen av din starthanterare.\n"
 " Detta bör endast göras av erfarna användare. \n"
-"Använd tryckt dokumentation eller den inbyggda hjälpen i Mandrakelinux\n"
+"Använd tryckt dokumentation eller den inbyggda hjälpen i Mandrivalinux\n"
 "Control Center för konfiguration av starthanterare\n"
 ".\n"
 " * \"%s\": här kan du ställa in i detalj vilka tjänster som körs på din\n"
@@ -5791,11 +5791,11 @@ msgstr "Tjänster"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Välj vilken hårddisk du vill radera för att kunna installera din nya\n"
-"Mandrakelinux-partition. Var försiktig, alla data som för tillfället\n"
+"Mandrivalinux-partition. Var försiktig, alla data som för tillfället\n"
 "finns på partitionen kommer att gå förlorad och kommer inte att kunna \n"
 "återställas!"
 
@@ -6148,7 +6148,7 @@ msgstr "Räknar ut storleken på Windows-partitionen"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Windows-partitionen är för fragmenterad, kör \"Defrag\" under Windows först."
@@ -6267,19 +6267,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6301,7 +6301,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6309,14 +6309,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6326,7 +6326,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6346,10 +6346,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6360,11 +6360,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6380,7 +6380,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Detta är en inofficiell översättning av licensavtalet för Linux Mandrake.\n"
 "Denna text bestämmer inte reglerna för mjukvara i denna distribution - \n"
@@ -6393,16 +6393,16 @@ msgstr ""
 "\n"
 " Hädanefter avses med beteckningen \"Mjukvaruprodukter\",\n"
 "operativsystemet, samt de olika komponenter som ingår i\n"
-"Mandrakelinux-distributionen. Mjukvaruprodukterna inkluderar, men är\n"
+"Mandrivalinux-distributionen. Mjukvaruprodukterna inkluderar, men är\n"
 "inte begränsade till, programmen, metoderna, reglerna och\n"
 "dokumentationen relaterade till operativsystemet och de olika\n"
-"komponenterna i Mandrakelinux-distributionen.\n"
+"komponenterna i Mandrivalinux-distributionen.\n"
 "\n"
 "\n"
 "1. Licens\n"
 "\n"
 " Läs denna text noggrant. Den är en licensavtal mellan dig\n"
-"och Mandrakesoft S.A., gällande mjukvaruprodukterna. Genom att\n"
+"och Mandriva S.A., gällande mjukvaruprodukterna. Genom att\n"
 "installera, kopiera, eller använda mjukvaruprodukterna på något sätt,\n"
 "accepterar du detta avtal, och godkänner att rätta dig efter dess\n"
 "regler.\n"
@@ -6419,25 +6419,25 @@ msgstr ""
 "\n"
 " Mjukvaruprodukten och medföljande dokumentation tillhandahålls \"som\n"
 "den är\", utan någon som helst garanti, endast begränsat av vad lagen\n"
-"kräver. Mandrakesoft S.A. ska, under inga omständigheter, till den\n"
+"kräver. Mandriva S.A. ska, under inga omständigheter, till den\n"
 "grad lagen tillåter det, hållas ansvariga för olycks-, direkt eller\n"
 "indirekt skada (bland annat, men inte begränsat till, minskad\n"
 "försäljning, drifts-/affärs-avbrott, finansiella förluster,\n"
 "rättsavgifter och böter i en rättsprocess mot er, eller några andra\n"
 "därav följande förluster) som orsakats av användandet, eller oförmågan\n"
-"att använda mjukvaruprodukten, även om Mandrakesoft S.A. skulle ha\n"
+"att använda mjukvaruprodukten, även om Mandriva S.A. skulle ha\n"
 "vetskap om möjligheten av en sådan händelse.\n"
 "\n"
 "BEGRÄNSAT ANSVAR GÄLLANDE ÄGANDET ELLER ANVÄNDANDET AV PROGRAMVARA FÖRBJUDEN "
 "I VISSA LÄNDER\n"
 "\n"
-" Mandrakesoft S.A. ska, under inga omständigheter, till den grad\n"
+" Mandriva S.A. ska, under inga omständigheter, till den grad\n"
 "lagen tillåter det, hållas ansvariga för olycks-, direkt eller\n"
 "indirekt skada (bland annat, men inte begränsat till, minskad\n"
 "försäljning, drifts-/affärs-avbrott, finansiella förluster,\n"
 "rättsavgifter och böter i en rättsprocess mot er, eller några andra\n"
 "därav följande förluster) som orsakats av ägandet, användandet eller\n"
-"nedladdandet, från någon av Mandrakelinux platser, av\n"
+"nedladdandet, från någon av Mandrivalinux platser, av\n"
 "mjukvarukomponenter som är förbjudna eller begränsade av landets\n"
 "lagar. Detta begränsade ansvar gäller bland annat, men är inte\n"
 "begränsat till, det kryptografiska mjukvarukomponenter som ingår i\n"
@@ -6454,9 +6454,9 @@ msgstr ""
 "komponenterna. Läs avtalet för varje enskild komponent noga\n"
 "innan ni använder komponenten i fråga. Varje fråga angående licensen\n"
 "för en given komponent ska ställas till komponentens upphovsman,\n"
-"inte till Mandrakesoft S.A.\n"
-" Program skrivna av Mandrakesoft S.A. distribueras under GPL.\n"
-" Dokumentation skriven av Mandrakesoft S.A. distribueras under en\n"
+"inte till Mandriva S.A.\n"
+" Program skrivna av Mandriva S.A. distribueras under GPL.\n"
+" Dokumentation skriven av Mandriva S.A. distribueras under en\n"
 "speciell licens. Se dokumentationen för detaljer.\n"
 "\n"
 "\n"
@@ -6465,10 +6465,10 @@ msgstr ""
 " Alla rättigheter till Mjukvaruproduktens komponenter tillhör deras\n"
 "respektive upphovsmän och är skyddade av\n"
 "immaterialrätt/copyrightlagstiftning som kan appliceras på mjukvara.\n"
-" Mandrakesoft S.A. har rätt att ändra mjukvaruprodukten, helt eller\n"
+" Mandriva S.A. har rätt att ändra mjukvaruprodukten, helt eller\n"
 "delvis, på alla sätt och för alla ändamål.\n"
-" \"Mandrake\", \"Mandrakelinux\" och associerade logotyper är\n"
-"registrerade varumärken tillhörande Mandrakesoft S.A.\n"
+" \"Mandriva\", \"Mandrivalinux\" och associerade logotyper är\n"
+"registrerade varumärken tillhörande Mandriva S.A.\n"
 "\n"
 "\n"
 "5. Lagar\n"
@@ -6481,7 +6481,7 @@ msgstr ""
 " Alla stridigheter över reglerna i detta avtal ska i första hand\n"
 "göras upp utom domstol, och om detta ej är möjligt, inom en domstol i\n"
 "Paris, Frankrike.\n"
-" För alla frågor rörande denna text, kontakta Mandrakesoft\n"
+" För alla frågor rörande denna text, kontakta Mandriva\n"
 "S.A.\n"
 
 #: install_messages.pm:90
@@ -6573,7 +6573,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6581,19 +6581,19 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Gratulerar! Installationen är färdig.\n"
 "Ta ur diskett och/eller cd-skiva och tryck Enter för att starta om datorn.\n"
 "\n"
-"Information om uppdateringar för denna version av Mandrakelinux hittar du "
+"Information om uppdateringar för denna version av Mandrivalinux hittar du "
 "på:\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Information om anpassning av systemet finns i kapitlet \"post install\" i\n"
-"boken \"Official Mandrakelinux User's Guide\"."
+"boken \"Official Mandrivalinux User's Guide\"."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6617,7 +6617,7 @@ msgstr ""
 "Några viktiga paket blev inte installerade ordentligt.\n"
 "Antingen är cd-enheten eller cd-skivan trasig.\n"
 "Du kan kontrollera cd-skivan på en redan installerad\n"
-"Mandrakelinux-dator med kommandot \"rpm -qpl media/main/*.rpm\".\n"
+"Mandrivalinux-dator med kommandot \"rpm -qpl media/main/*.rpm\".\n"
 
 #: install_steps_auto_install.pm:76 install_steps_stdio.pm:27
 #, c-format
@@ -6628,12 +6628,12 @@ msgstr "Påbörjar steg \"%s\"\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Systemet har ont om resurser. Du kan få problem med att installera\n"
-"Mandrakelinux. Om det blir problem kan du prova den textbaserade\n"
+"Mandrivalinux. Om det blir problem kan du prova den textbaserade\n"
 "installationen istället. För att göra det tryck F1 när du startar\n"
 "från cd-skivan, skriv sedan \"text\"."
 
@@ -7177,9 +7177,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Kontaktar Mandrakelinux webbplats för att hämta listan över tillgängliga "
+"Kontaktar Mandrivalinux webbplats för att hämta listan över tillgängliga "
 "speglar..."
 
 #: install_steps_interactive.pm:840
@@ -7403,8 +7403,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux installation %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux installation %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9993,13 +9993,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Drakfirewall-konfigurator\n"
 "\n"
-"Detta konfigurerar en personlig brandvägg för den här Mandrakelinux-datorn.\n"
+"Detta konfigurerar en personlig brandvägg för den här Mandrivalinux-datorn.\n"
 "För en kraftfull och dedikerad brandväggslösning, se den\n"
 "specialiserade distributionen MandrakeSecurity Firewall."
 
@@ -14060,11 +14060,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"Starta Scannerdrake (Hårdvara/bildläsare i Mandrakelinux kontrollcentral) "
+"Starta Scannerdrake (Hårdvara/bildläsare i Mandrivalinux kontrollcentral) "
 "för att dela din bildläsare över nätverket.\n"
 "\n"
 
@@ -15990,23 +15990,23 @@ msgstr "Stoppa"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Vad är Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Vad är Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Välkommen till <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Välkommen till <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux är en <b>Linuxdistribution</b> som innefattar kärnan av "
+"Mandrivalinux är en <b>Linuxdistribution</b> som innefattar kärnan av "
 "systemet, kallat <b>operativsystemet</b> (baserat på Linuxkärnan), "
 "tillsammans med <b>en massa program</b> som möter varje behov som du kan "
 "tänkas ha."
@@ -16014,11 +16014,11 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux är den mest <b>användarvänliga</b> Linuxdistributionen. "
-"Mandrakelinux är även en av världens <b>mest använda</b> Linux-"
+"Mandrivalinux är den mest <b>användarvänliga</b> Linuxdistributionen. "
+"Mandrivalinux är även en av världens <b>mest använda</b> Linux-"
 "distributioner!"
 
 #: share/advertising/02.pl:13
@@ -16034,14 +16034,14 @@ msgstr "Välkommen till <b>de öppna källkodernas värld</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux stödjer Open Source modellen. Detta betyder att ditt nya "
-"Mandrakelinux-operativsystem och dess många applikationer är resultatet av "
-"ett <b>samarbete </b> mellan <b>Mandrakesofts utvecklare</b> och "
+"Mandrivalinux stödjer Open Source modellen. Detta betyder att ditt nya "
+"Mandrivalinux-operativsystem och dess många applikationer är resultatet av "
+"ett <b>samarbete </b> mellan <b>Mandrivas utvecklare</b> och "
 "<b>bidragsgivare runtom i världen</b>."
 
 #: share/advertising/02.pl:19
@@ -16062,10 +16062,10 @@ msgstr "<b>GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "Det mesta av mjukvaran som medföljer denna distribution och alla "
-"Mandrakelinux verktyg är licensierade under <b>GNU General Public Licence</b>"
+"Mandrivalinux verktyg är licensierade under <b>GNU General Public Licence</b>"
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16091,20 +16091,20 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Anslut dig till Mandrakelinux-gemenskapen!</b>"
+msgstr "<b>Anslut dig till Mandrivalinux-gemenskapen!</b>"
 
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux har en av de <b>största grupperna</b> av användare och "
+"Mandrivalinux har en av de <b>största grupperna</b> av användare och "
 "utvecklare. Sådana grupper utför en stor mängd skilda uppgifter, från att "
 "rapportera buggar och översätta program till att utveckla nya applikationer. "
-"Gemenskapen är en <b>nyckelroll</b> i Mandrakelinux värld."
+"Gemenskapen är en <b>nyckelroll</b> i Mandrivalinux värld."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16125,11 +16125,11 @@ msgstr "<b>Nerladdningsversion</b>."
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Du installerar nu <b>Mandrakelinux Nerladdningsversion</b>. Detta är den "
-"fria gratisversionen som Mandrakesoft vill <b>göra tillgänglig för alla</b>."
+"Du installerar nu <b>Mandrivalinux Nerladdningsversion</b>. Detta är den "
+"fria gratisversionen som Mandriva vill <b>göra tillgänglig för alla</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16160,9 +16160,9 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
-"De <b>tjänster som följer med</b> andra Mandrakesoft produkter är inte "
+"De <b>tjänster som följer med</b> andra Mandriva produkter är inte "
 "heller tillgängliga."
 
 #: share/advertising/06.pl:13
@@ -16172,8 +16172,8 @@ msgstr "<b>Discovery, Din Första Linux Desktop</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Du installerar nu <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Du installerar nu <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16195,17 +16195,17 @@ msgstr "<b>PowerPack, Den ultimata Linux desktopen</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Du installerar nu <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Du installerar nu <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack är Mandrakesofts <b>främsta Linux desktop produkt</b>. PowerPack "
+"PowerPack är Mandrivas <b>främsta Linux desktop produkt</b>. PowerPack "
 "innehåller <b>tusentals applikationer</b> - allt från de mest populära till "
 "de mest avancerade."
 
@@ -16216,8 +16216,8 @@ msgstr "<b>PowerPack+, Linuxlösningen för Desktop och Server</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Du installerar nu <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Du installerar nu <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16233,22 +16233,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesoft Produkter</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva Produkter</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> har utvecklat ett stort antal <b>Mandrakelinux</b> "
+"<b>Mandriva</b> har utvecklat ett stort antal <b>Mandrivalinux</b> "
 "produkter."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux produkterna är:"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux produkterna är:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16268,54 +16268,54 @@ msgstr "\t* <b>PowerPack+</b>, Linuxlösningen för Desktop och Server."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux för x86-64</b>, Mandrakelinux lösningen som utnyttjar "
+"\t* <b>Mandrivalinux för x86-64</b>, Mandrivalinux lösningen som utnyttjar "
 "din 64-bit processor till fullo."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesoft Produkter (Vanliga Produkter)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandriva Produkter (Vanliga Produkter)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft har utvecklat två produkter som gör det möjligt för dig att "
-"använda Mandrakelinux på <b>vilken dator som helst</b> utan att ens behöva "
+"Mandriva har utvecklat två produkter som gör det möjligt för dig att "
+"använda Mandrivalinux på <b>vilken dator som helst</b> utan att ens behöva "
 "installera det."
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, en Mandrakelinux distribution som körs helt och hållet från "
+"\t* <b>Move</b>, en Mandrivalinux distribution som körs helt och hållet från "
 "en bootbar cd-rom skiva."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, en Mandrakelinux distribution som är förinstallerad "
+"\t* <b>GlobeTrotter</b>, en Mandrivalinux distribution som är förinstallerad "
 "på den ultra-kompakta \"LaCie\" mobila hårddisken."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Mandrakesoft Produkter (Professionella lösningar)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Mandriva Produkter (Professionella lösningar)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 "Följande produkter är de som utvecklats för att möta <b>professionella "
@@ -16323,18 +16323,18 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, Mandrakelinux Desktop för företag."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Mandrivalinux Desktop för företag."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Mandrakelinux Server lösning."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandrivalinux Server lösning."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b>, Mandrakelinux Säkerhetslösning"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, Mandrivalinux Säkerhetslösning"
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16378,9 +16378,9 @@ msgstr "<b>Välj din önskade skrivbordsmiljö</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"Med PowerPack kan du välja mellan <b>skrivbordsmiljöer</b>. Mandrakesoft har "
+"Med PowerPack kan du välja mellan <b>skrivbordsmiljöer</b>. Mandriva har "
 "valt <b>KDE</b> som grundvalet."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -16406,9 +16406,9 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"Med PowerPack+ kan du välja mellan <b>skrivbordsmiljöer</b>. Mandrakesoft "
+"Med PowerPack+ kan du välja mellan <b>skrivbordsmiljöer</b>. Mandriva "
 "har valt <b>KDE</b> som grundvalet."
 
 #: share/advertising/14.pl:15
@@ -16536,10 +16536,10 @@ msgstr "<b>Använd ett stort antal applikationer</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"I Mandrakelinux menyn kommer du att hitta <b>lättanvända</b> applikationer "
+"I Mandrivalinux menyn kommer du att hitta <b>lättanvända</b> applikationer "
 "för <b>alla dina behov</b>:"
 
 #: share/advertising/18.pl:16
@@ -16806,18 +16806,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux kontrollcentral</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux kontrollcentral</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrakelinux kontrollcentralen</b> är en grundläggande samling verktyg "
-"specifika för Mandrakelinux för att förenkla konfigurationen av din dator."
+"<b>Mandrivalinux kontrollcentralen</b> är en grundläggande samling verktyg "
+"specifika för Mandrivalinux för att förenkla konfigurationen av din dator."
 
 #: share/advertising/25.pl:17
 #, c-format
@@ -16841,16 +16841,16 @@ msgstr "<b>Modellen för Öppen Källkod</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Som med all dataprogrammering kräver program med öppen källkod <b>tid och "
 "människor</b> för utvecklingen. För att respektera den öppna källkodens "
-"filosofi säljer Mandrakesoft produkter och tjänster för att kunna <b> "
-"fortsätta förbättra Mandrakelinux</b>. Om du vill <b>stödja den öppna "
-"källkodens filosofi</b> och utvecklandet av Mandrakelinux, <b>vänligen</b> "
+"filosofi säljer Mandriva produkter och tjänster för att kunna <b> "
+"fortsätta förbättra Mandrivalinux</b>. Om du vill <b>stödja den öppna "
+"källkodens filosofi</b> och utvecklandet av Mandrivalinux, <b>vänligen</b> "
 "överväg att köpa någon av våra produkter eller tjänster!"
 
 #: share/advertising/27.pl:13
@@ -16861,10 +16861,10 @@ msgstr "<b>Online Butik</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"För att lära dig mera om Mandrakesofts produkten och tjänster, kan du besöka "
+"För att lära dig mera om Mandrivas produkten och tjänster, kan du besöka "
 "vår <b>e-handelsplattform</b>."
 
 #: share/advertising/27.pl:17
@@ -16889,25 +16889,25 @@ msgstr "Stanna upp vid <b>store.mandrakesoft.com</b> idag"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> är det <b>perfekta komplementet</b> till din "
-"Mandrakelinux produkt."
+"<b>Mandriva Club</b> är det <b>perfekta komplementet</b> till din "
+"Mandrivalinux produkt."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 "Dra fördel av <b>värdefulla förmåner</b> genom att ansluta dig till "
-"Mandrakeclub, såsom:"
+"Mandriva Club, såsom:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -16929,40 +16929,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Delta i Mandrakelinux <b>användarforum</b>"
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Delta i Mandrivalinux <b>användarforum</b>"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Förhands- och priviligerad tillgång</b>, före den allmäna "
-"lanseringen, till Mandrakelinux <b>ISO-avbilder</b>."
+"lanseringen, till Mandrivalinux <b>ISO-avbilder</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> är en ny specialtjänst som Mandrakesoft stolt erbjuder "
+"<b>Mandriva Online</b> är en ny specialtjänst som Mandriva stolt erbjuder "
 "sina kunder!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline tillhandahåller en brett register av värdefulla tjänster för "
-"att <b> enkelt uppdatera</b> dina Mandrakelinux system."
+"Mandriva Online tillhandahåller en brett register av värdefulla tjänster för "
+"att <b> enkelt uppdatera</b> dina Mandrivalinux system."
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16986,39 +16986,39 @@ msgstr "\t* Flexibla <b> schemalagda</b> uppdateringar."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
-msgstr "\t* Hantering av <b>alla dina Mandrakelinux system</b> med ett konto."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+msgstr "\t* Hantering av <b>alla dina Mandrivalinux system</b> med ett konto."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Behöver du <b>hjälp?</b> Få kontakt med Mandrakesofts tekniska experter på "
+"Behöver du <b>hjälp?</b> Få kontakt med Mandrivas tekniska experter på "
 "<b>vår tekniska hjälp-plattform</b> www.mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Tack vare hjälp från <b>kvalificerade Mandrakelinux experter</b>, sparar du "
+"Tack vare hjälp från <b>kvalificerade Mandrivalinux experter</b>, sparar du "
 "mycket tid."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"För alla frågor rörande Mandrakelinux, har du möjligheten att köpa support-"
+"För alla frågor rörande Mandrivalinux, har du möjligheten att köpa support-"
 "incidenter på <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17317,8 +17317,8 @@ msgstr "Övervakningsverkty, processhantering, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesoft Guider"
+msgid "Mandriva Wizards"
+msgstr "Mandriva Guider"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17416,8 +17416,8 @@ msgstr ""
 "\n"
 "FLAGGOR:\n"
 "  --help            - visa det här hjälpmeddelandet.\n"
-"  --report          - programmet ska vara ett Mandrakelinux-verktyg\n"
-"  --incident        - programmet ska vara ett Mandrakelinux-verktyg"
+"  --report          - programmet ska vara ett Mandrivalinux-verktyg\n"
+"  --incident        - programmet ska vara ett Mandrivalinux-verktyg"
 
 #: standalone.pm:63
 #, c-format
@@ -17473,7 +17473,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17487,7 +17487,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[FLAGGOR]...\n"
-"konfiguration av Mandrakelinux terminalserver\n"
+"konfiguration av Mandrivalinux terminalserver\n"
 "--enable         : aktivera MTS\n"
 "--disable        : inaktivera MTS\n"
 "--start          : starta MTS\n"
@@ -17544,7 +17544,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17552,7 +17552,7 @@ msgid ""
 msgstr ""
 "[FLAGGOR]...\n"
 "  --no-confirmation      fråga inte den första bekräftelsefrågan "
-"iMandrakeUpdate-läge\n"
+"iMandriva Update-läge\n"
 "  --no-verify-rpm        verifiera inte paketsignaturer\n"
 "  --changelog-first      visa ändringslogg före fillista i "
 "beskrivningsfönstret\n"
@@ -20331,13 +20331,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Felrapporteringsverkyg för Mandrakelinux"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Felrapporteringsverkyg för Mandrivalinux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux kontrollcentral"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux kontrollcentral"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20357,8 +20357,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20402,8 +20402,8 @@ msgstr "Konfigurationsguider"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Välj Mandrakesoft verktyg:"
+msgid "Select Mandriva Tool:"
+msgstr "Välj Mandriva verktyg:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20829,19 +20829,19 @@ msgstr "Startad vid uppstart"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Gränssnittet har inte konfigurerats ännu.\n"
-"Starta guiden \"Lägg till gränssnitt\" från Mandrakelinux kontrollcentral."
+"Starta guiden \"Lägg till gränssnitt\" från Mandrivalinux kontrollcentral."
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Gränssnittet har inte konfigurerats ännu.\n"
-"Starta guiden \"%s\" från Mandrakelinux kontrollcentral."
+"Starta guiden \"%s\" från Mandrivalinux kontrollcentral."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20891,8 +20891,8 @@ msgstr "KDM (KDE inloggningshanterare)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux inloggningshanterare)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux inloggningshanterare)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21191,7 +21191,7 @@ msgstr "Importera"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21200,7 +21200,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 Mandrakesoft \n"
+"Copyright (C) 2001-2002 Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (originalversion)\n"
@@ -21746,14 +21746,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "Detta är fri mjukvara som kan spridas under de villkor som definieras i GNU "
 "GPL.\n"
 "\n"
@@ -21782,8 +21782,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux kontrollcentral"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux kontrollcentral"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25309,8 +25309,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinux verktygens loggar"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinux verktygens loggar"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25825,10 +25825,10 @@ msgstr "Anslutning klar."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Anslutning misslyckades.\n"
-"Verifiera konfigurationen i Mandrakelinux kontrollcentral."
+"Verifiera konfigurationen i Mandrivalinux kontrollcentral."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/ta.po b/perl-install/share/po/ta.po
index b06e3a4a7..1f474d056 100644
--- a/perl-install/share/po/ta.po
+++ b/perl-install/share/po/ta.po
@@ -1,5 +1,5 @@
 # Drak X
-# Copyright (C) 2002 Mandrakesoft
+# Copyright (C) 2002 Mandriva
 #
 # NOTE: use UTF-8 only
 #
@@ -62,7 +62,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -81,7 +81,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -89,7 +89,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -97,7 +97,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -223,7 +223,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1250,7 +1250,7 @@ msgstr "மியான்மர்"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3556,13 +3556,13 @@ msgstr "வாெனாலி ஆதரவை ெசயலபடுத்து"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "உதவி இன்னமும் மொழிபெயர்கப்படவில்லை. Before continuing, you should read carefully "
 "the terms of the license. It\n"
-"covers the whole Mandrakelinux distribution, and if you do not agree with\n"
+"covers the whole Mandrivalinux distribution, and if you do not agree with\n"
 "all the terms in it, click on the \"Refuse\" button which will immediately\n"
 "terminate the installation. To continue with the installation, click on the\n"
 "\"Accept\" button."
@@ -3729,13 +3729,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"உதவி இன்னமும் மொழிபெயர்கப்படவில்லை.The Mandrakelinux installation is spread out "
+"உதவி இன்னமும் மொழிபெயர்கப்படவில்லை.The Mandrivalinux installation is spread out "
 "over several CD-ROMs. DrakX\n"
 "knows if a selected package is located on another CD-ROM and will eject the\n"
 "current CD and ask you to insert a different one as required"
@@ -3744,11 +3744,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3801,7 +3801,7 @@ msgid ""
 msgstr ""
 "உதவி இன்னமும் மொழிபெயர்கப்படவில்லை.It is now time to specify which programs you "
 "wish to install on your\n"
-"system. There are thousands of packages available for Mandrakelinux, and\n"
+"system. There are thousands of packages available for Mandrivalinux, and\n"
 "you are not supposed to know them all by heart.\n"
 "\n"
 "If you are performing a standard installation from a CD-ROM, you will first\n"
@@ -3905,10 +3905,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3944,10 +3944,10 @@ msgstr ""
 "\n"
 "!! If a server package has been selected, either intentionally or because\n"
 "it was part of a whole group, you will be asked to confirm that you really\n"
-"want those servers to be installed. Under Mandrakelinux, any installed\n"
+"want those servers to be installed. Under Mandrivalinux, any installed\n"
 "servers are started by default at boot time. Even if they are safe and have\n"
 "no known issues at the time the distribution was shipped, it may happen\n"
-"that security holes are discovered after this version of Mandrakelinux was\n"
+"that security holes are discovered after this version of Mandrivalinux 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 \"No\". Clicking \"Yes\" will\n"
 "install the listed services and they will be started automatically by\n"
@@ -4081,7 +4081,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4185,12 +4185,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4217,7 +4217,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4226,7 +4226,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4251,7 +4251,7 @@ msgstr ""
 "Linux operating system on your hard drive. If your hard drive is empty or\n"
 "if an existing operating system is using all the available space, you will\n"
 "need to partition it. Basically, partitioning a hard drive consists of\n"
-"logically dividing it to create space to install your new Mandrakelinux\n"
+"logically dividing it to create space to install your new Mandrivalinux\n"
 "system.\n"
 "\n"
 "Because the partitioning process' effects are usually irreversible,\n"
@@ -4260,7 +4260,7 @@ msgstr ""
 "beginning, please consult the manual and take your time.\n"
 "\n"
 "If you are running the installation in Expert mode, you will enter\n"
-"DiskDrake, the Mandrakelinux partitioning tool, which allows you to\n"
+"DiskDrake, the Mandrivalinux partitioning tool, which allows you to\n"
 "fine-tune your partitions. See the DiskDrake section in the ``User Guide''.\n"
 "From the installation interface, you can use the wizards as described here\n"
 "by clicking the dialog's \"Wizard\" button.\n"
@@ -4288,7 +4288,7 @@ msgstr ""
 "be performed without the loss of any data, provided you previously\n"
 "defragment the Windows partition. Backing up your data will not hurt "
 "either..\n"
-"This solution is recommended if you want to use both Mandrakelinux and\n"
+"This solution is recommended if you want to use both Mandrivalinux and\n"
 "Microsoft Windows on the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4297,7 +4297,7 @@ msgstr ""
 "Windows to store your data or to install new software;\n"
 "\n"
 " * \"Erase entire disk\": if you want to delete all data and all partitions\n"
-"present on your hard drive and replace them with your new Mandrakelinux\n"
+"present on your hard drive and replace them with your new Mandrivalinux\n"
 "system, choose this option. Be careful with this solution because you will\n"
 "not be able to revert your choice after you confirm;\n"
 "\n"
@@ -4452,7 +4452,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4478,7 +4478,7 @@ msgstr ""
 "Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
 "Click on \"Cancel\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions that will be checked\n"
 "for bad blocks on the disk."
@@ -4495,7 +4495,7 @@ msgstr "முன்னது"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4538,7 +4538,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4563,7 +4563,7 @@ msgstr "பாதுகாப்பு மேலாளர்(பெயர் அ
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4635,7 +4635,7 @@ msgid ""
 msgstr ""
 "உதவி இன்னமும் மொழிபெயர்கப்படவில்லை.At this point, you need to choose which "
 "partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or from another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -4719,7 +4719,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4750,7 +4750,7 @@ msgstr ""
 "உதவி இன்னமும் மொழிபெயர்கப்படவில்ைல.More than one Microsoft partition has been "
 "detected on your hard drive.\n"
 "Please choose the one you want to resize in order to install your new\n"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4794,7 +4794,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4803,13 +4803,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4861,7 +4861,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5080,7 +5080,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5101,12 +5101,12 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "உதவி இன்னமும் மொழிபெயர்கப்படவில்லை. Here, we select a printing system for your "
 "computer. Other OSs may offer\n"
-"you one, but Mandrakelinux offers three.\n"
+"you one, but Mandrivalinux offers three.\n"
 "\n"
 " * \"pdq\" - which means ``print, do not queue'', is the choice if you have\n"
 "a direct connection to your printer and you want to be able to panic out of\n"
@@ -5254,7 +5254,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5271,7 +5271,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5333,7 +5333,7 @@ msgstr "சேவைகள்"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "உங்கள் கணினியில் மாண்ட்ேரக் லினக்ஸ் இயக்க அமைப்ேபா மட்டும்\n"
@@ -5678,7 +5678,7 @@ msgstr "விண்ேடாஸ் வகிற்றில் உள்ள இ
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "விண்ேடாஸ் வகிர் மிகவும் துண்டாக்கப்பட்டுள்ளது. தயவுசெய்து நீங்கள் கணினியை விண்ேடாஸில் "
@@ -5794,19 +5794,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5828,7 +5828,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5836,14 +5836,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5853,7 +5853,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5873,10 +5873,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5887,11 +5887,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5907,7 +5907,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Introduction\n"
 "\n"
@@ -5918,14 +5918,14 @@ msgstr ""
 "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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5947,7 +5947,7 @@ msgstr ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5955,14 +5955,14 @@ msgstr ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5972,7 +5972,7 @@ msgstr ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5992,10 +5992,10 @@ msgstr ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6006,11 +6006,11 @@ msgstr ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6026,7 +6026,7 @@ msgstr ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6091,7 +6091,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6099,7 +6099,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "வாழ்த்துக்கள், நிறுவுதல் வெற்றிகரமாக முடிந்தது\n"
 "நிறுவல்வட்ைடயும், நிறுவல் சிடியையும் வெளியெ எடுத்துவிட்டு மறுதொடக்கம் செய்யவும்.\n"
@@ -6148,7 +6148,7 @@ msgstr "தற்ேபாது இந்த  `%s நிலைக்கு ச�
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -6681,7 +6681,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr "தற்ேபாதுள்ள இணைப் பதிப்புதளங்களை அறிய மாண்ட்ேரக் இணையதளம் தொடர்புகொள்ளப்படுகிறது"
 
 #: install_steps_interactive.pm:840
@@ -6896,7 +6896,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
 msgstr "மாண்ட்ேரக் லினக்ஸ் நிறுவல்  %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -9480,7 +9480,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -13086,7 +13086,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14782,18 +14782,18 @@ msgstr "நிறுத்து"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, fuzzy, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
 msgstr "மாண்டடிரேக் லினக்ஸுக்கு வருக"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14802,7 +14802,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -14819,9 +14819,9 @@ msgstr "திறந்த மூலநிரல் உலகுக்கு வ
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -14841,7 +14841,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14867,10 +14867,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14889,8 +14889,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14917,7 +14917,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14927,7 +14927,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14946,13 +14946,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14964,7 +14964,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14978,19 +14978,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr "மாண்ட்ேரக் கட்டுப்பட்டு மையம்"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -15011,61 +15011,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -15103,7 +15103,7 @@ msgstr "உங்கள் கோப்பமைப்புக்கு மற�
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -15124,7 +15124,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -15241,7 +15241,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -15476,14 +15476,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr "<b>மாண்ட்ேரக் கட்டுப்பட்டு மையம்</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -15505,9 +15505,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -15519,7 +15519,7 @@ msgstr "மாண்ட்ேரக் கட்டுப்பட்டு ம�
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -15542,20 +15542,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
 msgstr "<b>மாண்ட்ரேக் கிளப்</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -15574,33 +15574,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr "<b>மாண்ட்ேரக்இணைய</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -15623,32 +15623,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
 msgstr "<b>மாண்ட்ரேக் எக்ஸ்பர்ட்</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15939,7 +15939,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr "மாண்ட்ேரக் கட்டுப்பட்டு மையம்"
 
 #: share/compssUsers.pl:197
@@ -16035,7 +16035,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16083,7 +16083,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -18543,12 +18543,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "டிரேக்பிழை  அறிவிப்பாளன் கருவி"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
 msgstr "மாண்ட்ேரக் கட்டுப்பட்டு மையம்"
 
 #: standalone/drakbug:48
@@ -18569,7 +18569,7 @@ msgstr "டிரேக்வன்ெபாருள்"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "மாண்ட்ேரக்இணைய"
 
 #: standalone/drakbug:52
@@ -18614,7 +18614,7 @@ msgstr "டிரேக்மாயாவிகள்"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -19026,7 +19026,7 @@ msgstr "தொடங்கும்போதே துவக்கிவிட�
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "இந்த வலையமைப்பு அட்ைட இன்னும் வடிவமைக்கப்படவில்ைல\n"
 "இதற்க்கான மாயாவியைத் துவக்கு"
@@ -19035,7 +19035,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "இந்த வலையமைப்பு அட்ைட இன்னும் வடிவமைக்கப்படவில்ைல\n"
 "இதற்க்கான மாயாவியைத் துவக்கு"
@@ -19088,7 +19088,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -19378,7 +19378,7 @@ msgstr "இறக்குமதி செய்"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19866,7 +19866,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -19893,7 +19893,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "மாண்ட்ேரக் கட்டுப்பட்டு மையம்"
 
 #: standalone/drakhelp:36
@@ -22890,7 +22890,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "மாண்ட்ேரக் கட்டுப்பாடு மையம்"
 
 #: standalone/logdrake:51
@@ -23394,7 +23394,7 @@ msgstr "தொடர்பு வேகம்: "
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
@@ -24235,7 +24235,7 @@ msgstr "நிறுவுதலில் பிழை நேர்ந்து�
 #~ msgstr "நுழைவிடத்தை நீக்கு"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
+#~ msgid "Mandriva Wizards"
 #~ msgstr "மாண்ட்ேரக் கட்டுப்பட்டு மையம்"
 
 #~ msgid "No browser available! Please install one"
@@ -24692,7 +24692,7 @@ msgstr "நிறுவுதலில் பிழை நேர்ந்து�
 #~ msgid "mkraid failed"
 #~ msgstr "mkraid தோல்வியடைந்தது"
 
-#~ msgid "Mandrake Online"
+#~ msgid "Mandriva Online"
 #~ msgstr "மாண்ட்ேரக்இணைய"
 
 #~ msgid "The package %s is needed. Install it?"
diff --git a/perl-install/share/po/tg.po b/perl-install/share/po/tg.po
index 8d63fe7b0..169be1240 100644
--- a/perl-install/share/po/tg.po
+++ b/perl-install/share/po/tg.po
@@ -76,7 +76,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Эҳтимолан дар калиди USB муҳофизат аз навиштан даргиронида\n"
 "шудааст, лекин ҳозир бехатар баровардани он нашуда истодааст.\n"
@@ -84,7 +84,7 @@ msgstr ""
 "\n"
 "Ба тугма барои боркунии мошина ангушт занед, онро бароред,\n"
 "муҳофизат аз навиштанро хориҷ кунед, аз нав калидро ворид намоед ва бори "
-"дигар Mandrake Move-ро сар диҳед."
+"дигар Mandriva Move-ро сар диҳед."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -102,7 +102,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Калиди USB-и шумо ягон бахши дурусти Windows (FAT)-ро надорад.\n"
@@ -113,14 +113,14 @@ msgstr ""
 "\n"
 "\n"
 "Инчунин шумо метавонед бе калиди USB давом диҳед - дар ин ҳолат\n"
-"шумо қодиред, ки Mandrake Move-ро ҳамчун live Mandrake\n"
+"шумо қодиред, ки Mandriva Move-ро ҳамчун live Mandriva\n"
 "Operating System истифода баред."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -128,11 +128,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Дар системаи шумо ягон калиди USB пайдо нагардид. Агар шумо\n"
-"USB калидро ҳозир ворид кунед, Mandrake Move имконияти\n"
+"USB калидро ҳозир ворид кунед, Mandriva Move имконияти\n"
 "восеҳи захиракунии додаҳоро дар феҳристи хонагии шумо,\n"
 "батанзимдарории васеъи система барои худборшавии оянда\n"
 "дар ин ё он компютер, медиҳад. Қайд: агар шумо калидро ҳозир\n"
@@ -140,7 +140,7 @@ msgstr ""
 "\n"
 "\n"
 "Инчунин шумо метавонед бе калиди USB давом диҳед,\n"
-"шумо ҳоло имконияти истифодаи Mandrake Move-ро\n"
+"шумо ҳоло имконияти истифодаи Mandriva Move-ро\n"
 "ҳамчун Системаи Амалии Mandrake доред."
 
 #: ../move/move.pm:494
@@ -270,7 +270,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -286,7 +286,7 @@ msgstr ""
 "\n"
 "Он мумкин аст аз сабаби харобии файлҳои батанзимдарории\n"
 "системавӣ дар калиди USB рух дода бошад, дар ин ҳолат\n"
-"хориҷкунии ____ ва бозборкунии Mandrake Move масъаларо\n"
+"хориҷкунии ____ ва бозборкунии Mandriva Move масъаларо\n"
 "ҳал кунад. Барои ин ба тугмаи мувофиқ ангушт занед.\n"
 "\n"
 "\n"
@@ -1332,11 +1332,11 @@ msgstr "Интихоби забон"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux якчанд забонҳоро дастгирӣ менамояд. Забонҳоеро интихоб намоед, "
+"Mandrivalinux якчанд забонҳоро дастгирӣ менамояд. Забонҳоеро интихоб намоед, "
 "ки\n"
 "шумо онҳоро коргузорӣ кардан мехоҳед. Вақте ки коргузорӣ ба итмом мерасад "
 "онҳо\n"
@@ -3780,12 +3780,12 @@ msgstr "даргиронидани пуштибонии радио"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Пеш аз давомдиҳӣ шумо бояд шартҳои литсензияро бо диққат хонед. Он\n"
-"ба ҳамаи тақсимоти  Mandrakelinux паҳн гардидааст. Агар шумо ба\n"
+"ба ҳамаи тақсимоти  Mandrivalinux паҳн гардидааст. Агар шумо ба\n"
 "ҳамаи шартҳои литсензия розӣ бошед, пункти \"%s\"-ро қайд кунед. Агар розӣ\n"
 "набошед, танҳо \"%s\" компютери худро хомӯш созед."
 
@@ -3975,13 +3975,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Коргузории Mandrakelinux дар CD-ROM-ҳои мухталиф тақсим шудааст. Агар\n"
+"Коргузории Mandrivalinux дар CD-ROM-ҳои мухталиф тақсим шудааст. Агар\n"
 "бастаи интихобшуда дар дигар CD-ROM ҷойгир бошад, DrakX диски фишурдаи\n"
 "ҷориро ба берун кашида аз шумо вогузории диски талабшударо пурсон мешавад.\n"
 "Агар шумо дар даст диски фишурдаи талабшударо надошта бошед, танҳо ба \"%s\" "
@@ -3992,11 +3992,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4048,11 +4048,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4158,10 +4158,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4193,11 +4193,11 @@ msgstr ""
 "!! Агар бастаи хидматрасонро интихоб карда бошед, хоҳ барои интихоби муайяни "
 "бастаи алоҳида, хоҳ барои он ки вай як қисми гурӯҳӣ баста\n"
 "аст, шумо бояд тасдиқ кунед, ки дар ҳақиқат ин хидматрасонҳои\n"
-"коргузоришавандаро истифода бурдан мехоҳед. Дар Mandrakelinux\n"
+"коргузоришавандаро истифода бурдан мехоҳед. Дар Mandrivalinux\n"
 "ҳамаи хидматрасонҳои коргузоришуда ҳангоми оғозёбӣ ба таври худкор, бо "
 "нобаёнӣ сар дода мешаванд. Ҳарчанде, ки онҳо бехатаранд ва муаммоҳои\n"
 "маълумро ҳангоми даргиронидан дар тақсимот надоранд, мумкин аст, ки\n"
-"дар бехатарӣ баъди барориши нусхаи хотимавии Mandrakelinux\n"
+"дар бехатарӣ баъди барориши нусхаи хотимавии Mandrivalinux\n"
 "сӯрохиҳои муайян мешаванд. Агар шумо надонед, ки барои чӣ ин ё он\n"
 "хидматрасон лозим аст ё барои чӣ он коргузорӣ мегардад пас ба \"%s\"\n"
 "ангушт занед. Бо пахшкунии \"%s\" шумо хидматрасонҳои номбаршударо\n"
@@ -4361,7 +4361,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4417,7 +4417,7 @@ msgid ""
 msgstr ""
 "X (барои системи X Window) ин асоси интерфейси графикии GNU/Linux мебошад,\n"
 "ки дар он ҳамаи муҳитҳои графикӣ асос ёфтааст (KDE, GNOME, AfterStep,\n"
-"WindowMaker ва ғайра) ва ба ҳайати Mandrakelinux дохил аст.\n"
+"WindowMaker ва ғайра) ва ба ҳайати Mandrivalinux дохил аст.\n"
 "\n"
 "Ба шумо рӯйхати параметрҳои гуногуне ки ба тағироти гирифтани тасвири\n"
 "беҳтарини графикӣ пешбинӣ шудааст, дода мешавад: Корти графикӣ\n"
@@ -4550,12 +4550,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4582,7 +4582,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4591,7 +4591,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4612,12 +4612,12 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Дар ин қадам шумо бояд дар куҷои гардонандаи сахт ҷойгир кардани\n"
-"системаи омили Mandrakelinux-ро ҳал кунед. Агар гардонандаи сахти\n"
+"системаи омили Mandrivalinux-ро ҳал кунед. Агар гардонандаи сахти\n"
 "шумо холӣ бошад ё системаи омили ҳозирбуда ҳамаи фазои имконпазирро\n"
 "ишғол кунад, ба шумо лозим меояд, ки гардонандаи сахти худро\n"
 "бахшбандӣ кунед. Бахшбандикунии гардонандаи сахт асосан аз тақсимоти "
 "мантиқии фазои ишғолшуда барои коргузории системаи омилии \n"
-"Mandrakelinux иборат аст.\n"
+"Mandrivalinux иборат аст.\n"
 "\n"
 "Азбаски ҷараёни бахшбандии гардонандаи сахт одатан барнагарданда\n"
 "аст ва ба гумшавии додаҳо оварда расониданаш мумкин аст, агар дар "
@@ -4659,7 +4659,7 @@ msgstr ""
 "\n"
 " * \"%s\": агар шумо хоҳед, ки ҳамаи додаҳоро дар ҳама қисматҳои\n"
 "дар гардонандаи сахти худ мавҷудбударо нобуд созед ва ҷои онҳоро бо системаи "
-"нави Mandrakelinux иваз кунед, ин хосиятро интихоб\n"
+"нави Mandrivalinux иваз кунед, ин хосиятро интихоб\n"
 "кунед. Эҳтиёт бошед, зеро баъди тасдиқот шумо интихоби худро\n"
 "баргардонида наметавонед.\n"
 "\n"
@@ -4824,7 +4824,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4848,7 +4848,7 @@ msgstr ""
 "Агар шумо ба шаклбандии бахшҳо тайёр бошед ба \"%s\" ангушт занед.\n"
 "\n"
 "Агар шумо хоҳед, ки дигар бахшҳоро барои коргузории системаи\n"
-"омилии навъи Mandrakelinux интихоб кунед ба \"%s\" ангушт занед.\n"
+"омилии навъи Mandrivalinux интихоб кунед ба \"%s\" ангушт занед.\n"
 "\n"
 "Агар хоҳед бахшҳоеро, ки дар диск ба мавҷудияти қисмҳои бад\n"
 "тафтиш карда шаванд интихоб намоед, ба \"%s\" ангушт занед."
@@ -4865,7 +4865,7 @@ msgstr "Гузашта"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4877,7 +4877,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Ҳангоми коргузории Mandrakelinux хуб мешуд, ки баъзе бастаи\n"
+"Ҳангоми коргузории Mandrivalinux хуб мешуд, ки баъзе бастаи\n"
 "барномаҳо нав карда шаванд, аз рӯзи барориши ибтидоӣ. Эҳтимолан\n"
 "баъзе хатогиҳо ислоҳ шудаанд ва дархостҳо оиди бехтарӣ ҳал шудаанд.\n"
 "Барои гирифтани фоида аз ин навсозиҳо, ҳозир ба шумо боркунии онҳо аз "
@@ -4908,7 +4908,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4938,7 +4938,7 @@ msgstr "Идоракунандаи Бехатарӣ"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -5009,7 +5009,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Дар ин пункт шумо бояд интихоб намоед, ки кадом бахш(ҳо) барои\n"
-"коргузории системавӣ Mandrakelinux-и шумо истифода бурда мешаванд.\n"
+"коргузории системавӣ Mandrivalinux-и шумо истифода бурда мешаванд.\n"
 "Агар бахшҳои алоқаи аз коргузории пешинаи GNU/Linux ё аз дигар\n"
 "асбоби бахшбандикунӣ муайян шуда бошад, шумо метавонед бахшҳои мавҷударо "
 "истифода баред. Дар дигар ҳолат бояд бахшҳои гардонандаи\n"
@@ -5103,7 +5103,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5133,7 +5133,7 @@ msgid ""
 msgstr ""
 "Дар гардонандаи сахти шумо зиёда аз як бахши Microsoft муайян гардид.\n"
 "Марҳамат карда бахшеро, ки барои коргузории системаи нави омили\n"
-"Mandrakelinux андозаи онро тағир додан мехоҳед, интихоб намоед.\n"
+"Mandrivalinux андозаи онро тағир додан мехоҳед, интихоб намоед.\n"
 "\n"
 "Ҳар бахш ба таври зерин ба рӯйхат гирифта мешавад: \"ном дар Linux\",\n"
 "\"ном дар Windows\" \"Ғунҷоиш\".\n"
@@ -5184,7 +5184,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5193,19 +5193,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Ин қадам танҳо дар он ҳолате фаъол мегардад, ки дар мошинаи шумо\n"
 "бахши кӯҳнаи GNU/Linux пайдо гардад.\n"
 "\n"
 "DrakX бояд донад, ки оё шумо мехоҳед, ки коргузории навро гузаронед\n"
-"ё системаи Mandrakelinux-и мавҷударо афзоиш диҳед:\n"
+"ё системаи Mandrivalinux-и мавҷударо афзоиш диҳед:\n"
 "\n"
 " * \"%s\": Дар бисёр ҳолатҳо ин вариант ба нобудшавии системаи кӯҳна\n"
 "оварда мерасонад. Агар хоҳед, ки бахшҳои гардонандаи сахти худро иваз\n"
@@ -5214,14 +5214,14 @@ msgstr ""
 "додаҳои мавҷудаи худро аз бознависӣ захира карда метавонанд.\n"
 "\n"
 " * \"%s\": ин синфи коргузорӣ ба шумо имконияти авкунии бастаи\n"
-"барномаҳои дар системаи Mandrakelinux-и коргузоришударо медиҳад.\n"
+"барномаҳои дар системаи Mandrivalinux-и коргузоришударо медиҳад.\n"
 "Нақшаи бахшбандии ҷорӣ ва додаҳои корванд, ивазнашавандаанд.\n"
 "Бештари дигар қадамҳо низ дастрас мегарданд, ба монанди коргузории "
 "низоммеъёр.\n"
 "\n"
-"Интихоби хосияти ``Густариш'' дар системаҳои Mandrakelinux аз нусхаи\n"
+"Интихоби хосияти ``Густариш'' дар системаҳои Mandrivalinux аз нусхаи\n"
 "\"8.1\" сар карда то охирон хеле хуб хоҳад кор кард. Гузаронидани Густариш\n"
-"дар системаҳои Mandrakelinux болотар аз \"8.1\" маслиҳат дода мешавад."
+"дар системаҳои Mandrivalinux болотар аз \"8.1\" маслиҳат дода мешавад."
 
 #: help.pm:591
 #, c-format
@@ -5278,7 +5278,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5547,7 +5547,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5568,11 +5568,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Ҳоло вақте расидааст барои интихоби системаи чопкунӣ барои компютери\n"
-"шумо. Дигар СО ба шумо як намудро пешкаш карда метавонад, Mandrakelinux\n"
+"шумо. Дигар СО ба шумо як намудро пешкаш карда метавонад, Mandrivalinux\n"
 "бошад, ду намудро. Ҳар яке аз системаҳо барои батанзимдарории\n"
 "муайяни беҳтарин мебошад.\n"
 "\n"
@@ -5720,7 +5720,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5737,7 +5737,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5862,11 +5862,11 @@ msgstr "Хидматрасонҳо"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Диски сахтеро, интихоб намоед, ки шумо онро барои офаридани қисми\n"
-"Mandrakelinux дур намудан мехоҳед. Эҳтиёт шавед, ки дар он ҳамаи\n"
+"Mandrivalinux дур намудан мехоҳед. Эҳтиёт шавед, ки дар он ҳамаи\n"
 "додаҳои мавҷуд буда гум хоҳад шуд ва он барқарор намегардад!"
 
 #: help.pm:863
@@ -6225,12 +6225,12 @@ msgstr "Андозаи бахшбандии Windows ҳисоб шуда исто
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Қисми Windows-и шумо бениҳоят тика гардидааст. Лутфан, компютери худро дар "
 "зери Windows аз сари нав оғоз намоед, ``defrag''-ро ба кор андозед ва сониян "
-"такроран коргузории Mandrakelinux-ро мавриди истифодабарӣ қарор диҳед."
+"такроран коргузории Mandrivalinux-ро мавриди истифодабарӣ қарор диҳед."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6347,19 +6347,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6381,7 +6381,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6389,14 +6389,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6406,7 +6406,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6426,10 +6426,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6440,11 +6440,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6460,21 +6460,21 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Муқаддима\n"
-"Системи операсионӣ ва қисмҳои гуногуне ки дар тақсимоти Mandrakelinux \n"
+"Системи операсионӣ ва қисмҳои гуногуне ки дар тақсимоти Mandrivalinux \n"
 "дастрас мебошад баъдан \"Маҳсулотҳои Нармафзор\" номида мешавад.\n"
 "Маҳсулотҳои Нармафзор иборат аст аз маҷмӯи барномаҳо, усулҳо, қоидаҳо\n"
 "ва ҳуҷҷатҳое ки бо системи операсионӣ ва қисмҳои гуногуни тақсимоти\n"
-"Mandrakelinux алоқаманд аст.\n"
+"Mandrivalinux алоқаманд аст.\n"
 "\n"
 "\n"
 "1. Шартномаи Лисензионӣ\n"
 "\n"
 "Лутфан ин ҳучҷатро бо диққат хонед. Ҳуҷҷати мазкур ин шартномаи лисензионӣ "
 "байни шумо ва \n"
-"Mandrakesoft S.A., ки он ба Маҳсулотҳои Нармафзор тааллуқ дорад.\n"
+"Mandriva S.A., ки он ба Маҳсулотҳои Нармафзор тааллуқ дорад.\n"
 "Маҳсулотҳои Барномавиро муқаррар намуда, чоп намуда ва истифода намудан бо "
 "мақсадҳои дигар шумо комилан бо шарту қоидаҳои шартномаи мазкур розӣ "
 "мебошед. Агар шумо бо яке аз қисмҳои Шартномаи мазкур розӣ набошед, онгоҳ ба "
@@ -6490,16 +6490,16 @@ msgstr ""
 "\n"
 "Маҳсулотҳои Барномавӣ ва ҳуҷҷати пешниҳодшуда бечунучаро\"мебошад\"бе ҳеҷ "
 "кафолат дар доираи қонун.\n"
-"Mandrakesoft S.A. дар ягон ҳолате аз тарафи қонун пешбинӣ шуда маъсулятро "
+"Mandriva S.A. дар ягон ҳолате аз тарафи қонун пешбинӣ шуда маъсулятро "
 "барои камбудии муаяйне, тасодуфӣ, бевосита ва бавосита (аз он ҷумла камбудии "
 "беҳудуд аз муфлисшавии бизнес, танаффус дар фаъолияти тиҷоратӣ, муфлисшавии "
 "молиявӣ, хароҷотҳои судӣ ва ҷаримаҳое ки натиҷаи мубоҳисаи судӣ мебошад ё "
 "дигар камбудиҳои бавосита), ки натиҷаи истифодаи Маҳсулотҳои Барномавӣ, "
-"ҳатто агар ба Mandrakesoft S.A. маълум бошад дар хусуси имконият ё ин ки "
+"ҳатто агар ба Mandriva S.A. маълум бошад дар хусуси имконият ё ин ки "
 "ҳолати чунин камбудӣ\n"
 "\n"
 "ӮҲДАДОРИИ МАҲДУДНОКЕ БО НИГОҲДОРӢ ВА ИСТИФОДАИ ТАЪМИНОТИ БАРНОМАВӢ ДАР ЯК "
-"ЧАНД МАМЛАКАТҲО ВОБАСТА АСТ Мувофиқи доираҳои қонунӣ Mandrakesoft S.A. ва "
+"ЧАНД МАМЛАКАТҲО ВОБАСТА АСТ Мувофиқи доираҳои қонунӣ Mandriva S.A. ва "
 "паҳнкунандагони он бе ҳеҷ шарту асос маъсулиятро В пределах, дозволенных "
 "законом, или ее распространители\n"
 "ни при каких условиях не несут ответственности за любой, какой бы то ни "
@@ -6511,7 +6511,7 @@ msgstr ""
 "разбирательств, или любых других косвенных потерь), являющихся результатом\n"
 "владения и использования компонентов программного обеспечения,\n"
 "или являющихся результатом скачивания компонентов программного обеспечения\n"
-"с одного из сайтов Mandrakelinux, запрещенных или ограниченных в некоторых\n"
+"с одного из сайтов Mandrivalinux, запрещенных или ограниченных в некоторых\n"
 "странах местными законами.\n"
 "Ограниченная ответственность применяется, но не ограничивается,\n"
 "к компонентам сильной криптографии, включаемых в Программные Продукты.\n"
@@ -6527,10 +6527,10 @@ msgstr ""
 "они распространяются. Пожалуйста, внимательно читайте условия и положения\n"
 "лицензионного соглашения для каждого из компонент перед использованием\n"
 "любого компонента. Любые вопросы по лицензии компонента должны быть\n"
-"адресованы автору компонента, а не Mandrakesoft.\n"
-"Программы, разработанные Mandrakesoft S.A., находятся под действием "
+"адресованы автору компонента, а не Mandriva.\n"
+"Программы, разработанные Mandriva S.A., находятся под действием "
 "лицензии\n"
-"GPL. Документация, написанная Mandrakesoft S.A., находится под действием\n"
+"GPL. Документация, написанная Mandriva S.A., находится под действием\n"
 "особой лицензии. Пожалуйста, обратитесь к документации за дополнительной\n"
 "информацией.\n"
 "\n"
@@ -6540,11 +6540,11 @@ msgstr ""
 "соответствующим\n"
 "авторам и защищены законами об интеллектуальной собственности и авторском\n"
 "праве, применительно к программному обеспечению.\n"
-"Mandrakesoft S.A. сохраняет за собой право изменять или адаптировать\n"
+"Mandriva S.A. сохраняет за собой право изменять или адаптировать\n"
 "Программные Продукты, как целиком, так и по частям, любым способом и для\n"
 "любых целей.\n"
-"\"Mandrake\", \"Mandrakelinux\" и соответствующие логотипы являются "
-"торговыми марками Mandrakesoft S.A.\n"
+"\"Mandriva\", \"Mandrivalinux\" и соответствующие логотипы являются "
+"торговыми марками Mandriva S.A.\n"
 "\n"
 "\n"
 "5. Основные законы\n"
@@ -6559,7 +6559,7 @@ msgstr ""
 "будут оспариваться в суде. В последнюю очередь оспаривание вопроса будет "
 "передано в соответствующий Законодательный Суд Парижа - Франция. По любым "
 "вопросам, касающимся этого документа, пожалуйста, свяжитесь\n"
-"с Mandrakesoft S.A.\n"
+"с Mandriva S.A.\n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6659,7 +6659,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6667,14 +6667,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Табрикоти моро қабул намоед, коргузорӣ ба итмом расид.\n"
 "Расонаи худборшавиро дур намоед ва барои бозхудборшавӣ ба Enter ангушт "
 "занед.\n"
 "\n"
 "\n"
-"Барои гирифтани маълумот оиди собитии барои ин нусхаи Mandrakelinux дастрас\n"
+"Барои гирифтани маълумот оиди собитии барои ин нусхаи Mandrivalinux дастрас\n"
 "буда ба Рӯйхати хатогиҳо муроҷиат намоед, ки мавҷуд аст дар:\n"
 "\n"
 "\n"
@@ -6682,7 +6682,7 @@ msgstr ""
 "\n"
 "\n"
 "Маълумот оиди танзимдарории системи шумо дар порчаи post install-и\n"
-"Дастуамали Расмиии Корванди Mandrakelinux мавҷуд аст."
+"Дастуамали Расмиии Корванди Mandrivalinux мавҷуд аст."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6717,11 +6717,11 @@ msgstr "Гузориш ба қадами `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Дар системи шумо захира кам аст. Ҳангоми коргузорӣ намудани Mandrakelinux "
+"Дар системи шумо захира кам аст. Ҳангоми коргузорӣ намудани Mandrivalinux "
 "шумо метавонед бо муаммоҳо дучор гардед. Агар ин рӯй диҳад, онгоҳ шумо "
 "метавонед коргузории матниро ба амал оред. Ҳангоми худборкунии CDROM ба`F1' "
 "ангушт занед  ва сониян ба `text' дохил шавед."
@@ -7276,7 +7276,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
 "Барои ба даст даровардани рӯйхати қуттиҳои дастрас пайвастшавӣ ба Mandrake "
 "Linuxweb site ба роҳ монда шудааст..."
@@ -7505,8 +7505,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Коргузории Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Коргузории Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10095,13 +10095,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Танзимгари drakfirewall\n"
 "\n"
-"Вай фейрволҳои шахсиро барои ин мошинаи Mandrakelinux ба танзим медарорад.\n"
+"Вай фейрволҳои шахсиро барои ин мошинаи Mandrivalinux ба танзим медарорад.\n"
 "Барои ҳалли фейрволи тахассуснок ва пуриқтидор, марҳамат карда ба тақсимоти\n"
 "MandrakeSecurity Firewall нигаред."
 
@@ -14196,7 +14196,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -16200,33 +16200,33 @@ msgstr "Ист"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mandrakelinux чист?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Mandrivalinux чист?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Марҳамат ба <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Марҳамат ба <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux ин <b>тақсимоти Linux</b>, ки дар худ ҳастаи системаро дарбар "
+"Mandrivalinux ин <b>тақсимоти Linux</b>, ки дар худ ҳастаи системаро дарбар "
 "мегирад ва он <b>системаи омил</b> ном дорад (ба ҳастаи Linux асос ёфтааст) "
 "ба ҳамроҳии <b>замимаҳои бисёр</b> ба дилхоҳ дархости шумо ҷавобгӯ аст."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Дар айни замон Mandrakelinux ин тақсимоти бештар <b>бо корванд иртиботи "
+"Дар айни замон Mandrivalinux ин тақсимоти бештар <b>бо корванд иртиботи "
 "дӯстона доштаи</b> Linux мебошад. Инчунин он тақсимоти ҷаҳонии Linux-и "
 "<b>васеъ истифодашаванда</b> мебошад!"
 
@@ -16243,14 +16243,14 @@ msgstr "Марҳамат ба <b>ҷаҳони сарчашмаи кушод<b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux ба усули сарчашмаи кушод масъул аст. Ин маънои онро дорад, ки "
+"Mandrivalinux ба усули сарчашмаи кушод масъул аст. Ин маънои онро дорад, ки "
 "ин барориши нав натиҷаи <b>ҳамкории</b> байни <b>гурӯҳи коргардонони "
-"Mandrakesoft</b> ва <b>ҷамъияти шабакаи ҷаҳонии</b> ҳамкорони Mandrakelinux "
+"Mandriva</b> ва <b>ҷамъияти шабакаи ҷаҳонии</b> ҳамкорони Mandrivalinux "
 "мебошад."
 
 #: share/advertising/02.pl:19
@@ -16271,10 +16271,10 @@ msgstr "<b>GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "Бештари таъминотҳои барномавӣ ба тақсимот ҳамроҳ карда шудаанд ва ҳамаи "
-"асбобҳои Mandrakelinux ҷавознома таҳти <b>Ҷавозномаи Умумии Оммавӣ<b> доранд."
+"асбобҳои Mandrivalinux ҷавознома таҳти <b>Ҷавозномаи Умумии Оммавӣ<b> доранд."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16304,15 +16304,15 @@ msgstr "<b>Ба Ҷамъомад ҳамроҳ шавед!</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux яке аз <b>ҷамъиятҳои калонтарини</b> корвандон ва "
+"Mandrivalinux яке аз <b>ҷамъиятҳои калонтарини</b> корвандон ва "
 "коргардононро дорад. Вазифаи чунин ҷамъият хеле васеъ аст, аз маърӯза оиди "
 "хатогӣ то коркарди замимаҳои нав. Ҷамъият <b>мавқеъи асосиро</b> дар ҷаҳони "
-"Mandrakelinux ишғол мекунад."
+"Mandrivalinux ишғол мекунад."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16334,11 +16334,11 @@ msgstr "<b>Нусхаи Корандозӣ<b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Дар айни замон шумо <b>Mandrakelinux Download</b>-ро коргузорӣ карна "
-"истодаед. Ин нисхаи озоде, ки онро Mandrakesoft  <b>ба ҳама дастрас кардан</"
+"Дар айни замон шумо <b>Mandrivalinux Download</b>-ро коргузорӣ карна "
+"истодаед. Ин нисхаи озоде, ки онро Mandriva  <b>ба ҳама дастрас кардан</"
 "b> мехоҳад."
 
 #: share/advertising/05.pl:19
@@ -16372,10 +16372,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Шимо инчунин ба <b>хидматҳои ҳамроҳшуда</b> ба дигар маҳсулотҳои "
-"Mandrakesoft дастрасӣ пайдо намекунед."
+"Mandriva дастрасӣ пайдо намекунед."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16384,9 +16384,9 @@ msgstr "<b>Discovery,Мизи Кории Якуми Linux-и Шумо</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
-"Дар айни замон шумо <b>Mandrakelinux Discovery</b>-ро коргузорӣ карда "
+"Дар айни замон шумо <b>Mandrivalinux Discovery</b>-ро коргузорӣ карда "
 "истодаед."
 
 #: share/advertising/06.pl:17
@@ -16409,19 +16409,19 @@ msgstr "<b>PowerPack,Мизи Кории Ниҳоии Linux</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
-"Дар айни замон шумо <b>Mandrakelinux PowerPack</b>-ро коргузорӣ карна "
+"Дар айни замон шумо <b>Mandrivalinux PowerPack</b>-ро коргузорӣ карна "
 "истодаед"
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack ин маҳсулоти асосии <b>мизи кории Mandrakesoft<b> мебошад. Илова "
+"PowerPack ин маҳсулоти асосии <b>мизи кории Mandriva<b> мебошад. Илова "
 "он ки вай тақсимоти Linux-и соддатарин ва бо корванд хеле иртиботи дӯстона "
 "дорад, PowerPack боз ҳазорҳо <b>замимаҳоро<b> дар бар мегирад: аз ҳама "
 "машҳуртарин сар карда то бисёртехникӣ."
@@ -16433,9 +16433,9 @@ msgstr "<b>PowerPack+, Ҳалнокии Linux барои Мизҳои Корӣ �
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
-"Дар айни замон шумо <b>Mandrakelinux PowerPack+</b>-ро коргузорӣ карна "
+"Дар айни замон шумо <b>Mandrivalinux PowerPack+</b>-ро коргузорӣ карна "
 "истодаед."
 
 #: share/advertising/08.pl:17
@@ -16452,22 +16452,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Маҳсулотҳои Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Маҳсулотҳои Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> Шумораи зиёди маҳсулотҳои <b>Mandrakelinux</b>-ро кор "
+"<b>Mandriva</b> Шумораи зиёди маҳсулотҳои <b>Mandrivalinux</b>-ро кор "
 "карда баромадааст."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Маҳсулотҳои Mandrakelinux инҳоянд:"
+msgid "The Mandrivalinux products are:"
+msgstr "Маҳсулотҳои Mandrivalinux инҳоянд:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16488,76 +16488,76 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux барои x86-64</b>, Ҳалнокии Mandrakelinux барои беҳтар "
+"\t* <b>Mandrivalinux барои x86-64</b>, Ҳалнокии Mandrivalinux барои беҳтар "
 "кардани пардозандаи 64-битаи шумо."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Маҳсулотҳои Mandrakesoft (Маҳсулотҳои Nomad)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Маҳсулотҳои Mandriva (Маҳсулотҳои Nomad)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft ду маҳсулотеро кор карда баромадааст, ки ба шумо имконияти  "
-"истифодабарии Mandrakelinux-ро дар <b>компютери дилхоҳ</b> ва бе зарурати "
+"Mandriva ду маҳсулотеро кор карда баромадааст, ки ба шумо имконияти  "
+"истифодабарии Mandrivalinux-ро дар <b>компютери дилхоҳ</b> ва бе зарурати "
 "коргузории он медиҳад:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Ҳаракатдиҳӣ</b>, тақсимоти Mandrakelinux, ки аз  CD-ROM-и боршаванда "
+"\t* <b>Ҳаракатдиҳӣ</b>, тақсимоти Mandrivalinux, ки аз  CD-ROM-и боршаванда "
 "иҷро мешавад."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, тақсимоти Mandrakelinux, ки пештар дар “LaCie "
+"\t* <b>GlobeTrotter</b>, тақсимоти Mandrivalinux, ки пештар дар “LaCie "
 "Mobile Hard Drive” коргузорӣ шудааст."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Маҳсулотҳои Mandrakesoft (Ҳалнокии Тахассусӣ)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Маҳсулотҳои Mandriva (Ҳалнокии Тахассусӣ)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Дар поён маҳсулоти Mandrakesoft оварда шудаанд, ки ба <b>талаботҳои "
+"Дар поён маҳсулоти Mandriva оварда шудаанд, ки ба <b>талаботҳои "
 "мутахассисӣ</b> ҷавобгӯянд:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
-"\t* <b>Мизи Кории Корпаративӣ</b>, Мизи Кории Mandrakelinux барои Соҳибкорон."
+"\t* <b>Мизи Кории Корпаративӣ</b>, Мизи Кории Mandrivalinux барои Соҳибкорон."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
-"\t* <b>Хидматрасони Корпаративӣ</b>, Ҳалнокии Хидматрасони Mandrakelinux."
+"\t* <b>Хидматрасони Корпаративӣ</b>, Ҳалнокии Хидматрасони Mandrivalinux."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
-"\t* <b>Экрани Байнишабакавии Хурд</b>, Ҳалнокии Бехатарии Mandrakelinux."
+"\t* <b>Экрани Байнишабакавии Хурд</b>, Ҳалнокии Бехатарии Mandrivalinux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16601,10 +16601,10 @@ msgstr "<b>Мудири графикии Мизи Кории худро инти
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Бо PowerPack, шумо <b>муҳити графикии мизи кориро</b> интихоб карда "
-"метавонед. Mandrakesoft <b>KDE</b>-ро бо нобаёнӣ интихоб кардааст."
+"метавонед. Mandriva <b>KDE</b>-ро бо нобаёнӣ интихоб кардааст."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16629,10 +16629,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Бо PowerPack, шумо <b>муҳити графикии мизи кориро</b> интихоб карда "
-"метавонед. Mandrakesoft <b>KDE</b>-ро бо нобаёнӣ интихоб кардааст."
+"метавонед. Mandriva <b>KDE</b>-ро бо нобаёнӣ интихоб кардааст."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16761,10 +16761,10 @@ msgstr "<b>Аз Шумораи Зиёди Замимаҳо Баҳра Баред
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Дар менюи Mandrakelinux шумо метавонед замимаҳои <b>дар истифода оддиро<b> "
+"Дар менюи Mandrivalinux шумо метавонед замимаҳои <b>дар истифода оддиро<b> "
 "барои <b>ҳамаи супоришҳои худ ёбед<b>:"
 
 #: share/advertising/18.pl:16
@@ -17039,17 +17039,17 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Маркази Идораи Mandrakelinux<b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Маркази Идораи Mandrivalinux<b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Маркази Идораи Mandrakelinux</b> ин маҷмӯаи зарурии барномаҳои пушибонии "
+"<b>Маркази Идораи Mandrivalinux</b> ин маҷмӯаи зарурии барномаҳои пушибонии "
 "махсуси Mandrake барои содданомоии батанзимдарории компютери шумо мебошад."
 
 #: share/advertising/25.pl:17
@@ -17075,16 +17075,16 @@ msgstr "<b>Модели Сарчашмаи Кушод</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Ба монанди ҳамаи барномаҳои компютерӣ, таъминоти барномавии сарчашмаи кушод "
 "<b>вақт ва одамонро</b> барои коркард талаб мекунад. Барои ҳурмати фалсафаи "
-"сарчашмаи кушод Mandrakesoft шумораи маҳсулот ва хизматҳои иловашударо "
-"мефурӯшад барои <b>исботи фаъолияти Mandrakelinux</b>. Агар хеҳед, ки "
-"<b>фалсафаи сарчашмаи кушодро</b> ва рушди Mandrakelinux-ро дастгири кунед, "
+"сарчашмаи кушод Mandriva шумораи маҳсулот ва хизматҳои иловашударо "
+"мефурӯшад барои <b>исботи фаъолияти Mandrivalinux</b>. Агар хеҳед, ки "
+"<b>фалсафаи сарчашмаи кушодро</b> ва рушди Mandrivalinux-ро дастгири кунед, "
 "<b>марҳамат карда</b> яке аз маҳсулот ё хизматҳои моро харед!"
 
 #: share/advertising/27.pl:13
@@ -17095,10 +17095,10 @@ msgstr "<b>Мағозаи Шабакавӣ</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Барои гирифтани маълумоти бештар оиди маҳсулот ва хизматҳои Mandrakesoft "
+"Барои гирифтани маълумоти бештар оиди маҳсулот ва хизматҳои Mandriva "
 "шумо ба <b>истгоҳи тиҷорати электронии</b> мо ташриф оварда метавонед."
 
 #: share/advertising/27.pl:17
@@ -17124,24 +17124,24 @@ msgstr "Имрӯз дар <b>store.mandrakesoft.com<b> ист кунед"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> ин <b>шарики беҳтарин</b> ба маҳсулоти Mandrakelinux "
+"<b>Mandriva Club</b> ин <b>шарики беҳтарин</b> ба маҳсулоти Mandrivalinux "
 "мебошад.."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Бо воридшавӣ ба клуби Mandrakeclub аз <b>имтиёзҳои зиёд</b>, маҳсулоту "
+"Бо воридшавӣ ба клуби Mandriva Club аз <b>имтиёзҳои зиёд</b>, маҳсулоту "
 "хизматҳо фоида кунед, ба монанди:"
 
 #: share/advertising/28.pl:20
@@ -17164,40 +17164,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Иштикор дар Mandrakelinux <b>форумҳои корванд</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Иштикор дар Mandrivalinux <b>форумҳои корванд</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Дастёбии барвақт ва бартариятнок</b>, пеш аз барориши оммавӣ ба "
-"Mandrakelinux <b>ISO симоҳо</b>."
+"Mandrivalinux <b>ISO симоҳо</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr "<b>Mandrake Ғайрихудмухтор</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> хизмати нави ҷоизадоре, ки Mandrakesoft аз пешкаши он "
+"<b>Mandriva Online</b> хизмати нави ҷоизадоре, ки Mandriva аз пешкаши он "
 "ба мизоҷон фахр мекунад!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline шумораи зиёди хизматҳои арзишнокро барои <b>навсозии осони</"
-"b> системаи Mandrakelinux-и шумо пешкаш мекунад:"
+"Mandriva Online шумораи зиёди хизматҳои арзишнокро барои <b>навсозии осони</"
+"b> системаи Mandrivalinux-и шумо пешкаш мекунад:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17223,39 +17223,39 @@ msgstr "\t* Навсозиҳои чандири <b>ҷадвалбандӣ</b>."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
-msgstr "\t* Мудирият бо <b>ҳамаи системаҳои Mandrakelinux</b> бо як ҳисоб."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+msgstr "\t* Мудирият бо <b>ҳамаи системаҳои Mandrivalinux</b> бо як ҳисоб."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Ба шумо <b>кӯмак</b> лозим аст? Бо кордонони техникии Mandrakesoft дар "
+"Ба шумо <b>кӯмак</b> лозим аст? Бо кордонони техникии Mandriva дар "
 "<b>истгоҳи пуштибонии техникии моён</b> www.mandrakeexpert.com.во хӯред."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Ба туфайли ёрии <b>кордонони мутахассиси Mandrakelinux</b>, шумо бештари "
+"Ба туфайли ёрии <b>кордонони мутахассиси Mandrivalinux</b>, шумо бештари "
 "вақти худро захира мекунед."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Бо ҳама гуна суолҳои ба Mandrakelinux вобаста, шумо метавонед ҳолати "
+"Бо ҳама гуна суолҳои ба Mandrivalinux вобаста, шумо метавонед ҳолати "
 "пуштибониро дар <b>store.mandrakesoft.com</b> харед."
 
 #: share/compssUsers.pl:25
@@ -17555,8 +17555,8 @@ msgstr "Дидабонии асбобҳо, ҳисоботи ҷараёнҳо, tc
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Устодҳои Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Устодҳои Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17708,7 +17708,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17780,14 +17780,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[ИНТИХОБ]...\n"
-"  --no-confirmation      тасдиқоти якум дар усули MandrakeUpdate-ро "
+"  --no-confirmation      тасдиқоти якум дар усули Mandriva Update-ро "
 "напурсед\n"
 "  --no-verify-rpm        имзоҳои бастаҳоро наозмоед\n"
 "  --changelog-first      феҳристи тағиротҳоро пеш аз рӯйхати файлҳо дар "
@@ -20594,13 +20594,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux Асбоби Сохтани Маърӯза оиди Хатогӣ"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux Асбоби Сохтани Маърӯза оиди Хатогӣ"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Маркази Идораи Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Маркази Идораи Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20620,7 +20620,7 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr "Mandrake Ғайрихудмухтор"
 
 #: standalone/drakbug:52
@@ -20665,7 +20665,7 @@ msgstr "Устоди Танзимдарорӣ"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -21092,20 +21092,20 @@ msgstr "Дар худборшав шурӯъ шудааст"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Ин интерфейс то ҳол танзим нашудааст.\n"
-"Аз Маркази Идораи Mandrakelinux ёрдамчии \"Иловакунии интерфейс\"-ро ба кор "
+"Аз Маркази Идораи Mandrivalinux ёрдамчии \"Иловакунии интерфейс\"-ро ба кор "
 "андозед"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Шумо ягон пайвастшавии Интернети танзимшударо надоред.\n"
-"\"%s\"-ро аз Маркази Идораи Mandrakelinux сар диҳед"
+"\"%s\"-ро аз Маркази Идораи Mandrivalinux сар диҳед"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21155,8 +21155,8 @@ msgstr "KDM (KDE Мудири Намоиш)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux Мудири Намоиш)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux Мудири Намоиш)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21457,7 +21457,7 @@ msgstr "Воридот"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21466,7 +21466,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (нусхаи аслӣ)\n"
@@ -22029,14 +22029,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "Ин таъминоти барномавии озод ва он метавонад мутобиқи шартҳои литсензияи GNU "
 "GPL паҳн гардад.\n"
 "\n"
@@ -22066,8 +22066,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Маркази Идораи Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Маркази Идораи Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25618,8 +25618,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Шарҳдиҳандаҳои Асбобҳои Mandrakelinux"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Шарҳдиҳандаҳои Асбобҳои Mandrivalinux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -26137,7 +26137,7 @@ msgstr "Пайвастшавӣ ба итмом расид."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Пайвастшавӣ ба итмом расид.\n"
 "Ба танзимдарориро дар Маркази Назорати Mandrake санҷед."
@@ -27020,8 +27020,8 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ msgstr "Шумо ягон ҳуруфро интихоб накардед"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Устодҳои Mandrakesoft"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Устодҳои Mandriva"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Баррас дастрас нест! Марҳамат карда онро коргузорӣ кунед"
@@ -27137,7 +27137,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "\n"
 #~ "Click the button to reboot the machine, unplug it, remove write "
 #~ "protection,\n"
-#~ "plug the key again, and launch Mandrake Move again."
+#~ "plug the key again, and launch Mandriva Move again."
 #~ msgstr ""
 #~ "Эҳтимолан дар калиди USB муҳофизат аз навиштан даргиронида\n"
 #~ "шудааст, лекин ҳозир бехатар баровардани он нашуда истодааст.\n"
@@ -27145,7 +27145,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "\n"
 #~ "Ба тугма барои боркунии мошина ангушт занед, онро бароред,\n"
 #~ "муҳофизат аз навиштанро хориҷ кунед, аз нав калидро ворид намоед ва бори "
-#~ "дигар Mandrake Move-ро сар диҳед."
+#~ "дигар Mandriva Move-ро сар диҳед."
 
 #~ msgid ""
 #~ "Your USB key doesn't have any valid Windows (FAT) partitions.\n"
@@ -27156,7 +27156,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "\n"
 #~ "\n"
 #~ "You may also proceed without an USB key - you'll still be\n"
-#~ "able to use Mandrake Move as a normal live Mandrake\n"
+#~ "able to use Mandriva Move as a normal live Mandriva\n"
 #~ "Operating System."
 #~ msgstr ""
 #~ "Калиди USB-и шумо ягон бахши дурусти Windows (FAT)-ро надорад.\n"
@@ -27167,12 +27167,12 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "\n"
 #~ "\n"
 #~ "Инчунин шумо метавонед бе калиди USB давом диҳед - дар ин ҳолат\n"
-#~ "шумо қодиред, ки Mandrake Move-ро ҳамчун live Mandrake\n"
+#~ "шумо қодиред, ки Mandriva Move-ро ҳамчун live Mandriva\n"
 #~ "Operating System истифода баред."
 
 #~ msgid ""
 #~ "We didn't detect any USB key on your system. If you\n"
-#~ "plug in an USB key now, Mandrake Move will have the ability\n"
+#~ "plug in an USB key now, Mandriva Move will have the ability\n"
 #~ "to transparently save the data in your home directory and\n"
 #~ "system wide configuration, for next boot on this computer\n"
 #~ "or another one. Note: if you plug in a key now, wait several\n"
@@ -27180,11 +27180,11 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "\n"
 #~ "\n"
 #~ "You may also proceed without an USB key - you'll still be\n"
-#~ "able to use Mandrake Move as a normal live Mandrake\n"
+#~ "able to use Mandriva Move as a normal live Mandriva\n"
 #~ "Operating System."
 #~ msgstr ""
 #~ "Дар системаи шумо ягон калиди USB пайдо нагардид. Агар шумо\n"
-#~ "USB калидро ҳозир ворид кунед, Mandrake Move имконияти\n"
+#~ "USB калидро ҳозир ворид кунед, Mandriva Move имконияти\n"
 #~ "восеҳи захиракунии додаҳоро дар феҳристи хонагии шумо,\n"
 #~ "батанзимдарории васеъи система барои худборшавии оянда\n"
 #~ "дар ин ё он компютер, медиҳад. Қайд: агар шумо калидро ҳозир\n"
@@ -27193,7 +27193,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "\n"
 #~ "\n"
 #~ "Инчунин шумо метавонед бе калиди USB давом диҳед,\n"
-#~ "шумо ҳоло имконияти истифодаи Mandrake Move-ро\n"
+#~ "шумо ҳоло имконияти истифодаи Mandriva Move-ро\n"
 #~ "ҳамчун Системаи Амалии Mandrake доред."
 
 #~ msgid ""
@@ -27445,11 +27445,11 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "chose the individual package or because it was part of a group of "
 #~ "packages,\n"
 #~ "you'll be asked to confirm that you really want those servers to be\n"
-#~ "installed. By default Mandrakelinux will automatically start any "
+#~ "installed. By default Mandrivalinux 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\n"
-#~ "security holes were discovered after this version of Mandrakelinux was\n"
+#~ "security holes were discovered after this version of Mandrivalinux was\n"
 #~ "finalized. If you don't know what a particular service is supposed to do "
 #~ "or\n"
 #~ "why it's being installed, then click \"%s\". Clicking \"%s\" will "
@@ -27489,11 +27489,11 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "!! Агар бастаи хидматрасонро интихоб карда бошед, хоҳ барои интихоби "
 #~ "муайяни бастаи алоҳида, хоҳ барои он ки вай як қисми гурӯҳӣ баста\n"
 #~ "аст, шумо бояд тасдиқ кунед, ки дар ҳақиқат ин хидматрасонҳои\n"
-#~ "коргузоришавандаро истифода бурдан мехоҳед. Дар Mandrakelinux\n"
+#~ "коргузоришавандаро истифода бурдан мехоҳед. Дар Mandrivalinux\n"
 #~ "ҳамаи хидматрасонҳои коргузоришуда ҳангоми оғозёбӣ ба таври худкор, бо "
 #~ "нобаёнӣ сар дода мешаванд. Ҳарчанде, ки онҳо бехатаранд ва муаммоҳои\n"
 #~ "маълумро ҳангоми даргиронидан дар тақсимот надоранд, мумкин аст, ки\n"
-#~ "дар бехатарӣ баъди барориши нусхаи хотимавии Mandrakelinux\n"
+#~ "дар бехатарӣ баъди барориши нусхаи хотимавии Mandrivalinux\n"
 #~ "сӯрохиҳои муайян мешаванд. Агар шумо надонед, ки барои чӣ ин ё он\n"
 #~ "хидматрасон лозим аст ё барои чӣ он коргузорӣ мегардад пас ба \"%s\"\n"
 #~ "ангушт занед. Бо пахшкунии \"%s\" шумо хидматрасонҳои номбаршударо\n"
@@ -27557,14 +27557,14 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "!!"
 
 #~ msgid ""
-#~ "You now need to decide where you want to install the Mandrakelinux\n"
+#~ "You now need to decide where you want to install the Mandrivalinux\n"
 #~ "operating system on your hard drive. If your hard drive is empty or if "
 #~ "an\n"
 #~ "existing operating system is using all the available space you will have "
 #~ "to\n"
 #~ "partition the drive. Basically, partitioning a hard drive means to\n"
 #~ "logically divide it to create the space needed to install your new\n"
-#~ "Mandrakelinux system.\n"
+#~ "Mandrivalinux system.\n"
 #~ "\n"
 #~ "Because the process of partitioning a hard drive is usually irreversible\n"
 #~ "and can lead to data losses, partitioning can be intimidating and "
@@ -27600,7 +27600,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 #~ "data, provided you've 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 Mandrakelinux and Microsoft Windows "
+#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "
 #~ "on\n"
 #~ "the same computer.\n"
 #~ "\n"
@@ -27611,7 +27611,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "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 Mandrakelinux system, "
+#~ "your hard drive and replace them with your new Mandrivalinux system, "
 #~ "choose\n"
 #~ "this option. Be careful, because you won't be able to undo this "
 #~ "operation\n"
@@ -27638,12 +27638,12 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "Guide''."
 #~ msgstr ""
 #~ "Дар ин қадам шумо бояд дар куҷои гардонандаи сахт ҷойгир кардани\n"
-#~ "системаи омили Mandrakelinux-ро ҳал кунед. Агар гардонандаи сахти\n"
+#~ "системаи омили Mandrivalinux-ро ҳал кунед. Агар гардонандаи сахти\n"
 #~ "шумо холӣ бошад ё системаи омили ҳозирбуда ҳамаи фазои имконпазирро\n"
 #~ "ишғол кунад, ба шумо лозим меояд, ки гардонандаи сахти худро\n"
 #~ "бахшбандӣ кунед. Бахшбандикунии гардонандаи сахт асосан аз тақсимоти "
 #~ "мантиқии фазои ишғолшуда барои коргузории системаи омилии \n"
-#~ "Mandrakelinux иборат аст.\n"
+#~ "Mandrivalinux иборат аст.\n"
 #~ "\n"
 #~ "Азбаски ҷараёни бахшбандии гардонандаи сахт одатан барнагарданда\n"
 #~ "аст ва ба гумшавии додаҳо оварда расониданаш мумкин аст, агар дар "
@@ -27686,7 +27686,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "\n"
 #~ " * \"%s\": агар шумо хоҳед, ки ҳамаи додаҳоро дар ҳама қисматҳои\n"
 #~ "дар гардонандаи сахти худ мавҷудбударо нобуд созед ва ҷои онҳоро бо "
-#~ "системаи нави Mandrakelinux иваз кунед, ин хосиятро интихоб\n"
+#~ "системаи нави Mandrivalinux иваз кунед, ин хосиятро интихоб\n"
 #~ "кунед. Эҳтиёт бошед, зеро баъди тасдиқот шумо интихоби худро\n"
 #~ "баргардонида наметавонед.\n"
 #~ "\n"
@@ -27809,7 +27809,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "Click on \"%s\" when you're ready to format the partitions.\n"
 #~ "\n"
 #~ "Click on \"%s\" if you want to choose another partition for your new\n"
-#~ "Mandrakelinux operating system installation.\n"
+#~ "Mandrivalinux operating system installation.\n"
 #~ "\n"
 #~ "Click on \"%s\" if you wish to select partitions which will be checked "
 #~ "for\n"
@@ -27834,7 +27834,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "Агар шумо ба шаклбандии бахшҳо тайёр бошед ба \"%s\" ангушт занед.\n"
 #~ "\n"
 #~ "Агар шумо хоҳед, ки дигар бахшҳоро барои коргузории системаи\n"
-#~ "омилии навъи Mandrakelinux интихоб кунед ба \"%s\" ангушт занед.\n"
+#~ "омилии навъи Mandrivalinux интихоб кунед ба \"%s\" ангушт занед.\n"
 #~ "\n"
 #~ "Агар хоҳед бахшҳоеро, ки дар диск ба мавҷудияти қисмҳои бад\n"
 #~ "тафтиш карда шаванд интихоб намоед, ба \"%s\" ангушт занед."
@@ -27850,7 +27850,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "\n"
 #~ "If you don't know what to choose, keep the default option. You'll be "
 #~ "able\n"
-#~ "to change it later with the draksec tool, which is part of Mandrakelinux\n"
+#~ "to change it later with the draksec tool, which is part of Mandrivalinux\n"
 #~ "Control Center.\n"
 #~ "\n"
 #~ "Fill the \"%s\" field with the e-mail address of the person responsible "
@@ -27876,7 +27876,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ msgid ""
 #~ "At this point, you need to choose which partition(s) will be used for "
 #~ "the\n"
-#~ "installation of your Mandrakelinux system. If partitions have already "
+#~ "installation of your Mandrivalinux 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 "
@@ -27959,7 +27959,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "emergency boot situations."
 #~ msgstr ""
 #~ "Дар ин пункт шумо бояд интихоб намоед, ки кадом бахш(ҳо) барои\n"
-#~ "коргузории системавӣ Mandrakelinux-и шумо истифода бурда мешаванд.\n"
+#~ "коргузории системавӣ Mandrivalinux-и шумо истифода бурда мешаванд.\n"
 #~ "Агар бахшҳои алоқаи аз коргузории пешинаи GNU/Linux ё аз дигар\n"
 #~ "асбоби бахшбандикунӣ муайян шуда бошад, шумо метавонед бахшҳои мавҷударо "
 #~ "истифода баред. Дар дигар ҳолат бояд бахшҳои гардонандаи\n"
@@ -28058,7 +28058,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "found on your machine.\n"
 #~ "\n"
 #~ "DrakX now needs to know if you want to perform a new installation or an\n"
-#~ "upgrade of an existing Mandrakelinux system:\n"
+#~ "upgrade of an existing Mandrivalinux system:\n"
 #~ "\n"
 #~ " * \"%s\". For the most part, this completely wipes out the old system.\n"
 #~ "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -28068,21 +28068,21 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "the file system, you should use this option.\n"
 #~ "\n"
 #~ " * \"%s\". This installation class allows you to update the packages\n"
-#~ "currently installed on your Mandrakelinux system. Your current "
+#~ "currently installed on your Mandrivalinux system. Your current "
 #~ "partitioning\n"
 #~ "scheme and user data won't be altered. Most of the other configuration\n"
 #~ "steps remain available and are similar to a standard installation.\n"
 #~ "\n"
-#~ "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+#~ "Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 #~ "running version \"8.1\" or later. Performing an upgrade on versions "
 #~ "prior\n"
-#~ "to Mandrakelinux version \"8.1\" is not recommended."
+#~ "to Mandrivalinux version \"8.1\" is not recommended."
 #~ msgstr ""
 #~ "Ин қадам танҳо дар он ҳолате фаъол мегардад, ки дар мошинаи шумо\n"
 #~ "бахши кӯҳнаи GNU/Linux пайдо гардад.\n"
 #~ "\n"
 #~ "DrakX бояд донад, ки оё шумо мехоҳед, ки коргузории навро гузаронед\n"
-#~ "ё системаи Mandrakelinux-и мавҷударо афзоиш диҳед:\n"
+#~ "ё системаи Mandrivalinux-и мавҷударо афзоиш диҳед:\n"
 #~ "\n"
 #~ " * \"%s\": Дар бисёр ҳолатҳо ин вариант ба нобудшавии системаи кӯҳна\n"
 #~ "оварда мерасонад. Агар хоҳед, ки бахшҳои гардонандаи сахти худро иваз\n"
@@ -28091,15 +28091,15 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "додаҳои мавҷудаи худро аз бознависӣ захира карда метавонанд.\n"
 #~ "\n"
 #~ " * \"%s\": ин синфи коргузорӣ ба шумо имконияти авкунии бастаи\n"
-#~ "барномаҳои дар системаи Mandrakelinux-и коргузоришударо медиҳад.\n"
+#~ "барномаҳои дар системаи Mandrivalinux-и коргузоришударо медиҳад.\n"
 #~ "Нақшаи бахшбандии ҷорӣ ва додаҳои корванд, ивазнашавандаанд.\n"
 #~ "Бештари дигар қадамҳо низ дастрас мегарданд, ба монанди коргузории "
 #~ "низоммеъёр.\n"
 #~ "\n"
-#~ "Интихоби хосияти ``Густариш'' дар системаҳои Mandrakelinux аз нусхаи\n"
+#~ "Интихоби хосияти ``Густариш'' дар системаҳои Mandrivalinux аз нусхаи\n"
 #~ "\"8.1\" сар карда то охирон хеле хуб хоҳад кор кард. Гузаронидани "
 #~ "Густариш\n"
-#~ "дар системаҳои Mandrakelinux болотар аз \"8.1\" маслиҳат дода мешавад."
+#~ "дар системаҳои Mandrivalinux болотар аз \"8.1\" маслиҳат дода мешавад."
 
 #~ msgid ""
 #~ "Depending on the language you chose (), DrakX will automatically select "
@@ -28280,7 +28280,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 
 #~ msgid ""
 #~ "Now, it's time to select a printing system for your computer. Other\n"
-#~ "operating systems may offer you one, but Mandrakelinux offers two. Each "
+#~ "operating systems may offer you one, but Mandrivalinux offers two. Each "
 #~ "of\n"
 #~ "the printing systems is best suited to particular types of "
 #~ "configuration.\n"
@@ -28308,11 +28308,11 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "\n"
 #~ "If you make a choice now, and later find that you don't like your "
 #~ "printing\n"
-#~ "system you may change it by running PrinterDrake from the Mandrakelinux\n"
+#~ "system you may change it by running PrinterDrake from the Mandrivalinux\n"
 #~ "Control Center and clicking on the \"%s\" button."
 #~ msgstr ""
 #~ "Ҳоло вақте расидааст барои интихоби системаи чопкунӣ барои компютери\n"
-#~ "шумо. Дигар СО ба шумо як намудро пешкаш карда метавонад, Mandrakelinux\n"
+#~ "шумо. Дигар СО ба шумо як намудро пешкаш карда метавонад, Mandrivalinux\n"
 #~ "бошад, ду намудро. Ҳар яке аз системаҳо барои батанзимдарории\n"
 #~ "муайяни беҳтарин мебошад.\n"
 #~ "\n"
@@ -28409,7 +28409,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ " * \"%s\": if you wish to configure your Internet or local network "
 #~ "access,\n"
 #~ "you can do so now. Refer to the printed documentation or use the\n"
-#~ "Mandrakelinux Control Center after the installation has finished to "
+#~ "Mandrivalinux Control Center after the installation has finished to "
 #~ "benefit\n"
 #~ "from full in-line help.\n"
 #~ "\n"
@@ -28432,7 +28432,7 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ "this\n"
 #~ "button. This should be reserved to advanced users. Refer to the printed\n"
 #~ "documentation or the in-line help about bootloader configuration in the\n"
-#~ "Mandrakelinux Control Center.\n"
+#~ "Mandrivalinux Control Center.\n"
 #~ "\n"
 #~ " * \"%s\": through this entry you can fine tune which services will be "
 #~ "run\n"
@@ -28782,10 +28782,10 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 
 #~ msgid ""
 #~ "You won't have access to the <b>services included</b> in the other "
-#~ "Mandrakesoft products either."
+#~ "Mandriva products either."
 #~ msgstr ""
 #~ "Шимо инчунин ба <b>хидматҳои ҳамроҳшуда</b> ба дигар маҳсулотҳои "
-#~ "Mandrakesoft дастрасӣ пайдо намекунед."
+#~ "Mandriva дастрасӣ пайдо намекунед."
 
 #~ msgid ""
 #~ "KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you "
@@ -28818,14 +28818,14 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 #~ msgid ""
 #~ "[OPTION]...\n"
 #~ "  --no-confirmation      don't ask first confirmation question in "
-#~ "MandrakeUpdate mode\n"
+#~ "Mandriva Update mode\n"
 #~ "  --no-verify-rpm        don't verify packages signatures\n"
 #~ "  --changelog-first      display changelog before filelist in the "
 #~ "description window\n"
 #~ "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 #~ msgstr ""
 #~ "[ИНТИХОБ]...\n"
-#~ "  --no-confirmation      тасдиқоти якум дар усули MandrakeUpdate-ро "
+#~ "  --no-confirmation      тасдиқоти якум дар усули Mandriva Update-ро "
 #~ "напурсед\n"
 #~ "  --no-verify-rpm        имзоҳои бастаҳоро наозмоед\n"
 #~ "  --changelog-first      феҳристи тағиротҳоро пеш аз рӯйхати файлҳо дар "
@@ -28872,10 +28872,10 @@ msgstr "Коргузорӣ бо нокомӣ анҷомид"
 
 #~ msgid ""
 #~ "You don't have any configured Internet connection.\n"
-#~ "Run the \"%s\" assistant from the Mandrakelinux Control Center"
+#~ "Run the \"%s\" assistant from the Mandrivalinux Control Center"
 #~ msgstr ""
 #~ "Шумо ягон пайвастшавии Интернети танзимшударо надоред.\n"
-#~ "\"Илованамоии Пайвастшавӣ\"-ро аз Маркази Идораи Mandrakelinux сар диҳед"
+#~ "\"Илованамоии Пайвастшавӣ\"-ро аз Маркази Идораи Mandrivalinux сар диҳед"
 
 #~ msgid ""
 #~ "DHCP Server Configuration.\n"
diff --git a/perl-install/share/po/th.po b/perl-install/share/po/th.po
index 6fdb32da9..700feef63 100644
--- a/perl-install/share/po/th.po
+++ b/perl-install/share/po/th.po
@@ -59,7 +59,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -78,7 +78,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -86,7 +86,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -94,7 +94,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -220,7 +220,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1222,7 +1222,7 @@ msgstr "เลือกภาษาที่คุณใช้"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 "คุณสามารถเลือกภาษาอื่นซึ่งจะสามารถใช้ได้หลังติดตั้ง"
@@ -3499,7 +3499,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3609,7 +3609,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3620,11 +3620,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3731,10 +3731,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3843,7 +3843,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -3941,12 +3941,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -3973,7 +3973,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -3982,7 +3982,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4111,7 +4111,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4129,7 +4129,7 @@ msgstr "ก่อน"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4158,7 +4158,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4174,7 +4174,7 @@ msgstr "อ๊อปชั่นของเครื่องพิมพ์แ
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4260,7 +4260,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4305,7 +4305,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4314,13 +4314,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4361,7 +4361,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4518,7 +4518,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4539,7 +4539,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4658,7 +4658,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4675,7 +4675,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4737,10 +4737,10 @@ msgstr "บริการ"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"เลือก harddisk ที่ต้องการลบและลง Mandrakelinux\n"
+"เลือก harddisk ที่ต้องการลบและลง Mandrivalinux\n"
 "ควรระวังเป็นอย่างมากดพราะว่าข้อมูลทุกอย่างจะถูกลบ\n"
 "และจะไม่สามารถกู้คืนได้"
 
@@ -5068,7 +5068,7 @@ msgstr "ใช้พื้นที่ที่ว่างใน Windows partit
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr "Windows partition ของคุณกระจัดกระจายมากเกินไป กรุณา Defrag ก่อน"
 
@@ -5180,19 +5180,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5214,7 +5214,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5222,14 +5222,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5239,7 +5239,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5259,10 +5259,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5273,11 +5273,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5293,7 +5293,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Introduction\n"
 "\n"
@@ -5303,14 +5303,14 @@ msgstr ""
 "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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5332,7 +5332,7 @@ msgstr ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5340,14 +5340,14 @@ msgstr ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5357,7 +5357,7 @@ msgstr ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5377,10 +5377,10 @@ msgstr ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5391,11 +5391,11 @@ msgstr ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5411,7 +5411,7 @@ msgstr ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -5467,7 +5467,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5475,7 +5475,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "ขอแสดงความยินดี การติดตั้งเสร็จเรียบร้อย\n"
 "ให้เอาสื่อที่ใช้บูตออกจากไดรว์ (แผ่นฟล้อปปี้หรือซีดี) กดปุ่ม reboot เพื่อรีบูต\n"
@@ -5524,12 +5524,12 @@ msgstr "เข้าสู่ขั้นตอน `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "เครื่องของคุณมีทรัพยากรค่อนข้างต่ำคุณอาจมีปัญหาติดตั้ง \n"
-"Mandrakelinux  ถ้าเป็นเช่นนั้น กรุณาทดลองติดตั้งแบบ text \n"
+"Mandrivalinux  ถ้าเป็นเช่นนั้น กรุณาทดลองติดตั้งแบบ text \n"
 "กรุณากด F1 ขณะ boot จาก cdrom แล้วพิมพ์ text"
 
 #: install_steps_gtk.pm:228 install_steps_interactive.pm:624
@@ -6040,7 +6040,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, fuzzy, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr "กำลังติดต่อกับมิลเรอร์ไซต์เพื่อหารายการของแพ็คเก็จที่มีให้"
 
 #: install_steps_interactive.pm:840
@@ -6254,7 +6254,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
 msgstr "การติดตั้งลีนุกซ์-แมนเดรก %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -8825,7 +8825,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12442,7 +12442,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14144,18 +14144,18 @@ msgstr "หยุด"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, fuzzy, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
 msgstr "แบบผู้เชี่ยวชาญ (Expert)"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14164,7 +14164,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -14181,9 +14181,9 @@ msgstr "ทดสอบการคอนฟิก"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -14203,7 +14203,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14229,10 +14229,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14251,8 +14251,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14279,7 +14279,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14289,7 +14289,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14308,13 +14308,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14326,7 +14326,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14340,19 +14340,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr "Control Center"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -14373,61 +14373,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14465,7 +14465,7 @@ msgstr "Graphical Desktops อื่นๆ"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14486,7 +14486,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -14603,7 +14603,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -14838,14 +14838,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr "Control Center"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -14867,9 +14867,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -14881,7 +14881,7 @@ msgstr "Control Center"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -14904,20 +14904,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, fuzzy, c-format
-msgid "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
 msgstr "Control Center"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -14936,33 +14936,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr "Control Center"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -14985,32 +14985,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
 msgstr "Control Center"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15301,7 +15301,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr "Control Center"
 
 #: share/compssUsers.pl:197
@@ -15397,7 +15397,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15445,7 +15445,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17895,13 +17895,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr ""
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux ฐานควบคุม"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux ฐานควบคุม"
 
 #: standalone/drakbug:48
 #, c-format
@@ -17921,8 +17921,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -17966,7 +17966,7 @@ msgstr "Network Configuration Wizard"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -18372,14 +18372,14 @@ msgstr "เริ่มทำงานตอน boot"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18430,7 +18430,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18722,7 +18722,7 @@ msgstr "นำเข้า"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19192,7 +19192,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -19219,8 +19219,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux ฐานควบคุม"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux ฐานควบคุม"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22198,7 +22198,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Control Center"
 
 #: standalone/logdrake:51
@@ -22702,7 +22702,7 @@ msgstr "ชนิดการเชื่อมต่อ"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
@@ -23536,7 +23536,7 @@ msgstr "การติดตั้งไม่สำเร็จ"
 #~ msgstr "ลบคิว"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
+#~ msgid "Mandriva Wizards"
 #~ msgstr "Control Center"
 
 #, fuzzy
diff --git a/perl-install/share/po/tl.po b/perl-install/share/po/tl.po
index 034f06954..f4a36a05d 100644
--- a/perl-install/share/po/tl.po
+++ b/perl-install/share/po/tl.po
@@ -62,7 +62,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Ang USB key ay tila may proteksiyon laban sa pagsulat, pero hindi\n"
 "natin ligtas na mahuhugot ito ngayon.\n"
@@ -70,7 +70,7 @@ msgstr ""
 "\n"
 "I-click ang button para i-reboot ang makina, hugutin ang USB key, alisin\n"
 "ang proteksiyon nito laban sa pagsulat, ipasak muli ang key, at i-launch\n"
-"ulit ang Mandrake Move."
+"ulit ang Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -88,7 +88,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Ang inyong USB key ay walang balidong partisyon ng Windows (FAT).\n"
@@ -99,14 +99,14 @@ msgstr ""
 "\n"
 "\n"
 "Maaari rin kayong magpatuloy na walang USB key - magagamit ninyo\n"
-"pa rin ang Mandrake Move bilang isang normal na \"live\" Mandrake\n"
+"pa rin ang Mandriva Move bilang isang normal na \"live\" Mandrake\n"
 "Operating System."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -114,20 +114,20 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Wala kaming natiktikang USB key sa inyong sistema. Kapag\n"
 "kayo ay magpapasak ng USB key ngayon, magkakaroon ng\n"
-"kakayahan ang Mandrake Move na i-save ang inyong data sa\n"
+"kakayahan ang Mandriva Move na i-save ang inyong data sa\n"
 "\"home directory\" at mga configuration ng inyong sistema, para\n"
-"sa susunod na pag-boot ng Mandrake Move. Tandaan: Kapag\n"
+"sa susunod na pag-boot ng Mandriva Move. Tandaan: Kapag\n"
 "magpapasak kayo ng USB key ngayon, maghintay po lamang\n"
 "ng ilang sandali bago tiktikan muli.\n"
 "\n"
 "\n"
 "Maaari rin kayong magpatuloy na walang USB key - magagamit \n"
-"ninyo pa rin ang Mandrake Move bilang isang normal na \"live\"\n"
+"ninyo pa rin ang Mandriva Move bilang isang normal na \"live\"\n"
 "Mandrake Operating System."
 
 #: ../move/move.pm:494
@@ -255,7 +255,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -271,7 +271,7 @@ msgstr ""
 "\n"
 "Ito ay marahil dahil \"corrupted\" ang mga \"configuration file\"\n"
 "ng sistema na nasa USB key. Maaayos ito sa pamamagitan\n"
-"ng pagtanggal ng mga ito at pag-reboot ng Mandrake Move.\n"
+"ng pagtanggal ng mga ito at pag-reboot ng Mandriva Move.\n"
 "Para gawin ito i-click ang angkop na button.\n"
 "\n"
 "\n"
@@ -1310,11 +1310,11 @@ msgstr "Mano-manong pili"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Kaya ng Mandrakelinux na sumuporta sa maraming wika. Piliin\n"
+"Kaya ng Mandrivalinux na sumuporta sa maraming wika. Piliin\n"
 "ang mga wika na nais ninyong i-install. Sila ay mapapakinabangan\n"
 "kung natapos na ang inyong installation at ni-restart ang inyong sistema."
 
@@ -3744,12 +3744,12 @@ msgstr "Paganahin ang suporta sa radyo"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Bago magpatuloy, kailangang basahin ninyong mabuti ang mga nasasaad sa\n"
-"lisensiya. Tinutukoy nito ang kabuoang distribusyon ng Mandrakelinux. Kung\n"
+"lisensiya. Tinutukoy nito ang kabuoang distribusyon ng Mandrivalinux. Kung\n"
 "kayo ay sumasang-ayon sa lahat ng nasasaad, i-check ang \"%s\" na box.\n"
 "Kung hindi, i-click ang \"%s\" na button para i-reboot ang inyong computer."
 
@@ -3953,13 +3953,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Ang installation ng Mandrakelinux ay nakahati sa ilang mga CD-ROM.\n"
+"Ang installation ng Mandrivalinux ay nakahati sa ilang mga CD-ROM.\n"
 "Kung ang napiling package ay nakalagay sa ibang CD-ROM, iluluwa ng DrakX\n"
 "ang kasalukuyang CD at ipapasuksok sa inyo ang tamang CD."
 
@@ -3967,11 +3967,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4024,11 +4024,11 @@ msgid ""
 msgstr ""
 "Panahon na para piliin kung aling mga program ang nais ninyong i-install sa\n"
 "inyong sistema. Mayroong libo-libong mga package na available para sa\n"
-"Mandrakelinux, at upang mas madali itong pangasiwaan, ang mga package\n"
+"Mandrivalinux, at upang mas madali itong pangasiwaan, ang mga package\n"
 "ay inayos sa mga pangkat ng magkakatulad na mga application.\n"
 "\n"
 "Ang mga package ay inayos sa mga pangkat na batay sa paggamit ng\n"
-"inyong makina. Inaayos ng Mandrakelinux ang mga pangkat ng mga\n"
+"inyong makina. Inaayos ng Mandrivalinux ang mga pangkat ng mga\n"
 "package sa apat na kategoriya. Maaari ninyong paghaluhaluin at\n"
 "pagbagaybagayin ang mga application mula sa sari-saring kategoriya,\n"
 "para ang installation na ``Workstation'' ay maaari pa ring maka-install\n"
@@ -4137,10 +4137,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4173,11 +4173,11 @@ msgstr ""
 "!! Kung ang isang package ng server ay napili, dahil kayo ay pumili ng\n"
 "bukod na package o kaya iyon ay bahagi ng isang pangkat ng mga package,\n"
 "kayo ay tatanungin kung gusto ninyo talagang i-install ang mga server na\n"
-"iyon. Bilang default, sisimulan kaagad ng Mandrakelinux pag-boot ang kahit\n"
+"iyon. Bilang default, sisimulan kaagad ng Mandrivalinux pag-boot ang kahit\n"
 "anong na-install na mga service. Kahit na sila ay ligtas at walang kilalang "
 "mga\n"
 "issue nang mailabas ang distribusyon, maaring matuklasan na may butas sa\n"
-"seguridad pagkatapos matapos ang version ng Mandrakelinux na ito. Kung\n"
+"seguridad pagkatapos matapos ang version ng Mandrivalinux na ito. Kung\n"
 "hindi ninyo nalalaman ang ginagawa ng isang service o bakit ito ini-"
 "install,\n"
 "i-click ang \"%s\". Ang pagki-click sa \"%s\" ay mag-i-install ng mga "
@@ -4346,7 +4346,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4402,7 +4402,7 @@ msgid ""
 msgstr ""
 "X (para sa \"X Window System\") ay ang puso ng \"graphical interface\"\n"
 "ng GNU/Linux na kung saan lahat ng mga \"graphical environment\" (KDE,\n"
-"GNOME, AfterStep, WindowMaker, atbp.) na kasama sa Mandrakelinux ay\n"
+"GNOME, AfterStep, WindowMaker, atbp.) na kasama sa Mandrivalinux ay\n"
 "nakaasa.\n"
 "\n"
 "Ihaharap sa inyo ang isang talaan ng iba-ibang mga parameter na babaguhin\n"
@@ -4529,12 +4529,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4561,7 +4561,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4570,7 +4570,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4591,13 +4591,13 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Sa puntong ito, kailangan ninyong magpasya kung saan ninyo nais i-install\n"
-"ang Mandrakelinux na \"operating system\" (OS) sa inyong \"hard drive\".\n"
+"ang Mandrivalinux na \"operating system\" (OS) sa inyong \"hard drive\".\n"
 "Kung ang inyong \"hard drive\" ay walang laman o kung may namamalaging\n"
 "\"operating system\" na gumagamit sa lahat ng available na puwang,\n"
 "kakailanganin ninyong ipartisyon ang drive. Ang pagpapartisyon ng isang\n"
 "\"hard drive\" ay ginagawa sa pamamagitan ng paghahati-hati nito sa\n"
 "kaisipan (\"logical\") upang makagawa ng puwang na kinakailangan para\n"
-"ma-install ang inyong bagong sistema ng Mandrakelinux.\n"
+"ma-install ang inyong bagong sistema ng Mandrivalinux.\n"
 "\n"
 "Dahil kadalasan na hindi na mababawi ang paraan ng pagpapartisyon ng\n"
 "hard drive at maaaring magdulot ng pagkawala ng data  kung mayroon\n"
@@ -4633,7 +4633,7 @@ msgstr ""
 "walang mawawalang data, kung dati na ninyong na-defragment ang partisyon\n"
 "ng Windows. Matinding itinatagubilin na i-backup ang inyong data. Ang\n"
 "paggamit sa option na ito ay ipinapayo kung nais ninyong gamitin pareho ang\n"
-"Mandrakelinux at Microsoft Windows sa iisang computer.\n"
+"Mandrivalinux at Microsoft Windows sa iisang computer.\n"
 "\n"
 "   Bago piliin ang option na ito, pakiunawa na pagkatapos ng paraang ito,\n"
 "ang laki ng partisyon ng inyong Microsoft Windows ay magiging mas\n"
@@ -4643,7 +4643,7 @@ msgstr ""
 "\n"
 " * \"%s\": kung gusto ninyong tanggalin lahat ng data at mga partisyon\n"
 "na mayroon sa inyong hard drive at palitan sila ng inyong bagong sistema\n"
-"ng Mandrakelinux, piliin ang option na ito. Maging maingat, dahil hindi na\n"
+"ng Mandrivalinux, piliin ang option na ito. Maging maingat, dahil hindi na\n"
 "ninyo maaaring bawiin ang inyong pili matapos ninyong patotohanan ito.\n"
 "\n"
 "   !! kung pipiliin ninyo ang option na ito, lahat ng data sa inyong disk "
@@ -4809,7 +4809,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4835,7 +4835,7 @@ msgstr ""
 "I-click ang \"%s\" kung handa na kayong i-format ang mga partisyon.\n"
 "\n"
 "I-click ang \"%s\" kung gusto ninyong pumili ng ibang partisyon para sa\n"
-"inyong pag-i-install ng bagong Mandrakelinux na \"operating system\".\n"
+"inyong pag-i-install ng bagong Mandrivalinux na \"operating system\".\n"
 "\n"
 "I-click ang \"%s\" kung nais ninyong piliin ang mga partisyon na susuriin\n"
 "para sa mga \"bad blocks\" (mga sirang bloke) sa disk."
@@ -4852,7 +4852,7 @@ msgstr "Nakaraan"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4864,7 +4864,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Pagdating ng panahon na kayo ay nag-i-install ng Mandrakelinux, mas\n"
+"Pagdating ng panahon na kayo ay nag-i-install ng Mandrivalinux, mas\n"
 "malamang na ilang mga package ay nabago na simula nang naunang\n"
 "paglabas. Maaaring inayos ang mga sira (\"bug\"), naresolba ang mga tanong\n"
 "sa sequridad. Para pakinabangan ang mga update (pagbabago) na ito ,\n"
@@ -4895,7 +4895,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4924,7 +4924,7 @@ msgstr "Tagapamala ng Seguridad"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4995,7 +4995,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Sa puntong ito, kailangan ninyong piliin kung aling mga partisyon ang\n"
-"gagamitin para sa pag-i-install ng sistema na Mandrakelinux. Kung ang\n"
+"gagamitin para sa pag-i-install ng sistema na Mandrivalinux. Kung ang\n"
 "mga partisyon ay nai-define na, mula sa dating pag-i-install ng GNU/Linux\n"
 "o ng ibang kasangkapang pangpartisyon, maaari ninyong gamiting ang\n"
 "mga mayroon nang partisyon. Kung hindi, dapat mag-define ng mga\n"
@@ -5094,7 +5094,7 @@ msgstr "Lipat sa normal o bihasang mode"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5125,7 +5125,7 @@ msgstr ""
 "Mahigit sa isang partisyon ng Microsoft ang natiktikan sa inyong hard "
 "drive.\n"
 "Pakipili kung alin ang gusto ninyong i-resize para ma-install ang inyong\n"
-"bagong \"operating sytem\" na Mandrakelinux.\n"
+"bagong \"operating sytem\" na Mandrivalinux.\n"
 "\n"
 "Bawat partition ay nakalista ng ganito: \"Pangalan ng Linux\",\n"
 "\"Pangalan ng Windows\", \"Capacity\".\n"
@@ -5180,7 +5180,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5189,19 +5189,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Ang hakbang na ito pagaganahin lamang kung mayroong nakitang\n"
 "partisyon ng GNU/Linux sa inyong makina.\n"
 "\n"
 "Kailangang malaman ngayon ng DrakX kung gusto ninyong magsagawa\n"
-"ng bagong install o upgrade ng namamalaging Mandrakelinux na sistema:\n"
+"ng bagong install o upgrade ng namamalaging Mandrivalinux na sistema:\n"
 "\n"
 " * \"%s\": Para sa karamihang bahagi, ganap na binubura nito ang lumang\n"
 "sistema. Kung nais ninyong baguhin kung paano ang pagpartisyon sa inyong\n"
@@ -5212,13 +5212,13 @@ msgstr ""
 " * \"%s\": ang klase ng pag-i-install na ito ay pahihintulutan kayong i-"
 "update\n"
 "ang mga package na kasalukuyang naka-install sa inyong sistema ng\n"
-"Mandrakelinux. Ang inyong kasalukuyang pakana ng pagpapartisyon at\n"
+"Mandrivalinux. Ang inyong kasalukuyang pakana ng pagpapartisyon at\n"
 "data ng gumagamit ay hindi nabago. Karamihan ng ibang mga hakbang sa\n"
 "pagko-configure ay mayroon pa rin, katulad ng standard na pag-i-install.\n"
 "\n"
 "Ang paggamit sa ``Upgrade'' na option ay gagana ng mabuti sa mga sistema\n"
-"ng Mandrakelinux na nagpapatakbo ng version \"8.1\" o pataas. Ang\n"
-"pagsasagawa ng upgrade sa mga version bago ng Mandrakelinux \"8.1\" ay\n"
+"ng Mandrivalinux na nagpapatakbo ng version \"8.1\" o pataas. Ang\n"
+"pagsasagawa ng upgrade sa mga version bago ng Mandrivalinux \"8.1\" ay\n"
 "hindi ipinapayo."
 
 #: help.pm:591
@@ -5279,7 +5279,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5321,7 +5321,7 @@ msgstr ""
 "Tungkol sa suporta sa UTF-8 (unicode): Ang Unicode ay isang bagong\n"
 "\"character encoding\" na nagnanais masakop ang lahat ng namamalaging\n"
 "wika. Ang buong suporta dita ng GNU/Linux ay ginagawa pa rin. Sa dahilang\n"
-"ito, gagamitin ito o hindi ng Mandrakelinux depende sa mga pili ng mga\n"
+"ito, gagamitin ito o hindi ng Mandrivalinux depende sa mga pili ng mga\n"
 "gumagamit:\n"
 "\n"
 " * Kung kayo ay pipili ng wika na may malakas na \"legacy encoding"
@@ -5585,7 +5585,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5606,12 +5606,12 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Panahon na upang pumili ng sistema ng pagpi-print para sa inyong computer.\n"
 "Ang ibang mga \"operating system\" (OS) ay mag-aalok lamang ng isa, pero\n"
-"ang Mandrakelinux ay nag-aalok ng dalawa. Bawat isa sa dalawang sistema\n"
+"ang Mandrivalinux ay nag-aalok ng dalawa. Bawat isa sa dalawang sistema\n"
 "ng pagpi-print na ito ay nababagay sa natatanging uri ng configuration.\n"
 "\n"
 " * \"%s\" -- na acronym para sa ``print, do not queue'', ang piliin kung "
@@ -5763,7 +5763,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5780,7 +5780,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5918,11 +5918,11 @@ msgstr "Mga serbisyo"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Piliin ang hard drive na inyong gustong burahin upang ma-install ang\n"
-"inyong bagong Mandrakelinux na partisyon. Mag-ingat, lahat ng data\n"
+"inyong bagong Mandrivalinux na partisyon. Mag-ingat, lahat ng data\n"
 "sa drive na ito ay mawawala at hindi na ito mababawi!"
 
 #: help.pm:863
@@ -6275,12 +6275,12 @@ msgstr "Kino-compute ang laki ng partisyon ng Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Ang inyong partisyon ng Windows ay sobrang fragmented. Paki-reboot ang "
 "inyong computer sa Windows, patakbuhin ang ``defrag'', at simulan ulit ang "
-"pag-i-install ng Mandrakelinux."
+"pag-i-install ng Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6398,19 +6398,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6432,7 +6432,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6440,14 +6440,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6457,7 +6457,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6477,10 +6477,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6491,11 +6491,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6511,26 +6511,26 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Pagpapakilala\n"
 "\n"
 "Ang \"operating system\" (OS) at ang mga iba't-ibang bahagi na available sa "
-"distribusyon ng Mandrakelinux\n"
+"distribusyon ng Mandrivalinux\n"
 "ay tatawaging \"Software Products\" magmula ngayon. Ang mga Software "
 "Products ay\n"
 "nagsasama ng, pero hindi limitado dito, mga kumpol ng mga program, paraan, "
 "pamamalakad\n"
 "at dokumentasyon na may kaugnayan sa \"operating system\" at iba't-ibang mga "
 "bahagi ng\n"
-"distribusyon ng Mandrakelinux.\n"
+"distribusyon ng Mandrivalinux.\n"
 "\n"
 "\n"
 "1. Kasunduang Lisensiya\n"
 "\n"
 "Pakibasa ng mabuti ang dokumentong ito. Ang dokumentong ito ay kasunduan na "
 "lisensiya\n"
-"sa pagitan ninyo at ng Mandrakesoft S.A. na sumasakod sa \"Software Products"
+"sa pagitan ninyo at ng Mandriva S.A. na sumasakod sa \"Software Products"
 "\". Sa\n"
 "pag-i-install, pagkokopya o paggagamit ng Software Products sa ano mang "
 "paraan, kayo\n"
@@ -6557,7 +6557,7 @@ msgstr ""
 "\n"
 "Ang mga Software Product at nakakabit na dokumentasyon ay binigay na \"as is"
 "\", na walang warranty,\n"
-"hanggang sa pinahihintulutan ng batas. Ang Mandrakesoft S.A. ay, sa ano mang "
+"hanggang sa pinahihintulutan ng batas. Ang Mandriva S.A. ay, sa ano mang "
 "pangyayari at hanggang\n"
 "sa pinahihintulutan ng batas, walang pananagutan para sa mga natatangi, di-"
 "sinasadya, anumang direkta\n"
@@ -6567,7 +6567,7 @@ msgstr ""
 "bunga ng hatol ng\n"
 "hukuman, o kahit ano pang ibang kakalabasang kawalan) na gawa ng paggamit ng "
 "o hindi magamit ang\n"
-"Software Products, kahit na napayuhan ang Mandrakesoft S.A. ng ikapangyayari "
+"Software Products, kahit na napayuhan ang Mandriva S.A. ng ikapangyayari "
 "o pangyayari ng gayong\n"
 "mga kapinsalaan.\n"
 "\n"
@@ -6575,7 +6575,7 @@ msgstr ""
 "IPINAGBABAWAL NA\n"
 "SOFTWARE SA MGA IBANG BANSA\n"
 "\n"
-"Hanggang sa pinahihintulutan ng batas, ang Mandrakesoft S.A. o ang mga "
+"Hanggang sa pinahihintulutan ng batas, ang Mandriva S.A. o ang mga "
 "distributor nito ay, sa ano\n"
 "mang pangyayari, walang pananagutan para sa mga natatangi, di-sinasadya, "
 "anumang direkta\n"
@@ -6587,7 +6587,7 @@ msgstr ""
 "at paggamit ng mga\n"
 "software component o gawa ng  pagda-download ng mga software component mula "
 "sa isa sa mga site ng\n"
-"Mandrakelinux  na ipinagbabawal ng batas sa mga ibang bansa ng mga local na "
+"Mandrivalinux  na ipinagbabawal ng batas sa mga ibang bansa ng mga local na "
 "batas. Itong may\n"
 "hanggahang pananagutan ay sumasakop, pero hindi lamang dito, sa mga strong "
 "cryptography component\n"
@@ -6609,10 +6609,10 @@ msgstr ""
 "lisensiya para sa bawat component bago gumamit ng kahit anong component. Ang "
 "kahit anong tanong\n"
 "sa lisensiya ng component ay dapat ipaabot sa autor ng component at hindi sa "
-"Mandrakesoft. Ang mga\n"
-"program na nilinang ng Mandrakesoft S.A. ay nasasaklaw ng GPL License. Ang "
+"Mandriva. Ang mga\n"
+"program na nilinang ng Mandriva S.A. ay nasasaklaw ng GPL License. Ang "
 "dokumentasyon na sinulat\n"
-"ng Mandrakesoft S.A. ay nasasaklaw ng tiyak na lisensiya. Pakisangguni ang "
+"ng Mandriva S.A. ay nasasaklaw ng tiyak na lisensiya. Pakisangguni ang "
 "dokumentasyon para sa\n"
 "karagdagang detalye.\n"
 "\n"
@@ -6624,12 +6624,12 @@ msgstr ""
 "kani-kanilang mga\n"
 "autor at protektado by mga batas ng intellectual property at copyright na "
 "nagagamit sa mga software\n"
-"program. Inilalaan ng Mandrakesoft S.A. ang mga karapatan nito na baguhin o "
+"program. Inilalaan ng Mandriva S.A. ang mga karapatan nito na baguhin o "
 "i-adapt ang mga Software\n"
 "Products, sa kabuuan o bahagi, sa lahat ng paraan at para sa lahat ng "
 "layunin.\n"
-"Ang \"Mandrake\", \"Mandrakelinux\" at mga kasamahang logo ay mga trademark "
-"ng Mandrakesoft S.A.  \n"
+"Ang \"Mandriva\", \"Mandrivalinux\" at mga kasamahang logo ay mga trademark "
+"ng Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. \"Governing Laws\" (Mga Sumasaklaw na Batas)\n"
@@ -6646,7 +6646,7 @@ msgstr ""
 "huling gagawin, ang pagtatalo ay isasangguni sa mga naaangkop na mga Hukuman "
 "ng Batas ng Paris - France.\n"
 "Para sa kahit anong katanungan sa dokumentong ito, makipag-alam sa "
-"Mandrakesoft S.A.  \n"
+"Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6740,7 +6740,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6748,14 +6748,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Maligayang bati, tapos na ang pag-i-install.\n"
 "Tanggalin ang boot media at pindutin ang return para mag-boot ulit.\n"
 "\n"
 "\n"
 "Para sa inpormasyon sa mga fixes na available para sa labas ng "
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "na ito, konsultahin ang Errata na available mula sa:\n"
 "\n"
 "\n"
@@ -6800,12 +6800,12 @@ msgstr "Pumpasok sa hakbang na `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Ang inyong sistema mababa sa kakayahan. Maaari kayong magkaproblema\n"
-"sa pag-install ng Mandrakelinux. Kung mangyari ito, maaari ninyong subukan\n"
+"sa pag-install ng Mandrivalinux. Kung mangyari ito, maaari ninyong subukan\n"
 "ang \"text install\". Para dito, pindutin ang `F1' kapag nagbo-boot sa "
 "CDROM,\n"
 "at ipasok ang `text'."
@@ -7347,9 +7347,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Nakikipag-alam sa web site ng Mandrakelinux para makuha ang talaan ng mga "
+"Nakikipag-alam sa web site ng Mandrivalinux para makuha ang talaan ng mga "
 "available na mirror..."
 
 #: install_steps_interactive.pm:840
@@ -7578,8 +7578,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Pag-install ng Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Pag-install ng Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10170,14 +10170,14 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall configurator\n"
 "\n"
 "Ito ay nagko-configure ng personal na firewall para sa makinang ito ng\n"
-"Mandrakelinux. Para sa mas makapangyarihan at dedicated na solusyon\n"
+"Mandrivalinux. Para sa mas makapangyarihan at dedicated na solusyon\n"
 "ng firewall, pakitingnan ang pinatanging distribusyon na MandrakeSecurity\n"
 "Firewall."
 
@@ -14232,7 +14232,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -16185,18 +16185,18 @@ msgstr "Hinto"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Ano ang Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Ano ang Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Maligayang pagdating sa <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Maligayang pagdating sa <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -16205,12 +16205,12 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, fuzzy, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Ang Mandrakelinux ay isang Open Source na distribusyon na binubuo ng libo-"
+"Ang Mandrivalinux ay isang Open Source na distribusyon na binubuo ng libo-"
 "libong mga piling-pili na application mula sa mundo ng Libreng Software "
-"(Free Software). Ang Mandrakelinux ay isa sa mga pinaka ginagamit na "
+"(Free Software). Ang Mandrivalinux ay isa sa mga pinaka ginagamit na "
 "distribusyon ng Linux sa buong mundo!"
 
 #: share/advertising/02.pl:13
@@ -16226,15 +16226,15 @@ msgstr "Maligayang pagdating sa mundo ng Open Source!"
 #: share/advertising/02.pl:17
 #, fuzzy, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Ang Mandrakelinux ay committed sa Open Source na Model at buo ang paggalang "
+"Ang Mandrivalinux ay committed sa Open Source na Model at buo ang paggalang "
 "sa General Public License. Itong bagong release ay bunga ng bayanihan ng mga "
-"pangkat ng developer ng Mandrakesoft at ng buong mundong komunidad ng mga "
-"taga-ambag sa Mandrakelinux."
+"pangkat ng developer ng Mandriva at ng buong mundong komunidad ng mga "
+"taga-ambag sa Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, fuzzy, c-format
@@ -16254,7 +16254,7 @@ msgstr "<b>Tandaan</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -16275,15 +16275,15 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, fuzzy, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Sumali na sa komunidad ng Mandrakelinux!</b>"
+msgstr "<b>Sumali na sa komunidad ng Mandrivalinux!</b>"
 
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -16297,13 +16297,13 @@ msgstr ""
 #: share/advertising/05.pl:15
 #, fuzzy, c-format
 msgid "<b>Download Version</b>"
-msgstr "Ito ang Mandrakelinux <b>Download version</b>."
+msgstr "Ito ang Mandrivalinux <b>Download version</b>."
 
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -16330,7 +16330,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -16340,7 +16340,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -16363,17 +16363,17 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, fuzzy, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"Ang PowerPack ay ang premier na produktong Linux desktop ng Mandrakesoft. "
+"Ang PowerPack ay ang premier na produktong Linux desktop ng Mandriva. "
 "Bukod sa pagiging pinakamadali at pinaka user-friendly na distribusyon ng "
 "Linux, ang PowerPack ay nagsasama ng libo-libong mga application - lahat "
 "mula sa pinakatanyag sa pinakateknikal."
@@ -16385,7 +16385,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -16403,20 +16403,20 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakestore</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva Store</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux Updates Applet"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux Updates Applet"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16436,61 +16436,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr "Alamin ang tungkol sa aming <b>Personal Solutions</b>:"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -16528,7 +16528,7 @@ msgstr "<b>Piliin ang inyong graphical na Desktop environment!</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -16549,7 +16549,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -16669,10 +16669,10 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, fuzzy, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Sa Mandrakelinux menu makakakita kayo ng mga madaling gamitin na application "
+"Sa Mandrivalinux menu makakakita kayo ng mga madaling gamitin na application "
 "para sa lahat ng inyong gawain:"
 
 #: share/advertising/18.pl:16
@@ -16923,17 +16923,17 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux Control Center</b>"
 
 #: share/advertising/25.pl:15
 #, fuzzy, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"Ang Mandrakelinux Control Center ay kinakailangang koleksyon ng mga "
+"Ang Mandrivalinux Control Center ay kinakailangang koleksyon ng mga "
 "kagamitang pang Mandrake lamang para maging simple ang pagco-configure ng "
 "inyong computer."
 
@@ -16960,9 +16960,9 @@ msgstr "<b>Ang Piling KDE</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -16974,11 +16974,11 @@ msgstr "<b>MandrakeStore</b>"
 #: share/advertising/27.pl:15
 #, fuzzy, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Hanapin ang lahat ng produkto at serbisyo ng Mandrakesoft sa "
-"<b>Mandrakestore</b> -- ang aming buong serbisyong plataporma ng e-commerce."
+"Hanapin ang lahat ng produkto at serbisyo ng Mandriva sa "
+"<b>Mandriva Store</b> -- ang aming buong serbisyong plataporma ng e-commerce."
 
 #: share/advertising/27.pl:17
 #, c-format
@@ -16999,23 +16999,23 @@ msgstr "Dumaan kayo ngayon sa <b>store.mandrakesoft.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, fuzzy, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 "Makinabang sa mga mahahalagang bigay-pala, produkto at serbisyo sa "
-"pamamagitan ng pagsali sa Mandrakeclub, gaya ng:"
+"pamamagitan ng pagsali sa Mandriva Club, gaya ng:"
 
 #: share/advertising/28.pl:20
 #, fuzzy, c-format
@@ -17023,7 +17023,7 @@ msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
 "<b>store.mandrakesoft.com</b>."
 msgstr ""
-"\t* Espesyal na mga tawad para sa mga produkto at serbisyo sa Mandrakestore"
+"\t* Espesyal na mga tawad para sa mga produkto at serbisyo sa Mandriva Store"
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -17034,7 +17034,7 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, fuzzy, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 "\t* Makilahok sa \"online chat\" (usapan sa internet) gamit ang <b>Kopete</b>"
 
@@ -17042,26 +17042,26 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -17084,32 +17084,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -17410,8 +17410,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "<b>Mandrakestore</b>"
+msgid "Mandriva Wizards"
+msgstr "<b>Mandriva Store</b>"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -17564,7 +17564,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17578,7 +17578,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[MGA_OPTION]...\n"
-"Taga-configure ng Mandrake Terminal Server\n"
+"Taga-configure ng Mandriva Terminal Server\n"
 "--enable         : paganahin ang MTS\n"
 "--disable        : i-disable ang MTS\n"
 "--start          : paandarin ang MTS\n"
@@ -17636,14 +17636,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPTION]...\n"
-"  --no-confirmation      huwag magtanong ng unang patotoo sa MandrakeUpdate "
+"  --no-confirmation      huwag magtanong ng unang patotoo sa Mandriva Update "
 "na mode\n"
 "  --no-verify-rpm        huwag i-verify ang mga signature ng mga package\n"
 "  --changelog-first      ipakita ang changelog bago ang filelist sa window "
@@ -20441,13 +20441,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "Mandrake Bug Report Tool"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux Control Center"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20467,8 +20467,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20512,7 +20512,7 @@ msgstr "Mga Configuration Wizard"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -20939,7 +20939,7 @@ msgstr "Sinimulan sa boot"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Ang interface na ito ay hindi pa na-configure.\n"
 "Patakbuhin ang \"Magdagdag ng interface\" na assistant mula sa Mandrake "
@@ -20949,7 +20949,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Ang interface na ito ay hindi pa na-configure.\n"
 "Patakbuhin ang \"%s\" na assistant mula sa Mandrake Control Center"
@@ -21002,7 +21002,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -21301,7 +21301,7 @@ msgstr "Mag-import"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21310,7 +21310,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 ng Mandrakesoft \n"
+"Copyright (C) 2001-2002 ng Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original na version)\n"
@@ -21860,14 +21860,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "Ito ay libreng software at maaaring muling ipamahagi sa ilalim ng mga "
 "nasasaad sa GNU GPL.\n"
 "\n"
@@ -21896,7 +21896,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Mandrake Control Center"
 
 #: standalone/drakhelp:36
@@ -25441,7 +25441,7 @@ msgstr "Tapos na ang pagbabago, pero para magkabisa dapat kayong mag-logout."
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Mandrake Tools Logs"
 
 #: standalone/logdrake:51
@@ -25958,10 +25958,10 @@ msgstr "Kompleta na ang koneksyon."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Koneksyon ay nabigo.\n"
-"I-verify ang inyong configuration sa Mandrakelinux Control Center."
+"I-verify ang inyong configuration sa Mandrivalinux Control Center."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26838,8 +26838,8 @@ msgstr "Pag-i-install nabigo"
 #~ msgstr "Hindi kayo nakapili ng font"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "<b>Mandrakestore</b>"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "<b>Mandriva Store</b>"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Walang available na browser! Mag-install ng isa"
@@ -26974,13 +26974,13 @@ msgstr "Pag-i-install nabigo"
 #~ msgstr "Error sa pagbubukas ng %s para sa pagsusulat: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Ito ay HardDrake, isang kagamitang gawa ng Mandrakelinux na pang-"
+#~ "Ito ay HardDrake, isang kagamitang gawa ng Mandrivalinux na pang-"
 #~ "configure ng hardware.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
@@ -27407,18 +27407,18 @@ msgstr "Pag-i-install nabigo"
 #~ "Nabigong tanggalin ang printer na \"%s\" mula sa Star Office/OpenOffice."
 #~ "org/GIMP."
 
-#~ msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
-#~ msgstr "<b>Maligayang bati sa pagpili ng Mandrakelinux!</b>"
+#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
+#~ msgstr "<b>Maligayang bati sa pagpili ng Mandrivalinux!</b>"
 
 #~ 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."
+#~ "Your new Mandrivalinux operating system and its many applications is the "
+#~ "result of collaborative efforts between Mandriva developers and "
+#~ "Mandrivalinux contributors throughout the world."
 #~ msgstr ""
-#~ "Ang iyong bagong Mandrakelinux na operating system (OS) at marami nitong "
+#~ "Ang iyong bagong Mandrivalinux na operating system (OS) at marami nitong "
 #~ "mga application ay bunga ng mala-bayanihang pagsisikap sa pagitan ng mga "
-#~ "developer ng Mandrakesoft at mga nag-aambag (mula sa iba't-ibang bahagi "
-#~ "ng mundo) sa Mandrakelinux."
+#~ "developer ng Mandriva at mga nag-aambag (mula sa iba't-ibang bahagi "
+#~ "ng mundo) sa Mandrivalinux."
 
 #~ msgid ""
 #~ "We would like to thank everyone who participated in the development of "
@@ -27524,27 +27524,27 @@ msgstr "Pag-i-install nabigo"
 #~ "Tingnan at i-edit ang mga image at photo gamit ang <b>GQview</b> at "
 #~ "<b>Ang Gimp!</b>"
 
-#~ msgid "Become a <b>Mandrakeclub</b> member!"
-#~ msgstr "Maging kasapi ng <b>Mandrakeclub</b>!"
+#~ msgid "Become a <b>Mandriva Club</b> member!"
+#~ msgstr "Maging kasapi ng <b>Mandriva Club</b>!"
 
 #~ msgid ""
 #~ "Take advantage of valuable benefits, products and services by joining "
-#~ "Mandrakeclub, such as:"
+#~ "Mandriva Club, such as:"
 #~ msgstr ""
 #~ "Makinabang sa mga mahahalagang bigay-pala, produkto at serbisyo sa "
-#~ "pamamagitan ng pagsali sa Mandrakeclub, gaya ng:"
+#~ "pamamagitan ng pagsali sa Mandriva Club, gaya ng:"
 
 #~ msgid "\t* Full access to commercial applications"
 #~ msgstr "\t* Buong access sa mga commercial na application"
 
 #~ msgid ""
-#~ "\t* Special download mirror list exclusively for Mandrakeclub Members"
+#~ "\t* Special download mirror list exclusively for Mandriva Club Members"
 #~ msgstr ""
 #~ "\t* Espesyal na talaan ng mga download mirror para lamang sa mga Kasapi "
-#~ "ng Mandrakeclub"
+#~ "ng Mandriva Club"
 
-#~ msgid "\t* Voting for software to put in Mandrakelinux"
-#~ msgstr "\t* Pagboto para sa mga software na ilalagay sa Mandrakelinux"
+#~ msgid "\t* Voting for software to put in Mandrivalinux"
+#~ msgstr "\t* Pagboto para sa mga software na ilalagay sa Mandrivalinux"
 
 #~ msgid "\t* Plus much more"
 #~ msgstr "\t* At higit na marami pa"
@@ -27556,12 +27556,12 @@ msgstr "Pag-i-install nabigo"
 #~ msgid "Do you require assistance?"
 #~ msgstr "Nangangailangan ba kayo ng tulong?"
 
-#~ msgid "<b>Mandrakeexpert</b> is the primary source for technical support."
+#~ msgid "<b>Mandriva Expert</b> is the primary source for technical support."
 #~ msgstr ""
-#~ "<b>Mandrakeexpert</b> ay ang pangunahing pinagmulan ng tulong teknikal."
+#~ "<b>Mandriva Expert</b> ay ang pangunahing pinagmulan ng tulong teknikal."
 
 #~ msgid ""
-#~ "If you have Linux questions, subscribe to Mandrakeexpert at <b>www."
+#~ "If you have Linux questions, subscribe to Mandriva Expert at <b>www."
 #~ "mandrakeexpert.com</b>"
 #~ msgstr ""
 #~ "Kung mayroon kayong tanong sa Linux, mag-subscribe sa <b>www."
@@ -27582,24 +27582,24 @@ msgstr "Pag-i-install nabigo"
 #~ "dumalaw sa <b>www.mandrake-linux.com</b>!"
 
 #~ msgid ""
-#~ "Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus "
+#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "
 #~ "the latest versions of the most popular Open Source applications."
 #~ msgstr ""
-#~ "Ang Mandrakelinux ay naglalaman ng mga tanyag na graphical desktop na KDE "
+#~ "Ang Mandrivalinux ay naglalaman ng mga tanyag na graphical desktop na KDE "
 #~ "at GNOME, at ang pinakahuling version ng pinakatanyag na mga Open Source "
 #~ "application."
 
 #~ msgid ""
-#~ "Mandrakelinux is widely known as the most user-friendly and the easiest "
+#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "
 #~ "to install and easy to use Linux distribution."
 #~ msgstr ""
-#~ "Ang Mandrakelinux ay kilalang-kilala bilang (1) pinaka \"user friendly"
+#~ "Ang Mandrivalinux ay kilalang-kilala bilang (1) pinaka \"user friendly"
 #~ "\" (mabait sa gumagamit); (2) pinaka madaling i-install; at (3) pinaka "
 #~ "madaling gamitin; na distribusyon ng Linux."
 
-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with <b>Mandrakemove</b>"
+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandrakemove</b>"
 #~ msgstr ""
-#~ "\t* Alamin ang Mandrakelinux sa bootable na CD gamit ang <b>Mandrakemove</"
+#~ "\t* Alamin ang Mandrivalinux sa bootable na CD gamit ang <b>Mandrakemove</"
 #~ "b>"
 
 #~ msgid ""
@@ -27650,12 +27650,12 @@ msgstr "Pag-i-install nabigo"
 #~ 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 "
+#~ "Mandrivalinux distribution. A unique blend for incomparable HPC "
 #~ "performance."
 #~ msgstr ""
 #~ "<b>MandrakeClustering</b>: ang kapangyarihan at bilis ng Linux cluster na "
 #~ "sinamahan ng stability (kapanatagan) at ease-of-use (madaling gamitin) ng "
-#~ "tanyag sa mundo na distribusyon ng Mandrakelinux. Isang kakaibang halo "
+#~ "tanyag sa mundo na distribusyon ng Mandrivalinux. Isang kakaibang halo "
 #~ "para sa walang katulad na HPC performance."
 
 #~ msgid ""
@@ -27667,14 +27667,14 @@ msgstr "Pag-i-install nabigo"
 #~ "mula standard hanggang professional support, mula 1 hanggang 50 mga "
 #~ "incident, piliin ang isang makasisiya sa inyong mga pangangailangan!"
 
-#~ msgid "<b>Become a Mandrakeclub member!</b>"
-#~ msgstr "<b>Maging Kasapi ng Mandrakeclub!</b>"
+#~ msgid "<b>Become a Mandriva Club member!</b>"
+#~ msgstr "<b>Maging Kasapi ng Mandriva Club!</b>"
 
 #~ msgid "<b>Do you require assistance?</b>"
 #~ msgstr "<b>Nangangailangan ba kayo ng tulong?</b>"
 
-#~ msgid "This is the Mandrakelinux <b>Download version</b>."
-#~ msgstr "Ito ang Mandrakelinux <b>Download version</b>."
+#~ msgid "This is the Mandrivalinux <b>Download version</b>."
+#~ msgstr "Ito ang Mandrivalinux <b>Download version</b>."
 
 #~ msgid ""
 #~ "The free download version does not include commercial software, and "
@@ -27686,14 +27686,14 @@ msgstr "Pag-i-install nabigo"
 #~ "at RTC) at video card (gaya ng ATI® at NVIDIA®)."
 
 #~ msgid ""
-#~ "Your new Mandrakelinux distribution and its many applications are the "
-#~ "result of collaborative efforts between Mandrakesoft developers and "
-#~ "Mandrakelinux contributors throughout the world."
+#~ "Your new Mandrivalinux distribution and its many applications are the "
+#~ "result of collaborative efforts between Mandriva developers and "
+#~ "Mandrivalinux contributors throughout the world."
 #~ msgstr ""
-#~ "Ang inyong bagong distribusyon ng Mandrakelinux at marami nitong mga "
+#~ "Ang inyong bagong distribusyon ng Mandrivalinux at marami nitong mga "
 #~ "application ay bunga ng mala-bayanihang pagsisikap sa pagitan ng mga "
-#~ "developer ng Mandrakesoft at mga nag-aambag (mula sa iba't-ibang bahagi "
-#~ "ng mundo) sa Mandrakelinux."
+#~ "developer ng Mandriva at mga nag-aambag (mula sa iba't-ibang bahagi "
+#~ "ng mundo) sa Mandrivalinux."
 
 #~ msgid "<b>PowerPack+</b>"
 #~ msgstr "<b>PowerPack+</b>"
@@ -27709,25 +27709,25 @@ msgstr "Pag-i-install nabigo"
 #~ "komprehensibong pagpili ng mga world-class server application."
 
 #~ msgid ""
-#~ "It is the only Mandrakelinux product that includes the groupware solution."
+#~ "It is the only Mandrivalinux product that includes the groupware solution."
 #~ msgstr ""
-#~ "Ito lang ang tanging produkto ng Mandrakelinux na isinasama ang groupware "
+#~ "Ito lang ang tanging produkto ng Mandrivalinux na isinasama ang groupware "
 #~ "solution."
 
 #~ msgid ""
-#~ "When you log into your Mandrakelinux system for the first time, you can "
+#~ "When you log into your Mandrivalinux system for the first time, you can "
 #~ "choose between several popular graphical desktops environments, "
 #~ "including: KDE, GNOME, WindowMaker, IceWM, and others."
 #~ msgstr ""
-#~ "Kung kayo ay magla-login sa Mandrakelinux na sistema sa kauna-unahang "
+#~ "Kung kayo ay magla-login sa Mandrivalinux na sistema sa kauna-unahang "
 #~ "pagkakataon, maaari kayong pumili sa ilang mga tanyag na graphical "
 #~ "desktop environment, gaya ng: KDE, GNOME, WindowMaker, IceWM, at iba pa."
 
 #~ msgid ""
-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "
+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
 #~ "of your tasks:"
 #~ msgstr ""
-#~ "Sa Mandrakelinux menu makakakita kayo ng mga madaling gamitin na "
+#~ "Sa Mandrivalinux menu makakakita kayo ng mga madaling gamitin na "
 #~ "application para sa lahat ng inyong gawain:"
 
 #~ msgid ""
@@ -27774,13 +27774,13 @@ msgstr "Pag-i-install nabigo"
 #~ msgstr "\t* Address Book (server at client)"
 
 #~ msgid ""
-#~ "Your new Mandrakelinux distribution is the result of collaborative "
-#~ "efforts between Mandrakesoft developers and Mandrakelinux contributors "
+#~ "Your new Mandrivalinux distribution is the result of collaborative "
+#~ "efforts between Mandriva developers and Mandrivalinux contributors "
 #~ "throughout the world."
 #~ msgstr ""
-#~ "Ang inyong bagong distribusyon ng Mandrakelinux ay bunga ng mala-"
-#~ "bayanihang pagsisikap sa pagitan ng mga developer ng Mandrakesoft at mga "
-#~ "nag-aambag (mula sa iba't-ibang bahagi ng mundo) sa Mandrakelinux."
+#~ "Ang inyong bagong distribusyon ng Mandrivalinux ay bunga ng mala-"
+#~ "bayanihang pagsisikap sa pagitan ng mga developer ng Mandriva at mga "
+#~ "nag-aambag (mula sa iba't-ibang bahagi ng mundo) sa Mandrivalinux."
 
 #~ msgid ""
 #~ "We would like to thank everyone who participated in the development of "
@@ -27850,13 +27850,13 @@ msgstr "Pag-i-install nabigo"
 #~ msgid ""
 #~ "Before continuing, you should carefully read the terms of the license. "
 #~ "It\n"
-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "
+#~ "covers the entire Mandrivalinux 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 ""
 #~ "Bago magpatuloy, kailangang basahin ninyong mabuti ang mga nasasaad sa\n"
-#~ "lisensiya. Tinutukoy nito ang kabuoang distribusyon ng Mandrakelinux. "
+#~ "lisensiya. Tinutukoy nito ang kabuoang distribusyon ng Mandrivalinux. "
 #~ "Kung\n"
 #~ "kayo ay sumasang-ayon sa lahat ng nasasaad, i-check ang \"%s\" na box.\n"
 #~ "Kung hindi, i-click ang \"%s\" na button para i-reboot ang inyong "
@@ -27982,25 +27982,25 @@ msgstr "Pag-i-install nabigo"
 #~ "ang check sa \"%s\" na box."
 
 #~ msgid ""
-#~ "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+#~ "The Mandrivalinux 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 ""
-#~ "Ang installation ng Mandrakelinux ay nakahati sa ilang mga CD-ROM.\n"
+#~ "Ang installation ng Mandrivalinux ay nakahati sa ilang mga CD-ROM.\n"
 #~ "Kung ang napiling package ay nakalagay sa ibang CD-ROM, iluluwa ng DrakX\n"
 #~ "ang kasalukuyang CD at ipapasuksok sa inyo ang tamang CD."
 
 #~ msgid ""
 #~ "It is now time to specify which programs you wish to install on your\n"
-#~ "system. There are thousands of packages available for Mandrakelinux, and\n"
+#~ "system. There are thousands of packages available for Mandrivalinux, 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. Mandrakelinux sorts packages groups in four categories. You can\n"
+#~ "machine. Mandrivalinux 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"
@@ -28055,11 +28055,11 @@ msgstr "Pag-i-install nabigo"
 #~ "Panahon na para piliin kung aling mga program ang nais ninyong i-install "
 #~ "sa\n"
 #~ "inyong sistema. Mayroong libo-libong mga package na available para sa\n"
-#~ "Mandrakelinux, at upang mas madali itong pangasiwaan, ang mga package\n"
+#~ "Mandrivalinux, at upang mas madali itong pangasiwaan, ang mga package\n"
 #~ "ay inayos sa mga pangkat ng magkakatulad na mga application.\n"
 #~ "\n"
 #~ "Ang mga package ay inayos sa mga pangkat na batay sa paggamit ng\n"
-#~ "inyong makina. Inaayos ng Mandrakelinux ang mga pangkat ng mga\n"
+#~ "inyong makina. Inaayos ng Mandrivalinux ang mga pangkat ng mga\n"
 #~ "package sa apat na kategoriya. Maaari ninyong paghaluhaluin at\n"
 #~ "pagbagaybagayin ang mga application mula sa sari-saring kategoriya,\n"
 #~ "para ang installation na ``Workstation'' ay maaari pa ring maka-install\n"
@@ -28135,11 +28135,11 @@ msgstr "Pag-i-install nabigo"
 #~ "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 Mandrakelinux will automatically start any "
+#~ "installed. By default Mandrivalinux 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 Mandrakelinux was\n"
+#~ "security holes were discovered after this version of Mandrivalinux 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"
@@ -28180,12 +28180,12 @@ msgstr "Pag-i-install nabigo"
 #~ "!! Kung ang isang package ng server ay napili, dahil kayo ay pumili ng\n"
 #~ "bukod na package o kaya iyon ay bahagi ng isang pangkat ng mga package,\n"
 #~ "kayo ay tatanungin kung gusto ninyo talagang i-install ang mga server na\n"
-#~ "iyon. Bilang default, sisimulan kaagad ng Mandrakelinux pag-boot ang "
+#~ "iyon. Bilang default, sisimulan kaagad ng Mandrivalinux pag-boot ang "
 #~ "kahit\n"
 #~ "anong na-install na mga service. Kahit na sila ay ligtas at walang "
 #~ "kilalang mga\n"
 #~ "issue nang mailabas ang distribusyon, maaring matuklasan na may butas sa\n"
-#~ "seguridad pagkatapos matapos ang version ng Mandrakelinux na ito. Kung\n"
+#~ "seguridad pagkatapos matapos ang version ng Mandrivalinux na ito. Kung\n"
 #~ "hindi ninyo nalalaman ang ginagawa ng isang service o bakit ito ini-"
 #~ "install,\n"
 #~ "i-click ang \"%s\". Ang pagki-click sa \"%s\" ay mag-i-install ng mga "
@@ -28219,7 +28219,7 @@ msgstr "Pag-i-install nabigo"
 #~ "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"
-#~ "Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
+#~ "Mandrivalinux 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"
@@ -28240,7 +28240,7 @@ msgstr "Pag-i-install nabigo"
 #~ "modems\n"
 #~ "that require additional software to work compared to Normal modems. Some "
 #~ "of\n"
-#~ "those modems actually work under Mandrakelinux, some others do not. You\n"
+#~ "those modems actually work under Mandrivalinux, 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"
@@ -28250,7 +28250,7 @@ msgstr "Pag-i-install nabigo"
 #~ msgstr ""
 #~ "Ngayon ay ise-setup ninyo ang inyong koneksyon sa Internet/network.\n"
 #~ "Kung nais ninyong i-connect ang inyong computer sa Internet o sa isang\n"
-#~ "\"local network\", i-click ang \"%s\". Susubukin ng Mandrakelinux na\n"
+#~ "\"local network\", i-click ang \"%s\". Susubukin ng Mandrivalinux na\n"
 #~ "automatic na tiktikan ang mga network device at mga modem. Kung nabigo\n"
 #~ "itong pagtitiktik, tanggalin ang check sa \"%s\" na box. Maaarin rin "
 #~ "ninyong piliin\n"
@@ -28273,7 +28273,7 @@ msgstr "Pag-i-install nabigo"
 #~ "Tungkol sa Winmodem Connection. Ang mga Winmodem ay mga espesyal na\n"
 #~ "\"integrated low-end modem\" na nangangailangan ng karagdagang software\n"
 #~ "para gumana, kung ikukumpara sa mga Normal modem. Ilan sa mga gayong\n"
-#~ "modem ay talagang gagana sa ilalim ng Mandrakelinux, ilang iba pa ay "
+#~ "modem ay talagang gagana sa ilalim ng Mandrivalinux, ilang iba pa ay "
 #~ "hindi.\n"
 #~ "Maaari ninyong konsultahin ang listahan ng mga suportadong modem sa\n"
 #~ "\"LinModems\".\n"
@@ -28414,7 +28414,7 @@ msgstr "Pag-i-install nabigo"
 #~ "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 Mandrakelinux rely upon.\n"
+#~ "WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 #~ "\n"
 #~ "You will be presented with a list of different parameters to change to "
 #~ "get\n"
@@ -28477,7 +28477,7 @@ msgstr "Pag-i-install nabigo"
 #~ msgstr ""
 #~ "X (para sa \"X Window System\") ay ang puso ng \"graphical interface\"\n"
 #~ "ng GNU/Linux na kung saan lahat ng mga \"graphical environment\" (KDE,\n"
-#~ "GNOME, AfterStep, WindowMaker, atbp.) na kasama sa Mandrakelinux ay\n"
+#~ "GNOME, AfterStep, WindowMaker, atbp.) na kasama sa Mandrivalinux ay\n"
 #~ "nakaasa.\n"
 #~ "\n"
 #~ "Ihaharap sa inyo ang isang talaan ng iba-ibang mga parameter na "
@@ -28612,7 +28612,7 @@ msgstr "Pag-i-install nabigo"
 #~ "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"
-#~ "Mandrakelinux system.\n"
+#~ "Mandrivalinux 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 "
@@ -28651,7 +28651,7 @@ msgstr "Pag-i-install nabigo"
 #~ "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 Mandrakelinux and Microsoft Windows "
+#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "
 #~ "on\n"
 #~ "the same computer.\n"
 #~ "\n"
@@ -28661,7 +28661,7 @@ msgstr "Pag-i-install nabigo"
 #~ "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 Mandrakelinux system,\n"
+#~ "your hard drive and replace them with your new Mandrivalinux system,\n"
 #~ "choose this option. Be careful, because you will not be able to undo "
 #~ "your\n"
 #~ "choice after you confirm.\n"
@@ -28688,13 +28688,13 @@ msgstr "Pag-i-install nabigo"
 #~ msgstr ""
 #~ "Sa puntong ito, kailangan ninyong magpasya kung saan ninyo nais i-"
 #~ "install\n"
-#~ "ang Mandrakelinux na \"operating system\" (OS) sa inyong \"hard drive\".\n"
+#~ "ang Mandrivalinux na \"operating system\" (OS) sa inyong \"hard drive\".\n"
 #~ "Kung ang inyong \"hard drive\" ay walang laman o kung may namamalaging\n"
 #~ "\"operating system\" na gumagamit sa lahat ng available na puwang,\n"
 #~ "kakailanganin ninyong ipartisyon ang drive. Ang pagpapartisyon ng isang\n"
 #~ "\"hard drive\" ay ginagawa sa pamamagitan ng paghahati-hati nito sa\n"
 #~ "kaisipan (\"logical\") upang makagawa ng puwang na kinakailangan para\n"
-#~ "ma-install ang inyong bagong sistema ng Mandrakelinux.\n"
+#~ "ma-install ang inyong bagong sistema ng Mandrivalinux.\n"
 #~ "\n"
 #~ "Dahil kadalasan na hindi na mababawi ang paraan ng pagpapartisyon ng\n"
 #~ "hard drive at maaaring magdulot ng pagkawala ng data  kung mayroon\n"
@@ -28740,7 +28740,7 @@ msgstr "Pag-i-install nabigo"
 #~ "ng Windows. Matinding itinatagubilin na i-backup ang inyong data. Ang\n"
 #~ "paggamit sa option na ito ay ipinapayo kung nais ninyong gamitin pareho "
 #~ "ang\n"
-#~ "Mandrakelinux at Microsoft Windows sa iisang computer.\n"
+#~ "Mandrivalinux at Microsoft Windows sa iisang computer.\n"
 #~ "\n"
 #~ "   Bago piliin ang option na ito, pakiunawa na pagkatapos ng paraang "
 #~ "ito,\n"
@@ -28751,7 +28751,7 @@ msgstr "Pag-i-install nabigo"
 #~ "\n"
 #~ " * \"%s\": kung gusto ninyong tanggalin lahat ng data at mga partisyon\n"
 #~ "na mayroon sa inyong hard drive at palitan sila ng inyong bagong sistema\n"
-#~ "ng Mandrakelinux, piliin ang option na ito. Maging maingat, dahil hindi "
+#~ "ng Mandrivalinux, piliin ang option na ito. Maging maingat, dahil hindi "
 #~ "na\n"
 #~ "ninyo maaaring bawiin ang inyong pili matapos ninyong patotohanan ito.\n"
 #~ "\n"
@@ -28876,7 +28876,7 @@ msgstr "Pag-i-install nabigo"
 #~ "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"
-#~ "Mandrakelinux operating system installation.\n"
+#~ "Mandrivalinux operating system installation.\n"
 #~ "\n"
 #~ "Click on \"%s\" if you wish to select partitions that will be checked "
 #~ "for\n"
@@ -28905,14 +28905,14 @@ msgstr "Pag-i-install nabigo"
 #~ "I-click ang \"%s\" kung handa na kayong i-format ang mga partisyon.\n"
 #~ "\n"
 #~ "I-click ang \"%s\" kung gusto ninyong pumili ng ibang partisyon para sa\n"
-#~ "inyong pag-i-install ng bagong Mandrakelinux na \"operating system\".\n"
+#~ "inyong pag-i-install ng bagong Mandrivalinux na \"operating system\".\n"
 #~ "\n"
 #~ "I-click ang \"%s\" kung nais ninyong piliin ang mga partisyon na "
 #~ "susuriin\n"
 #~ "para sa mga \"bad blocks\" (mga sirang bloke) sa disk."
 
 #~ msgid ""
-#~ "At the time you are installing Mandrakelinux, it is likely that some\n"
+#~ "At the time you are installing Mandrivalinux, 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"
@@ -28927,7 +28927,7 @@ msgstr "Pag-i-install nabigo"
 #~ "the\n"
 #~ "selected package(s), or \"%s\" to abort."
 #~ msgstr ""
-#~ "Pagdating ng panahon na kayo ay nag-i-install ng Mandrakelinux, mas\n"
+#~ "Pagdating ng panahon na kayo ay nag-i-install ng Mandrivalinux, mas\n"
 #~ "malamang na ilang mga package ay nabago na simula nang naunang\n"
 #~ "paglabas. Maaaring inayos ang mga sira (\"bug\"), naresolba ang mga "
 #~ "tanong\n"
@@ -28998,7 +28998,7 @@ msgstr "Pag-i-install nabigo"
 #~ "\n"
 #~ "DrakX now needs to know if you want to perform a new install or an "
 #~ "upgrade\n"
-#~ "of an existing Mandrakelinux system:\n"
+#~ "of an existing Mandrivalinux system:\n"
 #~ "\n"
 #~ " * \"%s\": For the most part, this completely wipes out the old system. "
 #~ "If\n"
@@ -29010,21 +29010,21 @@ msgstr "Pag-i-install nabigo"
 #~ "written.\n"
 #~ "\n"
 #~ " * \"%s\": this installation class allows you to update the packages\n"
-#~ "currently installed on your Mandrakelinux system. Your current\n"
+#~ "currently installed on your Mandrivalinux 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 Mandrakelinux systems\n"
+#~ "Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 #~ "running version \"8.1\" or later. Performing an Upgrade on versions "
 #~ "prior\n"
-#~ "to Mandrakelinux version \"8.1\" is not recommended."
+#~ "to Mandrivalinux version \"8.1\" is not recommended."
 #~ msgstr ""
 #~ "Ang hakbang na ito pagaganahin lamang kung mayroong nakitang\n"
 #~ "partisyon ng GNU/Linux sa inyong makina.\n"
 #~ "\n"
 #~ "Kailangang malaman ngayon ng DrakX kung gusto ninyong magsagawa\n"
-#~ "ng bagong install o upgrade ng namamalaging Mandrakelinux na sistema:\n"
+#~ "ng bagong install o upgrade ng namamalaging Mandrivalinux na sistema:\n"
 #~ "\n"
 #~ " * \"%s\": Para sa karamihang bahagi, ganap na binubura nito ang lumang\n"
 #~ "sistema. Kung nais ninyong baguhin kung paano ang pagpartisyon sa inyong\n"
@@ -29036,13 +29036,13 @@ msgstr "Pag-i-install nabigo"
 #~ " * \"%s\": ang klase ng pag-i-install na ito ay pahihintulutan kayong i-"
 #~ "update\n"
 #~ "ang mga package na kasalukuyang naka-install sa inyong sistema ng\n"
-#~ "Mandrakelinux. Ang inyong kasalukuyang pakana ng pagpapartisyon at\n"
+#~ "Mandrivalinux. Ang inyong kasalukuyang pakana ng pagpapartisyon at\n"
 #~ "data ng gumagamit ay hindi nabago. Karamihan ng ibang mga hakbang sa\n"
 #~ "pagko-configure ay mayroon pa rin, katulad ng standard na pag-i-install.\n"
 #~ "\n"
 #~ "Ang paggamit sa ``Upgrade'' na option ay gagana ng mabuti sa mga sistema\n"
-#~ "ng Mandrakelinux na nagpapatakbo ng version \"8.1\" o pataas. Ang\n"
-#~ "pagsasagawa ng upgrade sa mga version bago ng Mandrakelinux \"8.1\" ay\n"
+#~ "ng Mandrivalinux na nagpapatakbo ng version \"8.1\" o pataas. Ang\n"
+#~ "pagsasagawa ng upgrade sa mga version bago ng Mandrivalinux \"8.1\" ay\n"
 #~ "hindi ipinapayo."
 
 #~ msgid ""
@@ -29109,7 +29109,7 @@ msgstr "Pag-i-install nabigo"
 #~ "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, Mandrakelinux will be using it\n"
+#~ "still under development. For that reason, Mandrivalinux 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"
@@ -29158,7 +29158,7 @@ msgstr "Pag-i-install nabigo"
 #~ "\"character encoding\" na nagnanais masakop ang lahat ng namamalaging\n"
 #~ "wika. Ang buong suporta dita ng GNU/Linux ay ginagawa pa rin. Sa "
 #~ "dahilang\n"
-#~ "ito, gagamitin ito o hindi ng Mandrakelinux depende sa mga pili ng mga\n"
+#~ "ito, gagamitin ito o hindi ng Mandrivalinux depende sa mga pili ng mga\n"
 #~ "gumagamit:\n"
 #~ "\n"
 #~ " * Kung kayo ay pipili ng wika na may malakas na \"legacy encoding"
@@ -29416,7 +29416,7 @@ msgstr "Pag-i-install nabigo"
 #~ "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 Mandrakelinux\n"
+#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"
 #~ "system! Be sure you know what you are doing before changing any of the\n"
 #~ "options. !!\n"
 #~ "\n"
@@ -29459,7 +29459,7 @@ msgstr "Pag-i-install nabigo"
 #~ "bootloader\n"
 #~ "(sa pagpili ng \"%s\"), dapat ninyong tiyaking na kayo ay may paraan "
 #~ "para\n"
-#~ "i-boot ang inyong sistema ng Mandrakelinux! Tiyakin na alam ninyo ang\n"
+#~ "i-boot ang inyong sistema ng Mandrivalinux! Tiyakin na alam ninyo ang\n"
 #~ "inyong ginagawa bego baguhin ang kahit na anong mga option. !!\n"
 #~ "\n"
 #~ "Ang pagki-click sa \"%s\" na pindutan sa dialog na ito ay mag-aalok ng "
@@ -29561,7 +29561,7 @@ msgstr "Pag-i-install nabigo"
 #~ msgid ""
 #~ "Now, it's time to select a printing system for your computer. Other OSs "
 #~ "may\n"
-#~ "offer you one, but Mandrakelinux offers two. Each of the printing "
+#~ "offer you one, but Mandrivalinux offers two. Each of the printing "
 #~ "systems\n"
 #~ "is best suited to particular types of configuration.\n"
 #~ "\n"
@@ -29599,7 +29599,7 @@ msgstr "Pag-i-install nabigo"
 #~ "Panahon na upang pumili ng sistema ng pagpi-print para sa inyong "
 #~ "computer.\n"
 #~ "Ang ibang mga \"operating system\" (OS) ay mag-aalok lamang ng isa, pero\n"
-#~ "ang Mandrakelinux ay nag-aalok ng dalawa. Bawat isa sa dalawang sistema\n"
+#~ "ang Mandrivalinux ay nag-aalok ng dalawa. Bawat isa sa dalawang sistema\n"
 #~ "ng pagpi-print na ito ay nababagay sa natatanging uri ng configuration.\n"
 #~ "\n"
 #~ " * \"%s\" -- na acronym para sa ``print, do not queue'', ang piliin kung "
@@ -30166,10 +30166,10 @@ msgstr "Pag-i-install nabigo"
 #~ "computer."
 
 #~ msgid ""
-#~ "Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- "
+#~ "Find all Mandriva products and services at <b>MandrakeStore</b> -- "
 #~ "our full service e-commerce platform."
 #~ msgstr ""
-#~ "Hanapin ang lahat ng produkto at serbisyo ng Mandrakesoft sa "
+#~ "Hanapin ang lahat ng produkto at serbisyo ng Mandriva sa "
 #~ "<b>MandrakeStore</b> -- ang aming buong serbisyong plataporma ng e-"
 #~ "commerce."
 
@@ -30194,26 +30194,26 @@ msgstr "Pag-i-install nabigo"
 #~ "\t* Espesyal na mga tawad para sa mga produkto at serbisyo sa "
 #~ "MandrakeStore"
 
-#~ msgid "\t* Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandriva Move</b>"
 #~ msgstr ""
-#~ "\t* Alamin ang Mandrakelinux sa bootable na CD gamit ang <b>MandrakeMove</"
+#~ "\t* Alamin ang Mandrivalinux sa bootable na CD gamit ang <b>Mandriva Move</"
 #~ "b>"
 
 #~ msgid ""
-#~ "Find all Mandrakesoft products at <b>MandrakeStore</b> -- our full "
+#~ "Find all Mandriva products at <b>MandrakeStore</b> -- our full "
 #~ "service e-commerce platform."
 #~ msgstr ""
-#~ "Hanapin lahat ng mga produkto ng Mandrakesoft sa <b>MandrakeStore</b> -- "
+#~ "Hanapin lahat ng mga produkto ng Mandriva sa <b>MandrakeStore</b> -- "
 #~ "ang aming buong serbisyong plataporma ng e-commerce."
 
 #~ msgid "<b>Become a MandrakeClub member!</b>"
 #~ msgstr "<b>Maging Kasapi ng MandrakeClub!</b>"
 
 #~ msgid ""
-#~ "In the Mandrakelinux menu you will find easy-to-use applications for all "
+#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
 #~ "tasks:"
 #~ msgstr ""
-#~ "Sa Mandrakelinux menu makakakita kayo ng mga madaling gamitin na "
+#~ "Sa Mandrivalinux menu makakakita kayo ng mga madaling gamitin na "
 #~ "application para sa lahat ng gawain:"
 
 #~ msgid ""
@@ -30251,8 +30251,8 @@ msgstr "Pag-i-install nabigo"
 #~ "  --report          - ang program ay dapat isa sa mga mandrake tool\n"
 #~ "  --incident        - ang program ay dapat isa sa mga mandrake tool"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "This interface has not been configured yet.\n"
diff --git a/perl-install/share/po/tr.po b/perl-install/share/po/tr.po
index 723715630..2b8ca8137 100644
--- a/perl-install/share/po/tr.po
+++ b/perl-install/share/po/tr.po
@@ -1,6 +1,6 @@
 # translation of DrakX-tr.po to Turkish
 # Copyright (C) 2000,2003 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandrakesoft
+# Copyright (c) 2000 Mandriva
 # ############################################
 #
 # Ömer Fadıl USTA <omer_fad@hotmail.com> , 1999-2003.
@@ -68,7 +68,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -87,7 +87,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -95,7 +95,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -103,7 +103,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -231,7 +231,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1262,11 +1262,11 @@ msgstr "Elle seçim"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux çoklu dil desteğine sahiptir.\n"
+"Mandrivalinux çoklu dil desteğine sahiptir.\n"
 "Kurulumdan sonra kullanmak isteyebileceğiniz diğer dilleri de seçebilirsiniz"
 
 #: any.pm:752 any.pm:773 help.pm:647
@@ -3620,12 +3620,12 @@ msgstr "radyo desteğini etkinleştir"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Devam etmeden önce lisans koşullarını dikkatle okumalısınız. Lisans tüm\n"
-"Mandrakelinux dağıtımını kapsar, bu koşullarını tamamını kabul ediyorsanız,\n"
+"Mandrivalinux dağıtımını kapsar, bu koşullarını tamamını kabul ediyorsanız,\n"
 "\"%s\" kutusunu işaretleyiniz aksi halde \"%s\" tuşuna tıklayarak\n"
 "makinenizi yeniden başlatabilirsiniz."
 
@@ -3804,13 +3804,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux kurulum CD'leri bir kaç CD'den oluşur. DrakX seçilen paketin\n"
+"Mandrivalinux kurulum CD'leri bir kaç CD'den oluşur. DrakX seçilen paketin\n"
 "hangi CD'de olduğunu bilir ve o CD'yi yerleştirmeniz için CD yuvasını açar\n"
 "ve size gerekli CD'yi yerleştirmeniz için uyarır."
 
@@ -3818,11 +3818,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3874,7 +3874,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Bundan sonra sisteminize hangi uygulamaları kuracağınızı belirteceksiniz.\n"
-"Mandrakelinux sisteminde kullanılabilecek binlerce paket vardır ve onları "
+"Mandrivalinux sisteminde kullanılabilecek binlerce paket vardır ve onları "
 "hep aklınızda tutamazsınız.\n"
 "\n"
 "CD'den kurulum yapıyorsanız önce elinizde hangi CD'lerin bulunduğunu\n"
@@ -3974,10 +3974,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4011,8 +4011,8 @@ msgstr ""
 "\n"
 "<ÖNEMLİ> İster bilerek ister belli bir grubun parçası olarak, sunucu\n"
 "bölümünden seçtiğiniz hizmetleri gerçekten kullanıp kullanmak istemediğiniz\n"
-"ayrıca sorulacaktır. Mandrakelinux başlatıldığında kurulu olan hizmetlerin\n"
-"herbiri öntanımlı olarak başlatılır. Onlar Mandrakelinux dağıtıma girerken\n"
+"ayrıca sorulacaktır. Mandrivalinux başlatıldığında kurulu olan hizmetlerin\n"
+"herbiri öntanımlı olarak başlatılır. Onlar Mandrivalinux dağıtıma girerken\n"
 "kılavuzlarından güvenli oldukları anlaşılarak seçilmiş bile olsalar,\n"
 "dağıtımdan sonra bir takım güvenlik açıkları keşfedilmiş olabilir.\n"
 "Bir hizmetin ne sunduğu hakkında bir fikriniz yoksa ya da neden kurmak\n"
@@ -4153,7 +4153,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4257,12 +4257,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4289,7 +4289,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4298,7 +4298,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4318,17 +4318,17 @@ 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 ""
-"Bu noktada, Mandrakelinux işletim sisteminizi sabit diskinizde\n"
+"Bu noktada, Mandrivalinux işletim sisteminizi sabit diskinizde\n"
 "nereye kuracağınızı seçmeniz gerekiyor. Diskiniz boşsa, ya da\n"
 "halihazırda bir işletim sistemi diskin tamamını kullanıyorsa\n"
 "diski bölümlendirmeniz gerekmektedir. Temel olarak, bir diski\n"
-"bölümlendirmek, Mandrakelinux sistemini kurabilmek için onu\n"
+"bölümlendirmek, Mandrivalinux sistemini kurabilmek için onu\n"
 "mantıksal olarak bölmek ve böylece boş alan oluşturmak anlamına\n"
 "gelir.\n"
 "\n"
 "Bölümlendirme işlemi gerellikle geri alınamaz ve zaten kurulu bir\n"
 "işletim sisteminiz var ise bilgi kaybına yol açabilir. Bu işlem, eğer\n"
-"tecrübesizseniz, korkutucu ve stresli bir iş olabilir. Mandrakelinux,\n"
+"tecrübesizseniz, korkutucu ve stresli bir iş olabilir. Mandrivalinux,\n"
 "bu işlemi oldukça kolaylaştıran bir sihirbaz sunmaktadır.Başlamadan\n"
 "önce lütfen aşağıdaki okumak için zaman ayrın.\n"
 "\n"
@@ -4355,7 +4355,7 @@ msgstr ""
 "işlem sırasında eğer Windows bölümünüzü birleştirmiş ve biçimi FAT ise\n"
 "herhangi bir veri kaybı yaşamazsınız. Verilerinizi yedeklemeniz şiddetle "
 "önerilir.\n"
-"Eğer aynı bilgisayarda hem Mandrakelinux hem de Windows kullanamk\n"
+"Eğer aynı bilgisayarda hem Mandrivalinux hem de Windows kullanamk\n"
 "istiyorsanız bu seçeneği seçmeniz önerilir.\n"
 "\n"
 "   Bu seçeneği seçmeden önce unutmayın ki işlem tamamlandığında Microsoft\n"
@@ -4365,7 +4365,7 @@ msgstr ""
 "olacak.\n"
 "\n"
 " * \"%s\": Sabit diskinizde bulunan tüm bilgileri silmek ve yeni bir "
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "kurulumu yapmak için bu seçeneği seçin. Lütfen bu seçeneği kullanırken "
 "dikkatli\n"
 "olun, çünkü onayladıktan sonra geri alma şansınız bulunmuyor.\n"
@@ -4539,7 +4539,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4564,7 +4564,7 @@ msgstr ""
 "\n"
 "Bölümleri biçemlendirmeye hazır olduğunuzda \"Tamam\"'a tıklayın.\n"
 "\n"
-"Mandrakelinux sisteminizi kurmak isteyeceğiniz başka bölümler de seçmek\n"
+"Mandrivalinux sisteminizi kurmak isteyeceğiniz başka bölümler de seçmek\n"
 "isterseniz \"İptal\"'e basın.\n"
 "\n"
 "\"Gelişmiş\" düğmesine tıkladıktan sonra isterseniz, sabit diskinizindeki\n"
@@ -4582,7 +4582,7 @@ msgstr "Önceki"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4594,7 +4594,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Mandrakelinux kurulumunuz sırasında dağıtımdan sonra güncellenmiş bazı "
+"Mandrivalinux kurulumunuz sırasında dağıtımdan sonra güncellenmiş bazı "
 "paketler, düzeltmeler ve çözümlenmiş güvenlik unsurlarının olup olmadığını "
 "internet bağlantınız üzerinden kontrol edip varsa indirip kurabilir. Çalışan "
 "bir internet bağlantınız varsa \"Evet\" seçebilir, yoksa \"Hayır\" seçerek "
@@ -4621,7 +4621,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4646,7 +4646,7 @@ msgstr "Güvenlik Yöneticisi"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4716,7 +4716,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Bu noktada, Mandrakelinux işletim sisteminizi sabit diskinizde nereye\n"
+"Bu noktada, Mandrivalinux işletim sisteminizi sabit diskinizde nereye\n"
 "kuracağınızı seçmeniz gerekiyor. Bölümler önceki bir kurulumda ya da bir\n"
 "başka bölümlendirme aracıyla önceden tanımlanmışsa eski bölümlerinizi\n"
 "kullanabilirsiniz. Aksi takdirde, sabit disk bölümlerinin tanımlanması\n"
@@ -4811,7 +4811,7 @@ msgstr "Normal/Uzman kipleri arasında geçiş yap"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4839,7 +4839,7 @@ msgid ""
 "\"Windows name\" is the letter of your hard drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
-"Sabit diskinizde birden fazla Windows bölümü bulundu. Yeni Mandrakelinux\n"
+"Sabit diskinizde birden fazla Windows bölümü bulundu. Yeni Mandrivalinux\n"
 "işletim sisteminizi kurmak için hangi bölümün boyutunu değiştirmek\n"
 "istiyorsunuz?\n"
 "\n"
@@ -4891,7 +4891,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4900,13 +4900,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4957,7 +4957,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5212,7 +5212,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5233,11 +5233,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Burada kullanacağınız yazdırma sistemini seçeceksiniz. Diğer işletim\n"
-"sistemleri bir seçenek sunarken, Mandrakelinux size iki ayrı seçenek\n"
+"sistemleri bir seçenek sunarken, Mandrivalinux size iki ayrı seçenek\n"
 "sunmaktadır. İki tip yazdırma sistemide özel yapılandırma türü için en "
 "iyidir.\n"
 "\n"
@@ -5369,7 +5369,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5386,7 +5386,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5448,10 +5448,10 @@ msgstr "Hizmetler"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Lütfen yeni Mandrakelinux disk bölümünüzü kurmak için silmek istediğiniz\n"
+"Lütfen yeni Mandrivalinux disk bölümünüzü kurmak için silmek istediğiniz\n"
 "sabit diski seçin. Üzerindeki tüm verilerin yok olacağını ve geriye dönüşün\n"
 "mümkün olmayacağını unutmayın!"
 
@@ -5803,7 +5803,7 @@ msgstr "Windows bölümünün boyutu hesaplanıyor"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Windows bölümünüz çok dağınık, lütfen önce \"defrag\" ile diskinizdeki "
@@ -5921,19 +5921,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5955,7 +5955,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5963,14 +5963,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5980,7 +5980,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6000,10 +6000,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6014,11 +6014,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6034,11 +6034,11 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Giriş\n"
 "\n"
-"İşletim sistemi, ve Mandrakelinux dağıtımında bulunan farklı parçalar\n"
+"İşletim sistemi, ve Mandrivalinux dağıtımında bulunan farklı parçalar\n"
 "buradan itibaren \"Yazılım Ürünleri\" olarak adlandırılacaktır. Yazılım\n"
 "ürünleri işletim sistemiyle ilgili program kümeleri, yötemleri, kuralları\n"
 "ve dokümanları, Linux-Mandrake'nin farklı parçalarını içermektedir, fakat\n"
@@ -6048,7 +6048,7 @@ msgstr ""
 "1. Lisans Anlaşması\n"
 "\n"
 "Lütfen bu dokümanı dikkatle okuyun. Bu doküman yazılım ürünlerini uygulayan\n"
-"Mandrakesoft S.A. ile sizin aranızdaki lisans anlaşmasıdır. Yazılım\n"
+"Mandriva S.A. ile sizin aranızdaki lisans anlaşmasıdır. Yazılım\n"
 "ürünlerini, kurulum yaparak, çoğaltarak, ya da herhangi bir amaçla "
 "kullanarak\n"
 "bu Lisans'ın şartlarına uyacağınızı açık ve tam olarak kabul etmiş\n"
@@ -6065,11 +6065,11 @@ msgstr ""
 "\n"
 "Yazılım Ürünleri ve yanlarında gelen dokümanlar \"oldukları gibi\"dirler, "
 "ve\n"
-"kanunların izin verdiği açılımda garantisizdirler. Mandrakesoft S.A.,\n"
+"kanunların izin verdiği açılımda garantisizdirler. Mandriva S.A.,\n"
 "kullanıcının yazılım ürünlerini kullanmak konusunda yetkin olmaması "
 "nedeniyle\n"
 "oluşan (iş kaybı, işin aksaması, maddi kayıp, hukuki cezalara çarptırılma\n"
-"vb. neden olacak) doğrudan ya da dolaylı (Mandrakesoft S.A. bu tür "
+"vb. neden olacak) doğrudan ya da dolaylı (Mandriva S.A. bu tür "
 "zararların\n"
 "oluşabileceğini duyursa bile) hiçbir zarar nedeniyle sorumluluk taşımaz.\n"
 "\n"
@@ -6077,12 +6077,12 @@ msgstr ""
 "BAZI ÜLKELERDE YASAKLANMIŞ YAZILIMA SAHİP OLMAYA YA DA ONU KULLANMAYA BAĞLI\n"
 "SINIRLI SORUMLULUK\n"
 "\n"
-"Kanunların verdiği yetkilere göre, Mandrakesoft S.A. ya da dağıtımcıları\n"
+"Kanunların verdiği yetkilere göre, Mandriva S.A. ya da dağıtımcıları\n"
 "kullanıcının, bulunduğu ülkede yasak olduğu halde, yazılım ürünlerini\n"
-"kullanması, onlara sahip olması, onları Mandrakelinux sitelerinden "
+"kullanması, onlara sahip olması, onları Mandrivalinux sitelerinden "
 "indirmesi\n"
 "nedeniyle oluşan (iş kaybı, işin aksaması, maddi kayıp, hukuki cezalara \n"
-"çarptırılma vb. neden olacak) doğrudan ya da dolaylı (Mandrakesoft S.A. bu\n"
+"çarptırılma vb. neden olacak) doğrudan ya da dolaylı (Mandriva S.A. bu\n"
 "tür zararların oluşabileceğini duyursa bile) hiçbir zarar nedeniyle\n"
 "sorumluluk taşımaz. Bu sınırlı sorumluluk, yazılım ürünleri içindeki güçlü\n"
 "kriptografi araçlarını kapsar, fakat bunlarla sınırlı değildir.\n"
@@ -6096,10 +6096,10 @@ msgstr ""
 "çoğaltılmasına, değiştirilmesine ya da tekrar dağıtımının yapılmasına izin\n"
 "vermektedir. Lütfen kullanımdan önce her bir yazılım ürünü için, onu\n"
 "ilgilendiren lisans(lar)ın tüm şartlarını okuyunuz. Bir yazılım ürünü\n"
-"hakkındaki herhangi bir soru, Mandrakesoft'a değil, o ürünün "
+"hakkındaki herhangi bir soru, Mandriva'a değil, o ürünün "
 "geliştiricisine\n"
-"yöneltilmelidir. Mandrakesoft tarafından geliştirilmiş yazılımlar GPL\n"
-"lisansıyla korunmaktadır. Mandrakesoft tarafından hazırlanan dokümanlar da\n"
+"yöneltilmelidir. Mandriva tarafından geliştirilmiş yazılımlar GPL\n"
+"lisansıyla korunmaktadır. Mandriva tarafından hazırlanan dokümanlar da\n"
 "özel bir lisansa tabidir. Daha fazla bilgi için lütfen dokümanlara\n"
 "göz atınız.\n"
 "\n"
@@ -6108,10 +6108,10 @@ msgstr ""
 "\n"
 "Yazılım ürünleri üzerindeki tüm haklar bu yazılımın geliştiricisine aittir;\n"
 " yazılıma uygulanan entellektüel özellik ve kopyalama kanunlarıyla\n"
-"korunmaktadırlar. Mandrakesoft, yazılım ürünlerinin, bütün olarak ya da\n"
+"korunmaktadırlar. Mandriva, yazılım ürünlerinin, bütün olarak ya da\n"
 "parça parça, herhangi bir amaç için değiştirilme ya da adapte edilme\n"
-"haklarını saklamaktadır. \"Mandrake\", ve \"Mandrakelinux\" ve ilgili\n"
-"logolar Mandrakesoft S.A.'ya ait tescilli markalardır.\n"
+"haklarını saklamaktadır. \"Mandriva\", ve \"Mandrivalinux\" ve ilgili\n"
+"logolar Mandriva S.A.'ya ait tescilli markalardır.\n"
 "\n"
 "\n"
 "5. Yönetim Kanunları\n"
@@ -6121,7 +6121,7 @@ msgstr ""
 "Diğer kısımların sınırlamaları devam edecektir. Bu lisansın şartları Fransa\n"
 "Kanunları altındadır. Bu lisansın şartlarına her türlü itiraz\n"
 "Paris Mahkemesi tarafından görüşülecektir. Bu doküman hakkında herhangi bir\n"
-"soru için lütfen Mandrakesoft S.A'ya başvurun.\n"
+"soru için lütfen Mandriva S.A'ya başvurun.\n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6206,7 +6206,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6214,13 +6214,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Tebrikler, kurulum tamamlandı.\n"
 "Cdrom ve/veya disketi çıkartın ve Enter'a basarak bilgisayarınızı\n"
 "yeniden başlatın.\n"
 "\n"
-"Mandrakelinux'nin bu sürümündeki güncellemeler hakkında bilgi\n"
+"Mandrivalinux'nin bu sürümündeki güncellemeler hakkında bilgi\n"
 "almak için: \n"
 "\n"
 "\n"
@@ -6228,7 +6228,7 @@ msgstr ""
 "\n"
 "\n"
 "adresine bakabilirsiniz. Sisteminizin ayarları hakkında daha geniş\n"
-"bilgiyi Mandrakelinux Kullanıcı Kılavuzunda bulabilirsiniz."
+"bilgiyi Mandrivalinux Kullanıcı Kılavuzunda bulabilirsiniz."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6263,11 +6263,11 @@ msgstr "`%s' adımına başlanıyor\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Sistem kaynaklarınız kısıtlı. Mandrakelinux'yi kurarken sorunlarınız\n"
+"Sistem kaynaklarınız kısıtlı. Mandrivalinux'yi kurarken sorunlarınız\n"
 "olabilir. Bu durum oluşursa, metin tabanlı kurulumu deneyebilirsiniz.\n"
 "Bunun için CDROM'dan açtıktan sonra `F1'e basın, ve komut satırına\n"
 "`text' yazın."
@@ -6804,9 +6804,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Yansı adreslerini almak için Mandrakelinux web sayfasına bağlantı kuruluyor"
+"Yansı adreslerini almak için Mandrivalinux web sayfasına bağlantı kuruluyor"
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7028,8 +7028,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux Kurulum %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux Kurulum %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9611,13 +9611,13 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall yapılandırma aracı\n"
 "\n"
-"Bu araç Mandrakelinux makinanız için kişisel bir ateş duvarı yapılandırır.\n"
+"Bu araç Mandrivalinux makinanız için kişisel bir ateş duvarı yapılandırır.\n"
 "Güçlü bir ateş duvarı çözümü için özelleştirilmiş Mandrake Security "
 "Firewall\n"
 "dağıtımına bakın."
@@ -13535,7 +13535,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -15368,18 +15368,18 @@ msgstr "Durdur"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mandrakelinux Nedir?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Mandrivalinux Nedir?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "<b>Mandrakelinux</b> dağıtımına Hoşgeldiniz!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "<b>Mandrivalinux</b> dağıtımına Hoşgeldiniz!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -15388,7 +15388,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -15405,9 +15405,9 @@ msgstr "Açık Kaynak Kodu Dünyasına Hoş Geldiniz!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -15427,7 +15427,7 @@ msgstr "<b>PowerPack</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -15453,10 +15453,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -15470,13 +15470,13 @@ msgstr ""
 #: share/advertising/05.pl:15
 #, fuzzy, c-format
 msgid "<b>Download Version</b>"
-msgstr "Bu Mandrakelinux dağıtımının <b>İndirilebilinir sürümüdür</b>."
+msgstr "Bu Mandrivalinux dağıtımının <b>İndirilebilinir sürümüdür</b>."
 
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -15503,7 +15503,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -15513,7 +15513,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15532,13 +15532,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -15550,7 +15550,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15564,20 +15564,20 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakestore</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva Store</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux Güncelleme Uygulamacığı"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux Güncelleme Uygulamacığı"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -15597,61 +15597,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -15689,7 +15689,7 @@ msgstr "Dosya sisteminizin parolasını seçiniz"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -15710,7 +15710,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -15827,7 +15827,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -16062,14 +16062,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux Kontrol Merkezi</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux Kontrol Merkezi</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -16091,9 +16091,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -16105,7 +16105,7 @@ msgstr "<b>MandrakeStore</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -16128,20 +16128,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -16160,33 +16160,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -16209,32 +16209,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -16532,8 +16532,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "<b>Mandrakestore</b>"
+msgid "Mandriva Wizards"
+msgstr "<b>Mandriva Store</b>"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -16647,7 +16647,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16695,7 +16695,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdp]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -19281,13 +19281,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "Mandrake Hata Bildirme Aracı"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Kontrol Merkezi"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux Kontrol Merkezi"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19307,8 +19307,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -19352,7 +19352,7 @@ msgstr "Yapılandırma Sihirbazı"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -19768,7 +19768,7 @@ msgstr "Önyüklemede başlatılan"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Bu bağdaştırıcı henüz yapılandırılmamış.\n"
 "Ana penceredeki yapılandırma sihirbazını çalıştırın"
@@ -19777,7 +19777,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Bu bağdaştırıcı henüz yapılandırılmamış.\n"
 "Ana penceredeki yapılandırma sihirbazını çalıştırın"
@@ -19830,7 +19830,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20124,7 +20124,7 @@ msgstr "Al"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -20641,14 +20641,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Telif Hakkı (C) 2003-2004 Mandrakesoft.\n"
+"Telif Hakkı (C) 2003-2004 Mandriva.\n"
 "Bu bir serbest yazılımdır ve GNU GPL lisansı altında tekrar "
 "dağıtılabilinir.\n"
 "\n"
@@ -20674,7 +20674,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Mandrake Kontrol Merkezi"
 
 #: standalone/drakhelp:36
@@ -23730,7 +23730,7 @@ msgstr "Değişklik bitti, fakat etkinleşmesi için sistemden çıkmalısınız
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Mandrake Araç Kayıtları"
 
 #: standalone/logdrake:51
@@ -24245,10 +24245,10 @@ msgstr "Bağlantı tamamlandı."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Bağlantı başarısız.\n"
-"Yapılandırmanızı Mandrakelinux Kontrol Merkezinden kontrol ediniz."
+"Yapılandırmanızı Mandrivalinux Kontrol Merkezinden kontrol ediniz."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -25099,8 +25099,8 @@ msgstr "Kurulum başarısız!"
 #~ msgstr "Hiç yazı tipi seçmemişsiniz"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "<b>Mandrakestore</b>"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "<b>Mandriva Store</b>"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Hiç bir web tarayıcısı kurulu değil! Lütfen bir tane kurun."
@@ -25223,13 +25223,13 @@ msgstr "Kurulum başarısız!"
 #~ msgstr "%s yazmak için açılırken hata: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Harddrake, Mandrakelinux'nin donanım yapılandırma aracı.\n"
+#~ "Harddrake, Mandrivalinux'nin donanım yapılandırma aracı.\n"
 #~ "<span foreground=\"royalblue3\">Sürüm:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Yazan:</span> Thierry Vignaud &lt;"
 #~ "tvignaud@mandrakesoft.com&gt;\n"
@@ -25588,8 +25588,8 @@ msgstr "Kurulum başarısız!"
 #~ "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
 #~ msgstr "Yazıcı \"%s\" Star Office/OpenOffice.org/GIMP'den kaldırılamadı."
 
-#~ msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
-#~ msgstr "<b>Mandrakelinux'u seçtiğiniz için tebrikler!</b>"
+#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
+#~ msgstr "<b>Mandrivalinux'u seçtiğiniz için tebrikler!</b>"
 
 #~ msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
 #~ msgstr "<b>OpenOffice.org</b>:·Tam bir ofis uygulama seti."
@@ -25609,8 +25609,8 @@ msgstr "Kurulum başarısız!"
 #~ msgid "\t* create your own Web site"
 #~ msgstr "\t-·kendi web sitenizi yapabilirsiniz"
 
-#~ msgid "This is the Mandrakelinux <b>Download version</b>."
-#~ msgstr "Bu Mandrakelinux dağıtımının <b>İndirilebilinir sürümüdür</b>."
+#~ msgid "This is the Mandrivalinux <b>Download version</b>."
+#~ msgstr "Bu Mandrivalinux dağıtımının <b>İndirilebilinir sürümüdür</b>."
 
 #~ msgid ""
 #~ "The free download version does not include commercial software, and "
@@ -25647,13 +25647,13 @@ msgstr "Kurulum başarısız!"
 #~ msgid ""
 #~ "Before continuing, you should carefully read the terms of the license. "
 #~ "It\n"
-#~ "covers the entire Mandrakelinux distribution. If you do agree with all "
+#~ "covers the entire Mandrivalinux 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 ""
 #~ "Devam etmeden önce lisans koşullarını dikkatle okumalısınız. Lisans tüm\n"
-#~ "Mandrakelinux dağıtımını kapsar, bu koşullarını tamamını kabul "
+#~ "Mandrivalinux dağıtımını kapsar, bu koşullarını tamamını kabul "
 #~ "ediyorsanız,\n"
 #~ "\"%s\" kutusunu işaretleyiniz aksi halde \"%s\" tuşuna tıklayarak\n"
 #~ "makinenizi yeniden başlatabilirsiniz."
@@ -25763,8 +25763,8 @@ msgstr "Kurulum başarısız!"
 #~ "  --report          - program mandrake'nin araçlarından olmalı\n"
 #~ "  --incident        - program mandrake'nin araçlarından olmalı"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "Connection failed.\n"
diff --git a/perl-install/share/po/uk.po b/perl-install/share/po/uk.po
index f3d37a455..5c5830c4e 100644
--- a/perl-install/share/po/uk.po
+++ b/perl-install/share/po/uk.po
@@ -73,7 +73,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Здається, що USB ключ має увімкнений захист від запису, але ми\n"
 "можемо безпечно відімкнути його зараз.\n"
@@ -81,7 +81,7 @@ msgstr ""
 "\n"
 "Клацніть кнопку для перезавантаження комп'ютера, від'єднайте \n"
 "його, зніміть захист від запису, під'єднайте ключ, і запустіть\n"
-"Mandrake Move знову."
+"Mandriva Move знову."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -99,7 +99,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Ваш USB ключ не має жодного розділу Windows (FAT).\n"
@@ -111,14 +111,14 @@ msgstr ""
 "\n"
 "\n"
 "Ви також можете продовжувати без USB ключа - Ви\n"
-"все одно зможете використовувати Mandrake Move як\n"
+"все одно зможете використовувати Mandriva Move як\n"
 "звичайну операційну систему Mandrake."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -126,11 +126,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "На вашій системі не знайдено USB ключ. Якщо Ви\n"
-"під'єднаєте USB ключ зараз, то Mandrake Move зможе\n"
+"під'єднаєте USB ключ зараз, то Mandriva Move зможе\n"
 "прозоро зберігати дані з Вашої домашньої теки і\n"
 "системну конфігурацію для наступного завантаження\n"
 "цього або іншого комп'ютера. Майте на увазі, що якщо\n"
@@ -139,7 +139,7 @@ msgstr ""
 "\n"
 "\n"
 "Ви також можете продовжити без USB ключа - Ви все\n"
-"одно зможете використовувати Mandrake Move як\n"
+"одно зможете використовувати Mandriva Move як\n"
 "звичайну операційну систему Mandrake."
 
 #: ../move/move.pm:494
@@ -268,7 +268,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -284,7 +284,7 @@ msgstr ""
 "\n"
 "Це можливо через пошкоджені конфігураційні файли\n"
 "на USB ключі, в цьому випадку їх видалення і наступне\n"
-"перезавантаження Mandrake Move виправить проблему.\n"
+"перезавантаження Mandriva Move виправить проблему.\n"
 "Для цього клацніть на відповідній кнопці.\n"
 "\n"
 "\n"
@@ -1335,7 +1335,7 @@ msgstr "Вибір мови"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3761,7 +3761,7 @@ msgstr "увімкнути підтримку радіо"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3946,7 +3946,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3962,11 +3962,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4128,10 +4128,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4315,7 +4315,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4489,12 +4489,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4521,7 +4521,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4530,7 +4530,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4757,7 +4757,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4798,7 +4798,7 @@ msgstr "Попередній"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4838,7 +4838,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4867,7 +4867,7 @@ msgstr "Адміністратор з безпеки"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -5027,7 +5027,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5107,7 +5107,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5116,13 +5116,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Цей крок виконується тільки у випадку, якщо на Вашій машині було\n"
 "знайдено старий розділ GNU/Linux.\n"
@@ -5201,7 +5201,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5488,7 +5488,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5509,7 +5509,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Зараз настав час вибрати систему друку на Вашому комп'ютері. Інші\n"
@@ -5653,7 +5653,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5670,7 +5670,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5796,7 +5796,7 @@ msgstr "Сервіси"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Виберіть твердий диск, який Ви хочете відформатувати для\n"
@@ -6160,7 +6160,7 @@ msgstr "Розраховується розмір розділу Віндовс"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Розділ з Windows на Вашому комп'ютері занадто фраґментований. Будь ласка, "
@@ -6280,19 +6280,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6314,7 +6314,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6322,14 +6322,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6339,7 +6339,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6359,10 +6359,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6373,11 +6373,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6393,7 +6393,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Вступ\n"
 "\n"
@@ -6407,7 +6407,7 @@ msgstr ""
 "1. Ліцензійна угода\n"
 "\n"
 "Будь ласка, прочитайте цю угоду уважно. Цей документ є ліцензійною\n"
-"угодою між Вами та Mandrakesoft S.A., яка стосується програмних\n"
+"угодою між Вами та Mandriva S.A., яка стосується програмних\n"
 "продуктів. Встановленням, дублюванням чи використанням Програмних\n"
 "продуктів будь-яким чином, Ви явно приймаєте та повністю\n"
 "погоджуєтесь з умовами даної Ліцензії. Якщо Ви не погоджуєтесь з\n"
@@ -6423,20 +6423,20 @@ msgstr ""
 "\n"
 "Програмні продукти та доповнююча документація поставляються \"як є\",\n"
 "без гарантії, в межах встановлених законодавством. Ні за яких умов\n"
-"Mandrakesoft S.A. не буде нести відповідальності, в межах встановлених\n"
+"Mandriva S.A. не буде нести відповідальності, в межах встановлених\n"
 "законодавством, за випадкові, прямі чи опосередковані (включаючи, але\n"
 "не обмежуючись втратами чи перепинами бізнесу, фінансовими втратами,\n"
 "адвокатськими витратами чи штрафами як результат присуду судової\n"
 "інстанції, чи будь-які інші втрати), що походять від використання,\n"
 "або, навпаки, від неможливості використання Програмного продукту, навіть\n"
-"у випадку, якщо Mandrakesoft S.A. повідомляло про можливості таких\n"
+"у випадку, якщо Mandriva S.A. повідомляло про можливості таких\n"
 "втрат.\n"
 "\n"
 "ОБМЕЖЕННЯ ВІДПОВІДАЛЬНОСТІ, ЗАЛЕЖНОЇ ВІД ОБЛАДНАННЯ АБО\n"
 "ВИКОРИСТАННЯ ЗАБОРОНЕНИХ ПРОГРАМНИХ ПРОДУКТІВ В ДЕЯКИХ\n"
 "КРАЇНАХ\n"
 "\n"
-"В межах, встановлених законодавством, Mandrakesoft S.A. чи його\n"
+"В межах, встановлених законодавством, Mandriva S.A. чи його\n"
 "дистриб'ютори ні за яких умов не несуть відповідальності за жодне\n"
 "навмисне, випадкове, пряме чи опосередковане пошкодження, (включаючи\n"
 "але не обмежуючись перешкодами для бізнесу, припиненням бізнесу,\n"
@@ -6462,8 +6462,8 @@ msgstr ""
 "складової частини, перш ніж використовувати будь-яку з\n"
 "частин. Будь-які запитання стосовно ліцензії на окрему складову\n"
 "частину мають адресуватися автору цієї складової частини, а не до\n"
-"Mandrakesoft. Програми, розроблені Mandrakesoft S.A., керуються\n"
-"ліцензією GPL. Документація, розроблена Mandrakesoft S.A,. керується\n"
+"Mandriva. Програми, розроблені Mandrakesoft S.A., керуються\n"
+"ліцензією GPL. Документація, розроблена Mandriva S.A,. керується\n"
 "спеціальною ліцензією. Зверніться, будь ласка, до документації за\n"
 "подробицями.\n"
 "\n"
@@ -6472,9 +6472,9 @@ msgstr ""
 "Всі права на складові компоненти Програмних продуктів належать\n"
 "відповідним авторам і захищені законами про інтелектуальну власність\n"
 "на програмне забезпечення.\n"
-"Mandrakesoft S.A. залишає за собою право змінювати чи\n"
+"Mandriva S.A. залишає за собою право змінювати чи\n"
 "адаптувати Програмні продукти як в цілому, так і окремими частинами з\n"
-"будь-якою метою і для будь-яких цілей. \"Mandrake\", \"Mandrakelinux\" та\n"
+"будь-якою метою і для будь-яких цілей. \"Mandriva\", \"Mandrivalinux\" та\n"
 "відповідні логотипи є торгівельними марками MandarakeSoft S.A.\n"
 "\n"
 "5. Законодавство\n"
@@ -6488,7 +6488,7 @@ msgstr ""
 "можливості поза межами судових установ. В крайніх випадках спірні\n"
 "питання будуть вирішуватися відповідним Судом Парижа - Франція.\n"
 "З будь-якими питаннями щодо цього документа звертайтеся, будь ласка,\n"
-"до Mandrakesoft S.A.\n"
+"до Mandriva S.A.\n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6578,7 +6578,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6586,7 +6586,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Вітання, встановлення завершено. Вийміть з дисководів завантажувальні\n"
 "носії і потім натисніть Return для перезавантаження системи.\n"
@@ -6635,7 +6635,7 @@ msgstr "Починається крок `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -7186,9 +7186,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Зв'язуюсь з веб-сайтом Mandrakelinux, щоб отримати список наявних джерел..."
+"Зв'язуюсь з веб-сайтом Mandrivalinux, щоб отримати список наявних джерел..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7412,7 +7412,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
 msgstr "Встановлення Мандрейклінакс %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -10000,7 +10000,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -14075,7 +14075,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -16034,18 +16034,18 @@ msgstr "Зупинити"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr "<b>Що таке Мандрейклінакс?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
 msgstr "Ласкаво просимо до <b>Мандрейклінакс</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -16058,7 +16058,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 "На сьогодні Мандрейклінакс є найбільш <b>наближеним до користувача</b> "
@@ -16078,13 +16078,13 @@ msgstr "Ласкаво просимо у світ <b>програм з відк�
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 "Мандрейклінакс є проектом з відкритим кодом. Це означає, що ця нова збірка є "
-"результатом <b>співпраці</b> команди <b>розробників Mandrakesoft</b> і "
+"результатом <b>співпраці</b> команди <b>розробників Mandriva</b> і "
 "<b>світової спільноти</b> помічників Мандрейклінакса."
 
 #: share/advertising/02.pl:19
@@ -16104,7 +16104,7 @@ msgstr "<b>Загальна публічна ліцензія</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "Більша частина програм, включених у це поширення, і всі інструменти "
 "Мандрейклінакса підтримуються <b>Загальною публічною ліцензією</b>."
@@ -16138,10 +16138,10 @@ msgstr "<b>Приєднуйтеся до Спільноти!</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 "Мандрейклінакс має одну з <b>найбільших Спільнот</b> користувачів і "
 "розробників. Коло діяльності такої спільноти дуже велике, від виявлення "
@@ -16167,11 +16167,11 @@ msgstr "<b>Версія для звантаження</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Зараз Ви встановлюєте <b>Mandrakelinux Download</b>. Це безкоштовна версія, "
-"яку Mandrakesoft зробив <b>доступною для всіх</b>."
+"Зараз Ви встановлюєте <b>Mandrivalinux Download</b>. Це безкоштовна версія, "
+"яку Mandriva зробив <b>доступною для всіх</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16201,10 +16201,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Також Ви не будете мати доступу до <b>послуг</b>, що входять в інші продукти "
-"Mandrakesoft."
+"Mandriva."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16213,8 +16213,8 @@ msgstr "<b>Discovery, Ваша перша настільна система Linu
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Зараз Ви встановлюєте <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Зараз Ви встановлюєте <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16236,17 +16236,17 @@ msgstr "<b>PowerPack, Довершена настільна система Linux
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Зараз Ви встановлюєте <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Зараз Ви встановлюєте <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack - <b>головний продукт</b> Mandrakesoft для настільних комп'ютерів. "
+"PowerPack - <b>головний продукт</b> Mandriva для настільних комп'ютерів. "
 "В додаток до простоти і дружності до користувача він містить <b>тисячі "
 "програм</b> - все від найпопулярнішого до найбільш професійного."
 
@@ -16258,8 +16258,8 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Зараз Ви встановлюєте <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Зараз Ви встановлюєте <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16275,22 +16275,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Продукти Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Продукти Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> розробив різноманітні програми для <b>Мандрейклінакса</"
+"<b>Mandriva</b> розробив різноманітні програми для <b>Мандрейклінакса</"
 "b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Продуктами Mandrakelinux є:"
+msgid "The Mandrivalinux products are:"
+msgstr "Продуктами Mandrivalinux є:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16311,31 +16311,31 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux для x86-64</b>, розробка Mandrakelinux для отримання "
+"\t* <b>Mandrivalinux для x86-64</b>, розробка Mandrivalinux для отримання "
 "найкращого результату від 64-бітних процесорів."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Програми Mandrakesoft (Загальні продукти)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Програми Mandriva (Загальні продукти)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft розробив два продукти, які дають можливість користуватися "
+"Mandriva розробив два продукти, які дають можливість користуватися "
 "Мандрейклінаксом <b>на будь-якому комп'ютері</b> без необхідності його "
 "встановлення:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 "\t* <b>Move</b>, поширення Мандрейклінакса, яке виконується безпосередньо з "
@@ -16344,7 +16344,7 @@ msgstr ""
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 "\t* <b>GlobeTrotter</b>, поширення Мандрейклінакса, попередньо встановлене "
@@ -16352,32 +16352,32 @@ msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Продукти Mandrakesoft (Професійні рішення)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Продукти Mandriva (Професійні рішення)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Нижче приведені продукти Mandrakesoft, розроблені для <b>професійних потреб</"
+"Нижче приведені продукти Mandriva, розроблені для <b>професійних потреб</"
 "b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 "\t* <b>Корпоративна станція</b>, Робоча станція Мандрейклінакс для бізнесу."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr "\t* <b>Корпоративний сервер</b>, версія Мандрейклінакса для сервера."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 "\t* <b>Міжмережевий захисний шлюз</b>, версія Мандрейклінакса з підвищеними "
 "вимогами безпеки."
@@ -16423,10 +16423,10 @@ msgstr "<b>Виберіть для себе графічну стільницю!
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "З допомогою PowerPack Ви отримаєте можливість вибрати <b>графічну стільницю</"
-"b>. Типово Mandrakesoft вибрав <b>KDE</b>."
+"b>. Типово Mandriva вибрав <b>KDE</b>."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16450,10 +16450,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "З допомогою PowerPack+ Ви отримаєте можливість вибрати <b>графічну "
-"стільницю</b>. Типово Mandrakesoft вибрав <b>KDE</b>."
+"стільницю</b>. Типово Mandriva вибрав <b>KDE</b>."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16576,7 +16576,7 @@ msgstr "<b>Отримайте задоволення від різноманіт
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 "В меню Мандрейклінакса Ви знайдете набір <b>простих у використанні</b> "
@@ -16849,14 +16849,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr "<b>Центр керування Мандрейк</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 "<b>Центр Керування Мандрейк</b> є особливою колекцією специфічних для "
@@ -16885,14 +16885,14 @@ msgstr "<b>Модель Open Source</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Як і все комп'ютерне програмування, програми з відкритим кодом <b>вимагають "
 "часу і людей </b> для розробки. В дусі філософії програмування з відкритим "
-"кодом Mandrakesoft продає додаткові продукти і послуги з метою <b>подальшого "
+"кодом Mandriva продає додаткові продукти і послуги з метою <b>подальшого "
 "розвитку Мандрейклінакса</b>. Якщо Ви бажаєте <b>підтримувати філософію "
 "програмування з відкритим кодом</b> і розвиток Мандрейклінакса, <b>будь "
 "ласка</b>, розгляньте можливість придбання одного з наших продуктів чи "
@@ -16906,10 +16906,10 @@ msgstr "<b>Інтернет-магазин</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Щоб дізнатися більше про продукти і послуги Mandrakesoft, завітайте на нашу "
+"Щоб дізнатися більше про продукти і послуги Mandriva, завітайте на нашу "
 "<b>платформу інтернет-комерції</b>."
 
 #: share/advertising/27.pl:17
@@ -16935,24 +16935,24 @@ msgstr "Зупиніться сьогодні на <b>store.mandrakesoft.com</b>
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> є <b>чудовим товаришем</b> для Вашого продукту "
+"<b>Mandriva Club</b> є <b>чудовим товаришем</b> для Вашого продукту "
 "Мандрейклінакс."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Приєднуйтеся до Mandrakeclub і отримайте переваги від <b>численних корисних "
+"Приєднуйтеся до Mandriva Club і отримайте переваги від <b>численних корисних "
 "речей</b>, таких як:"
 
 #: share/advertising/28.pl:20
@@ -16974,39 +16974,39 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr "\t* Беріть участь в <b>форумах користувачів</b> Мандрейклінакса."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Легкий спеціальний доступ</b> до <b>ISO-образів</b> Мандрейклінакса "
 "до появи версій для загального звантаження."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> є новою додатковою послугою, яку Mandrakesoft "
+"<b>Mandriva Online</b> є новою додатковою послугою, яку Mandriva "
 "безкоштовно надає своїм покупцям!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline надає широкий набір послуг для <b>легкого поновлення</b> "
+"Mandriva Online надає широкий набір послуг для <b>легкого поновлення</b> "
 "системи Мандрейклінакс:"
 
 #: share/advertising/29.pl:18
@@ -17032,28 +17032,28 @@ msgstr "\t* Гнучкі <b>розклади</b> поновлень."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 "\t* Керування <b>всіма системами Мандрейклінакс</b> з однієї реєстрації."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Потрібна <b>допомога</b>? Зверніться до технічних експертів Mandrakesoft на "
+"Потрібна <b>допомога</b>? Зверніться до технічних експертів Mandriva на "
 "нашій <b>платформі підтримки</b> www.mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 "Дякуємо за допомогу <b>кваліфікованим експертам</b>, Ви можете зекономити "
@@ -17062,7 +17062,7 @@ msgstr ""
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 "З будь-яких питань щодо Мандрейклінакса можна отримати підтримку в <b>store."
@@ -17365,8 +17365,8 @@ msgstr "Інструменти для слідкування, облік про�
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Помічники Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Помічники Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17517,7 +17517,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17531,7 +17531,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[ПАРАМЕТРИ]...\n"
-"Конфігуратор Mandrakelinux Terminal Server\n"
+"Конфігуратор Mandrivalinux Terminal Server\n"
 "--enable         : увімкнути MTS\n"
 "--disable        : вимкнути MTS\n"
 "--start          : запустити MTS\n"
@@ -17589,7 +17589,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17597,7 +17597,7 @@ msgid ""
 msgstr ""
 "[ПАРАМЕТР]...\n"
 "  --no-confirmation      не запитувати першого підтвердження в режимі "
-"MandrakeUpdate\n"
+"Mandriva Update\n"
 "  --no-verify-rpm        не перевіряти підписи пакунків\n"
 "  --changelog-first      показувати журнал змін перед списком файлів у вікні "
 "опису\n"
@@ -20390,12 +20390,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Програма створення звітів про помилки Mandrakelinux"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Програма створення звітів про помилки Mandrivalinux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
 msgstr "Центр керування Мандрейклінакс"
 
 #: standalone/drakbug:48
@@ -20416,8 +20416,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20461,8 +20461,8 @@ msgstr "Помічники налаштування"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Виберіть інструмент Mandrakesoft:"
+msgid "Select Mandriva Tool:"
+msgstr "Виберіть інструмент Mandriva:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20888,7 +20888,7 @@ msgstr "Стартувати при завантаженні"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Цей інтерфейс ще не було сконфігуровано.\n"
 "Запустіть Помічник \"Додати інтерфейс\" Центрі Керування Мандрейк"
@@ -20897,7 +20897,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "З'єднання з Інтернетом ще не було сконфігуровано.\n"
 "Запустіть Помічника \"%s\" Центрі Керування Мандрейк"
@@ -20950,7 +20950,7 @@ msgstr "KDM (менеджер дисплею KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr "MdkKDM (Менеджер дисплею Мандрейклінакс)"
 
 #: standalone/drakedm:37
@@ -21250,7 +21250,7 @@ msgstr "Імпортувати"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21259,7 +21259,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Всі права застережено (C) 2001-2002 by Mandrakesoft \n"
+"Всі права застережено (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (оригінальна версія)\n"
@@ -21806,14 +21806,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003 Mandrakesoft.\n"
+"Copyright (C) 2003 Mandriva.\n"
 "Ця програма безкоштовна і може розповсюджуватися згідно умов Загальної "
 "публічної ліцензії GNU\n"
 "\n"
@@ -21843,7 +21843,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Центр довідки Мандрейклінакса"
 
 #: standalone/drakhelp:36
@@ -25363,8 +25363,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Журнал Mandrakelinux Tools"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Журнал Mandrivalinux Tools"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25879,7 +25879,7 @@ msgstr "З'єднання завершене."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "З'єднання завершилося невдало.\n"
 "Перевірте налаштування в Центрі керування Мандрейк."
diff --git a/perl-install/share/po/uz.po b/perl-install/share/po/uz.po
index 1d70c7d90..200e015c9 100644
--- a/perl-install/share/po/uz.po
+++ b/perl-install/share/po/uz.po
@@ -1,6 +1,6 @@
 # translation of DrakX-uz.po to Uzbek
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# Copyright (C) 2003 Mandrakesoft.
+# Copyright (C) 2003 Mandriva.
 # Mashrab Kuvatov <kmashrab@uni-bremen.de>, 2003, 2004.
 #
 msgid ""
@@ -60,7 +60,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -79,7 +79,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -87,7 +87,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -95,7 +95,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -219,7 +219,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1223,7 +1223,7 @@ msgstr "Тилни танлаш"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3509,12 +3509,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Давом этишдан олдин лицензиянинг шартларини эътибор билан ўқиб\n"
-"чиқинг. Лицензия бутун Mandrakelinux'га тегишли. Агар унинг барча\n"
+"чиқинг. Лицензия бутун Mandrivalinux'га тегишли. Агар унинг барча\n"
 "шартларига рози бўлсангиз, \"%s\"ни танланг. Агар рози бўлмасангиз,\n"
 "компьютерни ўчириб-ёқиш учун \"%s\" тугмасини босинг."
 
@@ -3623,13 +3623,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux бир нечта компакт-дискларда тарқатилади. Агар танланган пакет\n"
+"Mandrivalinux бир нечта компакт-дискларда тарқатилади. Агар танланган пакет\n"
 "бошқа компакт-дискда жойлашган бўлса, DrakX жорий компакт-дискни\n"
 "чиқаради ва тегишлисини қўйишни сўрайди. Агар сўралган компакт-диск сизда\n"
 "бўлмаса, \"%s\" тугмасини босинг. Бу ҳолда, тегишли пакетлар ўрнатилмайди."
@@ -3638,11 +3638,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3749,10 +3749,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3866,7 +3866,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -3969,12 +3969,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4001,7 +4001,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4010,7 +4010,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4139,7 +4139,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4157,7 +4157,7 @@ msgstr "Олдинги"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4186,7 +4186,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4202,7 +4202,7 @@ msgstr "Хавфсизлик бошқарувчиси"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4288,7 +4288,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4333,7 +4333,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4342,13 +4342,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4389,7 +4389,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4548,7 +4548,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4569,7 +4569,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4672,7 +4672,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4689,7 +4689,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4751,7 +4751,7 @@ msgstr "Хизматлар"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -5084,7 +5084,7 @@ msgstr "Дискнинг Windows қисмининг ҳажми ҳисоблан�
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 
@@ -5193,19 +5193,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5227,7 +5227,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5235,14 +5235,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5252,7 +5252,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5272,10 +5272,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5286,11 +5286,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5306,14 +5306,14 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Кириш\n"
 "\n"
-"Mandrakelinux дистрибутивида мавжуд бўлган операцион тизим ва унинг турли "
+"Mandrivalinux дистрибутивида мавжуд бўлган операцион тизим ва унинг турли "
 "қисмлари \n"
 "бундан буён \"Дастурий Маҳсулотлар\" деб юритилади. Дастурий маҳсулотлар \n"
-"Mandrakelinux дистрибутивнинг қисмлари ва операцион тизим билан боғлиқ "
+"Mandrivalinux дистрибутивнинг қисмлари ва операцион тизим билан боғлиқ "
 "бўлган\n"
 "дастурлар тўплами, усуллар, қоидалар ва қўлланмаларни ўз ичига олади, аммо "
 "бу билан чекланмайди.\n"
@@ -5322,7 +5322,7 @@ msgstr ""
 "1. Лицензия келишуви\n"
 "\n"
 "Илтимос, ушбу ҳужжатни диққат билан ўқиб чиқинг. Бу ҳужжат Сиз билан "
-"Mandrakesoft S.A. \n"
+"Mandriva S.A. \n"
 "ўртасида Дастурий Маҳсулотлари бўйича имзоланадиган лицензия келишувидир.\n"
 "Дастурий Маҳсулотларни ҳар қандай мақсад билан ўрнатиб, кўпайтириб ёки \n"
 "улардан фойдаланиб Сиз мазкур Лицензиянинг шартлари ва қоидаларини тўлиқ "
@@ -5344,7 +5344,7 @@ msgstr ""
 "\n"
 "Дастурий Маҳсулотлар ва уларга илова қилинган қўлланмалар \"ўз ҳолича\", "
 "қонунда йўл қўйилган\n"
-"даражада ҳеч қандай кафолатларсиз тақдим қилинади. Mandrakesoft S.A. қонунда "
+"даражада ҳеч қандай кафолатларсиз тақдим қилинади. Mandriva S.A. қонунда "
 "йўл қўйилган\n"
 "даражада ҳеч қандай ҳолатда Дастурий Маҳсулотлардан фойдаланиш ёки "
 "фойдаланмаслик оқибатида\n"
@@ -5353,19 +5353,19 @@ msgstr ""
 "касод бўлиши, тижорат фаолиятидаги узилишлар, молиявий зарарлар, суд "
 "маҳкамалари натижасидаги\n"
 "суд харажатлари ёки жарималар ёки бошқа ҳар қандай билвосита йўқотишлар) "
-"учун, ҳатто Mandrakesoft S.A.'га\n"
+"учун, ҳатто Mandriva S.A.'га\n"
 "шундай зарар кўриш имконияти ёки ҳолатлари маълум бўлган тақдирда ҳам,\n"
 "жавобгар бўлмайди.\n"
 "\n"
 "БАЪЗИ МАМЛАКАТЛАРДА МАН ҚИЛИНГАН ДАСТУРИЙ МАҲСУЛОТЛАРГА ЭГАЛИК ҚИЛИШ\n"
 "ЁКИ УЛАРДАН ФОЙДАЛАНИШ БИЛАН БОҒЛИҚ ЧЕКЛАНГАН МАСЪУЛИЯТ\n"
 "\n"
-"Mandrakesoft S.A. ёки унинг тарқатувчилари қонунда йўл қўйилган даражада ҳеч "
+"Mandriva S.A. ёки унинг тарқатувчилари қонунда йўл қўйилган даражада ҳеч "
 "қандай ҳолатда\n"
 "баъзи мамлакатларнинг маҳаллий қонунлари билан чекланган ёки ман қилинган "
 "дастурий\n"
 "маҳсулотларнинг қисмларига эгалик қилиш ва улардан фойдаланиш, ёки "
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "сайтларининг биридан дастурий маҳсулотнинг қисмларини кўчириб олиш оқибатида "
 "тасодифий,\n"
 "тўғридан-тўғри, бевосита ёки билвосита етказилган зарарлар (шу жумладан "
@@ -5393,11 +5393,11 @@ msgstr ""
 "ҳар бири\n"
 "учун лицензия келишувининг шартлари ва қоидаларини диққат билан ўқиб чиқинг. "
 "Қисмнинг\n"
-"лицензиясига оид ҳар қандай саволлар Mandrakesoft'га эмас, балки қисмнинг "
+"лицензиясига оид ҳар қандай саволлар Mandriva'га эмас, балки қисмнинг "
 "муаллифига юборилиши\n"
-"лозим. Mandrakesoft S.A. томонидан ишлаб чиқилган дастурлар GPL лицензияси "
+"лозим. Mandriva S.A. томонидан ишлаб чиқилган дастурлар GPL лицензияси "
 "таъсири\n"
-"остидадир. Mandrakesoft S.A. томонидан ёзилган қўлланмалар эса махсус "
+"остидадир. Mandriva S.A. томонидан ёзилган қўлланмалар эса махсус "
 "лицензия таъсири\n"
 "остидадир. Илтимос, қўшимча маълумот учун қўлланмаларга мурожаат қилинг.\n"
 "\n"
@@ -5408,12 +5408,12 @@ msgstr ""
 "муаллифларига\n"
 "тегишли бўлиб, интеллектуал мулк ва дастурий маҳсулотларга оид муаллифлик "
 "ҳуқуқи\n"
-"тўғрисидаги қонунлар билан ҳимояланади. Mandrakesoft S.A. Дастурий "
+"тўғрисидаги қонунлар билан ҳимояланади. Mandriva S.A. Дастурий "
 "Маҳсулотларни тўлиқ\n"
 "ёки қисман, ҳар қандай йўл билан ва исталган мақсадларда ўзгартириш ёки "
 "мослаштириш ҳуқуқини\n"
-"ўзида сақлаб қолади. \"Mandrake\", \"Mandrakelinux\" ва тегишли белгилар "
-"Mandrakesoft S.A.'га\n"
+"ўзида сақлаб қолади. \"Mandriva\", \"Mandrivalinux\" ва тегишли белгилар "
+"Mandriva S.A.'га\n"
 "тегишли савдо белгиларидир.\n"
 "\n"
 "\n"
@@ -5431,7 +5431,7 @@ msgstr ""
 "судда муҳокама қилинади.\n"
 "Сўнгги навбатда масаланинг кўрилиши тегишли Париж (Франция) Қонунчилик "
 "судига ҳавола қилинади.\n"
-"Илтимос, мазкур ҳужжатга оид ҳар қандай саволлар бўйича Mandrakesoft S.A. "
+"Илтимос, мазкур ҳужжатга оид ҳар қандай саволлар бўйича Mandriva S.A. "
 "билан боғланинг.\n"
 
 #: install_messages.pm:90
@@ -5488,7 +5488,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5496,21 +5496,21 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Табриклаймиз! Ўрнатиш тугади.\n"
 "Юкловчи манбани олиб ташланг ва компьютерни\n"
 "ўчириб-ёқиш учун ENTER тугмасини босинг.\n"
 "\n"
 "\n"
-"Mandrakelinux'ниниг бу версияси учун янгиланишлар ҳақида\n"
+"Mandrivalinux'ниниг бу версияси учун янгиланишлар ҳақида\n"
 "маълумот қуйидаги Errata веб-саҳифасида мавжуд:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"Тизимни мослаш ҳақида маълумот Mandrakelinux\n"
+"Тизимни мослаш ҳақида маълумот Mandrivalinux\n"
 "фойдаланувчилари учун расмий қўлланмасида мавжуд."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5546,7 +5546,7 @@ msgstr "%s босқичга ўтилмоқда\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -6069,7 +6069,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
 
 #: install_steps_interactive.pm:840
@@ -6283,8 +6283,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux'ни ўрнатиш %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux'ни ўрнатиш %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8857,7 +8857,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12623,7 +12623,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14328,18 +14328,18 @@ msgstr "Тўхтатиш"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mandrakelinux нима?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Mandrivalinux нима?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "<b>Mandrakelinux</b> тизимига марҳамат!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "<b>Mandrivalinux</b> тизимига марҳамат!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14348,7 +14348,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -14365,12 +14365,12 @@ msgstr "<b>Open Source</b> оламига марҳамат!"
 #: share/advertising/02.pl:17
 #, fuzzy, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux операцион тизими ва унинг кўплаб дастурлари Mandrakesoft "
+"Mandrivalinux операцион тизими ва унинг кўплаб дастурлари Mandriva "
 "тузувчилари ва бутун олам бўйлаб ҳисса қўшувчилар ҳамкорликда бажарган иш "
 "натижасидир."
 
@@ -14392,7 +14392,7 @@ msgstr "<b>GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14418,10 +14418,10 @@ msgstr "<b>Бирлашмага қўшилинг</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14440,8 +14440,8 @@ msgstr "<b>Download</b> версия"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14468,7 +14468,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14478,7 +14478,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14497,13 +14497,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14515,7 +14515,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14529,19 +14529,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesoft маҳсулотлари</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva маҳсулотлари</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -14562,61 +14562,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14654,7 +14654,7 @@ msgstr "<b>Сизга мос келган график иш столини та�
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14675,7 +14675,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -14793,10 +14793,10 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Mandrakelinux менюсидан <b>барча вазифалар</b> учун <b>қулай дастурларни</b> "
+"Mandrivalinux менюсидан <b>барча вазифалар</b> учун <b>қулай дастурларни</b> "
 "топса бўлади:"
 
 #: share/advertising/18.pl:16
@@ -15039,14 +15039,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux бошқарув маркази</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux бошқарув маркази</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -15068,9 +15068,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -15082,7 +15082,7 @@ msgstr "<b>Интернет дўкон</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -15105,20 +15105,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -15137,33 +15137,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, fuzzy, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr "\t* Онлайн сухбатда <b>Kopete</b> ёрдамида қатнашинг"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -15186,32 +15186,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15510,8 +15510,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesoft ёрдамчилари"
+msgid "Mandriva Wizards"
+msgstr "Mandriva ёрдамчилари"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -15606,7 +15606,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15654,7 +15654,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -18156,13 +18156,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux учун хато ҳақида хабар қилувчи восита"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux учун хато ҳақида хабар қилувчи восита"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux бошқарув маркази"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux бошқарув маркази"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18182,8 +18182,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -18227,7 +18227,7 @@ msgstr "Мослаш ёрдамчилари"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -18644,20 +18644,20 @@ msgstr "Тизим юкланганда ишга туширилган"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Бу интерфейс ҳали мослангани йўқ.\n"
-"Mandrakelinux бошқарув марказидан \"Интерфейсни қўшиш\" ёрдамчини ишга "
+"Mandrivalinux бошқарув марказидан \"Интерфейсни қўшиш\" ёрдамчини ишга "
 "туширинг"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Интернет билан алоқа мосланмаган.\n"
-"Mandrakelinux бошқарув марказидан \"%s\" ёрдамчини ишга туширинг"
+"Mandrivalinux бошқарув марказидан \"%s\" ёрдамчини ишга туширинг"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -18707,7 +18707,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18992,7 +18992,7 @@ msgstr "Импорт қилиш"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19460,14 +19460,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
 "\n"
 "Фойдаланиш:\n"
@@ -19492,8 +19492,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux ёрдам маркази"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux ёрдам маркази"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22391,7 +22391,7 @@ msgid ""
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
-"HardDrake - Mandrakelinux учун асбоб-ускуналарни мословчи восита.\n"
+"HardDrake - Mandrivalinux учун асбоб-ускуналарни мословчи восита.\n"
 "<span foreground=\"royalblue3\">Версия:</span> %s\n"
 "<span foreground=\"royalblue3\">Муаллиф:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
@@ -22506,8 +22506,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinux бошқарув маркази"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinux бошқарув маркази"
 
 #: standalone/logdrake:51
 #, c-format
@@ -23016,10 +23016,10 @@ msgstr "Алоқа ўрнатилди."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Алоқа ўрнатиш муваффақиятсиз тугади.\n"
-"Мосламани Mandrakelinux бошқарув марказида текширинг."
+"Мосламани Mandrivalinux бошқарув марказида текширинг."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -23870,8 +23870,8 @@ msgstr "Ўрнатиш муваффақиятсиз тугади"
 #~ msgstr "Сиз ҳеч қандай шрифтни танламадингиз"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Mandrakesoft ёрдамчилари"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Mandriva ёрдамчилари"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Ҳеч қандай браузер мавжуд эмас! Илтимос бирортасини ўрнатинг"
diff --git a/perl-install/share/po/uz@Latn.po b/perl-install/share/po/uz@Latn.po
index 1a567c028..e0e46522e 100644
--- a/perl-install/share/po/uz@Latn.po
+++ b/perl-install/share/po/uz@Latn.po
@@ -1,6 +1,6 @@
 # translation of DrakX-uz.po to Uzbek
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# Copyright (C) 2003 Mandrakesoft.
+# Copyright (C) 2003 Mandriva.
 # Mashrab Kuvatov <kmashrab@uni-bremen.de>, 2003, 2004.
 #
 msgid ""
@@ -60,7 +60,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -79,7 +79,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -87,7 +87,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -95,7 +95,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -219,7 +219,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1223,7 +1223,7 @@ msgstr "Tilni tanlash"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3516,12 +3516,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Davom etishdan oldin litsenziyaning shartlarini e'tibor bilan o'qib\n"
-"chiqing. Litsenziya butun Mandrakelinux'ga tegishli. Agar uning barcha\n"
+"chiqing. Litsenziya butun Mandrivalinux'ga tegishli. Agar uning barcha\n"
 "shartlariga rozi bo'lsangiz, \"%s\"ni tanlang. Agar rozi bo'lmasangiz,\n"
 "kompyuterni o'chirib-yoqish uchun \"%s\" tugmasini bosing."
 
@@ -3630,13 +3630,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux bir nechta kompakt-disklarda tarqatiladi. Agar tanlangan "
+"Mandrivalinux bir nechta kompakt-disklarda tarqatiladi. Agar tanlangan "
 "paket\n"
 "boshqa kompakt-diskda joylashgan bo'lsa, DrakX joriy kompakt-diskni\n"
 "chiqaradi va tegishlisini qo'yishni so'raydi. Agar so'ralgan kompakt-disk "
@@ -3647,11 +3647,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3758,10 +3758,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -3875,7 +3875,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -3978,12 +3978,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4010,7 +4010,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4019,7 +4019,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4148,7 +4148,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4166,7 +4166,7 @@ msgstr "Oldingi"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4195,7 +4195,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4211,7 +4211,7 @@ msgstr "Xavfsizlik boshqaruvchisi"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4297,7 +4297,7 @@ msgstr "Odiy/ekspert usuliga o'tish"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4342,7 +4342,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4351,13 +4351,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4398,7 +4398,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4557,7 +4557,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4578,7 +4578,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4681,7 +4681,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4698,7 +4698,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4760,7 +4760,7 @@ msgstr "Xizmatlar"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -5093,7 +5093,7 @@ msgstr "Diskning Windows qismining hajmi hisoblanmoqda"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 
@@ -5202,19 +5202,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5236,7 +5236,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5244,14 +5244,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5261,7 +5261,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5281,10 +5281,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5295,11 +5295,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5315,14 +5315,14 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Kirish\n"
 "\n"
-"Mandrakelinux distributivida mavjud bo'lgan operatsion tizim va uning turli "
+"Mandrivalinux distributivida mavjud bo'lgan operatsion tizim va uning turli "
 "qismlari \n"
 "bundan buyon \"Dasturiy Mahsulotlar\" deb yuritiladi. Dasturiy mahsulotlar \n"
-"Mandrakelinux distributivning qismlari va operatsion tizim bilan bog'liq "
+"Mandrivalinux distributivning qismlari va operatsion tizim bilan bog'liq "
 "bo'lgan\n"
 "dasturlar to'plami, usullar, qoidalar va qo'llanmalarni o'z ichiga oladi, "
 "ammo bu bilan cheklanmaydi.\n"
@@ -5331,7 +5331,7 @@ msgstr ""
 "1. Litsenziya kelishuvi\n"
 "\n"
 "Iltimos, ushbu hujjatni diqqat bilan o'qib chiqing. Bu hujjat Siz bilan "
-"Mandrakesoft S.A. \n"
+"Mandriva S.A. \n"
 "o'rtasida Dasturiy Mahsulotlari bo'yicha imzolanadigan litsenziya "
 "kelishuvidir.\n"
 "Dasturiy Mahsulotlarni har qanday maqsad bilan o'rnatib, ko'paytirib yoki \n"
@@ -5355,7 +5355,7 @@ msgstr ""
 "\n"
 "Dasturiy Mahsulotlar va ularga ilova qilingan qo'llanmalar \"o'z holicha\", "
 "qonunda yo'l qo'yilgan\n"
-"darajada hech qanday kafolatlarsiz taqdim qilinadi. Mandrakesoft S.A. "
+"darajada hech qanday kafolatlarsiz taqdim qilinadi. Mandriva S.A. "
 "qonunda yo'l qo'yilgan\n"
 "darajada hech qanday holatda Dasturiy Mahsulotlardan foydalanish yoki "
 "foydalanmaslik oqibatida\n"
@@ -5364,7 +5364,7 @@ msgstr ""
 "kasod bo'lishi, tijorat faoliyatidagi uzilishlar, moliyaviy zararlar, sud "
 "mahkamalari natijasidagi\n"
 "sud xarajatlari yoki jarimalar yoki boshqa har qanday bilvosita "
-"yo'qotishlar) uchun, hatto Mandrakesoft S.A.'ga\n"
+"yo'qotishlar) uchun, hatto Mandriva S.A.'ga\n"
 "shunday zarar ko'rish imkoniyati yoki holatlari ma'lum bo'lgan taqdirda "
 "ham,\n"
 "javobgar bo'lmaydi.\n"
@@ -5372,12 +5372,12 @@ msgstr ""
 "BA'ZI MAMLAKATLARDA MAN QILINGAN DASTURIY MAHSULOTLARGA EGALIK QILISh\n"
 "YoKI ULARDAN FOYDALANISh BILAN BOG'LIQ ChEKLANGAN MAS'ULIYaT\n"
 "\n"
-"Mandrakesoft S.A. yoki uning tarqatuvchilari qonunda yo'l qo'yilgan darajada "
+"Mandriva S.A. yoki uning tarqatuvchilari qonunda yo'l qo'yilgan darajada "
 "hech qanday holatda\n"
 "ba'zi mamlakatlarning mahalliy qonunlari bilan cheklangan yoki man qilingan "
 "dasturiy\n"
 "mahsulotlarning qismlariga egalik qilish va ulardan foydalanish, yoki "
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "saytlarining biridan dasturiy mahsulotning qismlarini ko'chirib olish "
 "oqibatida tasodifiy,\n"
 "to'g'ridan-to'g'ri, bevosita yoki bilvosita etkazilgan zararlar (shu "
@@ -5405,11 +5405,11 @@ msgstr ""
 "qismlarning har biri\n"
 "uchun litsenziya kelishuvining shartlari va qoidalarini diqqat bilan o'qib "
 "chiqing. Qismning\n"
-"litsenziyasiga oid har qanday savollar Mandrakesoft'ga emas, balki qismning "
+"litsenziyasiga oid har qanday savollar Mandriva'ga emas, balki qismning "
 "muallifiga yuborilishi\n"
-"lozim. Mandrakesoft S.A. tomonidan ishlab chiqilgan dasturlar GPL "
+"lozim. Mandriva S.A. tomonidan ishlab chiqilgan dasturlar GPL "
 "litsenziyasi ta'siri\n"
-"ostidadir. Mandrakesoft S.A. tomonidan yozilgan qo'llanmalar esa maxsus "
+"ostidadir. Mandriva S.A. tomonidan yozilgan qo'llanmalar esa maxsus "
 "litsenziya ta'siri\n"
 "ostidadir. Iltimos, qo'shimcha ma'lumot uchun qo'llanmalarga murojaat "
 "qiling.\n"
@@ -5421,12 +5421,12 @@ msgstr ""
 "mualliflariga\n"
 "tegishli bo'lib, intellektual mulk va dasturiy mahsulotlarga oid mualliflik "
 "huquqi\n"
-"to'g'risidagi qonunlar bilan himoyalanadi. Mandrakesoft S.A. Dasturiy "
+"to'g'risidagi qonunlar bilan himoyalanadi. Mandriva S.A. Dasturiy "
 "Mahsulotlarni to'liq\n"
 "yoki qisman, har qanday yo'l bilan va istalgan maqsadlarda o'zgartirish yoki "
 "moslashtirish huquqini\n"
-"o'zida saqlab qoladi. \"Mandrake\", \"Mandrakelinux\" va tegishli belgilar "
-"Mandrakesoft S.A.'ga\n"
+"o'zida saqlab qoladi. \"Mandriva\", \"Mandrivalinux\" va tegishli belgilar "
+"Mandriva S.A.'ga\n"
 "tegishli savdo belgilaridir.\n"
 "\n"
 "\n"
@@ -5444,7 +5444,7 @@ msgstr ""
 "sudda muhokama qilinadi.\n"
 "So'nggi navbatda masalaning ko'rilishi tegishli Parij (Frantsiya) "
 "Qonunchilik sudiga havola qilinadi.\n"
-"Iltimos, mazkur hujjatga oid har qanday savollar bo'yicha Mandrakesoft S.A. "
+"Iltimos, mazkur hujjatga oid har qanday savollar bo'yicha Mandriva S.A. "
 "bilan bog'laning.\n"
 
 #: install_messages.pm:90
@@ -5501,7 +5501,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5509,21 +5509,21 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Tabriklaymiz! O'rnatish tugadi.\n"
 "Yuklovchi manbani olib tashlang va kompyuterni\n"
 "o'chirib-yoqish uchun ENTER tugmasini bosing.\n"
 "\n"
 "\n"
-"Mandrakelinux'ninig bu versiyasi uchun yangilanishlar haqida\n"
+"Mandrivalinux'ninig bu versiyasi uchun yangilanishlar haqida\n"
 "ma'lumot quyidagi Errata veb-sahifasida mavjud:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"Tizimni moslash haqida ma'lumot Mandrakelinux\n"
+"Tizimni moslash haqida ma'lumot Mandrivalinux\n"
 "foydalanuvchilari uchun rasmiy qo'llanmasida mavjud."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5559,7 +5559,7 @@ msgstr "%s bosqichga o'tilmoqda\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -6083,7 +6083,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
 
 #: install_steps_interactive.pm:840
@@ -6297,8 +6297,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux'ni o'rnatish %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux'ni o'rnatish %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8872,7 +8872,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12649,7 +12649,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14360,18 +14360,18 @@ msgstr "To'xtatish"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mandrakelinux nima?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Mandrivalinux nima?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "<b>Mandrakelinux</b> tizimiga marhamat!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "<b>Mandrivalinux</b> tizimiga marhamat!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14380,7 +14380,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -14397,12 +14397,12 @@ msgstr "<b>Open Source</b> olamiga marhamat!"
 #: share/advertising/02.pl:17
 #, fuzzy, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux operatsion tizimi va uning ko'plab dasturlari Mandrakesoft "
+"Mandrivalinux operatsion tizimi va uning ko'plab dasturlari Mandriva "
 "tuzuvchilari va butun olam bo'ylab hissa qo'shuvchilar hamkorlikda bajargan "
 "ish natijasidir."
 
@@ -14424,7 +14424,7 @@ msgstr "<b>GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14450,10 +14450,10 @@ msgstr "<b>Birlashmaga qo'shiling</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -14472,8 +14472,8 @@ msgstr "<b>Download</b> versiya"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -14500,7 +14500,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -14510,7 +14510,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14529,13 +14529,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -14547,7 +14547,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14561,19 +14561,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesoft mahsulotlari</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva mahsulotlari</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -14594,61 +14594,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14686,7 +14686,7 @@ msgstr "<b>Sizga mos kelgan grafik ish stolini tanlang</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14707,7 +14707,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -14825,10 +14825,10 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Mandrakelinux menyusidan <b>barcha vazifalar</b> uchun <b>qulay dasturlarni</"
+"Mandrivalinux menyusidan <b>barcha vazifalar</b> uchun <b>qulay dasturlarni</"
 "b> topsa bo'ladi:"
 
 #: share/advertising/18.pl:16
@@ -15072,14 +15072,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux boshqaruv markazi</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux boshqaruv markazi</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -15101,9 +15101,9 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -15115,7 +15115,7 @@ msgstr "<b>Internet do'kon</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -15138,20 +15138,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -15170,33 +15170,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, fuzzy, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr "\t* Onlayn suxbatda <b>Kopete</b> yordamida qatnashing"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -15219,32 +15219,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -15543,8 +15543,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesoft yordamchilari"
+msgid "Mandriva Wizards"
+msgstr "Mandriva yordamchilari"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -15639,7 +15639,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15687,7 +15687,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -18193,13 +18193,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux uchun xato haqida xabar qiluvchi vosita"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux uchun xato haqida xabar qiluvchi vosita"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux boshqaruv markazi"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux boshqaruv markazi"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18219,8 +18219,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -18264,7 +18264,7 @@ msgstr "Moslash yordamchilari"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -18681,20 +18681,20 @@ msgstr "Tizim yuklanganda ishga tushirilgan"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Bu interfeys hali moslangani yo'q.\n"
-"Mandrakelinux boshqaruv markazidan \"Interfeysni qo'shish\" yordamchini "
+"Mandrivalinux boshqaruv markazidan \"Interfeysni qo'shish\" yordamchini "
 "ishga tushiring"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Internet bilan aloqa moslanmagan.\n"
-"Mandrakelinux boshqaruv markazidan \"%s\" yordamchini ishga tushiring"
+"Mandrivalinux boshqaruv markazidan \"%s\" yordamchini ishga tushiring"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -18744,7 +18744,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -19030,7 +19030,7 @@ msgstr "Import qilish"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19501,14 +19501,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
 "\n"
 "Foydalanish:\n"
@@ -19533,8 +19533,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux yordam markazi"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux yordam markazi"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22433,7 +22433,7 @@ msgid ""
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
-"HardDrake - Mandrakelinux uchun asbob-uskunalarni moslovchi vosita.\n"
+"HardDrake - Mandrivalinux uchun asbob-uskunalarni moslovchi vosita.\n"
 "<span foreground=\"royalblue3\">Versiya:</span> %s\n"
 "<span foreground=\"royalblue3\">Muallif:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
@@ -22548,8 +22548,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinux boshqaruv markazi"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinux boshqaruv markazi"
 
 #: standalone/logdrake:51
 #, c-format
@@ -23058,10 +23058,10 @@ msgstr "Aloqa o'rnatildi."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Aloqa o'rnatish muvaffaqiyatsiz tugadi.\n"
-"Moslamani Mandrakelinux boshqaruv markazida tekshiring."
+"Moslamani Mandrivalinux boshqaruv markazida tekshiring."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -23914,8 +23914,8 @@ msgstr "O'rnatish muvaffaqiyatsiz tugadi"
 #~ msgstr "Siz hech qanday shriftni tanlamadingiz"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Mandrakesoft yordamchilari"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Mandriva yordamchilari"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Hech qanday brauzer mavjud emas! Iltimos birortasini o'rnating"
diff --git a/perl-install/share/po/vi.po b/perl-install/share/po/vi.po
index 1e5188fb5..bf6b6b998 100644
--- a/perl-install/share/po/vi.po
+++ b/perl-install/share/po/vi.po
@@ -66,14 +66,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Có vẻ như USB key bị khoá chế độ ghi nhưng vẫn không thể rút ra\n"
 "nó một cách an toàn.\n"
 "\n"
 "\n"
 "Hãy khởi động lại máy tính, rút USB key ra, mở khoá chống ghi,\n"
-"cắm lại USB key vào máy và chạy lại Mandrake Move."
+"cắm lại USB key vào máy và chạy lại Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -91,7 +91,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "USB key của bạn không có phân vùng FAT hợp lệ nào.\n"
@@ -101,14 +101,14 @@ msgstr ""
 "\n"
 "\n"
 "Bạn cũng có thể hoạt động mà không cần USB key - bạn còn\n"
-"có thể dùng Mandrake Move như một Hệ Điều Hành Mandrake\n"
+"có thể dùng Mandriva Move như một Hệ Điều Hành Mandrake\n"
 "thực thụ."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -116,11 +116,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Không dò tìm được USB key nào trong hệ thống. Nếu bạn\n"
-"nối một USB key bây giờ, Mandrake Move sẽ có thể\n"
+"nối một USB key bây giờ, Mandriva Move sẽ có thể\n"
 "sao chép toàn bộ dữ liệu vào thư mục home của bạn và\n"
 "cấu hình toàn bộ hệ thống, phục vụ cho lần khởi động lại tiếp theo trên máy "
 "tính này\n"
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "\n"
 "Bạn cũng có thể tiếp tục mà không cần USB key - bạn vẫn\n"
-"có thể dùng Mandrake Move như một Hệ Điều Hành Mandrake\n"
+"có thể dùng Mandriva Move như một Hệ Điều Hành Mandrake\n"
 "thực thụ."
 
 #: ../move/move.pm:494
@@ -256,7 +256,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -272,7 +272,7 @@ msgstr ""
 "\n"
 "Lỗi này có thể do tập tin cấu hình hệ thống trên USB key hỏng.\n"
 "Trong trường hợp này, hãy xoá bỏ chúng rồi sau đó khởi động lại\n"
-"Mandrake Move có thể giải quyết được vấn đề. Để làm vậy, hãy\n"
+"Mandriva Move có thể giải quyết được vấn đề. Để làm vậy, hãy\n"
 "nhấn nút tương ứng.\n"
 "\n"
 "\n"
@@ -1303,11 +1303,11 @@ msgstr "Chọn ngôn ngữ"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux có khả năng hỗ trợ đa ngôn ngữ. Hãy chọn\n"
+"Mandrivalinux có khả năng hỗ trợ đa ngôn ngữ. Hãy chọn\n"
 "các ngôn ngữ mà bạn muốn cài đặt. Chúng sẽ sẵn có để dùng\n"
 "khi hoàn thành cài đặt và khởi động lại hệ thống."
 
@@ -3711,12 +3711,12 @@ msgstr "bật hỗ trợ radio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Trước khi tiếp tục, hãy đọc kỹ các điều khoản ghi trong bản quyền.\n"
-"Nó bao xuyên suốt toàn bộ phân phối Mandrakelinux. Nếu đồng ý với\n"
+"Nó bao xuyên suốt toàn bộ phân phối Mandrivalinux. Nếu đồng ý với\n"
 "mọi điều khoản trong đó, nhấn vào hộp kiểm \"%s\". Nếu không, hãy\n"
 "nhấn nút \"%s\" để khởi động lại máy tính."
 
@@ -3888,7 +3888,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3903,11 +3903,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3959,11 +3959,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "Bây giờ là lúc chỉ ra chương trình nào mà bạn muốn cài đặt vào hệ thống.\n"
-"Hiện có hàng nghìn gói tin dùng cho Mandrakelinux và được tổ chức theo\n"
+"Hiện có hàng nghìn gói tin dùng cho Mandrivalinux và được tổ chức theo\n"
 "nhóm các ứng dụng giống nhau để dễ dàng quản lý.\n"
 "\n"
 "Các gói phần mềm được xếp loại theo các nhóm tương ứng với việc sử dụng\n"
-"cụ thể cho máy tính. Mandrakelinux có 4 kiểu cài đặt sẵn với nhiều loại gói "
+"cụ thể cho máy tính. Mandrivalinux có 4 kiểu cài đặt sẵn với nhiều loại gói "
 "tin.\n"
 "Bạn có thể chọn dùng các ứng dụng pha trộn của các kiểu cài đặt này, ví dụ\n"
 "như cài đặt kiểu ``Máy trạm'' cùng với việc cài các ứng dụng của kiểu cài\n"
@@ -4069,10 +4069,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4102,7 +4102,7 @@ msgstr ""
 "\n"
 "!! Nếu các gói tin cho server được chọn cố tình hoặc do nó là thành\n"
 "phần của một nhóm, bạn sẽ được hỏi để khẳng định là bạn thật sự\n"
-"muốn những server này được cài đặt. Trong Mandrakelinux, bất kỳ\n"
+"muốn những server này được cài đặt. Trong Mandrivalinux, bất kỳ\n"
 "server đã được cài đặt nào đều chạy vào lúc khởi động theo mặc định.\n"
 "Thậm chí được coi là an toàn tại thời điểm phát hành, nó vẫn có thể\n"
 "có lỗ hổng bảo mật được phát hiện sau khi phát hành phiên bản Linux\n"
@@ -4253,7 +4253,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4309,7 +4309,7 @@ msgid ""
 msgstr ""
 "X (cho hệ thống cửa sổ X) là trái tim của giao diện đồ họa GNU/Linux\n"
 "mà trên đó mọi môi trường đồ họa (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) được kết hợp trong Mandrakelinux.\n"
+"WindowMaker, etc.) được kết hợp trong Mandrivalinux.\n"
 "\n"
 "Bạn sẽ được xem danh sách các tham số khác nhau để thay đổi sao\n"
 "cho việc hiển thị đồ họa được tối ưu.\n"
@@ -4424,12 +4424,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4456,7 +4456,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4465,7 +4465,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4486,10 +4486,10 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Lúc này bạn cần chọn nơi nào trên đĩa cứng sẽ cài đặt hệ điều hành\n"
-"Mandrakelinux. Nếu như đĩa cứng chưa có gì hoặc nếu đã có một hệ\n"
+"Mandrivalinux. Nếu như đĩa cứng chưa có gì hoặc nếu đã có một hệ\n"
 "điều hành đang sử dụng toàn bộ không gian đĩa, bạn cần thực hiện việc\n"
 "phân vùng đĩa. Về cơ bản, việc phân vùng một ổ đĩa cứng là phân chia\n"
-"các ổ lý luận, tạo không gian để cài đặt hệ thống Mandrakelinux mới.\n"
+"các ổ lý luận, tạo không gian để cài đặt hệ thống Mandrivalinux mới.\n"
 "\n"
 "Do kết quả của quá trình phân vùng thường không thay đổi lại được nữa,\n"
 "nên việc phân vùng có thể gây sợ hãi và căng thẳng nếu bạn không phải\n"
@@ -4516,7 +4516,7 @@ msgstr ""
 "lập lại kích thước phân vùng của MS Windows mà có thể không bị mất bất\n"
 "kỳ dữ liệu nào. Tuy nhiên bạn rất nên thực hiện việc sao lưu dữ liệu trước "
 "đã.\n"
-"Nên chọn giải pháp này nếu muốn dùng cả Mandrakelinux và Windows trên\n"
+"Nên chọn giải pháp này nếu muốn dùng cả Mandrivalinux và Windows trên\n"
 "cùng một máy tính.\n"
 "\n"
 "   Trước khi chọn tùy chọn này, hãy hiểu là sau khi thực hiện cách này,\n"
@@ -4525,7 +4525,7 @@ msgstr ""
 "liệu và cài đặt phần mềm mới.\n"
 "\n"
 " * \"%s\": nếu muốn xoá toàn bộ dữ liệu và các phân vùng\n"
-"hiện có trên ổ cứng và thay thế bằng hệ thống Mandrakelinux mới,\n"
+"hiện có trên ổ cứng và thay thế bằng hệ thống Mandrivalinux mới,\n"
 "hãy dùng tùy chọn này. Hãy thận trọng với tùy chọn này vì sẽ không\n"
 "thể thay đổi lựa chọn sau khi đã khẳng định.\n"
 "\n"
@@ -4680,7 +4680,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4702,7 +4702,7 @@ msgstr ""
 "Nhấn lên \"%s\" khi bạn sẵn sàng format các phân vùng.\n"
 "\n"
 "Nhấn lên \"%s\" nếu muốn chọn một phân vùng khác cho việc\n"
-"cài đặt hệ điều hành Mandrakelinux mới.\n"
+"cài đặt hệ điều hành Mandrivalinux mới.\n"
 "\n"
 "Nhấn lên \"%s\" nếu muốn chọn các phân vùng sẽ được kiểm\n"
 "tra các khối bị hỏng trên bề mặt đĩa."
@@ -4719,7 +4719,7 @@ msgstr "Về trước"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4731,7 +4731,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Vào lúc bạn đang cài đặt Mandrakelinux, có thể đã có một số gói tin\n"
+"Vào lúc bạn đang cài đặt Mandrivalinux, có thể đã có một số gói tin\n"
 "đã được cập nhật kể từ lúc phát hành phiên bản này. Một số lỗi chương\n"
 "trình đã được sửa, các vấn đề bảo mật được giải quyết. Để cho bạn\n"
 "được hưởng lợi từ các cập nhật này, bây giờ bạn có thể để tải chúng về\n"
@@ -4759,7 +4759,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4787,7 +4787,7 @@ msgstr "Người Quản Trị Bảo Mật:"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4858,7 +4858,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Vào lúc này, bạn cần chọn những phân vùng nào sẽ được dùng để cài đặt\n"
-"hệ thống Mandrakelinux. Nếu các phân vùng đã được xác lập từ lần cài\n"
+"hệ thống Mandrivalinux. Nếu các phân vùng đã được xác lập từ lần cài\n"
 "đặt GNU/Linux trước đó hay được tạo bằng một công cụ phân vùng khác,\n"
 "bạn có thể dùng chúng. Nếu chưa có, bạn sẽ sẽ phải thực hiện việc hoạch\n"
 "định các phân vùng.\n"
@@ -4943,7 +4943,7 @@ msgstr "Chuyển đổi giữa chế độ bình thường và chuyên gia"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4973,7 +4973,7 @@ msgid ""
 msgstr ""
 "Phát hiện ra có hơn một phân vùng Microsoft Windows trên đĩa cứng.\n"
 "Hãy chọn một phân vùng cần lập lại kích thước để cài đặt hệ điều\n"
-"hành Mandrakelinux mới.\n"
+"hành Mandrivalinux mới.\n"
 "\n"
 "Mỗi phân vùng được liệt kê như sau: \"Tên Linux\", \"Tên Windows\"\n"
 "\"Dung lượng\".\n"
@@ -5021,7 +5021,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5030,19 +5030,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Bước này chỉ được kích hoạt khi phát hiện thấy một phân vùng GNU/Linux\n"
 "đang có sẵn trên máy của bạn.\n"
 "\n"
 "DrakX cần được biết là bạn muốn thực hiện cài đặt mới hay là nâng cấp\n"
-"hệ thống Mandrakelinux hiện có:\n"
+"hệ thống Mandrivalinux hiện có:\n"
 "\n"
 " * \"%s\": hầu hết các trường hợp, việc này sẽ xóa sạch hệ thống\n"
 "cũ. Nếu bạn muốn thay đổi các phân vùng của đĩa cứng, hoặc thay đổi\n"
@@ -5051,13 +5051,13 @@ msgstr ""
 "lên ví dụ như thư mục \"home\".\n"
 "\n"
 " * \"%s\": loại cài đặt này cho phép bạn nâng cấp các gói hiện thời\n"
-"đã cài trên hệ thống Mandrakelinux của bạn. Việc sắp xếp phân vùng\n"
+"đã cài trên hệ thống Mandrivalinux của bạn. Việc sắp xếp phân vùng\n"
 "hiện thời và dữ liệu không bị thay đổi. Hầu hết các bước cấu hình khác\n"
 "vẫn sẵn có để dùng, giống như việc cài đặt chuẩn.\n"
 "\n"
-"Tùy chọn ``Nâng cấp'' sẽ hoạt động tốt trên hệ thống Mandrakelinux\n"
+"Tùy chọn ``Nâng cấp'' sẽ hoạt động tốt trên hệ thống Mandrivalinux\n"
 "phiên bản \"8.1\" hay mới hơn. Không nên thực hiện nâng cấp cho các\n"
-"phiên bản cũ hơn Mandrakelinux \"8.1\" ."
+"phiên bản cũ hơn Mandrivalinux \"8.1\" ."
 
 #: help.pm:591
 #, c-format
@@ -5114,7 +5114,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5375,7 +5375,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5396,7 +5396,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Đây là lúc chọn hệ thống in ấn dùng cho máy tính này. Các hệ điều\n"
@@ -5421,7 +5421,7 @@ msgstr ""
 "\n"
 "Nếu bây giờ bạn chọn nhưng sau này lại muốn đổi hệ thống in, bạn có thể\n"
 "thực hiện bằng việc chạy PrinterDrake từ Trung Tâm Điều Khiển của\n"
-"Mandrakelinux và nhấn nút \"%s\"."
+"Mandrivalinux và nhấn nút \"%s\"."
 
 #: help.pm:765
 #, c-format
@@ -5538,7 +5538,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5555,7 +5555,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5602,7 +5602,7 @@ msgstr ""
 "\n"
 " * \"%s\": Nếu muốn cấu hình truy cập mạng cục bộ hay truy cập\n"
 "internet. Tham khảo tài liệu hoặc dùng Trung Tâm Điều Khiển \n"
-"Mandrakelinux để thực hiện sau khi cài đặt xong để có được sự trợ\n"
+"Mandrivalinux để thực hiện sau khi cài đặt xong để có được sự trợ\n"
 "giúp hoàn chỉnh.\n"
 "\n"
 " * \"%s\": cho phép cấu hình địa chỉ proxy HTTP và FTP nếu máy tính\n"
@@ -5618,7 +5618,7 @@ msgstr ""
 " * \"%s\": nếu muốn thay đổi cấu hình của trình nạp khởi động, hãy\n"
 "nhấn nút này. Nên dùng chỉ khi bạn là người dùng thành thạo. Hãy tham\n"
 "khảo tài liệu đi kèm hoặc trợ giúp trực tuyến về cấu hình trình nạp khởi\n"
-"động trong Trung Tâm Cấu Hình Mandrakelinux.\n"
+"động trong Trung Tâm Cấu Hình Mandrivalinux.\n"
 "\n"
 " * \"%s\": bạn có thể điều khiển dịch vụ nào sẽ được chạy trên máy\n"
 "này. Nếu bạn có kế hoạch dùng máy này làm máy chủ, hãy xem lại\n"
@@ -5679,10 +5679,10 @@ msgstr "Dịch vụ"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Hãy chọn ổ cứng mà bạn muốn xoá để cài đặt phân vùng Mandrakelinux\n"
+"Hãy chọn ổ cứng mà bạn muốn xoá để cài đặt phân vùng Mandrivalinux\n"
 "mới. Hãy thận trọng, mọi dữ liệu có trên đó sẽ bị mất và không thể khôi\n"
 "phục lại được !"
 
@@ -6036,12 +6036,12 @@ msgstr "Đang tính toán kích thước của phân vùng Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Phân vùng Windows bị phân mảnh quá nhiều. Hãy khởi động lại máy\n"
 "vào Windows, chạy ``defrag'' trước, rồi sau đó mới bắt đầu cài đặt\n"
-"Mandrakelinux."
+"Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6160,19 +6160,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6194,7 +6194,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6202,14 +6202,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6219,7 +6219,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6239,10 +6239,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6253,11 +6253,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6273,7 +6273,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Giới Thiệu\n"
 "\n"
@@ -6283,13 +6283,13 @@ msgstr ""
 "không \n"
 "bị giới hạn, một bộ các chương trình, phương pháp, quy tắc và tài liệu liên "
 "quan đến hệ điều hành \n"
-"và các thành phần khác có trong sản phẩm phân phối Mandrakelinux.\n"
+"và các thành phần khác có trong sản phẩm phân phối Mandrivalinux.\n"
 "\n"
 "\n"
 "1. Chấp Thuận Giấy Phép\n"
 "\n"
 "Hãy đọc cẩn thận tài liệu này. Nó là sự chấp thuận giấy phép giữa bạn và  \n"
-"Mandrakesoft S.A. được áp dụng cho các Sản Phẩm Phần Mềm.\n"
+"Mandriva S.A. được áp dụng cho các Sản Phẩm Phần Mềm.\n"
 "Bằng việc cài đặt, sao chép hay sử dụng Sản Phẩm Phần Mềm theo cách \n"
 "nào đó thì hiển nhiên bạn đồng ý và chấp thuận toàn bộ các điều khoản và "
 "điều kiện của giấy phép này. \n"
@@ -6309,7 +6309,7 @@ msgstr ""
 "Các sản phẩm phần mềm và tài liệu đi kèm được cung cấp \"như là\", không có "
 "sự bảo đảm, theo\n"
 "phạm vi cho phép của luật pháp.\n"
-"Mandrakesoft S.A. sẽ tự có trách nhiệm pháp lý ở một mức độ nào đó về các hư "
+"Mandriva S.A. sẽ tự có trách nhiệm pháp lý ở một mức độ nào đó về các hư "
 "hỏng ảnh hưởng tới công việc làm ăn.\n"
 "\n"
 "3. Giấy phép GPL và các giấy phép liên quan\n"
@@ -6325,10 +6325,10 @@ msgstr ""
 "và các điều kiện trong giấy phép của từng thành phần trước khi sử dụng "
 "chúng. Mọi câu hỏi \n"
 "về giấy phép của các thành phần nên được gửi tới tác giả mà không gửi tới "
-"Mandrakesoft.\n"
-"Các chương trình do Mandrakesoft S.A.phát triển được quản lý theo giấy phép "
+"Mandriva.\n"
+"Các chương trình do Mandriva S.A.phát triển được quản lý theo giấy phép "
 "GPL. Tài liệu do\n"
-"Mandrakesoft S.A. viết được quản lý bởi một giấy phép đặc biệt. Hãy tham "
+"Mandriva S.A. viết được quản lý bởi một giấy phép đặc biệt. Hãy tham "
 "khảo tài liệu để \n"
 "biết thêm chi tiết.\n"
 "\n"
@@ -6339,11 +6339,11 @@ msgstr ""
 "tác giả của chúng và\n"
 "được bảo vệ bởi luật sở hữu trí tuệ và luật bản quyền áp dụng cho các chương "
 "trình phần mềm.\n"
-"Mandrakesoft S.A. giữ quyền thay đổi hoặc chỉnh sửa các Sản Phẩm Phần Mềm "
+"Mandriva S.A. giữ quyền thay đổi hoặc chỉnh sửa các Sản Phẩm Phần Mềm "
 "toàn bộ hay một\n"
 "phần.\n"
-"\"Mandrake\", \"Mandrakelinux\" và các logo của nó là nhãn đăng ký của "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" và các logo của nó là nhãn đăng ký của "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6359,7 +6359,7 @@ msgstr ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6449,7 +6449,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6457,12 +6457,12 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Xin chúc mừng, quá trình cài đặt đã hoàn thành.\n"
 "Hãy đĩa khởi động ra và nhấn Enter để khởi động lại.\n"
 "\n"
-"Về thông tin sửa lỗi hiện có cho các phiên bản Mandrakelinux,\n"
+"Về thông tin sửa lỗi hiện có cho các phiên bản Mandrivalinux,\n"
 "hãy xem Errata tại:\n"
 "\n"
 "\n"
@@ -6470,7 +6470,7 @@ msgstr ""
 "\n"
 "\n"
 "Chi tiết về cấu hình hệ thống nằm trong chương Sau Cài Đặt của\n"
-"bản Hướng dẫn Sử dụng Chính thức (Official Mandrakelinux User's Guide)."
+"bản Hướng dẫn Sử dụng Chính thức (Official Mandrivalinux User's Guide)."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6504,12 +6504,12 @@ msgstr "Bắt đầu bước `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Hệ thống của bạn có cấu hình thấp. Bạn có thể gặp một số trục trặc khi\n"
-"cài đặt Mandrakelinux. Nếu xảy ra lỗi, bạn có thể thay thế bằng kiểu cài đặt "
+"cài đặt Mandrivalinux. Nếu xảy ra lỗi, bạn có thể thay thế bằng kiểu cài đặt "
 "trong\n"
 "chế độ văn bản bằng cách nhấn phím `F1' khi khởi động từ CDROM, rồi nhập "
 "`text'."
@@ -7047,9 +7047,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Đang kết nối với website của Mandrakelinux để lấy danh sách các mirrors "
+"Đang kết nối với website của Mandrivalinux để lấy danh sách các mirrors "
 "hiệncó..."
 
 #: install_steps_interactive.pm:840
@@ -7273,8 +7273,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Cài đặt Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Cài đặt Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9884,13 +9884,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Chương trình cấu hình Drakfirewall\n"
 "\n"
-"Chương trình này cấu hình một tường lửa cá nhân cho máy Mandrakelinux.\n"
+"Chương trình này cấu hình một tường lửa cá nhân cho máy Mandrivalinux.\n"
 "Về giải pháp tường lửa mạnh và chuyên dụng, hãy tìm xem phân phối\n"
 "tường lửa bảo mật chuyên dụng của Mandrake."
 
@@ -13912,12 +13912,12 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
 "Chạy Scannerdrake (Phần cứng/Máy quét trong Trung Tâm Điều Khiển "
-"Mandrakelinux) để chia sẻ máy quét trong mạng.\n"
+"Mandrivalinux) để chia sẻ máy quét trong mạng.\n"
 "\n"
 
 #: printer/printerdrake.pm:3933
@@ -15840,33 +15840,33 @@ msgstr "Dừng"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mandrakelinux là gì?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Mandrivalinux là gì?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Chào mừng <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Chào mừng <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux là <b>phân phối Linux</b> gồm có lõi (core) hệ thống gọi là   "
+"Mandrivalinux là <b>phân phối Linux</b> gồm có lõi (core) hệ thống gọi là   "
 "<b>hệ điều hành</b> (dựa trên Linux kernel) cùng với <b>rất nhiều ứng dụng</"
 "b> thỏa mãn mọi nhu cầu của bạn."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux là phân phối Linux <b>thân thiện người dùng</b> nhất. Nó cũng "
+"Mandrivalinux là phân phối Linux <b>thân thiện người dùng</b> nhất. Nó cũng "
 "là một bản Linux <b>được dùng nhiều nhất</b> trên thế giới!"
 
 #: share/advertising/02.pl:13
@@ -15882,14 +15882,14 @@ msgstr "Chào Mừng <b>Thế Giới Nguồn Mở</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux trung thành với mô hình nguồn mở. Điều này có nghĩa là phát "
+"Mandrivalinux trung thành với mô hình nguồn mở. Điều này có nghĩa là phát "
 "hành mới này là kết quả  của <b>sự cộng tác</b> giữa <b>đội ngũ phát triển "
-"của Mandrakesoft</b> với <b>cộng đồng từ khắp nơi trên thế giới</b>."
+"của Mandriva</b> với <b>cộng đồng từ khắp nơi trên thế giới</b>."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -15909,9 +15909,9 @@ msgstr "<b>The GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Toàn bộ phần mềm và các công cụ của Mandrakelinux được phát hành theo giấy "
+"Toàn bộ phần mềm và các công cụ của Mandrivalinux được phát hành theo giấy "
 "phép của <b>GPL</b>"
 
 #: share/advertising/03.pl:17
@@ -15941,15 +15941,15 @@ msgstr "<b>Gia nhập cộng đồng</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux có một <b>cộng đồng lớn</b> người dùng và nhà phát triển. Vai "
+"Mandrivalinux có một <b>cộng đồng lớn</b> người dùng và nhà phát triển. Vai "
 "trò của cộng đồng này rất lớn, từ việc báo cáo lỗi cho đến việc phát triển "
 "các chương trình mới. Cộng đồng đóng <b>vai trò chủ đạo</b> trong thế giới "
-"Mandrakelinux."
+"Mandrivalinux."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -15970,11 +15970,11 @@ msgstr "<b>Phiên Bản Tải Xuống</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Bạn đang cài đặt <b>Mandrakelinux Download</b>. Đây là bản miễn phí mà  "
-"Mandrakesoft muốn dành cho <b>mọi người dùng</b>."
+"Bạn đang cài đặt <b>Mandrivalinux Download</b>. Đây là bản miễn phí mà  "
+"Mandriva muốn dành cho <b>mọi người dùng</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16005,10 +16005,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Bạn cũng sẽ không truy cập được vào các <b>dịch vụ</b> có trong các sản phẩm "
-"khác của Mandrakesoft."
+"khác của Mandriva."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16017,8 +16017,8 @@ msgstr "<b>Discovery, Linux Desktop đầu tiên của bạn</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Bây giờ bạn đang cài đặt <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Bây giờ bạn đang cài đặt <b>Mandrivalinux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16040,17 +16040,17 @@ msgstr "<b>PowerPack, Linux Desktop tốt nhất</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Bây giờ bạn cài đặt <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Bây giờ bạn cài đặt <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack là một sản phẩm <b>Linux desktop tốt</b> của Mandrakesoft. "
+"PowerPack là một sản phẩm <b>Linux desktop tốt</b> của Mandriva. "
 "PowerPack  bao gồm <b>hàng ngàn ứng dụng</b> - mọi thứ đều là phổ biến và "
 "tân tiến nhất."
 
@@ -16061,8 +16061,8 @@ msgstr "<b>PowerPack+, giải pháp Linux cho Desktop và Server</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Bây giờ bạn cài đặt <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Bây giờ bạn cài đặt <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16078,21 +16078,21 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Sản Phẩm Của Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Sản Phẩm Của Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> phát triển hàng loạt sản phẩm cho <b>Mandrakelinux</b>."
+"<b>Mandriva</b> phát triển hàng loạt sản phẩm cho <b>Mandrivalinux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Sản phẩm Mandrakelinux là:"
+msgid "The Mandrivalinux products are:"
+msgstr "Sản phẩm Mandrivalinux là:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16112,39 +16112,39 @@ msgstr "\t* <b>PowerPack+</b>, giải pháp cho Desktop và Server."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux cho x86-64</b>, giải pháp cho hầu hết các bộ vi xử lý "
+"\t* <b>Mandrivalinux cho x86-64</b>, giải pháp cho hầu hết các bộ vi xử lý "
 "64-bit"
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Sản phẩm của Mandrakesoft (di động)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Sản phẩm của Mandriva (di động)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft phát triển hai sản phẩm cho phép bạn sửdụng Mandrakelinux trên "
+"Mandriva phát triển hai sản phẩm cho phép bạn sửdụng Mandrivalinux trên "
 "<b>bất kỳ máy tính nào</b> mà không cần phải cài đặt:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, phiên bản Mandrakelinux chạy hoàn toàn trên đĩa CD khởi "
+"\t* <b>Move</b>, phiên bản Mandrivalinux chạy hoàn toàn trên đĩa CD khởi "
 "động được."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 "\t* <b>GlobeTrotter</b>, một phân phối cài đặt sẵn trên ultra-compact “LaCie "
@@ -16152,33 +16152,33 @@ msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Sản phẩm của Mandrakesoft (chuyên nghiệp)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Sản phẩm của Mandriva (chuyên nghiệp)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Dưới đây là các sản phẩm của Mandrakesoft được thiết kế cho nhu cầu "
+"Dưới đây là các sản phẩm của Mandriva được thiết kế cho nhu cầu "
 "<b>chuyên nghiệp</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, Mandrakelinux Desktop cho doanh nghiệp."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Mandrivalinux Desktop cho doanh nghiệp."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Giải pháp máy chủ của Mandrakelinux."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Giải pháp máy chủ của Mandrivalinux."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
-"\t* <b>Multi-Network Firewall</b>, giải pháp bảo mật của Mandrakelinux."
+"\t* <b>Multi-Network Firewall</b>, giải pháp bảo mật của Mandrivalinux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16221,10 +16221,10 @@ msgstr "<b>Chọn môi trường desktop ưa thích cho bạn!</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Với PowerPack, bạn có nhiều lựa chọn cho <b>môi trường desktop đồ họa</b>. "
-"Mandrakesoft chọn <b>KDE</b> làm mặc định."
+"Mandriva chọn <b>KDE</b> làm mặc định."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16248,10 +16248,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Với PowerPack+, bạn sẽ có lựa chọn cho <b>môi trường desktop đồ họa</b>. "
-"Mandrakesoft đã chọn <b>KDE</b> làm mặc định."
+"Mandriva đã chọn <b>KDE</b> làm mặc định."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16376,10 +16376,10 @@ msgstr "<b>Thưởng thức nhiều ứng dụng</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Trên menu của Mandrakelinux, bạn sẽ thấy các ứng dụng <b>dễ dùng</b> cho "
+"Trên menu của Mandrivalinux, bạn sẽ thấy các ứng dụng <b>dễ dùng</b> cho "
 "<b>mọi tác vụ</b>:"
 
 #: share/advertising/18.pl:16
@@ -16645,18 +16645,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Trung tâm Điều khiển Mandrakelinuxlinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Trung tâm Điều khiển Mandrivalinuxlinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Trung Tâm Điều Khiển Mandrakelinux</b> là một tập hợp các tiện ích riêng "
-"của Mandrakelinux-được thiết kế nhằm đơn giản hoá việc cấu hình máy tính của "
+"<b>Trung Tâm Điều Khiển Mandrivalinux</b> là một tập hợp các tiện ích riêng "
+"của Mandrivalinux-được thiết kế nhằm đơn giản hoá việc cấu hình máy tính của "
 "bạn."
 
 #: share/advertising/25.pl:17
@@ -16680,16 +16680,16 @@ msgstr "<b>The Open Source Model</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Giống như mọi chương trình điện toán khác, phần mềm nguồn mở <b>cần có thời "
 "gian và con người</b> để phát triển. Tuân thủ triết lý nguồn mở, "
-"Mandrakesoft bán các sản phẩm và dịch vụ giá trị gia tăng <b>để phất triển "
-"Mandrakelinux</b>. Nếu bạn muốn <b>hỗ trợ triết lý nguồn mở</b> và phát "
-"triển Mandrakelinux, <b>hãy mua</b> một sản phẩm hay dịch vụ của hãng!"
+"Mandriva bán các sản phẩm và dịch vụ giá trị gia tăng <b>để phất triển "
+"Mandrivalinux</b>. Nếu bạn muốn <b>hỗ trợ triết lý nguồn mở</b> và phát "
+"triển Mandrivalinux, <b>hãy mua</b> một sản phẩm hay dịch vụ của hãng!"
 
 #: share/advertising/27.pl:13
 #, c-format
@@ -16699,10 +16699,10 @@ msgstr "<b>Online Store</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Để biết thêm về sản phẩm và dịch vụ của Mandrakesoft, bạn có thể thăm <b>e-"
+"Để biết thêm về sản phẩm và dịch vụ của Mandriva, bạn có thể thăm <b>e-"
 "commerce platform</b>."
 
 #: share/advertising/27.pl:17
@@ -16728,25 +16728,25 @@ msgstr "Hãy tới thăm <b>store.mandrakesoft.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> là một <b>nơi tuyệt vời</b> cho bạn sử dụng "
-"Mandrakelinux..."
+"<b>Mandriva Club</b> là một <b>nơi tuyệt vời</b> cho bạn sử dụng "
+"Mandrivalinux..."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 "Hãy nắm lợi thế từ <b>các lợi ích có giá trị</b> bằng việc tham gia "
-"Mandrakeclub, như:"
+"Mandriva Club, như:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -16768,40 +16768,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Tham gia Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Tham gia Mandrivalinux <b>user forums</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Truy cập đặc quyền và sớm</b>, trước khi phát hành công cộng, đến các "
-"Mandrakelinux <b>ISO image</b>."
+"Mandrivalinux <b>ISO image</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> là một dịch vụ mới cao cấp mà Mandrakesoft tự hào giới "
+"<b>Mandriva Online</b> là một dịch vụ mới cao cấp mà Mandriva tự hào giới "
 "thiệu cho người dùng của hãng!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline cung cấp hàng loạt các dịch vụ giá trị để <b>dễ dàng cập nhật "
-"</b> hệ thống Mandrakelinux của bạn:"
+"Mandriva Online cung cấp hàng loạt các dịch vụ giá trị để <b>dễ dàng cập nhật "
+"</b> hệ thống Mandrivalinux của bạn:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16824,40 +16824,40 @@ msgstr "\t* Cập nhật <b>theo lịch</b> mềm dẻo."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
-msgstr "\t* Quản lý toàn bộ<b>hệ thống Mandrakelinux</b> bằng một tài khoản."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+msgstr "\t* Quản lý toàn bộ<b>hệ thống Mandrivalinux</b> bằng một tài khoản."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "Bạn yêu cầu sự <b>trợ giúp?</b> Gặp gỡ các chuyên gia kỹ thuật của "
-"Mandrakesoft trên <b>site hỗ trợ kỹ thuật của chúng tôi:</b> www."
+"Mandriva trên <b>site hỗ trợ kỹ thuật của chúng tôi:</b> www."
 "mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Nhờ sự trợ giúp của <b>các chuyên gia Mandrakelinux</b>, bạn sẽ tiết kiệm "
+"Nhờ sự trợ giúp của <b>các chuyên gia Mandrivalinux</b>, bạn sẽ tiết kiệm "
 "được rất nhiều thời gian."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Để nhận mọi trả lời về Mandrakelinux, bạn có khả năng mua phí hỗ trợ tại  "
+"Để nhận mọi trả lời về Mandrivalinux, bạn có khả năng mua phí hỗ trợ tại  "
 "<b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17154,8 +17154,8 @@ msgstr "Các công cụ theo dõi, quản lý tiến trình, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Đồ thuật Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Đồ thuật Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17248,8 +17248,8 @@ msgstr ""
 "\n"
 "Tùy Chọn:\n"
 "  --help            - in thông điệp trợ giúp này.\n"
-"  --report          - Chương trình nên là loại công cụ của Mandrakelinux\n"
-"  --incident        - Chương trình nên là loại công cụ của Mandrakelinux"
+"  --report          - Chương trình nên là loại công cụ của Mandrivalinux\n"
+"  --incident        - Chương trình nên là loại công cụ của Mandrivalinux"
 
 #: standalone.pm:63
 #, c-format
@@ -17304,7 +17304,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17318,7 +17318,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[Tùy Chọn]...\n"
-"Chương Trình Cấu Hình Mandrake Terminal Server\n"
+"Chương Trình Cấu Hình Mandriva Terminal Server\n"
 "--enable         : bật chạy MTS\n"
 "--disable        : tắt MTS\n"
 "--start          : chạy MTS\n"
@@ -17374,7 +17374,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17382,7 +17382,7 @@ msgid ""
 msgstr ""
 "[Tùy Chọn]...\n"
 "  --no-confirmation      không hỏi câu khẳng định trước trong chế độ "
-"MandrakeUpdate\n"
+"Mandriva Update\n"
 "  --no-verify-rpm        không kiểm tra chữ ký các gói\n"
 "  --changelog-first      hiển thị bản ghi thay đổi trước danh sách tập tin "
 "trong cửa sổ mô tả\n"
@@ -20136,13 +20136,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Công cụ báo cáo lỗi của Mandrakelinux"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Công cụ báo cáo lỗi của Mandrivalinux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Trung tâm Điều khiển Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Trung tâm Điều khiển Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20162,8 +20162,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20207,8 +20207,8 @@ msgstr "Đồ Thuật Cấu Hình"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Hãy chọn công cụ Mandrakesoft:"
+msgid "Select Mandriva Tool:"
+msgstr "Hãy chọn công cụ Mandriva:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20632,20 +20632,20 @@ msgstr "Được chạy lúc khởi động "
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Giao diện này vẫn còn chưa được cấu hình.\n"
-"Hãy chạy \"Bổ sung giao diện\" trong Trung Tâm Điều Khiển Mandrakelinuxlinux"
+"Hãy chạy \"Bổ sung giao diện\" trong Trung Tâm Điều Khiển Mandrivalinuxlinux"
 
 #  -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Bạn chưa cấu hình kết nối internet.\n"
-"Hãy chạy \"%s\" từ Trung Tâm Điều Khiển Mandrakelinuxlinux"
+"Hãy chạy \"%s\" từ Trung Tâm Điều Khiển Mandrivalinuxlinux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20695,8 +20695,8 @@ msgstr "KDM (Trình quản lý hiển thị KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Trình quản lý hiển thị Mandrakelinux)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Trình quản lý hiển thị Mandrivalinux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -20995,7 +20995,7 @@ msgstr "Nhập"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21004,7 +21004,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Bản quyền (C) 2001-2002 của Mandrakesoft \n"
+"Bản quyền (C) 2001-2002 của Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (phiên bản gốc)\n"
@@ -21544,14 +21544,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 "Bản Drakhelp 0.1\n"
-"Bản quyền (C) 2003-2004 Mandrakesoft.\n"
+"Bản quyền (C) 2003-2004 Mandriva.\n"
 "Đây là phần mềm tự do và có thể phân phối lại theo các điều khoản của GNU "
 "GPL.\n"
 "\n"
@@ -21581,8 +21581,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Trung tâm trợ giúp Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Trung tâm trợ giúp Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25112,8 +25112,8 @@ msgstr "Thay đổi đã xong, nhưng để có hiệu lực bạn phải thoát
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Bản ghi công cụ của Mandrakelinux"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Bản ghi công cụ của Mandrivalinux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25636,10 +25636,10 @@ msgstr "Hoàn thành kết nối."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Không kết nối được.\n"
-"Hãy kiểm tra cấu hình trong Trung Tâm Điều Khiển Mandrakelinux."
+"Hãy kiểm tra cấu hình trong Trung Tâm Điều Khiển Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/wa.po b/perl-install/share/po/wa.po
index 43c036073..0a2db8d7b 100644
--- a/perl-install/share/po/wa.po
+++ b/perl-install/share/po/wa.po
@@ -71,7 +71,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "I shonne kel sere USB åye li proteccion siconte do scrijhaedje di metowe,\n"
 "mins on nel pout nén fé rexhe sins risses asteure.\n"
@@ -79,7 +79,7 @@ msgstr ""
 "\n"
 "Clitchîz sol boton po renonder l' éndjole, prindoz l' sere foû, dismetoz\n"
 "li proteccion siconte do scrijhaedje, ritchôkîz l' sere, eyet renondez\n"
-"Mandrake Move."
+"Mandriva Move."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -97,7 +97,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Li sere USB n' a nole pårticion Windows (FAT) di valide.\n"
@@ -107,14 +107,14 @@ msgstr ""
 "\n"
 "\n"
 "Vos ploz eto continouwer sins sere USB - vos pôroz co eployî\n"
-"Mandrake Move come on sistinme d' operance Mandrakelinux normå,\n"
+"Mandriva Move come on sistinme d' operance Mandrivalinux normå,\n"
 "mins vos piedroz a l' enondaedje ki vént çou k' vos åroz candjî."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -122,11 +122,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Nole sere USB n' a stî detectêye sol sistinme. Si vos tchôkîz ene\n"
-"sere USB asteure, Mandrake Move pôrè schaper di manire transparinte\n"
+"sere USB asteure, Mandriva Move pôrè schaper di manire transparinte\n"
 "les dnêyes di vosse ridant måjhon eyet l' apontiaedje do sistinme,\n"
 "po ls eployî a l' enondaedje ki vént, so cisse copiutrece chal ou\n"
 "so ene ôte. Note: si vos tchôkîz ene sere asteure, ratindoz sacwantès\n"
@@ -134,7 +134,7 @@ msgstr ""
 "\n"
 "\n"
 "Vos ploz eto continouwer sins sere USB - vos pôroz co eployî\n"
-"Mandrake Move come on sistinme d' operance Mandrakelinux normå,\n"
+"Mandriva Move come on sistinme d' operance Mandrivalinux normå,\n"
 "mins vos piedroz a l' enondaedje ki vént çou k' vos åroz candjî."
 
 #: ../move/move.pm:494
@@ -263,7 +263,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -279,7 +279,7 @@ msgstr ""
 "\n"
 "Çoula pout vni di crons fitchîs d' apontiaedje do sistinme\n"
 "sol sere USB, dins ç' cas disfacîz les fitchîs et s' renondez\n"
-" Mandrake Move po coridjî l' problinme. Po fé çoula, clitchîz\n"
+" Mandriva Move po coridjî l' problinme. Po fé çoula, clitchîz\n"
 "sol boton corespondant.\n"
 "\n"
 "\n"
@@ -1324,7 +1324,7 @@ msgstr "Tchoezi l' lingaedje"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
@@ -3766,12 +3766,12 @@ msgstr "mete en alaedje li sopoirt pol radio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Divant d' aler pus avant, vos dvrîz lére atintivmint l' licince.\n"
-"Ele covere li distribucion Mandrakelinux, si vos estoz d' acoird\n"
+"Ele covere li distribucion Mandrivalinux, si vos estoz d' acoird\n"
 "avou les termes del licince, clitchîz sol boesse «%s».\n"
 "Ôtrumint, clitchîz sol boton «%s» po renonder l' copiutrece."
 
@@ -3956,13 +3956,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"L' astalaedje del distribucion Mandrakelinux si fwait a pårti di\n"
+"L' astalaedje del distribucion Mandrivalinux si fwait a pårti di\n"
 "sacwantès plakes lazer diferinnes. Si on pacaedje k' a stî tchoezi\n"
 "est so ene ôte plake lazer, DrakX frè rexhe li plake k' est el lijheu\n"
 "d' plakes lazer eyet vos dmander d' î mete li cene k' i fåt.\n"
@@ -3973,11 +3973,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4030,7 +4030,7 @@ msgid ""
 msgstr ""
 "Asteure c' est l' moumint di specifyî kés programes ki vos vloz astaler so\n"
 "voste éndjole. I gn a des meyes et des meyes di pacaedjes pol "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "po rinde li tchoezixhaedje pus simpe il ont stî metous dins des groupes\n"
 "di programes sorlon les bouyes k' i permetèt d' fé.\n"
 "\n"
@@ -4145,10 +4145,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4178,12 +4178,12 @@ msgstr ""
 "\n"
 "!! Si on pacaedje di sierveu a stî tchoezi, soeye-t i en esprès, ou k' i\n"
 "fwait pårteye d' on groupe, on vos dmandrè d' acertiner ki vos vloz\n"
-"vormint astaler ces sierveus la. Avou Mandrakelinux tot l' minme ké\n"
+"vormint astaler ces sierveus la. Avou Mandrivalinux tot l' minme ké\n"
 "sierveu k' a stî astalé est, avou les prémetowès tchuzes, metou en\n"
 "alaedje tins di l' enondaedje di l' éndjole. Minme s' i sont seurs\n"
 "et k' i gn a nou cnoxhou problinme å moumint ki l' distribucion a stî\n"
 "fwaite, i s' pout k' des trôs di såvrité soeyexhe discovrous après ki\n"
-"cisse modêye chal di Mandrakelinux fouxhe fineye. Si vos n' savoz nén çou\n"
+"cisse modêye chal di Mandrivalinux fouxhe fineye. Si vos n' savoz nén çou\n"
 "k' on siervice dné est supôzé di fé, ou pocwè k' il est astalé, adon\n"
 "clitchîz so «%s». Si vos clitchîz so «%s» les siervices mostrés sront\n"
 "astalés eyet enondés otomaticmint. !!\n"
@@ -4341,7 +4341,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4397,7 +4397,7 @@ msgid ""
 msgstr ""
 "X (po Sistinme di Purneas X) est l' miercour di l' eterface grafike di\n"
 "GNU/Linux, ki tos les evironmints grafikes (KDE, Gnome, AfterStep,\n"
-"WindowsMaker, evnd.) ki vnèt avou Mandrakelinux end ont mezåjhe.\n"
+"WindowsMaker, evnd.) ki vnèt avou Mandrivalinux end ont mezåjhe.\n"
 "\n"
 "Vos åroz ene djivêye des diferins parametes a candjî po-z aveur\n"
 "voste eterface grafike a l' idêye:\n"
@@ -4517,12 +4517,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4549,7 +4549,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4558,7 +4558,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4579,11 +4579,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Asteure, vos dvoz tchoezi wice ki vos vloz astaler vosse sistinme\n"
-"d' operance Mandrakelinux so vosse deure plake. Si l' plake est vude,\n"
+"d' operance Mandrivalinux so vosse deure plake. Si l' plake est vude,\n"
 "ou si les sistinmes d' operance k' i gn a ddja prindèt tote li plaece,\n"
 "vos avoz mezåjhe del pårti. Fé on pårtixhaedje d' ene deure plake çoula\n"
 "vout dire del pårti lodjicmint po fé del plaece po-z astaler vosse novea\n"
-"sistinme Mandrakelinux.\n"
+"sistinme Mandrivalinux.\n"
 "\n"
 "Come, on côp ki li pårtixhaedje est fwait, on n' sait rivni en erî\n"
 "(normålmint), les apurdisses ont sovint sogne ou peu di s' enonder.\n"
@@ -4614,7 +4614,7 @@ msgstr ""
 "Li candjmint d' grandeu des pårticions si pout fé sins piede des dnêyes,\n"
 "a condicion del disfragminter d' aprume, eyet kel pårticion soeye ene\n"
 "pårticion FAT. C' est hôtmint ricmandé di fé ene copeye di såvrité.\n"
-"Cisse solucions est ricmandêye si vos vloz eployî Mandrakelinux et\n"
+"Cisse solucions est ricmandêye si vos vloz eployî Mandrivalinux et\n"
 "Microsoft Windows sol minme copiutrece.\n"
 "\n"
 "Divant di tchoezi cisse solucion, i vos fåt comprinde kel grandeu di vosse\n"
@@ -4623,7 +4623,7 @@ msgstr ""
 "les dnêyes da vosse ou astaler des noveas programes.\n"
 "\n"
 " * «%s»: si vos vloz disfacer totes les dnêyes k' i gn a\n"
-"so vosse deure plake po mete el plaece li sistinme Mandrakelinux,\n"
+"so vosse deure plake po mete el plaece li sistinme Mandrivalinux,\n"
 "vos ploz tchoezi cisse tchuze chal.\n"
 "Prindoz asteme k' avou cisse solucion chal vos n' pôroz nén rivni en erî\n"
 "on côp ki vos avoz acertiné vosse tchuze.\n"
@@ -4790,7 +4790,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4815,7 +4815,7 @@ msgstr ""
 "pårticions.\n"
 "\n"
 "Clitchîz so «%s» si vos vloz tchoezi ene ôte pårticion po-z astaler\n"
-"vosse novea sistinme d' operance Mandrakelinux.\n"
+"vosse novea sistinme d' operance Mandrivalinux.\n"
 "\n"
 "Clitchîz so «%s» si vos vloz tchoezi les pårticions ki sront\n"
 "verifieyes po vey s' i gn a des måvas bloks sol deure plake."
@@ -4832,7 +4832,7 @@ msgstr "Di dvant"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4844,7 +4844,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Å moumint ki vos astalez Mandrakelinux, i s' pout bén k' i gn åye\n"
+"Å moumint ki vos astalez Mandrivalinux, i s' pout bén k' i gn åye\n"
 "des pacaedjes k' ont stî metous a djoû dispoy li moumint do fijhaedje\n"
 "del distribucion. Motoit k' des bugs ont stî coridjîs, ou des problinmes\n"
 "di såvrité. Por vos profiter di ces metaedjes a djoû, on vs propôze\n"
@@ -4875,7 +4875,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4889,7 +4889,7 @@ msgstr ""
 "\n"
 "Si vos n' savoz cwè tchoezi, leyîz li prémetou livea. Vos l' pôroz candjî\n"
 "pus tård avou l' usteye draksec a pårti do cinte di contrôle di "
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 "Li tchamp «%s» c' est po dner l' adresse emile d' ene sakî responsåve del\n"
 "såvrité po ciste éndjole ci. Les messaedjes sol såvrité lyi sront evoyîs."
@@ -4903,7 +4903,7 @@ msgstr "Manaedjeu pol såvrité"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4974,7 +4974,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Chal, vos dvoz tchoezi so kéne/kénès pårticion(s) ki vos voloz astaler\n"
-"vosse sistinme Mandrakelinux. Si vos pårticions ont ddja stî fwaites\n"
+"vosse sistinme Mandrivalinux. Si vos pårticions ont ddja stî fwaites\n"
 "(p. egz. li dierin côp ki vos avoz astalé GNU/Linux ou bén avou ene ôte\n"
 "usteye di pårtixhaedje), vos les ploz eployî. Ôtrumint, des pårticions dvèt\n"
 "esse defineyes so vosse deure plake. Ça vout dire ki vos alez dispårti\n"
@@ -5068,7 +5068,7 @@ msgstr "Candjî pol môde normå/spepieus"
 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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5098,7 +5098,7 @@ msgid ""
 msgstr ""
 "Pus d' ene pårticion Windows a stî detectêye so vosse deure plake.\n"
 "Tchoezixhoz li cene ki vos vloz candjî si grandeu, po-z astaler vosse\n"
-"novea sistinme d'&nbsp;operance Mandrakelinux s' i vs plait.\n"
+"novea sistinme d'&nbsp;operance Mandrivalinux s' i vs plait.\n"
 "\n"
 "Po l' informåcion, tchaeke pårticion est mostrêye come çoula:\n"
 "«no Linux», «no Windows», «grandeu».\n"
@@ -5148,7 +5148,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5157,19 +5157,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "Ciste etape est enondêye seulmint si ene viye pårticion GNU/Linux a stî\n"
 "trovêye so voste éndjole.\n"
 "\n"
 "DrakX asteure a mezåjhe di saveur si vos vloz fé ene novele astalåcion\n"
-"oudonbén fé on metaedje a djoû d' on sistinme Mandrakelinux k' i gn a\n"
+"oudonbén fé on metaedje a djoû d' on sistinme Mandrivalinux k' i gn a\n"
 "ddja sol plake:\n"
 "\n"
 " * «%s»: çouchal va spotchî ttafwait l' vî sistinme k' i gn\n"
@@ -5180,14 +5180,14 @@ msgstr ""
 "ki n' seront nén spotcheyes.\n"
 "\n"
 " * «%s»: cisse classe d' astalaedje chal vos permete di\n"
-"mete a djoû les pacaedjes k' i gn a so vosse sistinme Mandrakelinux.\n"
+"mete a djoû les pacaedjes k' i gn a so vosse sistinme Mandrivalinux.\n"
 "Vosse pårtixhaedje est wårdé et les dnêyes des uzeus n' sont nén\n"
 "candjeyes. Li plupårt des ôtès etapes d' apontiaedje dimorèt, come\n"
 "pol cas d' èn astalaedje sitandård.\n"
 "\n"
 "Eployî l' tchuze «Metaedje a djoû» rote comifåt po mete a djoû des\n"
-"sistinmes Mandrakelinux modêye «8.1» ou pus nouve. Mins l' fé po\n"
-"des modêyes di Mandrakelinux pus viyes kel «8.1» n' est nén ricmandé."
+"sistinmes Mandrivalinux modêye «8.1» ou pus nouve. Mins l' fé po\n"
+"des modêyes di Mandrivalinux pus viyes kel «8.1» n' est nén ricmandé."
 
 #: help.pm:591
 #, c-format
@@ -5245,7 +5245,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5290,7 +5290,7 @@ msgstr ""
 "Åd fwait do sopoirt UTF-8 (unicôde): Unicôde est on novea ecôdaedje\n"
 "ki permete di scrire tos les lingaedjes del Daegn. Mins i gn a co des\n"
 "sacwès a-z amidrer dins l' sopoirt UTF-8 so GNU/Linux. Vola pocwè\n"
-"Mandrakelinux eployrè UTF-8 ou nén sorlon les tchuzes ki vos djhoz:\n"
+"Mandrivalinux eployrè UTF-8 ou nén sorlon les tchuzes ki vos djhoz:\n"
 "\n"
 " * Si vos tchoezixhoz on lingaedje avou ene foite eritance d' on dné\n"
 "ecôdaedje (lingaedjes latin1, rûsse, djaponès, chinwès, corêyin, taylandès\n"
@@ -5541,7 +5541,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5562,12 +5562,12 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Chal, vos tchoezixhoz li ké sistinme d' imprimaedje vos vloz eployî\n"
 "so vosse copiutrece. Des ôtes sistinmes d' operance k' i gn a\n"
-"vos dnèt onk, mins Mandrakelinux vos lait tchoezi inte deus, tchaeke onk\n"
+"vos dnèt onk, mins Mandrivalinux vos lait tchoezi inte deus, tchaeke onk\n"
 "estant l' meyeu dins on cas dné.\n"
 "\n"
 " * «%s» - ki vout dire «print, do not queue» (imprimer sins cawêye), est\n"
@@ -5591,7 +5591,7 @@ msgstr ""
 "\n"
 "Si vos tchoezixhoz asteure, et ki pus tård vos n' inmez nén vosse sistinme\n"
 "d' imprimaedje, vos l' poloz åjheymint candjî avou l' usteye d' apontiaedje\n"
-"des scrireces, a-z enonder a pårti do cinte di contrôle di Mandrakelinux, "
+"des scrireces, a-z enonder a pårti do cinte di contrôle di Mandrivalinux, "
 "tot\n"
 "clitchant sol boton «%s»."
 
@@ -5709,7 +5709,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5726,7 +5726,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5777,7 +5777,7 @@ msgstr ""
 "\n"
 " * «%s»: Si vos vloz apontyî li rantoele (locåle ou daegnrece),\n"
 "clitchîz so ç' boton chal. Lijhoz li documintåcion so papî oudonbén\n"
-"li cene håynåve a pårti do cinte di controle di Mandrakelinux\n"
+"li cene håynåve a pårti do cinte di controle di Mandrivalinux\n"
 "après l' astalaedje po-z aveur pus di racsegnes.\n"
 "\n"
 " * «%s»: vos permete d' apontyî les adresses des procsis HTTP eyet FTP\n"
@@ -5794,7 +5794,7 @@ msgstr ""
 " * «%s»: si vos vloz candjî l' apontiaedje di l' enondrece\n"
 "di l' éndjole. Vos nel duvrîz fé ki si vos estoz seur di vos.\n"
 "Lijhoz li documintåcion so l' enondrece dins l' cinte di controle\n"
-"di Mandrakelinux po pus di racsegnes.\n"
+"di Mandrivalinux po pus di racsegnes.\n"
 "\n"
 " * «%s»: vos pôroz controler finmint les kés siervices ki vos vloz\n"
 "enonder so voste éndjole. Si vos l' vloz eployî po fé do sierveu c' est\n"
@@ -5855,11 +5855,11 @@ msgstr "Siervices"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Tchoezixhoz li deure plake ki vos vloz disfacer po-z î astaler vosse\n"
-"novele pårticion Mandrakelinux. Prindoz asteme, totes les dnêyes\n"
+"novele pårticion Mandrivalinux. Prindoz asteme, totes les dnêyes\n"
 "k' i gn a sol deure plake vont esse pierdowes, et vos n' pôroz les rapexhî."
 
 #: help.pm:863
@@ -5902,7 +5902,7 @@ msgstr ""
 "Dji n' sai vey les modules po vosse nawea (i gn a pont d' fitchî %s), çoula "
 "vout probåblumint dire ki vosse plakete d' enondaedje n' a nén stî fwait pol "
 "sopoirt d' astalaedje ki vos vloz eployî. Vos dvrîz fé ene nouve plakete, a "
-"pårti des imådjes ki vnèt avou li modêye di Mandrakelinux ki vos vloz astaler"
+"pårti des imådjes ki vnèt avou li modêye di Mandrivalinux ki vos vloz astaler"
 
 #: install2.pm:172
 #, c-format
@@ -6219,7 +6219,7 @@ msgstr "Carculant l' grandeu del pårticion Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr "Vosse pårticion Windows est trop fragmintêye, i fåreut eployî «defrag»"
 
@@ -6339,19 +6339,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6373,7 +6373,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6381,14 +6381,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6398,7 +6398,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6418,10 +6418,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6432,11 +6432,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6452,7 +6452,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -6515,7 +6515,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6523,13 +6523,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Felicitåcions, l' astalåcion a stî fwaite.\n"
 "Bodjîz li sopoirt d' enondaedje et tapez so Return po renonder l' éndjole.\n"
 "\n"
 "Po des informåcions so les coridjaedjes k' i gn a po cisse modêye di "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "loukîz al pådje des Errata sol waibe:\n"
 "\n"
 "\n"
@@ -6537,7 +6537,7 @@ msgstr ""
 "\n"
 "\n"
 "vos trovroz di l' informåcion so l' apontiaedje do sistinme el tchaptrê\n"
-"sol post-astalåcion do Guide di l' Uzeu Mandrakelinux Oficir."
+"sol post-astalåcion do Guide di l' Uzeu Mandrivalinux Oficir."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6573,12 +6573,12 @@ msgstr "Intrant e l' etape '%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Vosse sistinme a po di rsources. Vos pôrîz aveur des rujhes po\n"
-"l' astalåcion di Mandrakelinux. Si çoula arive, vos ploz sayî ene\n"
+"l' astalåcion di Mandrivalinux. Si çoula arive, vos ploz sayî ene\n"
 "astalåcion e môde tecse. Po çoula, tchoûkîz sol tape «F1» a l' enondaedje\n"
 "et poy tapez «text»."
 
@@ -7125,9 +7125,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Dj' atôche li waibe da Mandrakelinux po-z aveur li djivêye di muroes k' i gn "
+"Dj' atôche li waibe da Mandrivalinux po-z aveur li djivêye di muroes k' i gn "
 "a"
 
 #: install_steps_interactive.pm:840
@@ -7353,8 +7353,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Astalåcion di Mandrakelinux %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Astalåcion di Mandrivalinux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9941,14 +9941,14 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Apontiaedje do côpe feu drakefirewall\n"
 "\n"
 "Çouci apontieye on côpe feu personel (dj' ô bén, po esse eployî sor on\n"
-"posse éndjolrece) po ciste éndjole Mandrakelinux chal.\n"
+"posse éndjolrece) po ciste éndjole Mandrivalinux chal.\n"
 "Po ene poûxhante solucion di côpe feu, loukîz purade do costé\n"
 "del distribucion MandrakeSecurity avou on côpe feu di hôte såvrité."
 
@@ -14025,12 +14025,12 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
 "Enondez Scannerdrake («Éndjolreye/Sicanreces» e cinte di controle di "
-"Mandrakelinux) po pårtaedjî vosse sicanrece sol rantoele.\n"
+"Mandrivalinux) po pårtaedjî vosse sicanrece sol rantoele.\n"
 "\n"
 
 #: printer/printerdrake.pm:3933
@@ -16018,23 +16018,23 @@ msgstr "Arester"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mandrakelinux, k' est çki c' est d' ça?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Mandrivalinux, k' est çki c' est d' ça?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Bénvnowe a <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Bénvnowe a <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux est ene <b>distribucion di GNU/Linux</b> fwait do cour do "
+"Mandrivalinux est ene <b>distribucion di GNU/Linux</b> fwait do cour do "
 "sistinme, dj' ô bén li <b>nawea</b> do sistinme d' operance (båzé sol nawea "
 "Linux) eyet aconcoisté di <b>bråmint di programes</b> po pleur fé ene miete "
 "tot çki vos pôrîz tuzer d' fé."
@@ -16042,10 +16042,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux est li distribucion di GNU/Linux li pus <b>uzeu-amiståve</b> "
+"Mandrivalinux est li distribucion di GNU/Linux li pus <b>uzeu-amiståve</b> "
 "d' enute.C' est eto ene des distribucions di Linux les <b>pus eployeyes sol "
 "Daegn</b>!"
 
@@ -16062,15 +16062,15 @@ msgstr "Wilicome amon les <b>libes programes</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux shût l' modele des libès programes. Dj' ô bén ki cisse nouve "
+"Mandrivalinux shût l' modele des libès programes. Dj' ô bén ki cisse nouve "
 "modêye est l' rizultat del <b>colaboråcion</b> etur l' <b>ekipe di "
-"diswalpeus di Mandrakesoft</b> eyet li <b>cminålté daegnrece</b> des "
-"contribouweus a Mandrakelinux."
+"diswalpeus di Mandriva</b> eyet li <b>cminålté daegnrece</b> des "
+"contribouweus a Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16090,10 +16090,10 @@ msgstr "<b>Li licince GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "Li plupårt des programes ki vnèt avou l' distribucion, eyet totes les "
-"usteyes di Mandrakelinux, sont dizo li <b>Licince Publike Djeneråle</b> "
+"usteyes di Mandrivalinux, sont dizo li <b>Licince Publike Djeneråle</b> "
 "(GPL)."
 
 #: share/advertising/03.pl:17
@@ -16126,15 +16126,15 @@ msgstr "<b>Ridjondoz li cminålté</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux a-st ene des <b>pus grandès cminåltés</b> d' uzeus eyet "
+"Mandrivalinux a-st ene des <b>pus grandès cminåltés</b> d' uzeus eyet "
 "d' diswalpeus. Li role d' ene sifwaite kiminålté est foirt lådje, alant des "
 "rapoirtaedjes di bugs å diswalpaedje di noveas programes. Li cminålté djouwe "
-"on <b>role-clé</b> dins l' monde di Mandrakelinux."
+"on <b>role-clé</b> dins l' monde di Mandrivalinux."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16156,11 +16156,11 @@ msgstr "<b>Modêye aberwetaedje («Download version»)</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Vos estoz k' astale li <b>Modêye aberwetaedje di Mandrakelinux</b>. C' est "
-"ene modêye po rén ki Mandrakesoft rind <b>disponibe po tertos</b>."
+"Vos estoz k' astale li <b>Modêye aberwetaedje di Mandrivalinux</b>. C' est "
+"ene modêye po rén ki Mandriva rind <b>disponibe po tertos</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16193,10 +16193,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Vos n' åroz nén accès nerén åzès <b>siervices</b> ki vnèt avou les ôtes "
-"prodûts di Mandrakesoft."
+"prodûts di Mandriva."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16205,8 +16205,8 @@ msgstr "<b>«Discovery», li dischovraedje di vosse prumî scribanne Linux</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Vos estoz k' astale <b>Mandrakelinux Discovery</b> (dischovraedje)."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Vos estoz k' astale <b>Mandrivalinux Discovery</b> (dischovraedje)."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16229,17 +16229,17 @@ msgstr "<b>Li PowerPack, li meyeu do scribanne Linux</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Vos estoz k' astale <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Vos estoz k' astale <b>Mandrivalinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"Li PowerPack est li prodût Mandrakesoft avou on <b>scribanne Linux di "
+"Li PowerPack est li prodût Mandriva avou on <b>scribanne Linux di "
 "prumire classe</b>. Li PowerPack vént avou des <b>meyes di programes</b> - "
 "di ttafwait, des pus simpes disk' ås pus spepieus."
 
@@ -16250,8 +16250,8 @@ msgstr "<b>PowerPack+, li solucion Linux po les scribannes et les sierveus</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Vos estoz k' astale <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Vos estoz k' astale <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16268,22 +16268,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Prodûts Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Prodûts Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> a diswalpé ene lådje game di prodûts <b>Mandrakelinux</"
+"<b>Mandriva</b> a diswalpé ene lådje game di prodûts <b>Mandrivalinux</"
 "b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Les prodûts Mandrakelinux sont:"
+msgid "The Mandrivalinux products are:"
+msgstr "Les prodûts Mandrivalinux sont:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16305,40 +16305,40 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux pås x86-64</b>, li solucion Mandrakelinux po-z eployî å "
+"\t* <b>Mandrivalinux pås x86-64</b>, li solucion Mandrivalinux po-z eployî å "
 "mî li processeu 64-bits da vosse."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Prodûts Mandrakesoft (prodûts nomades)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Prodûts Mandriva (prodûts nomades)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft a diswalpé deus prodûts ki vs permetèt d' eployî Mandrakelinux "
+"Mandriva a diswalpé deus prodûts ki vs permetèt d' eployî Mandrivalinux "
 "so <b>tot l' minme li kéne copiutrece</b> eyet sins mezåjhe di l' astaler po "
 "l' eployî:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b> (bodjî), ene distribucion Mandrakelinux ki s' enonde "
+"\t* <b>Move</b> (bodjî), ene distribucion Mandrivalinux ki s' enonde "
 "totafwaitmint a pårti d' ene plake lazer."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 "\t* <b>GlobeTrotter</b> (trote-Daegn), ene distribucion pré-astalêye sol "
@@ -16346,38 +16346,38 @@ msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Prodûts Mandrakesoft (solucions professioneles)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Prodûts Mandriva (solucions professioneles)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Chal pa dzo les prodûts Mandrakesoft fwait po les <b>mezåjhes professionels</"
+"Chal pa dzo les prodûts Mandriva fwait po les <b>mezåjhes professionels</"
 "b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 "\t* <b>Sicribanne po eterprijhes («Corporate Desktop»)</b>, li scribanne di "
-"Mandrakelinux po ls eterprijhes."
+"Mandrivalinux po ls eterprijhes."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 "\t* <b>Sierveu po eterprijhes («Corporate Server»)</b>, li solucion sierveus "
-"di Mandrakelinux"
+"di Mandrivalinux"
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 "\t* <b>Côpe-feu multi-rantoeles («Multi-Network Firewall» u «MNF»)</b>, li "
-"solucion Mandrakelinux pol såvrité des rantoeles."
+"solucion Mandrivalinux pol såvrité des rantoeles."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16420,10 +16420,10 @@ msgstr "<b>Tchoezixhoz vosse evironmint di scribanne grafike</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Avou l' PowerPack, vos åroz l' tchuze di l' <b>evironmint di scribanne "
-"grafike</b>. Mandrakesoft a fwait l' tchuze di <b>KDE</b> po l' ci k' est "
+"grafike</b>. Mandriva a fwait l' tchuze di <b>KDE</b> po l' ci k' est "
 "prémetou."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -16449,10 +16449,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Avou l' PowerPack+, vos åroz l' tchuze di l' <b>evironmint di scribanne "
-"grafike</b>. Mandrakesoft a tchoezi <b>KDE</b> come prémetou scribanne."
+"grafike</b>. Mandriva a tchoezi <b>KDE</b> come prémetou scribanne."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16581,10 +16581,10 @@ msgstr "<b>Mo do plaijhi avou l' lådje fortchete di programes</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"E menu Mandrakelinux vos trovroz des programes <b>åjheys a-z eployî</b> po "
+"E menu Mandrivalinux vos trovroz des programes <b>åjheys a-z eployî</b> po "
 "<b>tot çki vos vôrîz fé</b>:"
 
 #: share/advertising/18.pl:16
@@ -16854,18 +16854,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Cinte di contrôle di Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Cinte di contrôle di Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"Li <b>cinte di contrôle di Mandrakelinux</b> est ene ramexhnêye d' usteyes "
-"essincieles di Mandrakelinux po vs simplifyî l' apontiaedje del copiutrece "
+"Li <b>cinte di contrôle di Mandrivalinux</b> est ene ramexhnêye d' usteyes "
+"essincieles di Mandrivalinux po vs simplifyî l' apontiaedje del copiutrece "
 "da vosse."
 
 #: share/advertising/25.pl:17
@@ -16891,17 +16891,17 @@ msgstr "<b>Li modele des libes programes</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Come tot programaedje po les copiutreces, les libes programes <b>ont mezåjhe "
 "di tines et d' djins</b> po-z esse diswalpés. Po shure li filozofeye des "
-"libes programes Mandrakesoft vind des prodûts avou del radjoutêye valixhance "
-"eyet des siervices po ki <b>Mandrakelinux continouwe a-z esse tofer "
+"libes programes Mandriva vind des prodûts avou del radjoutêye valixhance "
+"eyet des siervices po ki <b>Mandrivalinux continouwe a-z esse tofer "
 "improuvé</b>. Si vos vloz <b>sopoirter l' filozofeye des libes programes</b> "
-"eyet l' diswalpaedje di Mandrakelinux, adon, <b>si vos vloz bén</b>, tuzez a-"
+"eyet l' diswalpaedje di Mandrivalinux, adon, <b>si vos vloz bén</b>, tuzez a-"
 "z atchter onk di nos prodûts ou siervices!"
 
 #: share/advertising/27.pl:13
@@ -16912,11 +16912,11 @@ msgstr "<b>Li botike so les fyis</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Vos trovroz tos les prodûts eyet siervices da Mandrakesoft sol Botike di "
-"Mandrakelinux -- nosse <b>tcherpinte di siervices eyet di comiece so les "
+"Vos trovroz tos les prodûts eyet siervices da Mandriva sol Botike di "
+"Mandrivalinux -- nosse <b>tcherpinte di siervices eyet di comiece so les "
 "fyis</b>."
 
 #: share/advertising/27.pl:17
@@ -16941,24 +16941,24 @@ msgstr "Passez ådjourdu minme pa <b>store.mandrakesoft.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> est li <b>cpagnon a l' idêye</b> po vosse prodût "
-"Mandrakelinux.."
+"<b>Mandriva Club</b> est li <b>cpagnon a l' idêye</b> po vosse prodût "
+"Mandrivalinux.."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Profitez d' nos <b>advintaedjes</b> tot radjondant l' Mandrakeclub; metans:"
+"Profitez d' nos <b>advintaedjes</b> tot radjondant l' Mandriva Club; metans:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -16980,40 +16980,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Pårticiper åzès <b>foroms des uzeus</b> di Mandrakelinux."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Pårticiper åzès <b>foroms des uzeus</b> di Mandrivalinux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Accès priviledjî eyet pus timpe</b>, divant l' publik cossemaedje, "
-"åzès <b>imådjes ISO</b> di Mandrakelinux."
+"åzès <b>imådjes ISO</b> di Mandrivalinux."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> est on novea siervice di prumî livea ki Mandrakesoft "
+"<b>Mandriva Online</b> est on novea siervice di prumî livea ki Mandriva "
 "est fir d' ofri a ses candes!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline dene ene lådje fortchete di clapants siervices po<b>mete "
-"åjheymint a djoû</b> vos sistinmes Mandrakelinux:"
+"Mandriva Online dene ene lådje fortchete di clapants siervices po<b>mete "
+"åjheymint a djoû</b> vos sistinmes Mandrivalinux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17039,40 +17039,40 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
-msgstr "\t* Manaedjî <b>tos vos sistinmes Mandrakelinux</b> avou on seu conte."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+msgstr "\t* Manaedjî <b>tos vos sistinmes Mandrivalinux</b> avou on seu conte."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "Avoz vs mezåjhe d' <b>aidance</b>? Rescontrez les esperts tecnikes di "
-"Mandrakesoft dizo <b>nosse platfôme di sopoirt tecnike</b> www."
+"Mandriva dizo <b>nosse platfôme di sopoirt tecnike</b> www."
 "mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Gråces a l' aidance des <b>esperts cwålifyîs Mandrakelinux</b>, vos alez "
+"Gråces a l' aidance des <b>esperts cwålifyîs Mandrivalinux</b>, vos alez "
 "wangnî bråmint do tins."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Po tote kesse åd fwait di Mandrakelinux, vos ploz atchter do sopoirt po des "
+"Po tote kesse åd fwait di Mandrivalinux, vos ploz atchter do sopoirt po des "
 "problinmes sol botike <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17376,8 +17376,8 @@ msgstr "Usteyes di corwaitaedje, contaedje des process, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Macreas Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Macreas Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17475,8 +17475,8 @@ msgstr ""
 "TCHUZES:\n"
 "  --help            - mostere ci messaedje d' aidance chal.\n"
 "  --report          - li programe doet esse ene des usteyes di "
-"Mandrakelinux\n"
-"  --incident        - li programe doet esse ene des usteyes di Mandrakelinux"
+"Mandrivalinux\n"
+"  --incident        - li programe doet esse ene des usteyes di Mandrivalinux"
 
 #: standalone.pm:63
 #, c-format
@@ -17531,7 +17531,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17589,7 +17589,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17597,7 +17597,7 @@ msgid ""
 msgstr ""
 "[TCHUZES]...\n"
 "  --no-confirmation      èn nén dmander d' aveurixhaedje e môde "
-"MandrakeUpdate\n"
+"Mandriva Update\n"
 "  --no-verify-rpm        èn nén verifyî les sinateures des pacaedjes rpm\n"
 "  --changelog-first      håyner li djournå des candjmints divant l' djivêye "
 "des fitchîs e purnea\n"
@@ -20268,13 +20268,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Usteye di rapoirtaedje di bugs di Mandrakelinux"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Usteye di rapoirtaedje di bugs di Mandrivalinux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Cinte di contrôle di Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Cinte di contrôle di Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20294,8 +20294,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline (Mandrakesoft so fyis)"
+msgid "Mandriva Online"
+msgstr "Mandriva Online (Mandriva so fyis)"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20339,8 +20339,8 @@ msgstr "Macreas d' apontiaedje"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Tchoezixhoz l' usteye da Mandrakesoft:"
+msgid "Select Mandriva Tool:"
+msgstr "Tchoezixhoz l' usteye da Mandriva:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20766,7 +20766,7 @@ msgstr "En alaedje a l' enondaedje"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Ciste eterface n' a nén co stî apontieye.\n"
 "Enondez li macrea «Radjouter ene eterface» a pårti do cinte di contrôle."
@@ -20775,7 +20775,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Vos n' avoz nou raloyaedje al daegntoele d' apontyî.\n"
 "Enondez li macrea «%s» a pårti do cinte di contrôle."
@@ -20828,8 +20828,8 @@ msgstr "KDM (manaedjeu di håynaedje KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM ((manaedjeu di håynaedje Mandrakelinux)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM ((manaedjeu di håynaedje Mandrivalinux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21131,7 +21131,7 @@ msgstr "Abagaedje"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21140,7 +21140,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright © 2001-2002 pa Mandrakesoft \n"
+"Copyright © 2001-2002 pa Mandriva \n"
 "\n"
 "\n"
 "        DUPONT Sébastien (prumire modêye)\n"
@@ -21690,14 +21690,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright © 2003-2004 Mandrakesoft.\n"
+"Copyright © 2003-2004 Mandriva.\n"
 "Çouchal est on libe programe et pout esse cossemé dzo les termes del licince "
 "GPL.\n"
 "\n"
@@ -21727,8 +21727,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Cinte di l' aidance di Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Cinte di l' aidance di Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25070,8 +25070,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Djournås des usteyes di Mandrakelinux"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Djournås des usteyes di Mandrivalinux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25586,10 +25586,10 @@ msgstr "Raloyaedje completé."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Li raloyaedje a fwait berwete.\n"
-"Verifyîz vost apontiaedje dins l' cinte di contrôle di Mandrakelinux."
+"Verifyîz vost apontiaedje dins l' cinte di contrôle di Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index d28b4518b..245016d13 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2005-04-21 14:27+0200\n"
 "PO-Revision-Date: 2005-03-27 06:56+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Mandrakelinux i18n Team <cooker-i18n@linux-mandrake.com>\n"
+"Language-Team: Mandrivalinux i18n Team <cooker-i18n@linux-mandrake.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,13 +64,13 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "USB 密钥盘好像启用了写保护, 但是现在无法安全拔出该密钥盘。\n"
 "\n"
 "\n"
 "请单击按钮重新启动计算机, 拔出该密钥盘之后, 去掉写保护后再插入, \n"
-"然后再次调用 Mandrake Move。"
+"然后再次调用 Mandriva Move。"
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -88,7 +88,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "您的 USB 密钥盘中没有有效的 Windows(FAT) 分区。而要继续使用此系\n"
@@ -98,13 +98,13 @@ msgstr ""
 "\n"
 "\n"
 "没有 USB 密钥盘, 您当然也可以继续 - 您仍然可以像普通的 Mandrake\n"
-"操作系统一样使用 Mandrake Move。"
+"操作系统一样使用 Mandriva Move。"
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -112,17 +112,17 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "我们没有在您的系统中检测到任何 USB 密钥盘。如果您现在插入一块这\n"
-"样的盘的话, Mandrake Move 将可以将您主目录和系统级配置中的数据透\n"
+"样的盘的话, Mandriva Move 将可以将您主目录和系统级配置中的数据透\n"
 "明的保存在该密钥盘中, 以备下次启动此计算机之用。注意: 如果您刚刚\n"
 "插入了密钥盘, 请在再次检测之前稍等几秒。\n"
 "\n"
 "\n"
 "没有 USB 密钥盘, 您当然也可以继续 - 您仍然可以像普通的 Mandrake\n"
-"操作系统一样使用 Mandrake Move。"
+"操作系统一样使用 Mandriva Move。"
 
 #: ../move/move.pm:494
 #, c-format
@@ -246,7 +246,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -261,7 +261,7 @@ msgstr ""
 "%s\n"
 "\n"
 "这可能是 USB 密钥盘中的系统配置文件已经损坏。此时只需删除这些文\n"
-"件, 然后重新启动 Mandrake Move 即可解决此问题。要完成这一操作, \n"
+"件, 然后重新启动 Mandriva Move 即可解决此问题。要完成这一操作, \n"
 "只需点击下面的按钮。\n"
 "\n"
 "\n"
@@ -1287,11 +1287,11 @@ msgstr "语言选择"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux 可以支持多种语言。请选择您想要安装的语言。\n"
+"Mandrivalinux 可以支持多种语言。请选择您想要安装的语言。\n"
 "安装完成并重新启动系统后它们就可以使用。"
 
 #: any.pm:752 any.pm:773 help.pm:647
@@ -3648,11 +3648,11 @@ msgstr "启用无线电支持"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
-"在继续之前, 您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrakelinux发行"
+"在继续之前, 您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrivalinux发行"
 "版。如果您同意其中的全部条款, 请选中\"%s\"框。如果不同意, 单击\"%s\"按钮将重"
 "新启动您的计算机。"
 
@@ -3818,13 +3818,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM, "
+"Mandrivalinux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM, "
 "DrakX 将弹出当前\n"
 "CD, 并要求您插入所需的正确 CD。如果您手中没有所请求的 CD, 只需单击\"%s\", 就"
 "不会安装相应的软件包了。"
@@ -3835,11 +3835,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3890,11 +3890,11 @@ msgid ""
 "command-line interface. The total size of this installation is about 65\n"
 "megabytes."
 msgstr ""
-"现在该指定要在您的系统中安装哪些程序了。Mandrakelinux\n"
+"现在该指定要在您的系统中安装哪些程序了。Mandrivalinux\n"
 "为您准备了数千个软件包。而为了使管理软件包更加容易, 软件包已经按相似程度分成"
 "了多个组。\n"
 "\n"
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "按四个类别对软件包进行了分类。您可以从不同的类别混合选择应用程序。也就是说, "
 "``工作站''中也可以选择安装``服务器''分类中的应用程序。\n"
 "\n"
@@ -3992,10 +3992,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4023,9 +4023,9 @@ msgstr ""
 "\n"
 "!!\n"
 "如果选择了服务器软件包, 不管是您特意选中的, 还是因为该软件包是某组的成员, 您"
-"都需要确认是否真的想要安装这些服务器。默认情况下, Mandrakelinux\n"
+"都需要确认是否真的想要安装这些服务器。默认情况下, Mandrivalinux\n"
 "会在启动时自动启动已安装的全部服务。尽管在发行版送出时这些服务是安全的, 但完"
-"全有可能在此版本 Mandrakelinux\n"
+"全有可能在此版本 Mandrivalinux\n"
 "完成后发现了相应软件的安全漏洞。如果您并不知道特定服务的用途, 或者不知道为什"
 "么要安装这些服务, 请单击\"%s\"。单击\"%s\"将安装列出的服务, 并且启动时这些服"
 "务会被自动启动。\n"
@@ -4172,7 +4172,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4226,7 +4226,7 @@ msgid ""
 "want to check \"%s\" if your machine is to act as a server, or if you were\n"
 "not successful in getting the display configured."
 msgstr ""
-"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrakelinux\n"
+"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrivalinux\n"
 "附带的所有图形环境(KDE、GNOME、AfterStep、WindowMaker 等)都依赖于该系统。\n"
 "\n"
 "您将会看到不同的参数列表, 以便进行图形显示选项的更改来达到最佳状态。其中包"
@@ -4338,12 +4338,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4370,7 +4370,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4379,7 +4379,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4399,11 +4399,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 ""
-"在这一步里, 您需要决定您想要将 Mandrakelinux\n"
+"在这一步里, 您需要决定您想要将 Mandrivalinux\n"
 "操作系统安装到硬盘的何处。如果您的硬盘完全是空的, 或者已有操作系统使用了所有"
 "的空间, 您就必须要对硬盘进行分区。粗略的说, 对硬盘进行分区就是将其划分成几个"
 "逻辑上不同的部分, 以便创建安装您新的\n"
-"Mandrakelinux 系统所需的空间。\n"
+"Mandrivalinux 系统所需的空间。\n"
 "\n"
 "由于对硬盘进行分区通常是不可恢复的, 并且可能导致数据丢失, 所以对于没有经验的"
 "用户来说, 分区是十分危险的操作。所幸的是, DrakX\n"
@@ -4426,7 +4426,7 @@ msgstr ""
 "Microsoft Windows FAT 或 NTFS 分区的大小。更改分区大小通常不会造成任何数据丢"
 "失, 但您必须事先对 Windows\n"
 "分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计"
-"算机上使用 Mandrakelinux 和 Microsoft\n"
+"算机上使用 Mandrivalinux 和 Microsoft\n"
 "Windows, 则推荐使用此选项。\n"
 "\n"
 "   注意, 在执行这一过程之后, 您原有的 Microsoft Windows 分区将会比先前小一"
@@ -4434,7 +4434,7 @@ msgstr ""
 "下可用来存储数据或安装新软件的剩余空间也会变少。\n"
 "\n"
 " * \"%s\"。如果您想要删除硬盘上的全部数据和全部分区, 并将其替换为全新的 "
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "系统, 请选择此选项。请额外小心, 因为在您确认之后, 此操作无法撤销。\n"
 "\n"
 "   !! 如果您选择了此选项, 您硬盘上的全部数据都将被删除。 !!\n"
@@ -4589,7 +4589,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4607,7 +4607,7 @@ msgstr ""
 "\n"
 "如果您准备好格式化分区了, 请单击\"%s\"。\n"
 "\n"
-"如果您想要选择其它分区用于安装 Mandrakelinux 操作系统, 请单击\"%s\"。\n"
+"如果您想要选择其它分区用于安装 Mandrivalinux 操作系统, 请单击\"%s\"。\n"
 "\n"
 "如果您想要选择要检测磁盘上的坏块, 请单击单击\"%s\"。"
 
@@ -4625,7 +4625,7 @@ msgstr "上一步"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4637,7 +4637,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"在您安装 Mandrakelinux\n"
+"在您安装 Mandrivalinux\n"
 "的这个时候, 很可能有些软件包在发行之后已经更新。有些故障已经被修正, 有些安全"
 "问题已经被解决。为了让您能够享用这些更新, 您现在可以从 Internet\n"
 "上下载它们。如果您的 Internet 连接已经可以使用, 请选择\"%s\"。如果您愿意以后"
@@ -4666,7 +4666,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4676,7 +4676,7 @@ msgstr ""
 "包含关键数据, 或者将直接暴露于 Internet\n"
 "之下, 则应该设置较高的安全级别。较高的安全级别通常以损失易用性作为代价。\n"
 "\n"
-"如果您不知道要选择什么, 请保持默认选项。您可以稍后从 Mandrakelinux 控制中心的"
+"如果您不知道要选择什么, 请保持默认选项。您可以稍后从 Mandrivalinux 控制中心的"
 "一部分 draksec\n"
 "来更改安全级别。\n"
 "\n"
@@ -4693,7 +4693,7 @@ msgstr "安全管理员"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4763,7 +4763,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"在这一步中, 您需要选择要使用哪个或哪些分区来安装您的 Mandrakelinux 系统。如果"
+"在这一步中, 您需要选择要使用哪个或哪些分区来安装您的 Mandrivalinux 系统。如果"
 "已经定义了分区, 不管是先前安装的 GNU/Linux\n"
 "还是由其它分区工具划分的, 您都可以使用已有的分区。否则, 必须对硬盘分区进行定"
 "义。\n"
@@ -4837,7 +4837,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4866,7 +4866,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "在硬盘上检测到了多个 Microsoft 分区。请选择一个分区改变大小, 以便安装您新\n"
-"的 Mandrakelinux 操作系统。\n"
+"的 Mandrivalinux 操作系统。\n"
 "\n"
 "每个分区都是按“Linux 名称”、“Windows 名称”、“容量”顺序列出的。\n"
 "\n"
@@ -4913,7 +4913,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4922,30 +4922,30 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "仅当在您的计算机上发现了已有的 GNU/Linux 分区, 才会激活这一步骤。\n"
 "\n"
-"DrakX 现在需要知道您是想要执行全新安装, 还是升级已有的 Mandrakelinux 系统：\n"
+"DrakX 现在需要知道您是想要执行全新安装, 还是升级已有的 Mandrivalinux 系统：\n"
 "\n"
 " *\n"
 "\"%s\"：总体来说, 这将完全销毁旧系统。但是, 根据您选择的分区方案, 您可以让现"
 "有的数据(比如\"主\"目录)免于覆盖。如果您想要更改硬盘的分区方案, 或者更该文件"
 "系统, 您就应该使用此选项。\n"
 "\n"
-" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandrakelinux\n"
+" * \"%s\"：这一安装级别允许您更新目前安装在您 Mandrivalinux\n"
 "系统上的软件包。您的分区方案和用户数据都不会被破坏。绝大多数配置步骤仍然可"
 "用, 与标准安装类似。\n"
 "\n"
-"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrakelinux 系统上工作正常。不"
+"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrivalinux 系统上工作正常。不"
 "推荐在先于 \"8.1\" 版本的\n"
-"Mandrakelinux 系统上执行升级。"
+"Mandrivalinux 系统上执行升级。"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
@@ -5002,7 +5002,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5040,7 +5040,7 @@ msgstr ""
 "\n"
 "关于 UTF-8 (Unicode) 支持：Unicode 是一种新的字符编码, 该编码可支持所有现存的"
 "语言。但是, 在 GNU/Linux 下完全支持\n"
-"Unicode, 仍然在开发和完善中。由此原因, Mandrakelinux 会根据用户的选择是否使"
+"Unicode, 仍然在开发和完善中。由此原因, Mandrivalinux 会根据用户的选择是否使"
 "用 UTF-8：\n"
 "\n"
 " * 如果您所选的语言自身有强制性的编码(latin1 语言、俄语、日语、中文、朝鲜语、"
@@ -5269,7 +5269,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5290,11 +5290,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "现在, 应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择, 但 "
-"Mandrakelinux\n"
+"Mandrivalinux\n"
 "提供了两种。每种打印系统都能够在不同的配置中大展身手。\n"
 "\n"
 " * \"%s\" --\n"
@@ -5313,7 +5313,7 @@ msgstr ""
 "还包括一个图形界面, 可用来打印或选择打印机选项, 以及管理打印机。\n"
 "\n"
 "如果您现在进行了选择, 但稍后又发现您并不喜欢所选择的打印系统, 可以轻松修改。"
-"只需从 Mandrakelinux Control Center中选择\n"
+"只需从 Mandrivalinux Control Center中选择\n"
 "PrinterDrake, 然后单击\"%s\"按钮。"
 
 #: help.pm:765
@@ -5430,7 +5430,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5447,7 +5447,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5490,7 +5490,7 @@ msgstr ""
 "分辨率。如果这不适合您的话, 请单击\"%s\"重新配置您的图形界面。\n"
 "\n"
 " * \"%s\"：如果您想要配置您的 Internet 或局域网访问, 现在就可以进行。请参考印"
-"刷文档或在安装完成后使用 Mandrakelinux\n"
+"刷文档或在安装完成后使用 Mandrivalinux\n"
 "Control Center来获得完整的在线帮助。\n"
 "\n"
 " * \"%s\"：如果您所安装的计算机位于代理服务器之后, 这里将允许您配置 HTTP 和 "
@@ -5503,7 +5503,7 @@ msgstr ""
 "指南''中的相应章节, 以获得关于防火墙设置的细节。\n"
 "\n"
 " * \"%s\"：如果您想要更改您的引导程序配置, 请单击此按钮。这仅适用于高级用户。"
-"请参考印刷文档或 Mandrakelinux 控制中心中关于引导程序配置的帮助。\n"
+"请参考印刷文档或 Mandrivalinux 控制中心中关于引导程序配置的帮助。\n"
 "\n"
 " * \"%s\"：在此您可以精确调整要在您的计算机上运行哪些服务。如果您要将此计算机"
 "用作服务器, 那么应该复查这一设置。"
@@ -5563,10 +5563,10 @@ msgstr "服务"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"请选择您为了安装新的 Mandrakelinux 分区想要删除的硬盘分区。\n"
+"请选择您为了安装新的 Mandrivalinux 分区想要删除的硬盘分区。\n"
 "注意, 该硬盘分区上的所有数据将丢失并且无法恢复！"
 
 #: help.pm:863
@@ -5909,11 +5909,11 @@ msgstr "正在计算 Windows 分区的大小"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "您的 Windows 分区有太多碎片, 请重新启动, 进入 Windows, 运行磁盘碎片整理程序, "
-"然后重新开始安装 Mandrakelinux"
+"然后重新开始安装 Mandrivalinux"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6024,19 +6024,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6058,7 +6058,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6066,14 +6066,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6083,7 +6083,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6103,10 +6103,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6117,11 +6117,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6137,18 +6137,18 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "简介\n"
 "\n"
-"Mandrakelinux 发行版中提供的操作系统和各种程序在此后简称为“本软件产品”。软件"
-"产品包括但不限于与 Mandrakelinux 发行版的操作系统和各个部分有关的程序、方法、"
+"Mandrivalinux 发行版中提供的操作系统和各种程序在此后简称为“本软件产品”。软件"
+"产品包括但不限于与 Mandrivalinux 发行版的操作系统和各个部分有关的程序、方法、"
 "规则和文档。\n"
 "\n"
 "\n"
 "1. 许可协议\n"
 "\n"
-"请仔细阅读此文档。此文档是您与 Mandrakesoft S.A. 之间关于本软件产品的一个许可"
+"请仔细阅读此文档。此文档是您与 Mandriva S.A. 之间关于本软件产品的一个许可"
 "协议。如果您安装、复制或使用本软件产品, 即表明您接受并完全同意遵守本许可协议"
 "的内容和条件。如果您不同意本许可协议中的任何部分, 您将无权安装、复制或使用本"
 "软件产品任何试图不遵守本许可协议的内容和条件, 而安装、复制或使用本软件产品的"
@@ -6159,15 +6159,15 @@ msgstr ""
 "2. 有限担保\n"
 "\n"
 "本软件产品和附带的文档是一经发表即“不再修改”, 在法律允许的范围内没有任何担"
-"保。在法律允许的范围内 Mandrakesoft S.A. 对因使用或不能使用本软件产品而引起的"
+"保。在法律允许的范围内 Mandriva S.A. 对因使用或不能使用本软件产品而引起的"
 "特定、偶然、直接、间接的无论任何损失(包括但不限于生意的丧失、生意的中断、财务"
 "损失、因法院裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责任, 即使 "
-"Mandrakesoft S.A. 已经被告知有发生这种损失的可能性。\n"
+"Mandriva S.A. 已经被告知有发生这种损失的可能性。\n"
 "\n"
 "在某些国家中关于拥有和使用被禁止的软件的有限责任\n"
 "\n"
-"在法律允许的范围内 Mandrakesoft S.A. 或其分销者对因拥有或使用, 或从任何 "
-"Mandrakelinux 的网站下载在某些国家中被当地法律禁止或限制的软件而引起的特定、"
+"在法律允许的范围内 Mandriva S.A. 或其分销者对因拥有或使用, 或从任何 "
+"Mandrivalinux 的网站下载在某些国家中被当地法律禁止或限制的软件而引起的特定、"
 "偶然、直接、间接的无论任何损失 (包括但不限于生意的丧失、生意的中断、财务损"
 "失、因法院裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责任。这种有限"
 "责任适用但不限于本软件产品所包括的强大数据加密组件。\n"
@@ -6179,17 +6179,17 @@ msgstr ""
 "共许可协议(GNU General Public Licence), 此后简称为“GPL”, 或其它类似的许可协议"
 "的条款和条件。这些许可协议大多允许您使用、复制、修改或重新发表协议所覆盖的部"
 "分。使用这些软件之前, 请仔细阅读有关许可协议的条款和条件。如果对任何部分的许"
-"可协议有疑问, 应该与该部分的作者联系, Mandrakesoft 无法解答这些问题。由 "
-"Mandrakesoft S.A. 开发的各个程序受 GPL 许可协议保护。由 Mandrakesoft S.A. 创"
+"可协议有疑问, 应该与该部分的作者联系, Mandriva 无法解答这些问题。由 "
+"Mandriva S.A. 开发的各个程序受 GPL 许可协议保护。由 Mandrakesoft S.A. 创"
 "作的文档采用一个特别的许可协议。详情见有关的文档。\n"
 "\n"
 "\n"
 "4. 知识产权\n"
 "\n"
 "本软件产品的各个组件的所有权利属于它们各自的作者, 并受到所有可适用于软件程序"
-"的知识产权和版权法律的保护。Mandrakesoft S.A. 保留对本软件产品进行全面或部分"
+"的知识产权和版权法律的保护。Mandriva S.A. 保留对本软件产品进行全面或部分"
 "的更改或调整的权利, 不论采用任何方法, 不论出于任何目的。\n"
-"“Mandrake”, “Mandrakelinux”和相关的标志是 Mandrakesoft S.A. 的商标。\n"
+"“Mandrake”, “Mandrivalinux”和相关的标志是 Mandriva S.A. 的商标。\n"
 "\n"
 "\n"
 "5. 适用法律\n"
@@ -6197,7 +6197,7 @@ msgstr ""
 "如果本协议的任何部分被法院裁定为无效、非法或不适用, 该部分将被排除在本协议之"
 "外。您仍然需要遵守本协议的其它可使用的部分。本协议的内容和条件受法国法律管"
 "辖。有关本协议的任何争议最好在法庭外解决。作为最后的手段, 争议将被提交法国巴"
-"黎适当的法院审理。对本文档有任何疑问, 请联系 Mandrakesoft S.A.。\n"
+"黎适当的法院审理。对本文档有任何疑问, 请联系 Mandriva S.A.。\n"
 "\n"
 "以上中文翻译仅为方便您理解, 不能作为法律用途, 请以协议英文文本为准。\n"
 
@@ -6278,7 +6278,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6286,19 +6286,19 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "恭喜。安装完成了。\n"
 "请取出启动介质, 然后按 ENTER 重新启动。\n"
 "\n"
 "\n"
-"要了解此版本 Mandrakelinux 的修订, 请访问以下勘误表: \n"
+"要了解此版本 Mandrivalinux 的修订, 请访问以下勘误表: \n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"关于安装后如何配置您的系统, 请查看 Mandrakelinux 官方用户手册。"
+"关于安装后如何配置您的系统, 请查看 Mandrivalinux 官方用户手册。"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6332,11 +6332,11 @@ msgstr "进入步骤“%s”\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"您的系统资源不足。您在安装 Mandrakelinux 时可能遇到问题。\n"
+"您的系统资源不足。您在安装 Mandrivalinux 时可能遇到问题。\n"
 "如果这样, 您可以尝试文本模式的安装。\n"
 "在从光盘启动后按“F1”键, 然后输入“text”。"
 
@@ -6865,8 +6865,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "正在连接 Mandrakelinux 网站以获得镜像网站列表..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
+msgstr "正在连接 Mandrivalinux 网站以获得镜像网站列表..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7083,8 +7083,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux 安装 %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux 安装 %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9669,13 +9669,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "“Drak 防火墙”配置\n"
 "\n"
-"此程序可为您的 Mandrakelinux 机器配置个人防火墙。\n"
+"此程序可为您的 Mandrivalinux 机器配置个人防火墙。\n"
 "如果要配置强大的专用防火墙, 请考虑使用专门的\n"
 "MandrakeSecurity 防火墙发行版。"
 
@@ -13588,11 +13588,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"运行 SannerDrake (Mandrakelinux 控制中心中的硬件/扫描仪)可在网络上共向您的扫"
+"运行 SannerDrake (Mandrivalinux 控制中心中的硬件/扫描仪)可在网络上共向您的扫"
 "描仪。\n"
 "\n"
 
@@ -15423,32 +15423,32 @@ msgstr "停止"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>何为 Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>何为 Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "<b>Mandrakelinux</b> 欢迎您!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "<b>Mandrivalinux</b> 欢迎您!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux 是一整套系统的有机组成, 其中不仅包括<b>操作系统</b>(基于 Linux "
+"Mandrivalinux 是一整套系统的有机组成, 其中不仅包括<b>操作系统</b>(基于 Linux "
 "内核), 还包括您梦寐以求的<b>海量应用程序</b>。"
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux 是现今最<b>友好</b>的 Linux 发行版之一。它还是世界上<b>使用最为"
+"Mandrivalinux 是现今最<b>友好</b>的 Linux 发行版之一。它还是世界上<b>使用最为"
 "广泛</b>的 Linux 发行版之一!"
 
 #: share/advertising/02.pl:13
@@ -15464,13 +15464,13 @@ msgstr "欢迎进入<b>开放源代码世界</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux 专注于开放源代码模型。这意味着您现在看到的新版本就是 "
-"<b>Mandrakesoft 开发者团队</b>和来自<b>世界各地 Mandrakelinux 贡献者社区</b>"
+"Mandrivalinux 专注于开放源代码模型。这意味着您现在看到的新版本就是 "
+"<b>Mandriva 开发者团队</b>和来自<b>世界各地 Mandrivalinux 贡献者社区</b>"
 "共同努力的结果。"
 
 #: share/advertising/02.pl:19
@@ -15489,9 +15489,9 @@ msgstr "<b>GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"发行版中包含的绝大多数软件以及 Mandrakelinux 专有的全部工具都以 <b>GPL</b> 协"
+"发行版中包含的绝大多数软件以及 Mandrivalinux 专有的全部工具都以 <b>GPL</b> 协"
 "议放出。"
 
 #: share/advertising/03.pl:17
@@ -15521,13 +15521,13 @@ msgstr "<b>加入社区</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinux 拥有的用户和开发者<b>社区人数众多</b>。这样的社区所扮演的角色十"
-"分广泛, 从错误报告到开发新程序。社区在 Mandrakelinux 世界中扮演着<b>至关重要"
+"Mandrivalinux 拥有的用户和开发者<b>社区人数众多</b>。这样的社区所扮演的角色十"
+"分广泛, 从错误报告到开发新程序。社区在 Mandrivalinux 世界中扮演着<b>至关重要"
 "</b>的角色。"
 
 #: share/advertising/04.pl:17
@@ -15549,11 +15549,11 @@ msgstr "<b>下载版本</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"您正在安装 <b>Mandrakelinux 下载版本</b>。这是一种免费下载的版本, "
-"Mandrakesoft 想要将其贡献给<b>每个人</b>。"
+"您正在安装 <b>Mandrivalinux 下载版本</b>。这是一种免费下载的版本, "
+"Mandriva 想要将其贡献给<b>每个人</b>。"
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -15580,8 +15580,8 @@ msgstr "\t* <b>私有软件</b> (诸如 Acrobat® Reader®、RealPlayer®、Flas
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
-msgstr "您也无法访问 Mandrakesoft 其它产品中<b>所赠送的增值服务</b>。"
+"Mandriva products either."
+msgstr "您也无法访问 Mandriva 其它产品中<b>所赠送的增值服务</b>。"
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -15590,8 +15590,8 @@ msgstr "<b>探索, 您的第一个 Linux 桌面</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "您正在安装 <b>Mandrakelinux 探索版</b>。"
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "您正在安装 <b>Mandrivalinux 探索版</b>。"
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -15612,17 +15612,17 @@ msgstr "<b>专业版, Linux 终极桌面</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "您正在安装 <b>Mandrakelinux 专业版</b>。"
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "您正在安装 <b>Mandrivalinux 专业版</b>。"
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"专业版是 Mandrakesoft 的<b>金牌 Linux 桌面</b>产品。除了是最易用最友好的 "
+"专业版是 Mandriva 的<b>金牌 Linux 桌面</b>产品。除了是最易用最友好的 "
 "Linux 发行版, 专业版还包括了<b>数千应用程序</b> - 从最流行程序到最专业的程序"
 "一应俱全。"
 
@@ -15633,8 +15633,8 @@ msgstr "<b>专业版+, 桌面和服务器的 Linux 解决方案</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "您正在安装 <b>Mandrakelinux 专业版+</b>。"
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "您正在安装 <b>Mandrivalinux 专业版+</b>。"
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -15649,20 +15649,20 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesoft 产品</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandriva 产品</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
-msgstr "<b>Mandrakesoft</b> 开发了广泛的 <b>Mandrakelinux</b> 产品线。"
+msgstr "<b>Mandriva</b> 开发了广泛的 <b>Mandrivalinux</b> 产品线。"
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux 产品包括:"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux 产品包括:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -15682,68 +15682,68 @@ msgstr "\t* <b>专业版+</b>, 桌面和服务器的 Linux 解决方案。"
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux for x86-64</b>, 充分发挥您 64 位处理器性能的 "
-"Mandrakelinux 解决方案。"
+"\t* <b>Mandrivalinux for x86-64</b>, 充分发挥您 64 位处理器性能的 "
+"Mandrivalinux 解决方案。"
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesoft 产品(随身产品)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandriva 产品(随身产品)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft 开发了两款随身产品, 使得您可以在不安装的情况下<b>在任何计算机上"
-"</b>使用 Mandrakelinux:"
+"Mandriva 开发了两款随身产品, 使得您可以在不安装的情况下<b>在任何计算机上"
+"</b>使用 Mandrivalinux:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
-msgstr "\t* <b>Move</b>, 直接从可启动光盘中运行的 Mandrakelinux 发行版。"
+msgstr "\t* <b>Move</b>, 直接从可启动光盘中运行的 Mandrivalinux 发行版。"
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, 预装于超强压缩的 LaCie 移动硬盘中的 Mandrakelinux 发"
+"\t* <b>GlobeTrotter</b>, 预装于超强压缩的 LaCie 移动硬盘中的 Mandrivalinux 发"
 "行版。"
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Mandrakesoft 产品(专业解决方案)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Mandriva 产品(专业解决方案)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
-msgstr "下面是 Mandrakesoft 专为适合<b>专业需求</b>所设计的产品:"
+msgstr "下面是 Mandriva 专为适合<b>专业需求</b>所设计的产品:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>企业桌面</b>, 商务适用的 Mandrakelinux 桌面。"
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgstr "\t* <b>企业桌面</b>, 商务适用的 Mandrivalinux 桌面。"
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>企业服务器</b>, Mandrakelinux 服务器解决方案。"
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>企业服务器</b>, Mandrivalinux 服务器解决方案。"
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>多网络防火墙</b>, Mandrakelinux 安全解决方案。"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>多网络防火墙</b>, Mandrivalinux 安全解决方案。"
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -15786,9 +15786,9 @@ msgstr "<b>选择您喜爱的桌面环境</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"在专业版中, 您可以选择各种<b>图形桌面环境</b>。而 Mandrakesoft 为您预设的桌面"
+"在专业版中, 您可以选择各种<b>图形桌面环境</b>。而 Mandriva 为您预设的桌面"
 "环境是 <b>KDE</b>。"
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -15813,9 +15813,9 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"在专业版+中, 您可以选择各种<b>图形桌面环境</b>。而 Mandrakesoft 为您预设的桌"
+"在专业版+中, 您可以选择各种<b>图形桌面环境</b>。而 Mandriva 为您预设的桌"
 "面环境是 <b>KDE</b>。"
 
 #: share/advertising/14.pl:15
@@ -15938,10 +15938,10 @@ msgstr "<b>享受广泛的应用程序</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"在 Mandrakelinux 菜单中, 您可<b>轻而易举</b>的找到完成<b>各种任务</b>的应用程"
+"在 Mandrivalinux 菜单中, 您可<b>轻而易举</b>的找到完成<b>各种任务</b>的应用程"
 "序:"
 
 #: share/advertising/18.pl:16
@@ -16186,17 +16186,17 @@ msgstr "\t* <b>Postfix</b> 和 <b>Sendmail</b>：流行而强大的邮件服务�
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux 控制中心</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux 控制中心</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrakelinux 控制中心</b>是 Mandrakelinux 特有工具的大集合, 它可显著简化"
+"<b>Mandrivalinux 控制中心</b>是 Mandrivalinux 特有工具的大集合, 它可显著简化"
 "对计算机的配置。"
 
 #: share/advertising/25.pl:17
@@ -16220,14 +16220,14 @@ msgstr "<b>开放源代码模型</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "与其它软件编程方式相同, 开放源代码软件<b>需要时间和人力</b>进行开发。为了遵从"
-"开放源代码理念, Mandrakesoft 会销售增值产品和服务, 以便进一步<b>改进 "
-"Mandrakelinux</b>。如果您想要<b>支持开放源代码理念</b>以及 Mandrakelinux 的开"
+"开放源代码理念, Mandriva 会销售增值产品和服务, 以便进一步<b>改进 "
+"Mandrivalinux</b>。如果您想要<b>支持开放源代码理念</b>以及 Mandrivalinux 的开"
 "发, <b>请</b>考虑购买我们的产品或服务！"
 
 #: share/advertising/27.pl:13
@@ -16238,10 +16238,10 @@ msgstr "<b>在线商店</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"要了解关于 Mandrakesoft 产品和服务的更多信息, 您可以参观我们的<b>电子商务平台"
+"要了解关于 Mandriva 产品和服务的更多信息, 您可以参观我们的<b>电子商务平台"
 "</b>。"
 
 #: share/advertising/27.pl:17
@@ -16263,21 +16263,21 @@ msgstr "驻足 <b>store.mandrakesoft.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
-msgstr "<b>Mandrakeclub</b> 是您 Mandrakelinux 产品的<b>绝佳拍档</b>..."
+msgstr "<b>Mandriva Club</b> 是您 Mandrivalinux 产品的<b>绝佳拍档</b>..."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
-msgstr "加入 Mandrakeclub, 您可充分享受各项<b>超值回馈</b>, 例如："
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
+msgstr "加入 Mandriva Club, 您可充分享受各项<b>超值回馈</b>, 例如："
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -16297,36 +16297,36 @@ msgstr "\t* 访问<b>商业应用程序</b>(例如 NVIDIA® 或 ATI™ 的驱动
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* 参与 Mandrakelinux <b>用户论坛</b>。"
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* 参与 Mandrivalinux <b>用户论坛</b>。"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
-"\t* <b>优先访问</b>, 在公众之前优先访问 Mandrakelinux <b>ISO 映像</b>。"
+"\t* <b>优先访问</b>, 在公众之前优先访问 Mandrivalinux <b>ISO 映像</b>。"
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
-msgstr "<b>Mandrakeonline</b> 是 Mandrakesoft 为客户特别开发的全新金牌服务。"
+msgstr "<b>Mandriva Online</b> 是 Mandriva 为客户特别开发的全新金牌服务。"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline 为<b>轻松更新</b>您的 Mandrakelinux 系统提供了范围广泛的增值服"
+"Mandriva Online 为<b>轻松更新</b>您的 Mandrivalinux 系统提供了范围广泛的增值服"
 "务："
 
 #: share/advertising/29.pl:18
@@ -16349,38 +16349,38 @@ msgstr "\t* 灵活的<b>按计划</b>更新。"
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
-msgstr "\t* 通过一个账户管理<b>您所有的 Mandrakelinux 系统</b>。"
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+msgstr "\t* 通过一个账户管理<b>您所有的 Mandrivalinux 系统</b>。"
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 "您需要<b>帮助</b>吗?您可在<b>我们的技术支持平台</b> www.mandrakeexpert.com "
-"与 Mandrakesoft 的技术专家会面。"
+"与 Mandriva 的技术专家会面。"
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"感谢<b>具有资质认证的 Mandrakelinux 专家</b>的帮助, 您将能够节省大量时间。"
+"感谢<b>具有资质认证的 Mandrivalinux 专家</b>的帮助, 您将能够节省大量时间。"
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"如果有关于 Mandrakelinux 的任何问题, 您都可以在 <b>store.mandrakesoft.com</"
+"如果有关于 Mandrivalinux 的任何问题, 您都可以在 <b>store.mandrakesoft.com</"
 "b> 购买支持事件。"
 
 #: share/compssUsers.pl:25
@@ -16673,8 +16673,8 @@ msgstr "监视工具、进程统计、tcpdump、nmap……"
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesoft 向导"
+msgid "Mandriva Wizards"
+msgstr "Mandriva 向导"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -16764,8 +16764,8 @@ msgstr ""
 "\n"
 "选项:\n"
 "  --help            - 打印此帮助信息。\n"
-"  --report          - 程序应该是 Mandrakelinux 工具之一\n"
-"  --incident        - 程序应该是 Mandrakelinux 工具之一"
+"  --report          - 程序应该是 Mandrivalinux 工具之一\n"
+"  --incident        - 程序应该是 Mandrivalinux 工具之一"
 
 #: standalone.pm:63
 #, c-format
@@ -16819,7 +16819,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16833,7 +16833,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[选项]...\n"
-"Mandrakelinux 终端服务器配置\n"
+"Mandrivalinux 终端服务器配置\n"
 "--enable         :启用 MTS\n"
 "--disable        :禁用 MTS\n"
 "--start          :启动 MTS\n"
@@ -16886,14 +16886,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[选项]...\n"
-"  --no-confirmation      不询问 MandrakeUpdate 模块中的第一个确认问题\n"
+"  --no-confirmation      不询问 Mandriva Update 模块中的第一个确认问题\n"
 "  --no-verify-rpm        不校验包签名\n"
 "  --changelog-first      在描述窗口中的文件列表前显示更改日志\n"
 "  --merge-all-rpmnew     计划合并找到的所有 .rpmnew/.rpmsave 文件"
@@ -19670,13 +19670,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux 故障报告工具"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux 故障报告工具"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux 控制中心"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux 控制中心"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19696,8 +19696,8 @@ msgstr "Drak 硬盘管理"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -19741,8 +19741,8 @@ msgstr "配置向导"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "选择 Mandrakesoft 工具:"
+msgid "Select Mandriva Tool:"
+msgstr "选择 Mandriva 工具:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20163,19 +20163,19 @@ msgstr "开机时启动"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "这块网卡还没有配置过。\n"
-"请从“Mandrakelinux 控制中心”运行“添加网卡”助手"
+"请从“Mandrivalinux 控制中心”运行“添加网卡”助手"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "您从未配置过 Internet 连接。\n"
-"请从 Mandrakelinux 控制中心运行“%s”助手"
+"请从 Mandrivalinux 控制中心运行“%s”助手"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20225,8 +20225,8 @@ msgstr "KDM (KDE 显示管理器)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux 显示管理器)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux 显示管理器)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -20522,7 +20522,7 @@ msgstr "导入"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -20531,7 +20531,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"版权 (C) 2001-2002 由 Mandrakesoft 持有\n"
+"版权 (C) 2001-2002 由 Mandriva 持有\n"
 "\n"
 "\n"
 "       DUPONT Sebastien (原始版本)\n"
@@ -21060,14 +21060,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " Drak 帮助 0.1\n"
-"版权 (C) 2003-2004 Mandrakesoft.\n"
+"版权 (C) 2003-2004 Mandriva.\n"
 "这是自由软件, 可按照 GNU GPL 协议条款再发放。\n"
 "\n"
 "用法: \n"
@@ -21092,8 +21092,8 @@ msgstr " --doc <link>          - 链接到其他网页 ( 给 WM 欢迎的前端�
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux 帮助中心"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinux 帮助中心"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -24317,8 +24317,8 @@ msgstr "修改已经完成, 不过您必须退出登录修改才会生效"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinux 工具日志"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinux 工具日志"
 
 #: standalone/logdrake:51
 #, c-format
@@ -24830,10 +24830,10 @@ msgstr "连接完成。"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "连接失败。\n"
-"请在 Mandrakelinux 控制中心中检查您的配置。"
+"请在 Mandrivalinux 控制中心中检查您的配置。"
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/zh_TW.po b/perl-install/share/po/zh_TW.po
index 75d7c3783..c109f5e31 100644
--- a/perl-install/share/po/zh_TW.po
+++ b/perl-install/share/po/zh_TW.po
@@ -78,13 +78,13 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "您的 USB 隨身碟似乎有防寫保護，但是我們現在無法安全的移除它。\n"
 "\n"
 "\n"
 "請按下此按鈕來重新開機，移除隨身碟並解除它的寫入保護，接著重\n"
-"新插入隨身碟，最後重新啟動 Mandrake Move。"
+"新插入隨身碟，最後重新啟動 Mandriva Move。"
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -102,7 +102,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -110,7 +110,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -118,7 +118,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -244,7 +244,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1268,11 +1268,11 @@ msgstr "語言選擇"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 ""
-"Mandrakelinux 能支援多種語言. 選擇您想安裝的語言.\n"
+"Mandrivalinux 能支援多種語言. 選擇您想安裝的語言.\n"
 "他們將可使用於您的安裝完成與您重新開始您的系統之後."
 
 #: any.pm:752 any.pm:773 help.pm:647
@@ -3580,12 +3580,12 @@ msgstr "啟用音效支援"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "在繼續之前，您應該仔細的閱讀下面相關版權條款。\n"
-"這包含整個 Mandrakelinux 發行版的版權內容。若是您同意裡面的所有條款，\n"
+"這包含整個 Mandrivalinux 發行版的版權內容。若是您同意裡面的所有條款，\n"
 "請點選 \"%s\" 按鈕，否則請點選 \"%s\" 按鈕並自動重新開機。"
 
 #: help.pm:14 install_steps_gtk.pm:556 install_steps_interactive.pm:92
@@ -3753,13 +3753,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinux 安裝片包含數張光碟片. 若一所選擇的套件是位於另一張光碟,\n"
+"Mandrivalinux 安裝片包含數張光碟片. 若一所選擇的套件是位於另一張光碟,\n"
 "DrakeX 會彈出現在的光碟且要求您放入所要求的正確光碟片.\n"
 "若您沒有要求的光碟在手上的話, 就按下 \"%s\", 對應的套件不會被安裝."
 
@@ -3767,11 +3767,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3822,10 +3822,10 @@ msgid ""
 "command-line interface. The total size of this installation is about 65\n"
 "megabytes."
 msgstr ""
-"現在是指定那個程式您想要裝在您的系統上. Mandrakelinux 有上千個套件,\n"
+"現在是指定那個程式您想要裝在您的系統上. Mandrivalinux 有上千個套件,\n"
 "為了簡單管理, 相似性質的應用程式已經被分類到群組裡.\n"
 "\n"
-"Mandrakelinux 分類套件群組於四個範疇. 你能由不同範疇混合與配對應用程式,\n"
+"Mandrivalinux 分類套件群組於四個範疇. 你能由不同範疇混合與配對應用程式,\n"
 "所以一個 ``工作站''安裝也能安裝``伺服器''範疇安裝的應用程式.\n"
 "\n"
 " * \"%s\": 如果您計畫用您的機器當作一個工作站, 選擇一個或\n"
@@ -3920,10 +3920,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'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4050,7 +4050,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4163,12 +4163,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4195,7 +4195,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've 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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4204,7 +4204,7 @@ msgid ""
 "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 Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4224,12 +4224,12 @@ 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 ""
-"您需要決定那裡你想要安裝 Mandrakelinux\n"
+"您需要決定那裡你想要安裝 Mandrivalinux\n"
 "作業系統於那個硬碟. 如果您的硬碟是全新尚未使用或\n"
 "已經存在的作業系統正在使用全部可被利用的空間, 您將\n"
 "必須進行分割硬碟的動作. 基本上, 分割硬碟的動作包含\n"
 "邏輯上劃分它以建立需要的空間來安裝您的新\n"
-"Mandrakelinux 系統.\n"
+"Mandrivalinux 系統.\n"
 "\n"
 "因為分割硬碟的動作程序通常是無法回復的\n"
 "且能導致資料遺失, 若您是一位不熟練的使用者,\n"
@@ -4255,7 +4255,7 @@ msgstr ""
 "重新調整 Microsoft Windows FAT 或 NTFS 分割區大小.\n"
 "若您已經 defragment(不連續碎片重新整理) Windows 分割\n"
 "且它用 FAT 格式.重新調整分割可以被執行於不遺失任何資料\n"
-"資料備份是被強烈建議的. 若您想要使用 Mandrakelinux and Microsoft\n"
+"資料備份是被強烈建議的. 若您想要使用 Mandrivalinux and Microsoft\n"
 "Windows 於同一台電腦, 使用此選項是被建議的.\n"
 "\n"
 "   選擇此選項前, 請了解當使用這個過程項目後, Microsoft Windows\n"
@@ -4263,7 +4263,7 @@ msgstr ""
 " Microsoft Windows 來存您的資料與安裝新軟體.\n"
 "\n"
 " * \"%s\". 如果您想要刪除全部現存於您的硬碟上資料與\n"
-"分割且以您的新 Mandrakelinux 系統替換他們,\n"
+"分割且以您的新 Mandrivalinux 系統替換他們,\n"
 "選此選項. 但是小心使用, 你將無法於你確認之後\n"
 "逆反你的決定.\n"
 "\n"
@@ -4415,7 +4415,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4430,7 +4430,7 @@ msgstr ""
 "您將不行重新恢復它.\n"
 "當您準備好要格式化此分割, 點選 \"%s\".\n"
 "\n"
-"若您想選擇另一個分割給您的新的 Mandrakelinux 作業系統安裝, 點選了\"%s\".\n"
+"若您想選擇另一個分割給您的新的 Mandrivalinux 作業系統安裝, 點選了\"%s\".\n"
 "若您想選擇要被檢查磁碟上壞的區塊的分割, 點選.\"%s\"."
 
 #: help.pm:431 install_steps_gtk.pm:392 interactive.pm:434
@@ -4445,7 +4445,7 @@ msgstr "上一步"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4457,7 +4457,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"此時您安裝 Mandrakelinux 時, 或許自從初始釋出的某些套件將有更新.\n"
+"此時您安裝 Mandrivalinux 時, 或許自從初始釋出的某些套件將有更新.\n"
 "臭蟲或許已經修正了, 安全性問題解決了. 為了允許您從這些更新中\n"
 "獲得利益, 您現在可以由網際網路下載他們. 如果您有可用的網際網路連線,\n"
 "選取 \"%s\", 或是, 如果您想稍後安裝更新套件, 選取 \"%s\".\n"
@@ -4482,7 +4482,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4493,7 +4493,7 @@ msgstr ""
 "安全性等級應該設定較高. 權衡之下, 較高的安全性等級換得不容易使用.\n"
 "\n"
 "如果您不知道選什麼, 保留預設選項. 您將能在稍後用 draksec 工具改變它,\n"
-"draksec 是 Mandrakelinux 控制中心的一部分.用負責安全性的人的 e-mail 地址填入 "
+"draksec 是 Mandrivalinux 控制中心的一部分.用負責安全性的人的 e-mail 地址填入 "
 "\"%s\" 欄位. 安全性訊息將被寄到\n"
 "那個位址."
 
@@ -4506,7 +4506,7 @@ msgstr "安全性管理員:"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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"
@@ -4576,7 +4576,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"在這個階段, 您需要選擇要用來安裝 Mandrakelinux 系統的分割區.\n"
+"在這個階段, 您需要選擇要用來安裝 Mandrivalinux 系統的分割區.\n"
 "如果分割區已經被定義了, 不管是從舊有的 GNU/Linux 安裝或是\n"
 "另一個處理分割區的工具, 您可以使用原本已經劃分好的分割區.\n"
 "否則硬碟分割必須要被定義.\n"
@@ -4651,7 +4651,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4680,7 +4680,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "多於一個 Microsoft 分割區已經在您的硬碟上被偵測到. 請選擇您希望要重新調整 大"
-"小的分割以便安裝您的新的 Mandrakelinux 作業系統.\n"
+"小的分割以便安裝您的新的 Mandrivalinux 作業系統.\n"
 "\n"
 "每個分割區都列出了像是: \"Linux 名稱\", \"Windows 名稱\", \"容量\".\n"
 "\n"
@@ -4722,7 +4722,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4731,13 +4731,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4790,7 +4790,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4827,7 +4827,7 @@ msgstr ""
 "選擇英文當預設語言且在進階部份選擇 \"%s\".\n"
 "\n"
 "關於 UTF-8 (unicode) 支援: Unicode 是一個新的字元編碼以含蓋全部存在的語言.\n"
-"然而, 在 GNU/Linux 下完全的支援仍然在開發中. 因為那個原因, Mandrakelinux 的\n"
+"然而, 在 GNU/Linux 下完全的支援仍然在開發中. 因為那個原因, Mandrivalinux 的\n"
 " UTF-8 使用將根據使用者的選擇:\n"
 "\n"
 " * 如果您選擇一個有強烈舊式編碼的語言 (latin1 語言, 俄羅斯, 日本, 中國,\n"
@@ -5032,7 +5032,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5053,11 +5053,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "現在要選擇您的電腦要使用的列印系統. 其他作業系統或許只有提供您一種選擇,\n"
-"但是 Mandrakelinux 這邊提供了兩種選擇. 每一種列印系統是最適合於特別設定型"
+"但是 Mandrivalinux 這邊提供了兩種選擇. 每一種列印系統是最適合於特別設定型"
 "態.\n"
 "\n"
 " * \"%s\" - 是 ``print, do not queue (列印, 不排隊)'' 之縮寫字, 是當您有一"
@@ -5075,7 +5075,7 @@ msgstr ""
 "\"%s\" 提供了圖形的介面前端給列印, 選擇列印的選項, 管理印表機.\n"
 "\n"
 "如果您現在做出決定, 且您之後發現不喜歡您的列印系統, 您可以藉由從\n"
-"Mandrakelinux 控制中心執行 PrinterDrake 點選 \"%s\" 按鍵改變它."
+"Mandrivalinux 控制中心執行 PrinterDrake 點選 \"%s\" 按鍵改變它."
 
 #: help.pm:765
 #, c-format
@@ -5185,7 +5185,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5202,7 +5202,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5264,10 +5264,10 @@ msgstr "服務"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"選擇您想要抹除的硬碟來安裝新的 Mandrakelinux 分割. 小心,\n"
+"選擇您想要抹除的硬碟來安裝新的 Mandrivalinux 分割. 小心,\n"
 "磁碟上全部資料將遺失且將無法挽回!"
 
 #: help.pm:863
@@ -5612,11 +5612,11 @@ msgstr "計算 Windows 分割區大小"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "您的 Windows 分割區太支離破碎。請先用 Windows 重新開機，執行  ``defrag'' 工具"
-"程式，然後重新開始安裝 Mandrakelinux 。"
+"程式，然後重新開始安裝 Mandrivalinux 。"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -5728,19 +5728,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5762,7 +5762,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5770,14 +5770,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5787,7 +5787,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -5807,10 +5807,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5821,11 +5821,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva 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\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5841,7 +5841,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 
 #: install_messages.pm:90
@@ -5926,7 +5926,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5934,21 +5934,21 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "恭喜您！系統已經完成安裝。\n"
 "請取出開機媒介並按下 return 以重新開機。\n"
 "\n"
 "\n"
-"要獲得這個 Mandrakelinux 釋出版本可用的修正相關資訊，\n"
+"要獲得這個 Mandrivalinux 釋出版本可用的修正相關資訊，\n"
 "請諮詢可用的勘誤表：\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"關於如何設定您系統的資訊可以在官方 Mandrakelinux 使用者指南\n"
-"(Official Mandrakelinux User's Guide) 的安裝後章節 (post install chapter )\n"
+"關於如何設定您系統的資訊可以在官方 Mandrivalinux 使用者指南\n"
+"(Official Mandrivalinux User's Guide) 的安裝後章節 (post install chapter )\n"
 "裡面找到。"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5983,11 +5983,11 @@ msgstr "進入步驟 `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"您的系統資源太少。您可能會在安裝 Mandrakelinux 過程中遇到問題。\n"
+"您的系統資源太少。您可能會在安裝 Mandrivalinux 過程中遇到問題。\n"
 "若是真的發生問題，您或許可以改用文字模式的安裝方式來取代。\n"
 "要如此作的話m，請在光碟開機時按下 `F1'，然後輸入 `text'。"
 
@@ -6518,7 +6518,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr "連結到 Mirror Linux Web Site 查詢可用的映射站台"
 
 #: install_steps_interactive.pm:840
@@ -6735,8 +6735,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux 安裝程式 %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux 安裝程式 %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9315,13 +9315,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall 設定程式\n"
 "\n"
-"這是用來設定個人防火牆給 Mandrakelinux 機器.\n"
+"這是用來設定個人防火牆給 Mandrivalinux 機器.\n"
 "若是您需要很致力強大的防火牆解決方案, 請您參閱\n"
 "專門的 MandrakeSecurity Firewall distribution 產品資訊."
 
@@ -13172,7 +13172,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
@@ -14950,18 +14950,18 @@ msgstr "停止"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mandrakelinux 是什麼？</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Mandrivalinux 是什麼？</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "歡迎來到 <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "歡迎來到 <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14970,7 +14970,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -14987,9 +14987,9 @@ msgstr "歡迎來到開放源碼的世界。"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
 
@@ -15009,7 +15009,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -15035,10 +15035,10 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -15057,8 +15057,8 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -15085,7 +15085,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -15095,7 +15095,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15114,13 +15114,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
@@ -15132,7 +15132,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15146,19 +15146,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "Mandrakelinux 控制中心"
+msgid "<b>Mandriva Products</b>"
+msgstr "Mandrivalinux 控制中心"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -15179,61 +15179,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -15271,7 +15271,7 @@ msgstr "選擇您檔案系統所使用的加密金鑰"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -15292,7 +15292,7 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -15322,7 +15322,7 @@ msgstr ""
 #: share/advertising/15.pl:13
 #, fuzzy, c-format
 msgid "<b>Kontact</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/15.pl:15
 #, c-format
@@ -15409,7 +15409,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -15644,14 +15644,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux 控制中心</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux 控制中心</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -15673,21 +15673,21 @@ msgstr ""
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
 #: share/advertising/27.pl:13
 #, fuzzy, c-format
 msgid "<b>Online Store</b>"
-msgstr "Mandrakelinux 控制中心"
+msgstr "Mandrivalinux 控制中心"
 
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
 
@@ -15710,20 +15710,20 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -15742,33 +15742,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline 線上服務</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online 線上服務</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -15791,32 +15791,32 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
@@ -16112,8 +16112,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakelinux 精靈"
+msgid "Mandriva Wizards"
+msgstr "Mandrivalinux 精靈"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -16208,7 +16208,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16256,7 +16256,7 @@ msgstr ""
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -16326,7 +16326,7 @@ msgstr ""
 #: standalone/drakTermServ:211 standalone/drakTermServ:214
 #, fuzzy, c-format
 msgid "Terminal Server Configuration"
-msgstr "Mandrake Terminal Server 設定"
+msgstr "Mandriva Terminal Server 設定"
 
 #: standalone/drakTermServ:220
 #, c-format
@@ -16471,7 +16471,7 @@ msgstr ""
 #: standalone/drakTermServ:509
 #, fuzzy, c-format
 msgid "Terminal Server Overview"
-msgstr "Mandrake Terminal Server 設定"
+msgstr "Mandriva Terminal Server 設定"
 
 #: standalone/drakTermServ:510
 #, c-format
@@ -18821,13 +18821,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinux 臭蟲回報工具"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinux 臭蟲回報工具"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux 控制中心"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux 控制中心"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18847,8 +18847,8 @@ msgstr "HardDrake 硬體偵測設定"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline 線上服務"
+msgid "Mandriva Online"
+msgstr "Mandriva Online 線上服務"
 
 #: standalone/drakbug:52
 #, c-format
@@ -18892,7 +18892,7 @@ msgstr "設定巫師"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -19305,17 +19305,17 @@ msgstr "於開機時啟動"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr "網路介面尚未設定, 請執行設定巫師"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "您沒有任何已設定好的網路連線。\n"
-"請由 Mandrakelinux 控制中心啟動 \"%s\" 設定精靈"
+"請由 Mandrivalinux 控制中心啟動 \"%s\" 設定精靈"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -19365,8 +19365,8 @@ msgstr "KDM (KDE 登入管理員)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux 登入管理員)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (Mandrivalinux 登入管理員)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -19658,7 +19658,7 @@ msgstr "匯入"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -20159,7 +20159,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -20186,7 +20186,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Mandrake 控制中心"
 
 #: standalone/drakhelp:36
@@ -23108,7 +23108,7 @@ msgid ""
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
-"這是 HardDrake 程式, Mandrakelinux 所發展的硬體檢視設定工具。\n"
+"這是 HardDrake 程式, Mandrivalinux 所發展的硬體檢視設定工具。\n"
 "<span foreground=\"royalblue3\">版本：</span> %s\n"
 "<span foreground=\"royalblue3\">作者:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
@@ -23219,7 +23219,7 @@ msgstr "變更已經完成，不過您需要重新登入才能夠生效"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Mandrake 工具紀錄"
 
 #: standalone/logdrake:51
@@ -23732,10 +23732,10 @@ msgstr "連線完成。"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "連線失敗。\n"
-"請檢查您在 Mandrakelinux 控制中心的設定。"
+"請檢查您在 Mandrivalinux 控制中心的設定。"
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index 64734b0d1..dc7380a31 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -82,7 +82,7 @@ OPTIONS:
            'draksec' => "[--debug]
 --debug: print debugging information",
            'drakTermServ' => N_("[OPTIONS]...
-Mandrakelinux Terminal Server Configurator
+Mandrivalinux Terminal Server Configurator
 --enable         : enable MTS
 --disable        : disable MTS
 --start          : start MTS
@@ -106,7 +106,7 @@ Network & Internet connection and monitoring application
 --quiet : do not be interactive. To be used with (dis)connect."),
 	      'printerdrake' => N_(" [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"),
 	      'rpmdrake' => N_("[OPTION]...
-  --no-confirmation      do not ask first confirmation question in MandrakeUpdate mode
+  --no-confirmation      do not ask first confirmation question in Mandriva Update mode
   --no-verify-rpm        do not verify packages signatures
   --changelog-first      display changelog before filelist in the description window
   --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"),
@@ -116,7 +116,7 @@ Network & Internet connection and monitoring application
        XFdrake resolution"),
 	      );
 
-$usages{$_} = $usages{rpmdrake} foreach qw(rpmdrake-remove MandrakeUpdate);
+$usages{$_} = $usages{rpmdrake} foreach qw(rpmdrake-remove Mandriva Update);
 $usages{Xdrakres} = $usages{XFdrake};
 
 
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 58ad9f2bf..abd178f31 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -92,7 +92,7 @@ my $desktop_combo = Gtk2::ComboBox->new_with_strings(\@sessions, if_(member($aut
 
 my %themes = 	('path' => '/usr/share/bootsplash/themes/',
    	        'sysconfig' => '/etc/sysconfig/bootsplash',
-                'default' => 'Mandrakelinux',
+                'default' => 'Mandrivalinux',
                 'def_thmb' => '/usr/share/libDrakX/pixmaps/nosplash_thumb.png',
                 'lilo' => {'file' => '/lilo/message',
                            'thumb' => '/lilo/thumb.png' },
diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug
index 6aaa333e2..69dd95f24 100755
--- a/perl-install/standalone/drakbug
+++ b/perl-install/standalone/drakbug
@@ -38,17 +38,17 @@ foreach (@ARGV) {
     /^--incident$/ && shift @ARGV and do { $incident = 1; $prog = shift @ARGV };
 }
 
-my $window = ugtk2->new(N("Mandrakelinux Bug Report Tool"), center => 1);
+my $window = ugtk2->new(N("Mandrivalinux Bug Report Tool"), center => 1);
 $window->{rwindow}->set_border_width(5);
 $window->{window}->signal_connect("delete_event", sub { ugtk2->exit(0) });
 
 my $mdk_app = { 
-	       N("Mandrakelinux Control Center") => 'drakconf',
+	       N("Mandrivalinux Control Center") => 'drakconf',
 	       N("First Time Wizard") => 'drakfw',
 	       N("Synchronization tool") => 'draksync',  
 	       N("Standalone Tools") => ['adduserdrake', 'diskdrake', 'drakautoinst', 'drakbackup', 'drakboot', 'DrakBug', 'DrakClock', 'DrakConnect', 'drakfloppy', 'drakfirewall', 'drakfont', 'drakgw', 'DrakSec', 'draksplash', 'drakvpn', 'drakxservices', 'drakxtools', 'drakxtv', 'keyboardrake', 'logdrake', 'mousedrake', 'net_monitor', 'printerdrake', 'scannerdrake', 'XFdrake'],
 	       N("HardDrake") => 'harddrake2',
-	       N("Mandrakeonline") => 'mdkonline',
+	       N("Mandriva Online") => 'mdkonline',
 	       N("Menudrake") => 'menudrake',
 	       N("Msec") => 'msec',
 	       N("Remote Control") => 'rfbdrake',
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index e7b1a0599..2a2337733 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -951,7 +951,7 @@ Configure them first by clicking on 'Configure'")));
                                               update();
                                           });
 	} else {
-	    $widget_temp = N("This interface has not been configured yet.\nRun the \"Add an interface\" assistant from the Mandrakelinux Control Center");
+	    $widget_temp = N("This interface has not been configured yet.\nRun the \"Add an interface\" assistant from the Mandrivalinux Control Center");
 	}
 	$vbox_local->pack_start(gtkpack__(Gtk2::HBox->new(0,0),
 					  $widget_temp
@@ -1007,7 +1007,7 @@ sub configure_net {
                     N("Warning"),
                     #-PO: here "Add Connection" should be translated the same was as in control-center
                     N("You do not have any configured Internet connection.
-Run the \"%s\" assistant from the Mandrakelinux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)")));
+Run the \"%s\" assistant from the Mandrivalinux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)")));
         $in->exit;
     }
     my $cnx = {};
diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm
index 65c0efee1..5ba4894c7 100644
--- a/perl-install/standalone/drakedm
+++ b/perl-install/standalone/drakedm
@@ -33,7 +33,7 @@ my $cfg_file = '/etc/sysconfig/desktop';
 
 my %dm = ('GNOME' => [ N("GDM (GNOME Display Manager)"), '/usr/bin/gdm', 'gdm' ],
           'KDM'   => [ N("KDM (KDE Display Manager)"), '/usr/bin/kdm', 'kdebase-kdm' ],
-          'KDE'   => [ N("MdkKDM (Mandrakelinux Display Manager)"), '/usr/bin/mdkkdm', 'mdkkdm' ],
+          'KDE'   => [ N("MdkKDM (Mandrivalinux Display Manager)"), '/usr/bin/mdkkdm', 'mdkkdm' ],
           'XDM'   => [ N("XDM (X Display Manager)"), '/usr/bin/X11/xdm', 'xorg-x11' ],
           );
 
diff --git a/perl-install/standalone/drakhelp b/perl-install/standalone/drakhelp
index d7b6ff6ed..303c06d9a 100644
--- a/perl-install/standalone/drakhelp
+++ b/perl-install/standalone/drakhelp
@@ -33,6 +33,6 @@ my $in = interactive->vnew;
 my ($instpath, $ancpath, $package) = ctxhelp::path2help($opt, $idlabel);
 
 -e $instpath or system("/usr/sbin/drakhelp_inst $package");
--e $instpath or $in->ask_warn(N("Mandrakelinux Help Center"), N("%s cannot be displayed \n. No Help entry of this type\n", $instpath));
+-e $instpath or $in->ask_warn(N("Mandrivalinux Help Center"), N("%s cannot be displayed \n. No Help entry of this type\n", $instpath));
 
 system("/usr/bin/www-browser $ancpath &") if -e $instpath;
diff --git a/perl-install/standalone/finish-install.xsetup b/perl-install/standalone/finish-install.xsetup
index f08bc02d1..cbe08788d 100755
--- a/perl-install/standalone/finish-install.xsetup
+++ b/perl-install/standalone/finish-install.xsetup
@@ -1,5 +1,5 @@
 #!/bin/sh
-# (c) 2004 Mandrakesoft SA
+# (c) 2004 Mandriva SA
 
 # to be sourced
 if [ -f /etc/sysconfig/finish-install -a -x /usr/sbin/finish-install ]; then
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index 7db12b26c..339509723 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -47,7 +47,7 @@ $| = 1 if $isTail;
 my $h = chomp_(`hostname -s`);
 
 $ugtk2::wm_icon = "logdrake";
-my $explain_title = N("Mandrakelinux Tools Logs");
+my $explain_title = N("Mandrivalinux Tools Logs");
 my $my_win = ugtk2->new($isExplain ? $explain_title : N("Logdrake"));
 
 unless ($::isEmbedded) {
diff --git a/perl-install/standalone/net_applet b/perl-install/standalone/net_applet
index 316f2cf86..c7e5d581a 100644
--- a/perl-install/standalone/net_applet
+++ b/perl-install/standalone/net_applet
@@ -59,7 +59,7 @@ my %appletstate = (
 			  menu => [ 'confNetwork', 'refresh', 'help' ],
 			  tt => [
                                  N_("You do not have any configured Internet connection.
-Run the \"%s\" assistant from the Mandrakelinux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)"))
+Run the \"%s\" assistant from the Mandrivalinux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)"))
                                 ]
 			  }
 	    );
diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor
index 608223375..78e7eab4f 100755
--- a/perl-install/standalone/net_monitor
+++ b/perl-install/standalone/net_monitor
@@ -233,7 +233,7 @@ sub connection() {
 									  N("Disconnection from Internet complete.")) :
 						     ($isconnected ?
 						       N("Connection complete.") :
-						       N("Connection failed.\nVerify your configuration in the Mandrakelinux Control Center."))
+						       N("Connection failed.\nVerify your configuration in the Mandrivalinux Control Center."))
 						    );
  				            # remove the connection time timer if connection is down or failed
  				            $isconnected or Glib::Source->remove($ct_tag);