1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/standalone/po/ca.po b/perl-install/standalone/po/ca.po
index 91e0f30c6..efc3e09f9 100644
--- a/perl-install/standalone/po/ca.po
+++ b/perl-install/standalone/po/ca.po
@@ -1328,7 +1328,7 @@ msgstr "Usuari"
 
 #: draksec:335
 #, fuzzy, c-format
-msgid "Boot Configuratoin"
+msgid "Boot Configuration"
 msgstr "Configuració de l'avís"
 
 #: draksec:361
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