1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/share/po/pt.po b/perl-install/share/po/pt.po
index e662df19d..22afafb32 100644
--- a/perl-install/share/po/pt.po
+++ b/perl-install/share/po/pt.po
@@ -23,7 +23,7 @@ msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-05-31 13:03+0200\n"
-"PO-Revision-Date: 2005-06-19 19:05+0100\n"
+"PO-Revision-Date: 2005-06-19 23:52+0100\n"
 "Last-Translator: José Melo <mmodem00@gmail.com>\n"
 "Language-Team: Português <pt@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -25617,7 +25617,7 @@ msgstr "Por favor teste o seu rato:"
 #: standalone/net_applet:45
 #, c-format
 msgid "Network is up on interface %s"
-msgstr "A rede está activa no interface %s"
+msgstr "A rede está activada no interface %s"
 
 #. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
 #: standalone/net_applet:53
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