1 files changed, 0 insertions, 0 deletions
diff --git a/perl-install/standalone/icons/ic82-back-up-32.png b/perl-install/standalone/icons/ic82-back-up-32.png
index bfd292e0a..8295f3725 100644
--- a/perl-install/standalone/icons/ic82-back-up-32.png
+++ b/perl-install/standalone/icons/ic82-back-up-32.png
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index cc164c9c8..d56008a58 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -1088,7 +1088,7 @@ msgstr ""
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux 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 Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux 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 Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux 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 Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux 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 Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux 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 Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux 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 Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\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"
-"Mandrivalinux system.\n"
+"Mandriva Linux 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 Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux 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 Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux 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"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux 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 Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, 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 Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\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 Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux 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"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux 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 Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux 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 Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux 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, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux'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 Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux 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 Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\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"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux 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"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux 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"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux 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 Mandrivalinux installation."
+msgid "Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandriva Linux installation."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -4845,10 +4845,10 @@ msgstr ""
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -4883,7 +4883,7 @@ msgid ""
 "limitation damages for loss of business, interruption of business, financial loss, legal fees \n"
 "and penalties resulting from a court judgment, or any other consequential loss) arising out \n"
 "of the possession and use of software components or arising out of  downloading software components \n"
-"from one of Mandrivalinux sites  which are prohibited or restricted in some countries by local laws.\n"
+"from one of Mandriva Linux sites  which are prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong cryptography components \n"
 "included in the Software Products.\n"
 "\n"
@@ -4907,7 +4907,7 @@ msgid ""
 "protected by intellectual property and copyright laws applicable to software programs.\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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of Mandriva S.A.  \n"
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -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 Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -4982,13 +4982,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
 msgstr ""
 
 #: install_steps.pm:246
@@ -5016,7 +5016,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For this,\n"
+"Mandriva Linux. 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 Mandrivalinux web site to get the list of available mirrors..."
+msgid "Contacting Mandriva Linux 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 "Mandrivalinux Installation %s"
+msgid "Mandriva Linux 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 Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux 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 Mandrivalinux Control Center) to share your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux 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 Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
 msgstr ""
 
 #: share/advertising/01.pl:17
 #, c-format
-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."
+msgid "Mandriva Linux 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 "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!"
+msgid "Mandriva Linux 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 "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."
+msgid "Mandriva Linux 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 Mandriva Linux 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 Mandrivalinux tools are licensed under the <b>General Public License</b>."
+msgid "Most of the software included in the distribution and all of the Mandriva Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -13100,12 +13100,12 @@ msgstr ""
 
 #: share/advertising/04.pl:15
 #, c-format
-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."
+msgid "Mandriva Linux 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 Mandriva Linux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
 #, c-format
-msgid "To <b>learn more</b> about our dynamic community, please visit <b>www.mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel.php3</b> if you would like to get <b>involved</b> in the development."
+msgid "To <b>learn more</b> about our dynamic community, please visit <b>www.mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel.php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 
 #: share/advertising/05.pl:15
@@ -13115,7 +13115,7 @@ msgstr ""
 
 #: share/advertising/05.pl:17
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Download</b>. This is the free version that Mandriva wants to keep <b>available to everyone</b>."
+msgid "You are now installing <b>Mandriva Linux Download</b>. This is the free version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -13145,7 +13145,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -13160,7 +13160,7 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
@@ -13175,7 +13175,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -13190,12 +13190,12 @@ msgstr ""
 
 #: share/advertising/09.pl:15
 #, c-format
-msgid "<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+msgid "<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
+msgid "The Mandriva Linux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -13215,7 +13215,7 @@ msgstr ""
 
 #: share/advertising/09.pl:21
 #, c-format
-msgid "\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making the most of your 64-bit processor."
+msgid "\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
@@ -13225,17 +13225,17 @@ msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
-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:"
+msgid "Mandriva has developed two products that allow you to use Mandriva Linux <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 Mandrivalinux distribution that runs entirely from a bootable CD-ROM."
+msgid "\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
-msgid "\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the ultra-compact “LaCie Mobile Hard Drive”."
+msgid "\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
@@ -13250,17 +13250,17 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -13410,7 +13410,7 @@ msgstr ""
 
 #: share/advertising/18.pl:15
 #, c-format
-msgid "In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for <b>all of your tasks</b>:"
+msgid "In the Mandriva Linux 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>Mandrivalinux Control Center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
 msgstr ""
 
 #: share/advertising/25.pl:15
 #, c-format
-msgid "The <b>Mandrivalinux Control Center</b> is an essential collection of Mandrivalinux-specific utilities designed to simplify the configuration of your computer."
+msgid "The <b>Mandriva Linux Control Center</b> is an essential collection of Mandriva Linux-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, 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!"
+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 Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> and the development of Mandriva Linux, <b>please</b> consider buying one of our products or services!"
 msgstr ""
 
 #: share/advertising/27.pl:13
@@ -13660,7 +13660,7 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
 msgstr ""
 
 #: share/advertising/28.pl:15
@@ -13670,7 +13670,7 @@ msgstr ""
 
 #: share/advertising/28.pl:17
 #, c-format
-msgid "<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux product.."
+msgid "<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
@@ -13680,7 +13680,7 @@ msgstr ""
 
 #: share/advertising/28.pl:20
 #, c-format
-msgid "\t* <b>Special discounts</b> on products and services of our online store <b>store.mandrakesoft.com</b>."
+msgid "\t* <b>Special discounts</b> on products and services of our online store <b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/advertising/28.pl:21
@@ -13690,12 +13690,12 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
-msgid "\t* <b>Early and privileged access</b>, before public release, to Mandrivalinux <b>ISO images</b>."
+msgid "\t* <b>Early and privileged access</b>, before public release, to Mandriva Linux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
@@ -13710,7 +13710,7 @@ msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
-msgid "Mandriva Online provides a wide range of valuable services for <b>easily updating</b> your Mandrivalinux systems:"
+msgid "Mandriva Online provides a wide range of valuable services for <b>easily updating</b> your Mandriva Linux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -13730,7 +13730,7 @@ msgstr ""
 
 #: share/advertising/29.pl:21
 #, c-format
-msgid "\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+msgid "\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
@@ -13740,17 +13740,17 @@ msgstr ""
 
 #: share/advertising/30.pl:15
 #, c-format
-msgid "Do you require <b>assistance?</b> Meet Mandriva'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.mandrivaexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
-msgid "Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save a lot of time."
+msgid "Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
-msgid "For any question related to Mandrivalinux, you have the possibility to purchase support incidents at <b>store.mandrakesoft.com</b>."
+msgid "For any question related to Mandriva Linux, you have the possibility to purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/compssUsers.pl:25
@@ -14090,8 +14090,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 
 #: standalone.pm:63
@@ -14127,7 +14127,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16609,12 +16609,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
 msgstr ""
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
+msgid "Mandriva Linux Control Center"
 msgstr ""
 
 #: standalone/drakbug:48
@@ -17072,14 +17072,14 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux 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 Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux 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 (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -17418,9 +17418,9 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 
 #: standalone/drakfont:520
@@ -17890,7 +17890,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr ""
 
 #: standalone/drakhelp:36
@@ -18449,7 +18449,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 
 #: standalone/draksound:57
@@ -20068,7 +20068,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 
 #: standalone/harddrake2:24
@@ -20726,7 +20726,7 @@ msgstr ""
 msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
-"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;tvignaud@mandrakesoft.com&gt;\n"
+"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;tvignaud@mandriva.com&gt;\n"
 "\n"
 ""
 msgstr ""
@@ -20833,7 +20833,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr ""
 
 #: standalone/logdrake:51
@@ -21336,7 +21336,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po
index 830afddc1..6717b8210 100644
--- a/perl-install/share/po/af.po
+++ b/perl-install/share/po/af.po
@@ -1303,7 +1303,7 @@ msgstr "selfdoen"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux 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 Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux 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 Mandrivalinux distribusie. Indien u saamstem met al die\n"
+"die hele Mandriva Linux 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 Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux 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 Mandrivalinux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"
+"Die Mandriva Linux 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,12 @@ 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 Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux 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 +3969,12 @@ msgid ""
 "megabytes."
 msgstr ""
 "Nou moet u spesifiseer watter programme u op die rekenaar wil\n"
-"installeer. Daar is duisende pakkette beskikbaar vir Mandrivalinux, en\n"
+"installeer. Daar is duisende pakkette beskikbaar vir Mandriva Linux, 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. Mandrivalinux het vier vooraf gespesifseerde installasies\n"
+"rekenaar. Mandriva Linux 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 +4067,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 Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux 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 +4100,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"
-"Mandrivalinux sal by verstek alle bediener-programme afskop nadat u die\n"
+"Mandriva Linux 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 +4243,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 Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4410,12 +4411,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\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"
-"Mandrivalinux system.\n"
+"Mandriva Linux 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 +4443,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 Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4451,7 +4452,8 @@ 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 Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4471,11 +4473,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 Mandrivalinux\n"
+"Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandriva Linux\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 Mandrivalinux bedryfstelsel.\n"
+"verdeel, om spasie te skep vir u nuwe Mandriva Linux bedryfstelsel.\n"
 "\n"
 "Indien u 'n onervare gebruiker is, kan die skep van partisies vreemd en\n"
 "intimiderend wees.\n"
@@ -4505,14 +4507,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 Mandrivalinux en Microsoft Windows op die\n"
+"die beste metode indien u beide Mandriva Linux 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 Mandrivalinux, kan u hierdie opsie kies.\n"
+"en dit dan vervang met Mandriva Linux, 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 +4666,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"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux 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 +4706,7 @@ msgstr "Vorige"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, 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 +4718,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 Mandrivalinux installeer, is dit hoogs waarskynlik\n"
+"Teen die tyd wat u Mandriva Linux 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 +4745,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 Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4756,7 +4758,8 @@ 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 Mandrivalinux Control\n"
+"kan altyd later die vlak verander deur draksec in die Mandriva Linux "
+"Control\n"
 "Center te grbruik.\n"
 "\n"
 "Die \"%s\" veld kan boodskappe stuur na 'n gekose persoon wat\n"
@@ -4772,7 +4775,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 Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux 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 +4846,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Nou moet u asseblief besluit watter partisie(s) u gaan gebruik vir die\n"
-"installasie van u Mandrivalinux rekenaar.Indien die partisies reeds\n"
+"installasie van u Mandriva Linux 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 +4930,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"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4957,7 +4960,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 Mandrivalinux bedryfstelsel.\n"
+"vir u nuwe Mandriva Linux bedryfstelsel.\n"
 "\n"
 "Elke partisie is as volg gelys: \"Linux-naam\", \"Windows-naam\"\n"
 "\"Kapasiteit\".\n"
@@ -5006,7 +5009,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 Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux 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 +5018,20 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux 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 Mandrivalinux wil doen:\n"
+"bestaande Mandriva Linux wil doen:\n"
 "\n"
 " * \"%s\": Hierdie deel word grootliks gebruik vir 'n hele nuwe "
 "installasie.\n"
@@ -5036,7 +5040,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 Mandrivalinux installasie. Die partisies\n"
+"wat deel uitmaak van u huidige Mandriva Linux installasie. Die partisies\n"
 "en gebruiker se data bly onveranderd. Ander stappe is baie dieselfde as\n"
 "'n normale installasie.\n"
 "\n"
@@ -5095,7 +5099,8 @@ 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, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux'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 +5354,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 Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux 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 +5375,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 Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\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 Mandrivalinux gee twee. Elk van hulle\n"
+"seker net een aan u bied, maar Mandriva Linux 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 +5398,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 'Mandrivalinux Control Center' en klik op die \"Kenner\" knoppie."
+"in die 'Mandriva Linux Control Center' en klik op die \"Kenner\" knoppie."
 
 #: help.pm:765
 #, c-format
@@ -5511,7 +5516,8 @@ 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"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux 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 +5534,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"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux 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 +5646,10 @@ msgstr "Dienste"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux 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 Mandrivalinux\n"
+"Kies die hardeskyf wat u wil wis, om u nuwe Mandriva Linux\n"
 "te kan installeer. Wees tog versigtig, alle huidige data op daardie\n"
 "partisie sal vernietig word!"
 
@@ -5990,7 +5996,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 Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr "U Windows-partisie is te gefragmenteer. Loop eers 'defrag' asb."
 
@@ -6104,13 +6110,13 @@ msgstr "Netwerk op pad af"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -6164,7 +6170,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6201,7 +6207,7 @@ msgid ""
 "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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6309,8 +6315,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6318,13 +6324,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux 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 Mandrivalinux,\n"
+"Vir inligting oor hierdie vrystelling van Mandriva Linux,\n"
 "bekyk die errata beskikbaar op\n"
 "\n"
 "\n"
@@ -6332,13 +6338,13 @@ msgstr ""
 "\n"
 "\n"
 "Inligting oor stelskonfigurasie is beskikbaar in die postinstallasie-\n"
-"hoofstuk in die Offisiële Mandrivalinux Gebruikersgids."
+"hoofstuk in die Offisiële Mandriva Linux Gebruikersgids."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -6367,13 +6373,13 @@ msgstr "Gaan stap '%s' binne\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. 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 Mandrivalinux. In so 'n geval probeer eerder die teksinstallasie.\n"
+"van Mandriva Linux. 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 +6918,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
-msgstr "Kontak Mandrivalinux se webwerf vir 'n lys van spieëlwebplekke...."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr "Kontak Mandriva Linux se webwerf vir 'n lys van spieëlwebplekke...."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7135,8 +7141,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux Installasie %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux Installasie %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9727,13 +9733,13 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux 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 Mandrivalinux\n"
+"Hiermee stel u 'n persoonlike vuurmuur op vir die Mandriva Linux\n"
 "rekenaar. Indien u 'n kragtige en toegewyde vuurmuur verlang, kyk\n"
 "dan gerus na die 'MandrakeSecurity Firewall'."
 
@@ -13773,8 +13779,8 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
 
@@ -14046,7 +14052,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 'Mandrivalinux Control Center' te gebruik. "
+"na deur die 'Mandriva Linux Control Center' te gebruik. "
 
 #: printer/printerdrake.pm:4196
 #, c-format
@@ -15674,18 +15680,18 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Wat is Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Wat is Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Welkom by <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Welkom by <b>Mandriva Linux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux 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 +15700,11 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, fuzzy, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux 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 ""
-"Mandrivalinux is 'n Oopbron bedryfstelsel wat duisende van die keurigste "
-"programme beskikbaar in die Oopbron wêreld bevat. Mandrivalinux is een van "
+"Mandriva Linux is 'n Oopbron bedryfstelsel wat duisende van die keurigste "
+"programme beskikbaar in die Oopbron wêreld bevat. Mandriva Linux is een van "
 "die gewildste in die wereld!"
 
 #: share/advertising/02.pl:13
@@ -15714,12 +15720,12 @@ msgstr "Welkom by die wêreld van Oopbron sagteware!"
 #: share/advertising/02.pl:17
 #, fuzzy, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux 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 "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
-"Mandrivalinux is toegewyd aan die Oopbron manier van dinge doen. Hierdie "
+"Mandriva Linux 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."
 
@@ -15740,8 +15746,8 @@ msgstr "<b>Neem Kennis</b>"
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -15762,34 +15768,34 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, fuzzy, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Sluit aan by die Mandrivalinux gemeenskap!</b>"
+msgstr "<b>Sluit aan by die Mandriva Linux gemeenskap!</b>"
 
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux 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."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 
 #: share/advertising/05.pl:15
 #, fuzzy, c-format
 msgid "<b>Download Version</b>"
-msgstr "Hierdie is die Mandrivalinux <b>Download weergawe</b>."
+msgstr "Hierdie is die Mandriva Linux <b>Download weergawe</b>."
 
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
@@ -15827,7 +15833,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15849,7 +15855,7 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
@@ -15870,7 +15876,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15893,13 +15899,13 @@ msgstr "<b>Mandriva Store</b>"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux Updates Applet"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux Updates Applet"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -15919,7 +15925,7 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
@@ -15931,21 +15937,21 @@ msgstr ""
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<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 Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
@@ -15963,17 +15969,19 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -16152,10 +16160,10 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, fuzzy, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Die kieslys in Mandrivalinux het gebruikersvriendelike programme vir alle "
+"Die kieslys in Mandriva Linux het gebruikersvriendelike programme vir alle "
 "behoefdes:"
 
 #: share/advertising/18.pl:16
@@ -16397,18 +16405,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux Control Center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux Control Center</b>"
 
 #: share/advertising/25.pl:15
 #, fuzzy, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"Die \"Mandrivalinux Control Center\" is 'n versameling nutsprogramme wat die "
-"opstel van u rekenaar vergemaklik."
+"Die \"Mandriva Linux Control Center\" is 'n versameling nutsprogramme wat "
+"die opstel van u rekenaar vergemaklik."
 
 #: share/advertising/25.pl:17
 #, fuzzy, c-format
@@ -16432,8 +16440,8 @@ 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 "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -16465,8 +16473,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Gaan draai sommer vandag by <b>store.mandrakesoft.com</b>"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Gaan draai sommer vandag by <b>store.mandriva.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16476,7 +16484,7 @@ msgstr "<b>Mandriva Club</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
 
@@ -16492,7 +16500,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr "\t* Spesiale afslag vir produkte en dienste by \"Mandriva Store\""
 
 #: share/advertising/28.pl:21
@@ -16504,14 +16512,14 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, fuzzy, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <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 "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
@@ -16530,7 +16538,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -16553,7 +16561,7 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
@@ -16565,21 +16573,21 @@ msgstr "<b>Mandriva Expert</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/compssUsers.pl:25
@@ -16970,8 +16978,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 "[OPSIES] [PROGRAMNAAM]\n"
 "\n"
@@ -17032,7 +17040,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -19890,13 +19898,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux Bug Report Tool"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux Control Center"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux Control Center"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20388,20 +20396,20 @@ msgstr "Gelaai tydens herlaaityd"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Hierdie koppelvlak is nog nie opgestel nie.\n"
-"Loods die \"Add an interface\"-assistent vanuit die Mandrivalinux Control "
+"Loods die \"Add an interface\"-assistent vanuit die Mandriva Linux 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 Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Hierdie koppelvlak is nog nie opgestel nie.\n"
-"Loods die \"%s\"-assistent vanuit die Mandrivalinux Control Center"
+"Loods die \"%s\"-assistent vanuit die Mandriva Linux Control Center"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20451,7 +20459,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20754,18 +20762,18 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 "Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 
 #: standalone/drakfont:520
 #, c-format
@@ -21338,8 +21346,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux Hulp Sentrum"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux Hulp Sentrum"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22000,7 +22008,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "Geen klankkaart is op u rekenaar bespeur nie. Maak tog seker dat dit 'n\n"
 "Linux-ondersteunde klankkaart is. Kyk of dit reg ingeprop is.\n"
@@ -22009,7 +22017,7 @@ msgstr ""
 "U kan ons hardeware-databasis besoek te:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24021,7 +24029,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "Geen TV-kaart is op u rekenaar bespeur nie. Maak tog seker dat dit 'n Linux-"
 "ondersteunde Video/TV-kaart is. Kyk of dit reg ingeprop is.\n"
@@ -24030,7 +24038,7 @@ msgstr ""
 "U kan ons hardeware-databasis besoek te:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -24741,13 +24749,13 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
 "Hierdie is HardDrake,'n Mandrake program vir hardewarekonfigurasie.\n"
 "<span foreground=\"royalblue3\">Weergawe:</span> %s\n"
 "<span foreground=\"royalblue3\">Skrywer</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -24857,8 +24865,8 @@ msgstr "Die verandering is aangebring, maar u moet eers afteken"
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linux Tools Logs"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25368,10 +25376,10 @@ msgstr "Voltooide konneksie."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Probleme met die Konneksie\n"
-"Maak tog seker van u konfigurasie in die 'Mandrivalinux Control Center'."
+"Maak tog seker van u konfigurasie in die 'Mandriva Linux Control Center'."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26394,16 +26402,17 @@ msgstr "Installasie het gefaal!"
 #~ msgstr "Fout om %s in skryfmodus te open: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandriva Linux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Hierdie is HardDrake,'n Mandrivalinux program vir hardewarekonfigurasie.\n"
+#~ "Hierdie is HardDrake,'n Mandriva Linux program vir "
+#~ "hardewarekonfigurasie.\n"
 #~ "<span foreground=\"royalblue3\">Weergawe:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Skrywer</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 
 #~ msgid "OK"
@@ -26804,8 +26813,8 @@ msgstr "Installasie het gefaal!"
 #~ msgstr ""
 #~ "Probleme om drukker \"%s\" uit Star Office/OpenOffice.org/GIMP te verwyder"
 
-#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
-#~ msgstr "<b>Veels Geluk met u puik keuse van Mandrivalinux! ;-)</b>"
+#~ msgid "<b>Congratulations for choosing Mandriva Linux!</b>"
+#~ msgstr "<b>Veels Geluk met u puik keuse van Mandriva Linux! ;-)</b>"
 
 #~ msgid ""
 #~ "We would like to thank everyone who participated in the development of "
@@ -26916,9 +26925,9 @@ msgstr "Installasie het gefaal!"
 #~ "\t* Spesiale spieel bedieners wat uitsluitlik vir \"Mandriva Club\" se "
 #~ "lede is"
 
-#~ msgid "\t* Voting for software to put in Mandrivalinux"
+#~ msgid "\t* Voting for software to put in Mandriva Linux"
 #~ msgstr ""
-#~ "\t* Stemreg om te kan se watter sagteware u in Mandrivalinux wil sien"
+#~ "\t* Stemreg om te kan se watter sagteware u in Mandriva Linux wil sien"
 
 #~ msgid "\t* Plus much more"
 #~ msgstr "\t* Plus veel meer"
@@ -26934,10 +26943,10 @@ msgstr "Installasie het gefaal!"
 
 #~ msgid ""
 #~ "If you have Linux questions, subscribe to Mandriva Expert at <b>www."
-#~ "mandrakeexpert.com</b>"
+#~ "mandrivaexpert.com</b>"
 #~ msgstr ""
 #~ "Sou u enige Linux tipe vrae het, sluit aan by Mandriva Expert <b>www. "
-#~ "mandrakeexpert.com</b>"
+#~ "mandrivaexpert.com</b>"
 
 #~ msgid ""
 #~ "If you would like to get involved, please subscribe to the \"Cooker\" "
@@ -26954,22 +26963,23 @@ msgstr "Installasie het gefaal!"
 #~ "mandrake- linux.com</b>!"
 
 #~ msgid ""
-#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "
+#~ "Mandriva Linux includes the famous graphical desktops KDE and GNOME, plus "
 #~ "the latest versions of the most popular Open Source applications."
 #~ msgstr ""
-#~ "Mandrivalinux sluit die bekende KDEen GNOME grafiese werkskerms, asook "
+#~ "Mandriva Linux sluit die bekende KDEen GNOME grafiese werkskerms, asook "
 #~ "die nuutste weergawes van die mees gewilde Oopbron programme in."
 
 #~ msgid ""
-#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "
+#~ "Mandriva Linux is widely known as the most user-friendly and the easiest "
 #~ "to install and easy to use Linux distribution."
 #~ msgstr ""
-#~ "Mandrivalinux word deur meeste mense as die gebruikervriendelikste Linux "
+#~ "Mandriva Linux word deur meeste mense as die gebruikervriendelikste Linux "
 #~ "beskou. Dit is maklik om te installeer en maklik om te gebruik."
 
-#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandrakemove</b>"
+#~ msgid ""
+#~ "\t* Find out Mandriva Linux on a bootable CD with <b>Mandrakemove</b>"
 #~ msgstr ""
-#~ "\t* Vind uit oor Mandrivalinux op 'n selflaai CD - <b>Mandrakemove</b>"
+#~ "\t* Vind uit oor Mandriva Linux op 'n selflaai CD - <b>Mandrakemove</b>"
 
 #~ msgid ""
 #~ "\t* If you use Linux mostly for Office, Internet and Multimedia tasks, "
@@ -27015,9 +27025,8 @@ 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 "
-#~ "Mandrivalinux distribution. A unique blend for incomparable HPC "
-#~ "performance."
+#~ "combined with the stability and easy-of-use of the world-famous Mandriva "
+#~ "Linux distribution. A unique blend for incomparable HPC performance."
 #~ msgstr ""
 #~ "<b>MandrakeClustering</b>: die krag en spoed van 'n Linux-trosrekenaar "
 #~ "gekombineer met die stabiliteit en gebruikersvriendelikheid van Mandrake "
@@ -27038,8 +27047,8 @@ msgstr "Installasie het gefaal!"
 #~ msgid "<b>Do you require assistance?</b>"
 #~ msgstr "<b>Benodig u bystand?</b>"
 
-#~ msgid "This is the Mandrivalinux <b>Download version</b>."
-#~ msgstr "Hierdie is die Mandrivalinux <b>Download weergawe</b>."
+#~ msgid "This is the Mandriva Linux <b>Download version</b>."
+#~ msgstr "Hierdie is die Mandriva Linux <b>Download weergawe</b>."
 
 #~ msgid ""
 #~ "The free download version does not include commercial software, and "
@@ -27063,26 +27072,27 @@ msgstr "Installasie het gefaal!"
 #~ "'n volledige keuse wereldklas bediener aplikasies in te sluit."
 
 #~ msgid ""
-#~ "It is the only Mandrivalinux product that includes the groupware solution."
+#~ "It is the only Mandriva Linux product that includes the groupware "
+#~ "solution."
 #~ msgstr ""
-#~ "Dit is die enigste Mandrivalinux produk wat die \"groupware\" oplossing "
+#~ "Dit is die enigste Mandriva Linux produk wat die \"groupware\" oplossing "
 #~ "bevat."
 
 #~ msgid ""
-#~ "When you log into your Mandrivalinux system for the first time, you can "
+#~ "When you log into your Mandriva Linux 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 Mandrivalinux rekenaar, het u 'n "
+#~ "Sodra u die eerste keer inteken op u Mandriva Linux rekenaar, het u 'n "
 #~ "keuse watter grafiese werksomgewing om te gebruik. Keuses sluit KDE, "
 #~ "GNOME, WindowMaker, IceWM, en ander in."
 
 #~ msgid ""
-#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
+#~ "In the Mandriva Linux menu you will find easy-to-use applications for all "
 #~ "of your tasks:"
 #~ msgstr ""
-#~ "Die kieslys in Mandrivalinux het gebruikersvriendelike programme vir alle "
-#~ "behoefdes:"
+#~ "Die kieslys in Mandriva Linux het gebruikersvriendelike programme vir "
+#~ "alle behoefdes:"
 
 #~ msgid ""
 #~ "\t* Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
@@ -27126,11 +27136,11 @@ msgstr "Installasie het gefaal!"
 #~ msgstr "\t* Adresboek (kliënt en bediener)"
 
 #~ msgid ""
-#~ "Your new Mandrivalinux distribution is the result of collaborative "
-#~ "efforts between Mandriva developers and Mandrivalinux contributors "
+#~ "Your new Mandriva Linux distribution is the result of collaborative "
+#~ "efforts between Mandriva developers and Mandriva Linux contributors "
 #~ "throughout the world."
 #~ msgstr ""
-#~ "U nuwe Mandrivalinux bedryfstelsel met al sy programme is die resultaat "
+#~ "U nuwe Mandriva Linux bedryfstelsel met al sy programme is die resultaat "
 #~ "van 'n wereldwye gemeenskap, wat Mandriva se ontwikkelaars, asook mense "
 #~ "in Sonnige Suid-Afrika insluit!"
 
@@ -27200,13 +27210,13 @@ msgstr "Installasie het gefaal!"
 #~ msgid ""
 #~ "Before continuing, you should carefully read the terms of the license. "
 #~ "It\n"
-#~ "covers the entire Mandrivalinux distribution. If you do agree with all "
+#~ "covers the entire Mandriva Linux 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 Mandrivalinux distribusie. Indien u saamstem met al die\n"
+#~ "die hele Mandriva Linux 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."
 
@@ -27318,25 +27328,27 @@ msgstr "Installasie het gefaal!"
 #~ "nie. "
 
 #~ msgid ""
-#~ "The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+#~ "The Mandriva Linux 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 Mandrivalinux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"
+#~ "Die Mandriva Linux 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 Mandrivalinux, and\n"
+#~ "system. There are thousands of packages available for Mandriva Linux, "
+#~ "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. Mandrivalinux sorts packages groups in four categories. You can\n"
+#~ "machine. Mandriva Linux 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"
@@ -27389,12 +27401,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 Mandrivalinux, en\n"
+#~ "installeer. Daar is duisende pakkette beskikbaar vir Mandriva Linux, 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. Mandrivalinux het vier vooraf gespesifseerde installasies\n"
+#~ "rekenaar. Mandriva Linux 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"
@@ -27450,11 +27462,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 Mandrivalinux will automatically start any "
+#~ "installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+#~ "security holes were discovered after this version of Mandriva Linux 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"
@@ -27493,7 +27505,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"
-#~ "Mandrivalinux sal by verstek alle bediener-programme afskop nadat u die\n"
+#~ "Mandriva Linux 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"
@@ -27522,7 +27534,8 @@ 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"
-#~ "Mandrivalinux will attempt to auto-detect network devices and modems. If\n"
+#~ "Mandriva Linux 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"
@@ -27543,7 +27556,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 Mandrivalinux, some others do not. You\n"
+#~ "those modems actually work under Mandriva Linux, 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"
@@ -27554,7 +27567,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"
-#~ "Mandrivalinux sal poog om u netwerk toestelle en modems te outospeur.\n"
+#~ "Mandriva Linux 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"
@@ -27681,7 +27694,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 Mandrivalinux rely upon.\n"
+#~ "WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 #~ "\n"
 #~ "You will be presented with a list of different parameters to change to "
 #~ "get\n"
@@ -27866,7 +27879,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"
-#~ "Mandrivalinux system.\n"
+#~ "Mandriva Linux 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 "
@@ -27905,7 +27918,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 Mandrivalinux and Microsoft Windows "
+#~ "recommended if you want to use both Mandriva Linux and Microsoft Windows "
 #~ "on\n"
 #~ "the same computer.\n"
 #~ "\n"
@@ -27915,7 +27928,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 Mandrivalinux system,\n"
+#~ "your hard drive and replace them with your new Mandriva Linux system,\n"
 #~ "choose this option. Be careful, because you will not be able to undo "
 #~ "your\n"
 #~ "choice after you confirm.\n"
@@ -27940,11 +27953,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 Mandrivalinux\n"
+#~ "Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandriva Linux\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 Mandrivalinux bedryfstelsel.\n"
+#~ "verdeel, om spasie te skep vir u nuwe Mandriva Linux bedryfstelsel.\n"
 #~ "\n"
 #~ "Indien u 'n onervare gebruiker is, kan die skep van partisies vreemd en\n"
 #~ "intimiderend wees.\n"
@@ -27980,7 +27993,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 Mandrivalinux en Microsoft Windows op "
+#~ "die beste metode indien u beide Mandriva Linux en Microsoft Windows op "
 #~ "die\n"
 #~ "rekenaar wil gebruik.\n"
 #~ "\n"
@@ -27990,7 +28003,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 Mandrivalinux, kan u hierdie opsie kies.\n"
+#~ "en dit dan vervang met Mandriva Linux, 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"
@@ -28097,7 +28110,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"
-#~ "Mandrivalinux operating system installation.\n"
+#~ "Mandriva Linux operating system installation.\n"
 #~ "\n"
 #~ "Click on \"%s\" if you wish to select partitions that will be checked "
 #~ "for\n"
@@ -28127,7 +28140,7 @@ msgstr "Installasie het gefaal!"
 #~ "getoets moet word."
 
 #~ msgid ""
-#~ "At the time you are installing Mandrivalinux, it is likely that some\n"
+#~ "At the time you are installing Mandriva Linux, 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"
@@ -28142,7 +28155,7 @@ msgstr "Installasie het gefaal!"
 #~ "the\n"
 #~ "selected package(s), or \"%s\" to abort."
 #~ msgstr ""
-#~ "Teen die tyd wat u Mandrivalinux installeer, is dit hoogs waarskynlik\n"
+#~ "Teen die tyd wat u Mandriva Linux 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"
@@ -28205,7 +28218,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 Mandrivalinux system:\n"
+#~ "of an existing Mandriva Linux system:\n"
 #~ "\n"
 #~ " * \"%s\": For the most part, this completely wipes out the old system. "
 #~ "If\n"
@@ -28217,21 +28230,21 @@ msgstr "Installasie het gefaal!"
 #~ "written.\n"
 #~ "\n"
 #~ " * \"%s\": this installation class allows you to update the packages\n"
-#~ "currently installed on your Mandrivalinux system. Your current\n"
+#~ "currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+#~ "Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 #~ "running version \"8.1\" or later. Performing an Upgrade on versions "
 #~ "prior\n"
-#~ "to Mandrivalinux version \"8.1\" is not recommended."
+#~ "to Mandriva Linux 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 Mandrivalinux wil doen:\n"
+#~ "bestaande Mandriva Linux wil doen:\n"
 #~ "\n"
 #~ " * \"%s\": Hierdie deel word grootliks gebruik vir 'n hele nuwe "
 #~ "installasie.\n"
@@ -28242,7 +28255,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 Mandrivalinux installasie. Die partisies\n"
+#~ "wat deel uitmaak van u huidige Mandriva Linux installasie. Die partisies\n"
 #~ "en gebruiker se data bly onveranderd. Ander stappe is baie dieselfde as\n"
 #~ "'n normale installasie.\n"
 #~ "\n"
@@ -28307,7 +28320,8 @@ 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, Mandrivalinux will be using it\n"
+#~ "still under development. For that reason, Mandriva Linux 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"
@@ -28563,7 +28577,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 Mandrivalinux\n"
+#~ "\"%s\"), you must ensure that you have a way to boot your Mandriva Linux\n"
 #~ "system! Be sure you know what you are doing before changing any of the\n"
 #~ "options. !!\n"
 #~ "\n"
@@ -28695,7 +28709,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 Mandrivalinux offers two. Each of the printing "
+#~ "offer you one, but Mandriva Linux offers two. Each of the printing "
 #~ "systems\n"
 #~ "is best suited to particular types of configuration.\n"
 #~ "\n"
@@ -28731,7 +28745,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 Mandrivalinux gee twee. Elk van hulle\n"
+#~ "seker net een aan u bied, maar Mandriva Linux 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"
@@ -29271,9 +29285,9 @@ msgstr "Installasie het gefaal!"
 #~ msgstr "\t* Spesiale afslag vir produkte en dienste by \"MandrakeStore\""
 
 #~ msgid ""
-#~ "\t* Find out Mandrivalinux on a bootable CD with <b>Mandriva Move</b>"
+#~ "\t* Find out Mandriva Linux on a bootable CD with <b>Mandriva Move</b>"
 #~ msgstr ""
-#~ "\t* Vind uit oor Mandrivalinux op 'n selflaai CD - <b>Mandriva Move</b>"
+#~ "\t* Vind uit oor Mandriva Linux op 'n selflaai CD - <b>Mandriva Move</b>"
 
 #~ msgid ""
 #~ "Find all Mandriva products at <b>MandrakeStore</b> -- our full service e-"
@@ -29286,11 +29300,11 @@ msgstr "Installasie het gefaal!"
 #~ msgstr "<b>Word 'n lid van die MandrakeClub!</b>"
 
 #~ msgid ""
-#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
+#~ "In the Mandriva Linux menu you will find easy-to-use applications for all "
 #~ "tasks:"
 #~ msgstr ""
-#~ "Die kieslys in Mandrivalinux het gebruikersvriendelike programme vir alle "
-#~ "behoefdes:"
+#~ "Die kieslys in Mandriva Linux het gebruikersvriendelike programme vir "
+#~ "alle behoefdes:"
 
 #~ msgid ""
 #~ "\t* Take charge of your personal data with the integrated personal "
diff --git a/perl-install/share/po/am.po b/perl-install/share/po/am.po
index 708c86f8b..27371b0c5 100644
--- a/perl-install/share/po/am.po
+++ b/perl-install/share/po/am.po
@@ -1,4 +1,4 @@
-# Latest versions of po files are at http://www.mandrakelinux.com/l10n/am.php3
+# Latest versions of po files are at http://www.mandrivalinux.com/l10n/am.php3
 # Copyright (C) 2004 Mandriva SA
 # Alemayehu Gemeda <alemayehu@gmx.at>, 2004.
 #
@@ -1199,7 +1199,7 @@ msgstr "የመመሪያ ገጾች"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux 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 Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux 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 Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux 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,12 @@ 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 Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux 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 +3671,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 Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux 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 +3783,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 Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -3880,12 +3881,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\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"
-"Mandrivalinux system.\n"
+"Mandriva Linux 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 +3913,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 Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -3921,7 +3922,8 @@ 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 Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4050,7 +4052,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"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux 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 +4070,7 @@ msgstr "የቀድሞው"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, 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 +4099,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 Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4113,7 +4115,7 @@ msgstr "የደህንነት ተቆጣጣሪ"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux 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 +4201,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"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4244,7 +4246,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 Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux 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 +4255,14 @@ 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 Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4300,7 +4303,8 @@ 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, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux'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 +4461,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 Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux 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 +4482,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 Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4578,7 +4582,8 @@ 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"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux 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 +4600,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"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux 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 +4662,7 @@ msgstr "አገልግሎት"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -4965,7 +4970,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 
@@ -5068,13 +5073,13 @@ msgstr "መረቡን በማለያየት ላይ"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -5128,7 +5133,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -5165,7 +5170,7 @@ msgid ""
 "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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -5238,8 +5243,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5247,14 +5252,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, fuzzy, c-format
@@ -5279,7 +5284,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. 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 +5786,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 
 #: install_steps_interactive.pm:840
@@ -5986,8 +5991,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "የMandrivalinux ተከላ %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "የMandriva Linux ተከላ %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8546,7 +8551,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12102,8 +12107,8 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
 
@@ -13766,18 +13771,18 @@ msgstr "አቁም"
 
 #: share/advertising/01.pl:13
 #, fuzzy, c-format
-msgid "<b>What is Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
 msgstr "ትርጉሙ &ጅምር ነው"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "ወደ <b>Mandrivalinux</b>! እንኳን ደህና መጡ"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "ወደ <b>Mandriva Linux</b>! እንኳን ደህና መጡ"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux 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 +13791,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux 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 +13808,9 @@ msgstr ""
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux 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 "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
 
@@ -13824,8 +13829,8 @@ msgstr "ማስታወሻ"
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -13851,17 +13856,17 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux 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."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 
@@ -13873,7 +13878,7 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
@@ -13911,7 +13916,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -13930,7 +13935,7 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
@@ -13948,7 +13953,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -13963,17 +13968,17 @@ msgstr ""
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
 msgid "<b>Mandriva Products</b>"
-msgstr "<b>የMandrivalinux ባለሞያ</b>"
+msgstr "<b>የMandriva Linux ባለሞያ</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
+msgid "The Mandriva Linux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -13994,7 +13999,7 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
@@ -14006,21 +14011,21 @@ msgstr ""
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<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 Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
@@ -14038,17 +14043,19 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14224,7 +14231,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -14459,14 +14466,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
 msgstr "አንቀጹን መሀል ኩልኩል አድርግ"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -14489,8 +14496,8 @@ 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 "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -14520,18 +14527,18 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
 msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
 msgid "<b>Mandriva Club</b>"
-msgstr "<b>የMandrivalinux ክለብ</b>"
+msgstr "<b>የMandriva Linux ክለብ</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
 
@@ -14545,7 +14552,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/advertising/28.pl:21
@@ -14557,14 +14564,14 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
@@ -14583,7 +14590,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -14606,33 +14613,33 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
 msgid "<b>Mandriva Expert</b>"
-msgstr "<b>የMandrivalinux ባለሞያ</b>"
+msgstr "<b>የMandriva Linux ባለሞያ</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/compssUsers.pl:25
@@ -14923,7 +14930,7 @@ msgstr ""
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
-msgstr "<b>የMandrivalinux ባለሞያ</b>"
+msgstr "<b>የMandriva Linux ባለሞያ</b>"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -14981,8 +14988,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 
 #: standalone.pm:63
@@ -15018,7 +15025,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17519,13 +17526,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
 msgstr "አንቀጹን መሀል ኩልኩል አድርግ"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "የMandrivalinux ቁጥጥር ማእከል"
+msgid "Mandriva Linux Control Center"
+msgstr "የMandriva Linux ቁጥጥር ማእከል"
 
 #: standalone/drakbug:48
 #, fuzzy, c-format
@@ -17994,14 +18001,14 @@ msgstr "መረጃ በ%s መጠቀሚያ ፕሮግራም ላይ"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux 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 Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18052,7 +18059,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18342,9 +18349,9 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 
 #: standalone/drakfont:520
@@ -18822,7 +18829,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "አንቀጹን መሀል ኩልኩል አድርግ"
 
 #: standalone/drakhelp:36
@@ -19403,7 +19410,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 
 #: standalone/draksound:57
@@ -21001,7 +21008,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 
 #: standalone/harddrake2:24
@@ -21687,7 +21694,7 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
 
@@ -21796,7 +21803,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "/መሣሪያዎች/የነበረው ቀለሞች"
 
 #: standalone/logdrake:51
@@ -22300,7 +22307,7 @@ msgstr "የቅርብ መረብ ማገናኛ"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
diff --git a/perl-install/share/po/ar.po b/perl-install/share/po/ar.po
index 07ef6e2b9..02ff07b6f 100644
--- a/perl-install/share/po/ar.po
+++ b/perl-install/share/po/ar.po
@@ -1302,7 +1302,7 @@ msgstr "خيار اللغة"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux 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 Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux 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 Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux 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,12 @@ 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 Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux 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 +4053,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 Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux 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 +4240,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4413,12 +4414,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\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"
-"Mandrivalinux system.\n"
+"Mandriva Linux 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 +4446,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4454,7 +4455,8 @@ 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 Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4674,7 +4676,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"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux 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 +4715,7 @@ msgstr "السابق "
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, 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 +4755,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 Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4782,7 +4784,7 @@ msgstr "مدير الأمن"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux 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 +4942,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"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5017,7 +5019,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 Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux 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 +5028,14 @@ 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 Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
 msgstr ""
 "يتم تنشيط هذه الخطوة فقط إذا عُثر على تجزيء جنو/لينكس موجود\n"
 "على ماكينتك.\n"
@@ -5110,7 +5113,8 @@ 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, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux'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 +5398,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 Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux 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 +5419,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 Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "الآن، حان وقت اختيار نظام الطباعة لحاسبك. قد توفّر أنظمة التشغيل الأخرى\n"
@@ -5560,7 +5564,8 @@ 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"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux 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 +5582,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"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux 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 +5711,7 @@ msgstr "الخدمات"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "اختر القرص الصلب الذي تريد محوه لتثبيت تجزيء\n"
@@ -6060,7 +6065,7 @@ msgstr "جاري حساب مساحة تجزيء ويندوز"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "تجزيء ويندوز الخاصّ بك كثير التجزّئات. رجاء أعد تشغيل جهازك إلى ويندوز، شغّل "
@@ -6178,13 +6183,13 @@ msgstr "جاري اغلاق الشبكة"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -6238,7 +6243,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6275,7 +6280,7 @@ msgid ""
 "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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6371,7 +6376,7 @@ msgstr ""
 "تحتفظ ماندريكسوفت ش.م. بحقّها في تعديل أو تكييف المنتجات البرمجيّة، "
 "بحذافيرها \n"
 "أو أجزاء معيّنة منها، بشتّى الطّرق ولسائر الأغراض.\n"
-"\"Mandriva\" و \"Mandrivalinux\" والشّعارات المتعلّقة هي علاماتٌ تجاريّة "
+"\"Mandriva\" و \"Mandriva Linux\" والشّعارات المتعلّقة هي علاماتٌ تجاريّة "
 "لماندريكسوفت ش.م. \n"
 "\n"
 "\n"
@@ -6475,8 +6480,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6484,7 +6489,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "تهانينا، التثبيت قد انتهى.\n"
 "أزل وسيط الإقلاع و اضغط زر الإدخال لإعادة التشغيل.\n"
@@ -6503,8 +6508,8 @@ msgstr ""
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -6532,7 +6537,7 @@ msgstr "الانتقال للخطوة `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. 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 +7077,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "جاري الإتصال بموقع ماندريكلينكس للحصول على قائمة بالمرايا المتوفرة..."
 
 #: install_steps_interactive.pm:840
@@ -7293,7 +7298,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
+msgid "Mandriva Linux Installation %s"
 msgstr "تثبيت ماندريكلينكس %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -9889,7 +9894,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -13890,8 +13895,8 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
 "تشغيل Scannerdrake )العتاد/الماسح الضوئي في مركز تحكم ماندريكلينكس) لمشاركة "
@@ -15789,18 +15794,18 @@ msgstr "إيقاف"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
 msgstr "<b>ما هو ماندريكلينكس؟</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
 msgstr "أهلا بك في <b>ماندريكلينكس</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux 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 +15817,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux 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 +15836,9 @@ msgstr "أهلاً بك في <b>عالم المصدر المفتوح</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux 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 "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
 "ماندريكلينكس هو نظام مخلص لنموذج المصدر المفتوح. هذا يعني أن هذا الإصدار "
@@ -15855,8 +15860,8 @@ msgstr "<b>رخصة GPL</b>"
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "معظم البرامج المرفقة مع هذه التوزيعة وكل أدوات ماندريكلينكس مرخّصة ضمن "
 "<b>الرخصة العموميّة الشاملة</b>."
@@ -15889,10 +15894,10 @@ msgstr "<b>انضمّ إلى المجتمع</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux 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."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
 "لدى ماندريكلينكس أحد <b>أكبر المجتمعات</b> من المستخدمين والمطورين. دور "
 "مجتمع كهذا هو واسع جداً، بدءً من تقرير العيوب البرمجية ووصولاً إلى تطوير "
@@ -15902,11 +15907,11 @@ msgstr ""
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 "كي <b>تقرأ المزيد</b> حول مجتمعنا الديناميكي، رجاء زُر <b>www.mandrakelinux."
-"com</b> أو مباشرة <b>www.mandrakelinux.com/en/cookerdevel.php3</b> إن وددت "
+"com</b> أو مباشرة <b>www.mandrivalinux.com/en/cookerdevel.php3</b> إن وددت "
 "<b>المشاركة</b> في التطوير."
 
 #: share/advertising/05.pl:15
@@ -15917,10 +15922,10 @@ msgstr "<b>نسخة التّنزيل</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"تقوم الآن بتثبيت <b>Mandrivalinux Download</b>. هذه هي النسخة المجانية التي "
+"تقوم الآن بتثبيت <b>Mandriva Linux Download</b>. هذه هي النسخة المجانية التي "
 "تريد ماندريكسوفت إبقائها <b>متوفّرة للجميع</b>."
 
 #: share/advertising/05.pl:19
@@ -15961,8 +15966,8 @@ msgstr "<b>Discovery، سطح مكتب لينكس الأول</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "تقوم الآن بتثبيت <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "تقوم الآن بتثبيت <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -15983,8 +15988,8 @@ msgstr "<b>PowerPack، سطح المكتب المُطلق للينكس</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "تقوم الآن بتثبيت <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "تقوم الآن بتثبيت <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16004,8 +16009,8 @@ msgstr "<b>PowerPack+، الحلّ لأسطح المكتب والخادمات</b
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "تقوم الآن بتثبيت <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "تقوم الآن بتثبيت <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16027,13 +16032,13 @@ msgstr "<b>منتجات ماندريكسوفت</b>"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
 "قامت <b>ماندريكسوفت</b> بتطوير تشكيلة واسعة من منتجات <b>ماندريكلينكس</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
+msgid "The Mandriva Linux products are:"
 msgstr "منتجات ماندريكلينكس هي:"
 
 #: share/advertising/09.pl:18
@@ -16054,7 +16059,7 @@ msgstr "\t* <b>PowerPack+</b>، حلّ لينكس لأسطح المكتب وال
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 "\t* <b>ماندريكلينكس لأنظمة x86-64</b>، حلّ ماندريكلينكس للحصول على أفضل نتيجة "
@@ -16068,7 +16073,7 @@ msgstr "<b>منتجات ماندريكسوفت (منتجات نوماد)</b>"
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 "قامت ماندريكلينكس بتطوير منتجين يسمحان لك باستخدام ماندريكلينكس <b>على أي "
@@ -16077,14 +16082,14 @@ msgstr ""
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux 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 Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 "\t* <b>جلوب تروتر</b>، وهي توزيعة ماندريكلينكس مُتثبيتة مسبقاً على “قرص لاسي "
@@ -16105,17 +16110,19 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr "\t* <b>سطح المكتب المؤسّساتي</b>، وهو سطح مكتب ماندريكلينكس للأعمال."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
 msgstr "\t* <b>الخادم المؤسّساتي</b>، وهو حلّ خادم ماندريكلينكس."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
 msgstr "\t* <b>الجدار الناري للشبكات المتعدّدة</b>، حلّ الأمن من ماندريكلينكس."
 
 #: share/advertising/12.pl:13
@@ -16313,7 +16320,7 @@ msgstr "<b>استمتع بالتشكيلة الواسعة من التطبيقا�
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 "في قائمة ماندريكلينكس ستجد تطبيقات <b>سهلة الاستخدام</b> ل<b>كل مهامّك</b>:"
@@ -16567,14 +16574,14 @@ msgstr "\t* <b>Postfix</b> و <b>Sendmail</b>: خوادم البريد الأك�
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
 msgstr "<b>مركز تحكّم ماندريكلينكس</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 "<b>مركز تحكم ماندريكلينكس</b> هي مجموعة أساسيّة من أدوات ماندريكلينكس الخاصّة "
@@ -16602,8 +16609,8 @@ 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 "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "كسائر ما يتعلّق ببرمجة الحاسبات، البرمجّيات المفتوحة المصدر  <b>تتطلّب وقتاً "
@@ -16640,8 +16647,8 @@ msgstr "تمّت <b>إعادة تصميم</b> هذه المنصة لتحسين �
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "زُرْنا اليوم على <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "زُرْنا اليوم على <b>store.mandriva.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16651,7 +16658,7 @@ msgstr "<b>Mandriva Club</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr "<b>نادي ماندريك</b> هو <b>المرافق الأمثل</b> لمنتجك ماندريكلينكس."
 
@@ -16665,7 +16672,7 @@ msgstr "اغتنم فرصة <b>الفوائد القيّمة</b> بالانضم�
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 "\t* <b>حسومات خاصة</b> على المنتجات والخدمات من متجرنا على الخط <b>store."
 "mandrakesoft.com</b>."
@@ -16680,14 +16687,14 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <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 "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 "\t* <b>وصول مبكّر وممتاز</b>، قبل الإصدار العام، <b>لصور ISO</b> لماندريك "
 "لينكس."
@@ -16710,7 +16717,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 "يوفر Mandriva Online تشكيلة واسعة من الخدمات القيّمة <b>للتحديث الميسّر</b> "
 "لأنظمة ماندريكلينكس الخاصة بك:"
@@ -16737,7 +16744,7 @@ msgstr "\t* تحديثات <b>مُجدولة</b> مرنة."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr "\t* إدارة <b>كل أنظمة ماندريكلينكس خاصتك</b> باستخدام حساب واحد."
 
 #: share/advertising/30.pl:13
@@ -16749,15 +16756,15 @@ msgstr "<b>Mandriva Expert</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 "هل تتطلّب <b>مساعدة؟</b> قابل خبراء ماندريكسوفت التقنيين على <b>موقع الدعم "
-"الفني الخاص بنا</b> www.mandrakeexpert.com."
+"الفني الخاص بنا</b> www.mandrivaexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 "بفضل مساعدة <b>خبراء ماندريكلينكس الأكفاء</b>، سوف توفّر الكثير من الوقت."
@@ -16765,8 +16772,8 @@ msgstr ""
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
 "لأي سؤال متعلق بماندريكلينكس، يمكن شراء الدعم من خلال <b>store.mandrakesoft."
 "com</b>."
@@ -17157,8 +17164,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 "[OPTIONS] [PROGRAM_NAME]\n"
 "\n"
@@ -17219,7 +17226,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -20040,12 +20047,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
 msgstr "أداة تقرير العيوب في ماندريكلينكس"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
+msgid "Mandriva Linux Control Center"
 msgstr "مركز تحكّم ماندريكلينكس"
 
 #: standalone/drakbug:48
@@ -20536,7 +20543,7 @@ msgstr "يتم تشغيله عند الإقلاع"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "لم تتمّ تهيئة الواجهة بعد.\n"
 "قم بتشغيل مساعد \"أضف واجهة\" من مركز تحكّم ماندريكلينكس"
@@ -20545,7 +20552,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "ليست لديك أية وصلة إنترنت مهيئة.\n"
 "شغّل مساعد \"%s\" من مركز تحكم ماندريكلينكس"
@@ -20598,7 +20605,7 @@ msgstr "KDM (مدير عرض كيدي("
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr "MdkKDM (مدير عرض ماندريكلينكس("
 
 #: standalone/drakedm:37
@@ -20902,18 +20909,18 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 "حقوق النّسخ 2001-2002 لماندريكسوفت \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (النّسخة الأصليّة)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 
 #: standalone/drakfont:520
 #, c-format
@@ -21478,7 +21485,7 @@ msgstr " --doc <link>          - رابط بصفحة وب أخرى ( لـWM welc
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "مركز مساعدة ماندريكلينكس"
 
 #: standalone/drakhelp:36
@@ -22127,7 +22134,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "تعذر العثور على بطاقة صوت على جهازك. الرجاء التأكّد من أن بطاقة الصوت "
 "المدعومة من لينكس موصولة بشكل صحيح.\n"
@@ -22136,7 +22143,7 @@ msgstr ""
 "يمكنك زيارة قاعدة بيانات العتاد المدعوم الخاصة بنا على:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24165,7 +24172,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "لم يعثر على بطاقة تلفاز على جهازك. الرجاء التأكّد من أن بطاقة الفيديو/التلفاز "
 "المدعومة في لينكس موصولة بشكل صحيح.\n"
@@ -24174,7 +24181,7 @@ msgstr ""
 "يمكنك زيارة قاعدة بيانات العتاد المدعوم الخاصة بنا على:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -24889,13 +24896,13 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
 "هذا هو HardDrake، أداة %s لتهيئة العتاد.\n"
 "<span foreground=\"royalblue3\">النّسخة:</span> %s\n"
 "<span foreground=\"royalblue3\">المؤلّف:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25004,7 +25011,7 @@ msgstr "تم عمل التغيير، و لكن ليتم تفعيله يجب عل
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "سجلات أدوات ماندريكلينكس"
 
 #: standalone/logdrake:51
@@ -25517,7 +25524,7 @@ msgstr "تم الإتصال."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "فشل الاتّصال.\n"
 "تحقق من تهيئتك في مركز تحكّم ماندريكلينكس."
@@ -26384,15 +26391,15 @@ msgstr "فشل التّثبيت"
 #~ msgid "You've not selected any font"
 #~ msgstr "لم تقم باختيار أي خط"
 
-#~ msgid "http://www.mandrakelinux.com/en/101errata.php3"
-#~ msgstr "http://www.mandrakelinux.com/en/101errata.php3"
+#~ msgid "http://www.mandrivalinux.com/en/101errata.php3"
+#~ msgstr "http://www.mandrivalinux.com/en/101errata.php3"
 
-#~ msgid "The Mandrivalinux 10.1 products are:"
+#~ msgid "The Mandriva Linux 10.1 products are:"
 #~ msgstr "منتجات ماندريكلينكس 10.1 هي:"
 
 #~ msgid ""
-#~ "\t* <b>Mandrivalinux 10.1 for x86-64</b>, The Mandrivalinux solution for "
-#~ "making the most of your 64-bit processor."
+#~ "\t* <b>Mandriva Linux 10.1 for x86-64</b>, The Mandriva Linux solution "
+#~ "for making the most of your 64-bit processor."
 #~ msgstr ""
 #~ "\t* <b>ماندريكلينكس 10.1 لأنظمة x86-64</b>، حلّ ماندريكلينكس للحصول على "
 #~ "أفضل نتيجة من معالجات 64بت."
diff --git a/perl-install/share/po/az.po b/perl-install/share/po/az.po
index 6e8fc989b..3d67c5615 100644
--- a/perl-install/share/po/az.po
+++ b/perl-install/share/po/az.po
@@ -1253,11 +1253,11 @@ msgstr "Dil seçkisi"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux 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 ""
-"Mandrivalinux müxtəlif dilləri dəstəkləyir. Qurmaq istədiyiniz\n"
+"Mandriva Linux 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 Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux 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 Mandrivalinux distribusiyasını əhatə edir. Əgər lisenziyadakı bütün\n"
+"bütün Mandriva Linux 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 Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux 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 ""
-"Mandrivalinux qurulumu müxtəlif CD-lər üstündə gəlir. DrakX\n"
+"Mandriva Linux 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,12 @@ 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 Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux 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 +3922,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "İndi sisteminizə qurmaq istədiyiniz proqramları müəyyən etmə vaxtıdır.\n"
-"Mandrivalinux daxilində minlərcə proqram mövcuddur və idarələrinin\n"
+"Mandriva Linux 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"
-"Mandrivalinuxda dörd əvvəldən müəyyən edilmiş qurulum növü mövcuddur.\n"
+"Mandriva Linuxda 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 +4022,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 Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux 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 +4057,8 @@ 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 Mandrivalinux bütün qurulu\n"
+"təsdiq istəyən pəncərə göstəriləcək. Əsas olaraq Mandriva Linux 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 +4069,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"
-"Mandrivalinux İdarə Mərkəzindən quraşdıra bilərsiniz!!\n"
+"Mandriva Linux İ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 +4223,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 Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4276,7 +4278,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"
-"Mandrivalinuxla bərabər gələn qrafiki mühitlərin hamısı (KDE, \n"
+"Mandriva Linuxla 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 +4398,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\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"
-"Mandrivalinux system.\n"
+"Mandriva Linux 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 +4430,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 Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4437,7 +4439,8 @@ 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 Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4457,10 +4460,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ə Mandrivalinuxi sabit diskinizdə haraya quracağınıza\n"
+"Bu nöqtədə Mandriva Linuxi 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ə Mandrivalinux üçün\n"
-"yer açmalısınız. Bölmələndirmə əsasən diskinizdə Mandrivalinuxu\n"
+"bütün yeri doldurmuş isə, o zaman diskinizdə Mandriva Linux üçün\n"
+"yer açmalısınız. Bölmələndirmə əsasən diskinizdə Mandriva Linuxu\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 +4498,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 Mandrivalinux həm də "
+"da qətiyyən unutmayın. Kompüteriniz üstündə həm Mandriva Linux 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 +4511,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"
-"Mandrivalinux sistemini qurmaq istəyirsinizsə bu seçənəyi seçin.\n"
+"Mandriva Linux 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 +4673,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"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux 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 +4696,7 @@ msgstr ""
 "\n"
 "Bölmələri şəkilləndirməyə hazır olanda \"%s\" düyməsini basın.\n"
 "\n"
-"Yeni Mandrivalinux sisteminizi qurmaq üçün başqa bölmə seçmək\n"
+"Yeni Mandriva Linux 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 +4714,7 @@ msgstr "Əvvəlki"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, 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 +4726,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Mandrivalinuxu qurduğunuz vaxtda çox güman ki bə'zi paketlər \n"
+"Mandriva Linuxu 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 +4756,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 Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4777,7 +4780,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 Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux 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 +4850,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 Mandrivalinux yüklənəcək bölmə(lər)i seçməlisiniz. Əgər\n"
+"Bu nöqtədə siz Mandriva Linux 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 +4945,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"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4971,7 +4974,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, Mandrivalinuxi qurmaq üçün onlardan hansını\n"
+"Xahiş edirik, Mandriva Linuxi 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 +5023,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 Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux 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 +5032,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 Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux 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 Mandrivalinux sisteminizi yeniləmək mi, yoxsa yenidən\n"
+"DrakX indi mövcud Mandriva Linux 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 +5054,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ı Mandrivalinux sisteminizdə qurulu olan paketləri "
+" * \"%s\": Hazırkı Mandriva Linux 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 "
-"Mandrivalinuxlarda\n"
+"Mandriva Linuxlarda\n"
 "tədbiq etmək uyğun görülmür."
 
 #: help.pm:591
@@ -5115,7 +5119,8 @@ 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, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux'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 +5374,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 Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux 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 +5395,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 Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\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 Mandrivalinux ikisini təqdim edir.\n"
+"dənəsini təqdim edə bilərlər, yalnız Mandriva Linux 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"
@@ -5412,8 +5417,8 @@ msgstr ""
 "emulyasiya etmək istəyirsinizsə, \"cups-lpd \" demonunu başlatdığınıza\n"
 "ə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 "
-"Mandrivalinux\n"
+"Əgər indi birisini seçib sonra çap sistemini bəyənməzsəniz, onu Mandriva "
+"Linux\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 +5536,8 @@ 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"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux 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 +5554,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"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux 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 +5680,10 @@ msgstr "Xidmətlər"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Yeni Mandrivalinux'izi qurmaq üçün silmək istədiyiniz sürücünü seçin.\n"
+"Yeni Mandriva Linux'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 +6030,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 Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "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 Mandrivalinux "
+"Windows ilə açın, ''defrag'' vasitəsini işlədin, sonra Mandriva Linux "
 "qurulumunu yenidən başladın."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6142,13 +6148,13 @@ msgstr "Şəbəkə dayandırılır"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -6202,7 +6208,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6239,7 +6245,7 @@ msgid ""
 "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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6266,7 +6272,7 @@ 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 Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. Lisenziya Müqaviləsi\n"
@@ -6320,7 +6326,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6357,7 +6363,7 @@ msgstr ""
 "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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6463,8 +6469,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6472,28 +6478,28 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux 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"
-"Mandrivalinux'in bu buraxılışındakı yamaqlar haqqında \n"
+"Mandriva Linux'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"
-"Mandrivalinux İstifadəçi Kitabcığının qurulum sonrası bölməsində\n"
+"Mandriva Linux İ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
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -6522,7 +6528,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"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. 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 +7070,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
-"Mövcud əkslərin siyahısını almaq üçün Mandrivalinux səhifəsi ilə təmas "
+"Mövcud əkslərin siyahısını almaq üçün Mandriva Linux səhifəsi ilə təmas "
 "qurulur..."
 
 #: install_steps_interactive.pm:840
@@ -7286,8 +7292,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux Qurulumu %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux Qurulumu %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9873,13 +9879,13 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux 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, Mandrivalinux sisteminiz üçün şəxsi bir atəş divarını quraşdıracaq.\n"
+"Bu, Mandriva Linux 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 +12523,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ə, Mandrivalinux İdarə Mərkəzindəki "
+"əlavə etmək / çapçı silmək istəyirsinizsə, Mandriva Linux İ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,8 +13841,8 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
 
@@ -14108,10 +14114,10 @@ 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ə Mandrivalinux "
-"İdarə Mərkəzindəki Şəbəkə və İnternet bölməsindən qurğuları düzəldin, və "
-"ondan sonra yenə də Mandrivalinux İdarə Mərkəzindəki \"Avadanlıq\"/\"Çapçı\" "
-"bölməsindən çapçınızı qurun."
+"dirik, sistem açılandan sonra şəbəkənin işlədiyini yoxlayın və Mandriva "
+"Linux İdarə Mərkəzindəki Şəbəkə və İnternet bölməsindən qurğuları düzəldin, "
+"və ondan sonra yenə də Mandriva Linux İdarə Mərkəzindəki \"Avadanlıq\"/"
+"\"Çapçı\" bölməsindən çapçınızı qurun."
 
 #: printer/printerdrake.pm:4196
 #, c-format
@@ -15736,18 +15742,18 @@ msgstr "Dayandır"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Mandrivalinux Nədir?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Mandriva Linux Nədir?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "<b>Mandrivalinux</b> Xoş Gəldiniz!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "<b>Mandriva Linux</b> Xoş Gəldiniz!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux 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 +15762,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux 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 +15779,9 @@ msgstr "Açıq Mənbə Dünyasına Xoş Gəldiniz!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux 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 "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
 
@@ -15794,8 +15800,8 @@ msgstr "<b>Qeyd</b>"
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -15816,34 +15822,34 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, fuzzy, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Mandrivalinux cəmiyyətinə qoşulun!</b>"
+msgstr "<b>Mandriva Linux cəmiyyətinə qoşulun!</b>"
 
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux 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."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 
 #: share/advertising/05.pl:15
 #, fuzzy, c-format
 msgid "<b>Download Version</b>"
-msgstr "Bu Mandrivalinux <b>Endirmə buraxılışıdır</b>."
+msgstr "Bu Mandriva Linux <b>Endirmə buraxılışıdır</b>."
 
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
@@ -15881,7 +15887,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15900,7 +15906,7 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
@@ -15918,7 +15924,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15938,13 +15944,13 @@ msgstr "<b>Mandriva Store</b>"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux Yeniləmələri Appleti"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux Yeniləmələri Appleti"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -15964,7 +15970,7 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
@@ -15976,21 +15982,21 @@ msgstr ""
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<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 Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
@@ -16008,17 +16014,19 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -16194,7 +16202,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -16435,14 +16443,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux İdarə Mərkəzi</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux İdarə Mərkəzi</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -16465,8 +16473,8 @@ 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 "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -16496,8 +16504,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Bugün <b>store.mandrakesoft.com</b> ünvanını ziyarət edin"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Bugün <b>store.mandriva.com</b> ünvanını ziyarət edin"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16507,7 +16515,7 @@ msgstr "<b>Mandriva Club</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
 
@@ -16521,7 +16529,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/advertising/28.pl:21
@@ -16533,14 +16541,14 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, fuzzy, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <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 "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
@@ -16559,7 +16567,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -16582,7 +16590,7 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
@@ -16594,21 +16602,21 @@ msgstr "<b>Mandriva Expert</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/compssUsers.pl:25
@@ -16988,8 +16996,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 "[SEÇİMLƏR] [PROQRAM_ADI]\n"
 "\n"
@@ -17042,7 +17050,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -19862,13 +19870,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux Xəta Raportlama Vasitəsi"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux Xəta Raportlama Vasitəsi"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux İdarə Mərkəzi"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux İdarə Mərkəzi"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20353,7 +20361,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 Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux 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"
@@ -20362,7 +20370,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux 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"
@@ -20415,7 +20423,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20717,18 +20725,18 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 "Müəllif Hüququ (C) 2001-2002 Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (orijinal buraxılış)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 
 #: standalone/drakfont:520
 #, fuzzy, c-format
@@ -21283,8 +21291,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux İdarə Mərkəzi"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux İdarə Mərkəzi"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -21938,7 +21946,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "Sisteminizdə səs kartı aşkar edilməyib. Xahiş edirik, Linuks dəstəkli səs "
 "kartının düzgün taxıldığını yoxlayın.\n"
@@ -21947,7 +21955,7 @@ msgstr ""
 "Avadanlıq mə'lumat bazamızı bu ünvanda ziyarət edə bilərisiniz:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, fuzzy, c-format
@@ -23573,7 +23581,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "Sisteminizdə heç bit Televiziya Kartı aşkar edilmədi. Xahiş edirik, Linuks "
 "dəstəkli Televiziya Kartının düzgün taxıldığını yoxlayın.\n"
@@ -23582,7 +23590,7 @@ msgstr ""
 "Avadanlıq mə'lumat bazamızı bu ünvandan ziyarət edə bilərsiniz:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -24284,13 +24292,13 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
-"Bu HardDrake'dir, Mandrivalinux avadanlıq quraşdırma vasitəsi.\n"
+"Bu HardDrake'dir, Mandriva Linux 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"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -24398,8 +24406,8 @@ msgstr "Dəyişikliklər edildi, ancaq effektiv olmaq üçün yenidən giriş ed
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinux Vasitələrinin İzahatı"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linux Vasitələrinin İzahatı"
 
 #: standalone/logdrake:51
 #, c-format
@@ -24912,10 +24920,10 @@ msgstr "Bağlantı tamamlandı."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Bağlantı iflas etdi.\n"
-"Mandrivalinux İdarə Mərkəzindən qurğularınızı yoxlayın."
+"Mandriva Linux İdarə Mərkəzindən qurğularınızı yoxlayın."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -25152,7 +25160,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 Mandrivalinuxun bu buraxılışı tərəfindən dəstəklənmir."
+msgstr "%s Mandriva Linuxun bu buraxılışı tərəfindən dəstəklənmir."
 
 #: standalone/scannerdrake:104
 #, c-format
@@ -25193,7 +25201,7 @@ msgstr ""
 #: standalone/scannerdrake:144
 #, fuzzy, c-format
 msgid "The %s is not supported under Linux."
-msgstr "%s Mandrivalinuxun bu buraxılışı tərəfindən dəstəklənmir."
+msgstr "%s Mandriva Linuxun bu buraxılışı tərəfindən dəstəklənmir."
 
 #: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
@@ -25294,7 +25302,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 Mandrivalinux İdarə Mərkəzindəki Avadanlıq bölməsindən işə "
+"Printerdrake'ni Mandriva Linux İ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 68f40007b..7888f045c 100644
--- a/perl-install/share/po/be.po
+++ b/perl-install/share/po/be.po
@@ -1226,7 +1226,7 @@ msgstr "Выбар мовы"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux 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 Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux 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 Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux 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,12 @@ 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 Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux 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 +3709,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 Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux 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 +3821,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 Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -3918,12 +3919,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\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"
-"Mandrivalinux system.\n"
+"Mandriva Linux 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 +3951,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 Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -3959,7 +3960,8 @@ 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 Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4088,7 +4090,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"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux 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 +4108,7 @@ msgstr "прылада"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, 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 +4137,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 Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4151,7 +4153,7 @@ msgstr "Сістэмнае адміністраваньне"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux 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 +4239,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"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4282,7 +4284,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 Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux 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 +4293,14 @@ 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 Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4338,7 +4341,8 @@ 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, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux'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 +4499,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 Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux 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 +4520,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 Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4616,7 +4620,8 @@ 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"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux 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 +4638,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"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux 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 +4700,7 @@ msgstr "Сэрвісы"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -5018,7 +5023,7 @@ msgstr "Выкарыстоўваць незанятую прастору на р
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Ваш раздзел з Windows занадта фрагментаваны. \n"
@@ -5125,13 +5130,13 @@ msgstr "Адлучэнне ад сеткі"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -5185,7 +5190,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -5222,7 +5227,7 @@ msgid ""
 "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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -5295,8 +5300,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5304,14 +5309,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -5340,12 +5345,12 @@ msgstr "Пераход на крок ‛%s’\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "У Вашай сістэме маецца недахоп рэсурсаў, таму магчымы праблемы\n"
-"пры ўсталяванні Mandrivalinux. У гэтым выпадку паспрабуйце тэкставую\n"
+"пры ўсталяванні Mandriva Linux. У гэтым выпадку паспрабуйце тэкставую\n"
 "праграму ўсталявання. Для гэтага націсніце ‛F1’ у час загрузкі, а потым\n"
 "набярыце ‛text’ і націсніце <ENTER>."
 
@@ -5862,7 +5867,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, fuzzy, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "Сувязь з люрам для атрымання спісу даступных пакетаў"
 
 #: install_steps_interactive.pm:840
@@ -6071,8 +6076,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Усталяванне Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Усталяванне Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8640,7 +8645,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12214,8 +12219,8 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
 
@@ -13942,18 +13947,18 @@ msgstr "Спыніць"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Сардэчна запрашаем у <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Сардэчна запрашаем у <b>Mandriva Linux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux 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 +13967,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux 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 +13984,9 @@ msgstr ""
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux 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 "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
 
@@ -14000,8 +14005,8 @@ msgstr ""
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14027,17 +14032,17 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux 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."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 
@@ -14049,7 +14054,7 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
@@ -14087,7 +14092,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14106,7 +14111,7 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
@@ -14124,7 +14129,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14144,12 +14149,12 @@ msgstr "Цэнтар кіраваньня"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
+msgid "The Mandriva Linux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -14170,7 +14175,7 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
@@ -14182,21 +14187,21 @@ msgstr ""
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<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 Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
@@ -14214,17 +14219,19 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14400,7 +14407,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -14635,14 +14642,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
 msgstr "Цэнтар кіраваньня"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -14665,8 +14672,8 @@ 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 "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -14696,7 +14703,7 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
 msgstr ""
 
 #: share/advertising/28.pl:15
@@ -14707,7 +14714,7 @@ msgstr "Цэнтар кіраваньня"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
 
@@ -14721,7 +14728,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/advertising/28.pl:21
@@ -14733,14 +14740,14 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
@@ -14759,7 +14766,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -14782,7 +14789,7 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
@@ -14794,21 +14801,21 @@ msgstr "Цэнтар кіраваньня"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/compssUsers.pl:25
@@ -15184,8 +15191,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 
 #: standalone.pm:63
@@ -15221,7 +15228,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17723,12 +17730,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Дастасаваньне для кіраваньня карыстальнікамі Mandrivalinux"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Дастасаваньне для кіраваньня карыстальнікамі Mandriva Linux"
 
 #: standalone/drakbug:46
 #, fuzzy, c-format
-msgid "Mandrivalinux Control Center"
+msgid "Mandriva Linux Control Center"
 msgstr "Цэнтар кіраваньня"
 
 #: standalone/drakbug:48
@@ -18200,14 +18207,14 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux 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 Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18258,7 +18265,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18548,9 +18555,9 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 
 #: standalone/drakfont:520
@@ -19049,7 +19056,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "Цэнтар кіраваньня"
 
 #: standalone/drakhelp:36
@@ -19636,7 +19643,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 
 #: standalone/draksound:57
@@ -21234,7 +21241,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 
 #: standalone/harddrake2:24
@@ -21920,7 +21927,7 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
 
@@ -22029,7 +22036,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "Цэнтар кіраваньня"
 
 #: standalone/logdrake:51
@@ -22533,7 +22540,7 @@ msgstr "Імя злучэння"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
diff --git a/perl-install/share/po/bg.po b/perl-install/share/po/bg.po
index c076c93f2..b55e11422 100644
--- a/perl-install/share/po/bg.po
+++ b/perl-install/share/po/bg.po
@@ -1245,11 +1245,11 @@ msgstr "ръчно"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux 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 ""
-"Mandrivalinux може да подържа много езици. Изберете\n"
+"Mandriva Linux може да подържа много езици. Изберете\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 Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux 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"
-"покрива цялата Mandrivalinux дистрибуция, и, ако сте съгласни с всички "
+"покрива цялата Mandriva Linux дистрибуция, и, ако сте съгласни с всички "
 "условия\n"
 "в него, сложете отметка на \"%s\".Ако не сте съгласни,просто спрете "
 "компютъра си."
@@ -3757,13 +3757,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux 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 ""
-"Инсталацията на Mandrivalinux е разположена на няколко CDROM-а. DrakX\n"
+"Инсталацията на Mandriva Linux е разположена на няколко CDROM-а. DrakX\n"
 "знае дали избран пакет не се намира на друг CDROM,така че ще извади "
 "текущото\n"
 "CD и ще ви остави да вкарате това, от което има нужда."
@@ -3772,11 +3772,12 @@ 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 Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux 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 +3829,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Сега е моментът да определите кои програми искате да бъдат инсталирани на\n"
-"системата ви. В Mandrivalinux дистрибуцията има хиляди пакети, но не е\n"
+"системата ви. В Mandriva Linux дистрибуцията има хиляди пакети, но не е\n"
 "задължително да ги знаете наизуст.\n"
 "\n"
 "Ако извършвате стандартна инстлация от CDROM, първо ще бъдете попитани кои\n"
@@ -3924,10 +3925,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 Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux 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 +3964,11 @@ msgstr ""
 "\n"
 "!! Ако е избран сървърен пакет, било то умишлено или защото е част от цяла\n"
 "група, ще бъдете помолени за потвърждение, че наистина искате този сървър\n"
-"да бъде инсталиран. В Mandrivalinux, всички сървъри тръгват по подразбиране\n"
+"да бъде инсталиран. В Mandriva Linux, всички сървъри тръгват по "
+"подразбиране\n"
 "при зареждане.Даже ако са сигурни и нямат известни проблеми, когато\n"
 "дистрибуцията се разпространява, може да се случи така, че да се появят\n"
-"дупки в сигурността, след като версията на Mandrivalinux е завършена. Ако\n"
+"дупки в сигурността, след като версията на Mandriva Linux е завършена. Ако\n"
 "не знаете за какво служи определена услуга или защо е инсталирана, цъкнете\n"
 "\"Не\". С цъкане на \"Да\"  ще инсталирате изброени услуги и те ще бъдат\n"
 "стартирани автоматично по подразбиране. !!\n"
@@ -4090,7 +4092,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 Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4193,12 +4195,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\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"
-"Mandrivalinux system.\n"
+"Mandriva Linux 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 +4227,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 Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4234,7 +4236,8 @@ 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 Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4256,12 +4259,12 @@ msgid ""
 msgstr ""
 "В този момент трябва изберете къде на твърдия си диска да инсталирате "
 "вашата\n"
-"Mandrivalinux операционна система. Ако твърдият ви диск е празен или друга\n"
+"Mandriva Linux операционна система. Ако твърдият ви диск е празен или друга\n"
 "операционна система използва цялото пространство, ще трябва да го "
 "разделите.\n"
 "Казано простичко, разделянето на твърдия диск се състои в логическо "
 "разделяне\n"
-"цел да се създаде място за инсталация на новата Mandrivalinux система.\n"
+"цел да се създаде място за инсталация на новата Mandriva Linux система.\n"
 "\n"
 "Тъй като процесът на разделяне обикновено е необратим, разделянето може да\n"
 "изглежда плашещ и стряскащ, ако сте неопитен потребител. Слава Богу, има\n"
@@ -4270,7 +4273,7 @@ msgstr ""
 "с ръководството и не бързайте.\n"
 "\n"
 "Ако пускате инсталацията в Експертен режим, ще бъдете въведени в DiskDrake,\n"
-"разделящия инструмент на Mandrivalinux, който ви позволява да донастроите\n"
+"разделящия инструмент на Mandriva Linux, който ви позволява да донастроите\n"
 "дяловете си. Вижте главата DiskDrake от ръководството. От инсталационния\n"
 "интерфейс можете да използвате магьосниците, като натиснете бутона\n"
 "\"Магьосник\" на диалога.\n"
@@ -4298,7 +4301,7 @@ msgstr ""
 "решенията \"Изтрий целия диск\" или \"Екпертен режим\") или да промените\n"
 "големината на Microsoft Windows дяла. Промяната на големината може да бъде\n"
 "извършена без загуба на данни. Това решение се препоръчва, ако искате\n"
-"едновременно Mandrivalinux и Microsoft Windows на един и същи компютър.\n"
+"едновременно Mandriva Linux и Microsoft Windows на един и същи компютър.\n"
 "\n"
 "   Преди да изберете тази опция, моля, разберете, че след тази процедура,\n"
 "големината на Microsoft Windows дяла ще бъде по-малка, отколкото преди "
@@ -4308,7 +4311,7 @@ msgstr ""
 "инсталира на нов софтуер.\n"
 "\n"
 " * \"%s\": ако искате да изтриете всички данни и дялове, които\n"
-"съществуват на вашия твърд диск и да ги замените с новата Mandrivalinux\n"
+"съществуват на вашия твърд диск и да ги замените с новата Mandriva Linux\n"
 "система, изберете тази опция. Бъдете внимателни с това решения, защото няма\n"
 "да можете да върнете обратно избора си, след като потвърдите.\n"
 "\n"
@@ -4467,7 +4470,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"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux 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 +4500,7 @@ msgstr ""
 "\n"
 "Цъкнете \"Отказ\", ако искате да изберете други дялове за инсталация на "
 "новата\n"
-"си Mandrivalinux операционна система.\n"
+"си Mandriva Linux операционна система.\n"
 "\n"
 "Цъкнете \"Напредничав\", ако искате да изберете дялове, които да бъдат\n"
 "проверени за лоши блокове от диска."
@@ -4514,7 +4517,7 @@ msgstr "Предишен"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, 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 +4546,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 Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4570,7 +4573,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 Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux 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 +4645,7 @@ msgid ""
 msgstr ""
 "В този момент трябва да изберете кой дялове да бъдат използвани за "
 "инсталация\n"
-"на вашата Mandrivalinux система. Ако дяловете вече са определени, дали от\n"
+"на вашата Mandriva Linux система. Ако дяловете вече са определени, дали от\n"
 "предишна инсталация на GNU/Linux или от друг инструмент за разделяне, "
 "можете\n"
 "да използвате съществуващите далове. В противен случай трябва да определите\n"
@@ -4722,7 +4725,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"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4753,7 +4756,7 @@ msgstr ""
 "Беше засечен повече от един Microsoft Windows дял\n"
 "на твърдия ви диска. Изберете този, чиято дължина искате да промените, за "
 "да\n"
-"инсталирате Mandrivalinux операционна система.\n"
+"инсталирате Mandriva Linux операционна система.\n"
 "\n"
 "\n"
 "За информация, всеки дял е изброен както следва: \"Linux име\", \"Windows име"
@@ -4801,7 +4804,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 Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux 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 +4813,14 @@ 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 Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4878,7 +4882,8 @@ 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, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux'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 +5065,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 Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux 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 +5086,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 Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Дойде времето да изберете система за печат за вашия компютър.Другите\n"
@@ -5210,7 +5215,8 @@ 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"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux 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 +5233,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"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux 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 +5295,11 @@ msgstr "Услуги"
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Изберете твърдия диск, който искате да изтриете, за да\n"
-"инсталирам новия ви Mandrivalinux дял. Внимание, всички данни на него ще "
+"инсталирам новия ви Mandriva Linux дял. Внимание, всички данни на него ще "
 "бъдат загубени\n"
 "и няма да могат да се възстановят."
 
@@ -5645,7 +5651,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 Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Вашият Windows дял е много фрагментиран, моля първо стартирайте ''defrag''"
@@ -5759,13 +5765,13 @@ msgstr "Изключване на мрежата"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -5819,7 +5825,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -5856,7 +5862,7 @@ msgid ""
 "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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -5877,13 +5883,13 @@ msgid ""
 msgstr ""
 "Въведение\n"
 "\n"
-"Операционната система и различните компоненти достъпни в Mandrivalinux "
+"Операционната система и различните компоненти достъпни в Mandriva Linux "
 "дистрибуцията по-долу ще се\n"
 "наричат \"Софтуерен Продукти\". Софтуерните Продукти включват, но не се "
 "ограничават само до, набора\n"
 "програми, методи, правила и документация отнасяща се до операционната "
 "система и различните\n"
-"компоненти на Mandrivalinux дистрибуцията.\n"
+"компоненти на Mandriva Linux дистрибуцията.\n"
 "\n"
 "\n"
 "1. Лицензионен договор\n"
@@ -5934,7 +5940,7 @@ msgstr ""
 "съдебно решение или каквато и да е друга произлизащи от това загуби) "
 "произтичащи от притежаването\n"
 "и употребата на софтуерни компоненти и от изтеглянето на софтуерни "
-"компоненти от сайтовете на Mandrivalinux,\n"
+"компоненти от сайтовете на Mandriva Linux,\n"
 "които са забранени в някои страни от местното законодателство.\n"
 "Тази ограничена отговорност се отнася до, но не само за, мощните "
 "криптографски компоненти включени\n"
@@ -5971,7 +5977,7 @@ msgstr ""
 "Mandriva S.A. запазва правото си да модифицира и пригодява Софтуерния "
 "Продукт, като цяло или на\n"
 "части, по всякакъв начин и с всякакви цели.\n"
-"\"Mandriva\", \"Mandrivalinux\" и свързаните логота са запазена марка на "
+"\"Mandriva\", \"Mandriva Linux\" и свързаните логота са запазена марка на "
 "Mandriva S.A.\n"
 "\n"
 "\n"
@@ -6076,8 +6082,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6085,13 +6091,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "Поздравления, инсталацията е преключена.\n"
 "Премахнете стартовото устройство и натисене Enter за да рестартирайте.\n"
 "\n"
 "\n"
-"За информация относно поправки, на тази версия на Mandrivalinux,\n"
+"За информация относно поправки, на тази версия на Mandriva Linux,\n"
 "се консултирайте с Errata, на адрес : \n"
 "\n"
 "\n"
@@ -6099,13 +6105,13 @@ msgstr ""
 "\n"
 "\n"
 "Информация за настройване на системата ви можете да намерите в\n"
-"слединсталационната глава от Official Mandrivalinux User's Guide."
+"слединсталационната глава от Official Mandriva Linux User's Guide."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -6134,12 +6140,12 @@ msgstr "Навлизам в етап `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Вашата система е с малки ресурси. Може да имате проблеми с инсталирането\n"
-"на Mandrivalinux. Ако се появи проблем опитайте с текстовата инсалация. "
+"на Mandriva Linux. Ако се появи проблем опитайте с текстовата инсалация. "
 "Зацелта,\n"
 "натиснете 'F1', когато стартирате от CDROM и въведете 'теьт'."
 
@@ -6669,9 +6675,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
-"Свързване с Mandrivalinux web сайт за получаване на списъка с налични "
+"Свързване с Mandriva Linux web сайт за получаване на списъка с налични "
 "огледални сървъри..."
 
 #: install_steps_interactive.pm:840
@@ -6892,8 +6898,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Инсталация на Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Инсталация на Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9473,13 +9479,13 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Настройчик за малка защитна стена\n"
 "\n"
-"Това настройва персонална защитна стена за тази Mandrivalinux машина.\n"
+"Това настройва персонална защитна стена за тази Mandriva Linux машина.\n"
 "За мощно постветено на защитата решение, моле, погледнете специализираната\n"
 "MandrakeSecurity Firewall дистрибуция."
 
@@ -13268,8 +13274,8 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
 
@@ -15064,18 +15070,18 @@ msgstr "Стоп"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Добре дошли в <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Добре дошли в <b>Mandriva Linux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux 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 +15090,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux 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 +15107,9 @@ msgstr "Добре дошли в света на Отвореният Изход
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux 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 "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
 
@@ -15122,8 +15128,8 @@ msgstr ""
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -15149,17 +15155,17 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux 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."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 
@@ -15171,7 +15177,7 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
@@ -15209,7 +15215,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15228,7 +15234,7 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
@@ -15246,7 +15252,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15261,17 +15267,17 @@ msgstr ""
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
 msgid "<b>Mandriva Products</b>"
-msgstr "Контролен център на Mandrivalinux"
+msgstr "Контролен център на Mandriva Linux"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
+msgid "The Mandriva Linux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -15292,7 +15298,7 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
@@ -15304,21 +15310,21 @@ msgstr ""
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<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 Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
@@ -15336,17 +15342,19 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -15522,7 +15530,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -15757,14 +15765,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Контролен център на Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Контролен център на Mandriva Linux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -15787,15 +15795,15 @@ 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 "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <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 "Контролен център на Mandrivalinux"
+msgstr "Контролен център на Mandriva Linux"
 
 #: share/advertising/27.pl:15
 #, c-format
@@ -15818,7 +15826,7 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
 msgstr ""
 
 #: share/advertising/28.pl:15
@@ -15829,7 +15837,7 @@ msgstr "<b>Мандрейклинукс Клуб</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
 
@@ -15843,7 +15851,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/advertising/28.pl:21
@@ -15855,14 +15863,14 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
@@ -15881,7 +15889,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -15904,7 +15912,7 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
@@ -15916,21 +15924,21 @@ msgstr "<b>МандрейкЕксперт</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/compssUsers.pl:25
@@ -16215,7 +16223,7 @@ msgstr "Webmin Обслужване"
 #: share/compssUsers.pl:187
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "Конфигурация на Терминален Сървър в Mandrivalinux"
+msgstr "Конфигурация на Терминален Сървър в Mandriva Linux"
 
 #: share/compssUsers.pl:191
 #, fuzzy, c-format
@@ -16230,7 +16238,7 @@ msgstr ""
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
-msgstr "Контролен център на Mandrivalinux"
+msgstr "Контролен център на Mandriva Linux"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -16288,8 +16296,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 
 #: standalone.pm:63
@@ -16325,7 +16333,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16448,7 +16456,7 @@ msgstr ""
 #: standalone/drakTermServ:211 standalone/drakTermServ:214
 #, fuzzy, c-format
 msgid "Terminal Server Configuration"
-msgstr "Конфигурация на Терминален Сървър в Mandrivalinux"
+msgstr "Конфигурация на Терминален Сървър в Mandriva Linux"
 
 #: standalone/drakTermServ:220
 #, c-format
@@ -16593,7 +16601,7 @@ msgstr ""
 #: standalone/drakTermServ:509
 #, fuzzy, c-format
 msgid "Terminal Server Overview"
-msgstr "Конфигурация на Терминален Сървър в Mandrivalinux"
+msgstr "Конфигурация на Терминален Сървър в Mandriva Linux"
 
 #: standalone/drakTermServ:510
 #, c-format
@@ -18872,13 +18880,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Контролен център на Mandrivalinux"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Контролен център на Mandriva Linux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Контролен център на Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Контролен център на Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19356,14 +19364,14 @@ msgstr "Пуснат при стартиране"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux 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 Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Нямате Internet връзка.\n"
 "Създайте такава, като цъкнете на 'Настрой'"
@@ -19416,7 +19424,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -19711,9 +19719,9 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 
 #: standalone/drakfont:520
@@ -20218,8 +20226,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Контролен център на Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Контролен център на Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -20810,7 +20818,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 
 #: standalone/draksound:57
@@ -22427,7 +22435,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 
 #: standalone/harddrake2:24
@@ -23118,13 +23126,13 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
 "Това е HardDrake, хардуерен конфигурационен инструмент на %s.\n"
 "<span foreground=\"royalblue3\">Версия:</span> %s\n"
 "<span foreground=\"royalblue3\">Автор:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -23232,7 +23240,7 @@ msgstr "Промените са запазени, но за да бъдат еф
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "Самостоятелни инструменти"
 
 #: standalone/logdrake:51
@@ -23741,10 +23749,10 @@ msgstr "Връзката е установена."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Връзката пропадна.\n"
-"Проверете си конфигурацията в Контролен център на Mandrivalinux."
+"Проверете си конфигурацията в Контролен център на Mandriva Linux."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -23979,7 +23987,7 @@ msgstr ""
 #: standalone/scannerdrake:101
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "%s не се подържа от тази версия на Mandrivalinux."
+msgstr "%s не се подържа от тази версия на Mandriva Linux."
 
 #: standalone/scannerdrake:104
 #, c-format
@@ -24019,7 +24027,7 @@ msgstr ""
 #: standalone/scannerdrake:144
 #, fuzzy, c-format
 msgid "The %s is not supported under Linux."
-msgstr "%s не се подържа от тази версия на Mandrivalinux."
+msgstr "%s не се подържа от тази версия на Mandriva Linux."
 
 #: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
@@ -24737,16 +24745,17 @@ msgstr "Инсталацията провалена"
 #~ msgstr "Грешка при отваряне на %s за запис: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandriva Linux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Това е HardDrake, хардуерен конфигурационен инструмент на Mandrivalinux.\n"
+#~ "Това е HardDrake, хардуерен конфигурационен инструмент на Mandriva "
+#~ "Linux.\n"
 #~ "<span foreground=\"royalblue3\">Версия:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Автор:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 
 #, fuzzy
@@ -25243,7 +25252,7 @@ msgstr "Инсталацията провалена"
 #~ "Verify your configuration in the Mandrake Control Center."
 #~ msgstr ""
 #~ "Връзката пропадна.\n"
-#~ "Проверете си конфигурацията в Контролен център на Mandrivalinux."
+#~ "Проверете си конфигурацията в Контролен център на Mandriva Linux."
 
 #~ 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 c9b9fb87f..d2b62ae46 100644
--- a/perl-install/share/po/bn.po
+++ b/perl-install/share/po/bn.po
@@ -1312,11 +1312,11 @@ msgstr "পছন্দনীয় ভাষা"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux 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 ""
-"Mandrivalinux বাভিন্ন ভাষা সমর্থন করে।\n"
+"Mandriva Linux বাভিন্ন ভাষা সমর্থন করে।\n"
 "আপনি যেই ভাষাটি ইনস্টল করতে চান তা পছন্দ করুন।\n"
 "ইনস্টল শেষে রি-স্টার্ট করার পরে সেই ভাষাগুলি উপলব্ধ হবে।"
 
@@ -3733,7 +3733,7 @@ msgstr "রেডিও সাপোর্ট সক্রিয় করো"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3924,7 +3924,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3942,11 +3942,12 @@ 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 Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3998,11 +3999,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "এখন আপনাকে নির্বাচন করতে হবে আপনি কোন কোন প্রোগ্রাম সিস্টেমে ইনস্টল করতে চান।\n"
-"Mandrivalinux এর জন্য কয়েক হাজার প্যাকেজ রয়েছে, এবং ব্যাবস্থাপনার সুবিধার্থে "
+"Mandriva Linux এর জন্য কয়েক হাজার প্যাকেজ রয়েছে, এবং ব্যাবস্থাপনার সুবিধার্থে "
 "সেগুলোকে\n"
 "অ্যাপ্লিকেশনের ধরন অনুযায়ী ভাগ করা হয়েছে।\n"
 "\n"
-"Mandrivalinux সব প্যাকেজগ্রুপসমূহ চারটি শ্রেণীতে ভাগ করে। আপনি বিভিন্ন শ্রেণীর\n"
+"Mandriva Linux সব প্যাকেজগ্রুপসমূহ চারটি শ্রেণীতে ভাগ করে। আপনি বিভিন্ন শ্রেণীর\n"
 "অ্যাপ্লিকেশনমিলিয়ে ও মিশিয়ে ইনস্টল করতে পারেন, যেমন একটি ``Workstation''\n"
 "ইনস্টলেশনে আপনি ''Server'' শ্রেণী থেকে অ্যাপ্লিকেশন ইনস্টল\n"
 "করতে পারেন।\n"
@@ -4110,10 +4111,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 Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4252,7 +4253,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4372,12 +4373,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\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"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4404,7 +4405,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 Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4413,7 +4414,8 @@ 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 Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4543,7 +4545,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"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4562,7 +4564,7 @@ msgstr ""
 "\n"
 "পার্টিশন ফরম্যাট শুরু করতে \"%s\" চাপুন।\n"
 "\n"
-"আপনার নতুন Mandrivalinux অপারেটিং সিস্টেম ইনস্টেশনের জন্য আপনি যদি অন্য একটি "
+"আপনার নতুন Mandriva Linux অপারেটিং সিস্টেম ইনস্টেশনের জন্য আপনি যদি অন্য একটি "
 "পার্টিশন নির্বাচন করতে, তবে \"%s\" ক্লিক করুন।\n"
 "\n"
 "যদি আপনি পার্টিশনের জন্য ডিস্কের খারাপ ব্লক সনাক্ত করাতে চান তাহলে \"%s\" ক্লিক "
@@ -4582,7 +4584,7 @@ msgstr "পূর্ববর্তী"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4594,7 +4596,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"আপনি যখন Mandrivalinux ইনস্টল করবেন, সম্ভবত প্রথম রিলিজ থেকে কিছু\n"
+"আপনি যখন Mandriva Linux ইনস্টল করবেন, সম্ভবত প্রথম রিলিজ থেকে কিছু\n"
 "প্যাকেজ আপডেট হয়ে গেছে। কোন সাধারন বা নিরাপত্তা ত্রুটি সমাধান করা হয়েছে।\n"
 "আপনাকে এই সুবিধাগুলি দেয়ার লক্ষ্যে এই আপডেটগুলো ইন্টারনেট থেকে ডাউনলোড\n"
 "করার সুযোগ দেয়া হয়েছে। যদি আপনার সক্রিয় ইন্টারনেট সংযোগ থাকে, \"%s\" চেক\n"
@@ -4624,7 +4626,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 Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4636,7 +4638,7 @@ msgstr ""
 "হয়। নিরাপত্তা যত বেশী, ব্যবহারের স্বাচ্ছন্দ্য তত কমে যায়।\n"
 "\n"
 "আপনি যদি নিশ্চিত না হন কোন অপশনটি রাখবেন তবে ডিফল্ট অপশনটিই রাখুন।\n"
-"পরবর্তীতে আপনি এটি draksec টুল (যেটি Mandrivalinux নিয়ন্ত্রন কেন্দ্রের একটি অংশ)\n"
+"পরবর্তীতে আপনি এটি draksec টুল (যেটি Mandriva Linux নিয়ন্ত্রন কেন্দ্রের একটি অংশ)\n"
 "দিয়ে পরিবর্তন করতে পারবেন।\n"
 "\n"
 "\"%s\" ক্ষেত্রটিতে যিনি নিরাপত্তার দায়িত্বে নিয়োজিত তার ই-মেইল অ্যাড্রেস দিন।\n"
@@ -4652,7 +4654,7 @@ msgstr "সিকিউরিটি এ্যডমিনিস্ট্রে�
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -4722,7 +4724,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"এই সময়ে আপনাকে Mandrivalinux যে পার্টিশনে ইনস্টল হবে তা নির্বাচন\n"
+"এই সময়ে আপনাকে Mandriva Linux যে পার্টিশনে ইনস্টল হবে তা নির্বাচন\n"
 "করতে হবে। যদি আগে থেকেই পার্টিশন তৈরী থাকে, (GNU/Linux এর পুর্বের\n"
 "কোন ইনস্টলেশনের কারনে বা অন্য কোন পার্টিশন টুল দিয়ে তৈরী করা) আপনি\n"
 "সেগুলো ব্যবহার করতে পারেন। অন্যথায় হার্ডড্রাইভ পার্টিশন তৈরী করতে হবে।\n"
@@ -4805,7 +4807,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"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4854,7 +4856,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 Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4863,13 +4865,14 @@ 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 Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
 msgstr ""
 
 # সাম
@@ -4928,7 +4931,8 @@ 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, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5089,7 +5093,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 Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5110,11 +5114,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 Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "এখন সময় আপনার কম্পিউটারের জন্য একটি প্রিন্টিং সিস্টেম নির্বাচন করার। অনান্য\n"
-"অপারেটিং সিস্টেম আপনাকে একটি অপশন দিতে পারে কিন্তু Mandrivalinux দেবে দুটি।\n"
+"অপারেটিং সিস্টেম আপনাকে একটি অপশন দিতে পারে কিন্তু Mandriva Linux দেবে দুটি।\n"
 "প্রিন্টিং সিস্টেমগুলো বিভিন্ন কনফিগারেশনের জন্য প্রযোজ্য।\n"
 "\n"
 " * \"%s\" -- অর্থ হচ্ছে \"প্রিন্ট করো, সারিতে রাখবেনা\". এটি নির্বাচন করুন যদি "
@@ -5141,7 +5145,7 @@ msgstr ""
 "ইন্টারফেস রয়েছে।\n"
 "\n"
 "আপনার বাছাইকৃত প্রিন্টিং সিস্টেমটি যদি আপনার পরে পছন্দ না হয়,\n"
-"তবে আপনি Mandrivalinux নিয়ন্ত্রন কেন্দ্র থেকে PrinterDrake চালিয়ে ও \"%s\" বাটন "
+"তবে আপনি Mandriva Linux নিয়ন্ত্রন কেন্দ্র থেকে PrinterDrake চালিয়ে ও \"%s\" বাটন "
 "ক্লিক\n"
 "করে তা বদল করতে পারেন।"
 
@@ -5262,7 +5266,8 @@ 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"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5279,7 +5284,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"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5341,7 +5346,7 @@ msgstr "সার্ভিস সমূহ"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "হার্ড ড্রাইভ বেছে নিন যেটি আপনি আপনার নতুন ম্যানড্রেকলিনাক্স পার্টিশন ইনস্টল করার "
@@ -5701,7 +5706,7 @@ msgstr "আপনার উইন্ডোজের পার্টিশনে�
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "আপনার উইন্ডোজের পার্টিশনটি প্রচন্ড অসম। অনুগ্রহ করে আপনার কম্পিউটারটি উইন্ডোজে রি-বুট "
@@ -5818,13 +5823,13 @@ msgstr "নেটওয়ার্ককে বন্ধ করা হচ্ছে
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -5878,7 +5883,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -5915,7 +5920,7 @@ msgid ""
 "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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -5993,8 +5998,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6002,7 +6007,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "অভিনন্দন, ইনস্টলেশন পুরোপুরিভাবে হয়ে গেছে।\n"
 "দ্নবুট মিডিয়া সরিয়ে ফেলুন, এবং পুনরায় চালু করার জন্য return চাপুন।\n"
@@ -6021,8 +6026,8 @@ msgstr ""
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -6051,7 +6056,7 @@ msgstr "`%s' স্টেপে প্রবেশ করছি\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -6603,8 +6608,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
-msgstr "উপস্থিত মিররের তালিকার জন্য Mandrivalinux-এ সংযুক্ত করা হচ্ছে..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr "উপস্থিত মিররের তালিকার জন্য Mandriva Linux-এ সংযুক্ত করা হচ্ছে..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -6826,8 +6831,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux ইনস্টলেশন %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux ইনস্টলেশন %s"
 
 #  -PO: This string must fit in a 80-char wide text screen
 #. -PO: This string must fit in a 80-char wide text screen
@@ -9443,7 +9448,7 @@ msgstr "বিটTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -13564,11 +13569,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
-"আপনার স্ক্যানারটি নেটওয়ার্ক শেয়ার করার জন্য Scannerdrake (Mandrivalinux নিয়ন্ত্রণ "
+"আপনার স্ক্যানারটি নেটওয়ার্ক শেয়ার করার জন্য Scannerdrake (Mandriva Linux নিয়ন্ত্রণ "
 "কেন্দ্র হার্ডওয়্যার/স্ক্যানার) চালান।\n"
 "\n"
 
@@ -15580,24 +15585,24 @@ msgstr "বন্ধ"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
 msgstr "<b>ম্যানড্রেককলিনাক্স কি?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
 msgstr "<b>ম্যানড্রেককলিনাক্স</b>-এ আপনাকে স্বাগতম!"
 
 # সাম
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux 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 ""
-"Mandrivalinux একটি <b>লিনাক্স ডিস্ট্রিবিউশন</b> যা গঠিত হয়েছে সিস্টেম মূল অংশ বা "
+"Mandriva Linux একটি <b>লিনাক্স ডিস্ট্রিবিউশন</b> যা গঠিত হয়েছে সিস্টেম মূল অংশ বা "
 "<b>অপারেটিং সিস্টেম</b> (লিনাক্স কার্নেল এর উপর ভিত্তি করে) এবং <b>বিভিন্ন অনেক "
 "অ্যাপ্লিকেশন</b> দিয়ে যা কিনা আপনার সম্ভাব্য সব চাহিদা পূরন করে।"
 
@@ -15605,11 +15610,11 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux 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 ""
-"Mandrivalinux আজকের সবচেয়ে <b>ব্যবহারকারীর বন্ধুসূলভ</b> লিনাক্স ডিস্ট্রিবিউশন। এটি "
-"পৃথিবীর সবচেয়ে <b>বহুল-ব্যবহৃত</b> লিনাক্স ডিস্ট্রিবিউশনের মধ্যে অন্যতম!"
+"Mandriva Linux আজকের সবচেয়ে <b>ব্যবহারকারীর বন্ধুসূলভ</b> লিনাক্স ডিস্ট্রিবিউশন। "
+"এটি পৃথিবীর সবচেয়ে <b>বহুল-ব্যবহৃত</b> লিনাক্স ডিস্ট্রিবিউশনের মধ্যে অন্যতম!"
 
 #: share/advertising/02.pl:13
 #, c-format
@@ -15626,12 +15631,12 @@ msgstr "<b>উন্মুক্ত সোর্সের পৃথিবী</b>
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux 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 "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
-"Mandrivalinux উন্মুক্ত সোর্স মডেলে প্রতিশ্রুতিবদ্ধ। এর অর্থ, এই নতুন রিলিজটি "
+"Mandriva Linux উন্মুক্ত সোর্স মডেলে প্রতিশ্রুতিবদ্ধ। এর অর্থ, এই নতুন রিলিজটি "
 "<b>Mandriva এর ডেভেলপমেন্ট টিম</b> এবং <b>বিশ্বব্যাপী কমিউনিটির</b> "
 "<b>সহযোগিতার</b> ফসল।"
 
@@ -15652,8 +15657,8 @@ msgstr "<b>জি-পি-এল</b>"
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "ডিস্ট্রিবিউশন এবং ম্যানড্রেকলিনাক্স টুলসমূহের বেশিরভাগ সফ্‌টওয়্যার <b>General Public "
 "License</b> এর অধীনে লাইসেন্সকৃত।"
@@ -15689,25 +15694,26 @@ msgstr "<b>কমিউনিটিতে যোগ দিন</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux 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."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
-"Mandrivalinux এর আছে ব্যবহারকারী ও ডেভেলপারদের <b>সবচেয়ে বড় কমিউনিটি</b> গুলোর "
-"একটি। এই কমিউনিটির কার্যক্রমও অনেক বিস্তৃত, ত্রুটি রিপোর্ট করা থেকে নতুন অ্যাপলিকেশন "
-"তৈরী পর্যন্ত। এ কমিউনিটি Mandrivalinux এর ভুবনে অপরিহার্য ভুমিকা পালন করে।"
+"Mandriva Linux এর আছে ব্যবহারকারী ও ডেভেলপারদের <b>সবচেয়ে বড় কমিউনিটি</b> "
+"গুলোর একটি। এই কমিউনিটির কার্যক্রমও অনেক বিস্তৃত, ত্রুটি রিপোর্ট করা থেকে নতুন "
+"অ্যাপলিকেশন তৈরী পর্যন্ত। এ কমিউনিটি Mandriva Linux এর ভুবনে অপরিহার্য ভুমিকা পালন "
+"করে।"
 
 # সাম
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
-"এই সক্রিয় কমিউনিটি সম্পর্কে <b>আরও জানতে</b>, দেখুন <b>www.mandrakelinux.com</b> "
-"অথবা সরাসরি <b>www.mandrakelinux.com/en/cookerdevel.php3</b> যদি আপনি "
+"এই সক্রিয় কমিউনিটি সম্পর্কে <b>আরও জানতে</b>, দেখুন <b>www.mandrivalinux.com</b> "
+"অথবা সরাসরি <b>www.mandrivalinux.com/en/cookerdevel.php3</b> যদি আপনি "
 "ডেভেলপমেন্টে <b>সম্পৃক্ত</b> হতে চান।"
 
 #: share/advertising/05.pl:15
@@ -15719,10 +15725,10 @@ msgstr "<b>ডাউনলোড সংস্করণ</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"আপনি এখন <b>Mandrivalinux ডাউনলোড</b> ইনস্টল করছেন। এটি একটি ফ্রী ভার্সন যা "
+"আপনি এখন <b>Mandriva Linux ডাউনলোড</b> ইনস্টল করছেন। এটি একটি ফ্রী ভার্সন যা "
 "কিনা Mandriva <b>সবার জন্য সহজলভ্য</b> রাখতে চায়।"
 
 # সাম
@@ -15767,7 +15773,7 @@ msgstr "<b>আবিষ্কার করুন, আপনার প্রথ�
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
 msgstr "আপনি এখন <b>ম্যানড্রেকলিনাস্ক আবিষ্কার</b> ইনস্টল করছেন।"
 
 # সাম:
@@ -15792,7 +15798,7 @@ msgstr "<b>পাওয়ারপ্যাক, চূড়ান্ত লিনা
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
 msgstr "আপনি এখন <b>ম্যানড্রেকলিনাক্স পাওয়ারপ্যাক</b> ইনস্টল করছেন।"
 
 # সাম
@@ -15815,7 +15821,7 @@ msgstr "<b>পাওয়ারপ্যাক+, ডেস্কটপ এবং �
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
 msgstr "আপনি এখন <b>ম্যানড্রেকলিনাক্স পাওয়ারপ্যা++</b> ইনস্টল করছেন।"
 
 # সাম 
@@ -15841,14 +15847,14 @@ msgstr "<b>Mandriva পণ্যসমূহ</b>"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr "<b>ম্যানড্রেকসফ্‌ট</b> <b>ম্যানড্রেকলিনাক্স</b> প্রচুর প্রোডাক্ট তৈরী করেছে।"
 
 # সাম
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux এর পণ্যসমূহ হলো:"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux এর পণ্যসমূহ হলো:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -15869,11 +15875,11 @@ msgstr "\t* <b>পাওয়ারপ্যাক+</b>, ডেস্কটপ এ
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>x86-64 এর জন্য Mandrivalinux</b>, আপনার ৬৪‌-বিট প্রোসেসরের সব সম্ভবনাকে "
-"কাজে লাগানোর Mandrivalinux সমাধান। "
+"\t* <b>x86-64 এর জন্য Mandriva Linux</b>, আপনার ৬৪‌-বিট প্রোসেসরের সব সম্ভবনাকে "
+"কাজে লাগানোর Mandriva Linux সমাধান। "
 
 # সাম
 #: share/advertising/10.pl:15
@@ -15885,31 +15891,31 @@ msgstr "<b>Mandriva পণ্যসমূহ (Nomad পণ্যসমূহ)</b
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 "Mandriva দুটি পণ্য তৈরী করেছে যা আপনাকে ইনস্টল করা ছাড়াই <b>যেকোন কম্পিউটারে</b> "
-"Mandrivalinux ব্যবহার করার সুযোগ দেবে। "
+"Mandriva Linux ব্যবহার করার সুযোগ দেবে। "
 
 # সাম
 # bootable = ?
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>মুভ</b>, একটি Mandrivalinux ডিস্ট্রিবিউশন সম্পূর্ণভাবে একটি বুট CD-ROM থেকে "
+"\t* <b>মুভ</b>, একটি Mandriva Linux ডিস্ট্রিবিউশন সম্পূর্ণভাবে একটি বুট CD-ROM থেকে "
 "চলতে পারে।"
 
 # সাম: ultra-compact = ?
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, একটি Mandrivalinux ডিস্ট্রিবিউশন যা কিনা আলট্রা‌-"
+"\t* <b>GlobeTrotter</b>, একটি Mandriva Linux ডিস্ট্রিবিউশন যা কিনা আলট্রা‌-"
 "কমপ্যাক্ট “LaCie মোবাইল হার্ড ড্রাইভ” এ পূর্ব-ইনস্টলকৃত।"
 
 #: share/advertising/11.pl:13
@@ -15929,22 +15935,24 @@ msgstr ""
 # সাম: Corporate = প্রাতিষ্ঠানিক লিখলাম...সিওর না।
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
-"\t* <b>কর্পোরেট ডেস্কটপ</b>, ব্যবসা প্রতিষ্ঠানের উপযুক্ত Mandrivalinux ডেস্কটপ।"
+"\t* <b>কর্পোরেট ডেস্কটপ</b>, ব্যবসা প্রতিষ্ঠানের উপযুক্ত Mandriva Linux ডেস্কটপ।"
 
 # সাম
 # প্রাতিষ্ঠানিক
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>কর্পোরেট সার্ভার</b>, Mandrivalinux সার্ভার সমাধান।"
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>কর্পোরেট সার্ভার</b>, Mandriva Linux সার্ভার সমাধান।"
 
 # সাম
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
-msgstr "\t* <b>একাধিক-নেটওয়ার্ক ফায়ারওয়াল</b>, Mandrivalinux নিরাপত্তা সমাধান।"
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr "\t* <b>একাধিক-নেটওয়ার্ক ফায়ারওয়াল</b>, Mandriva Linux নিরাপত্তা সমাধান।"
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16163,7 +16171,7 @@ msgstr "<b>অ্যাপ্লিকেশনের বিশাল সীম�
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 "ম্যানড্রেকলিনাক্স মেনু'তে <b>আপনার সকল কাজসমূহ</b> এর জন্য আপনি </b>সহজে-ব্যবহার্য</"
@@ -16448,7 +16456,7 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
 msgstr "<b>ম্যান্ড্রেক-লিনাক্স নিয়ন্ত্রণ কেন্দ্র</b>"
 
 # সাম
@@ -16456,11 +16464,11 @@ msgstr "<b>ম্যান্ড্রেক-লিনাক্স নিয়ন�
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrivalinux নিয়ন্ত্রণ কেন্দ্র</b> একটি Mandrivalinux-সম্পর্কিত মৌলিক "
+"<b>Mandriva Linux নিয়ন্ত্রণ কেন্দ্র</b> একটি Mandriva Linux-সম্পর্কিত মৌলিক "
 "ইউটিলিটির সমষ্টি যা কিনা আপনার কম্পিউটারের কনফিগারেশন সহজ করে তোলে।  "
 
 # সাম
@@ -16489,12 +16497,12 @@ 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 "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "সব কম্পিউটার প্রোগ্রামিং এর মতই, উন্মুক্ত সোর্স সফ্টওয়্যার ডেভেলপমেন্টেও প্রয়োজন <b>সময় "
-"এবং লোকবল</b>। উন্মুক্ত সোর্স ধারনাটির সমর্থনে এবং <b>Mandrivalinux উন্নততর করার "
+"এবং লোকবল</b>। উন্মুক্ত সোর্স ধারনাটির সমর্থনে এবং <b>Mandriva Linux উন্নততর করার "
 "উদ্দেশ্যে</b> Mandriva মূল্য সংযোজিত পণ্য ও সেবা বিক্রয় করে থাকে। আপনি যদি এই "
 "প্রচেষ্টায় সাহায্য করতে চান তবে <b>অনুগ্রহ করে</b> আমাদের যেকোন পণ্য বা সেবা ক্রয় "
 "করুন!"
@@ -16531,8 +16539,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "আজ <b>store.mandrakesoft.com</b> এ থেমে যান!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "আজ <b>store.mandriva.com</b> এ থেমে যান!"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16542,7 +16550,7 @@ msgstr "<b>ম্যানড্রেকক্লাব</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr "<b>ম্যানড্রেকক্লাব</b> আপনার ম্যানড্রেকলিনাক্স প্রোডাক্টের <b>সঠিক সংগী</b>.."
 
@@ -16556,9 +16564,9 @@ msgstr "ম্যানড্রেকক্লাবে যোগ দিয়ে
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
-"\t* আমাদের অনলাইন <b>store.mandrakesoft.com</b> স্টোরের প্রোডাক্টসমূহ এবং "
+"\t* আমাদের অনলাইন <b>store.mandriva.com</b> স্টোরের প্রোডাক্টসমূহ এবং "
 "সার্ভিসসমূহে<b>বিশেষ মূল্যহ্রাস</b>।"
 
 #: share/advertising/28.pl:21
@@ -16572,17 +16580,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <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 "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
-"\t* Mandrivalinux <b>ISO ইমেজগুলো</b>, <b>নির্ধারিত সময়ের পূর্বেই</b>, পাওয়ার "
+"\t* Mandriva Linux <b>ISO ইমেজগুলো</b>, <b>নির্ধারিত সময়ের পূর্বেই</b>, পাওয়ার "
 "বিশেষ সুবিধা।"
 
 #: share/advertising/29.pl:13
@@ -16603,7 +16611,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 "ম্যানড্রেকঅনলাইন আপনার ম্যানড্রেকলিনাক্স সিস্টেমের জন্য <b>সহজে আপডেট</b> এর জন্য "
 "বিশাল সীমানার গুরুত্বপূর্ণ সার্ভিস:"
@@ -16630,7 +16638,7 @@ msgstr "\t* নমনীয় <b>রুটিনমাফিক</b> আপডে�
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
 "\t* একটি অ্যাকাউন্ট দিয়ে <b>আপনার সম্পূর্ণ ম্যানড্রেকলিনাক্স সিস্টেমের</b> ম্যানেজমেন্ট।"
 
@@ -16643,16 +16651,16 @@ msgstr "<b>Mandriva Expert</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
-"আপনার কি কোন <b>সহযোগিতা</b> প্রয়োজন? www.mandrakeexpert.com এর  <b>আমাদের "
+"আপনার কি কোন <b>সহযোগিতা</b> প্রয়োজন? www.mandrivaexpert.com এর  <b>আমাদের "
 "প্রযুক্তিগত সহায়তা প্লাটফর্ম</b> এ ম্যানড্রেকসফ্‌টের অভিজ্ঞ প্রযুক্তিবিদদের সাথে যোগাযোগ "
 "করুন।"
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 "<b>যোগ্যতাসম্পন্ন অভিজ্ঞ ম্যানড্রেকলিনাক্স ব্যবহারকারীদের</b> সাহায্যের জন্য ধন্যবাদ, "
@@ -16661,11 +16669,11 @@ msgstr ""
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
-"ম্যানড্রেকলিনাক্স সম্পর্কিত কোন প্রশ্নের জন্য, আপনাকে <b>store.mandrakesoft.com</b> "
-"থেকে সকল প্রকার সহায়তা নিতে হবে।"
+"ম্যানড্রেকলিনাক্স সম্পর্কিত কোন প্রশ্নের জন্য, আপনাকে <b>store.mandriva.com</b> থেকে "
+"সকল প্রকার সহায়তা নিতে হবে।"
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17066,8 +17074,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 "[অপশনসমূহ] [প্রোগ্রামের নাম]\n"
 "\n"
@@ -17128,12 +17136,12 @@ msgstr ""
 "                 : এবং ghostscript এর জন্য gs।"
 
 # সাম
-# Mandrivalinux Terminal
+# Mandriva Linux Terminal
 #: standalone.pm:84
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17147,7 +17155,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Mandrivalinux টার্মিনাল সার্ভার কনফিগারকারী\n"
+"Mandriva Linux টার্মিনাল সার্ভার কনফিগারকারী\n"
 "--enable        :MTS সক্রিয় করো\n"
 "--disable        : MTS নিষ্ক্রিয় করো\n"
 "--start           : MTS চালু করো\n"
@@ -19952,12 +19960,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
 msgstr "ম্যানড্রেকলিনাক্স ত্রুটি রিপোর্টকারী টুল"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
+msgid "Mandriva Linux Control Center"
 msgstr "ম্যানড্রেকলিনাক্স নিয়ন্ত্রন (control) সেন্টার"
 
 #: standalone/drakbug:48
@@ -20455,7 +20463,7 @@ msgstr "বুট হওয়ার সময় সচল হয়"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "এই ইন্টারফেস এখনো কন্‌ফিগার করা হয়নি।\n"
 "ম্যানড্রেকলিনাক্স নিয়ন্ত্রক কেন্দ্র থেকে সহকারী \"ইন্টারফেস যুক্ত করো\" চালান"
@@ -20465,10 +20473,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "আপনার সিস্টেমে কোন ইন্টারনেট সংযোগ কনফিগার করা নেই।\n"
-"অনুগ্রহপূর্বক Mandrivalinux নিয়ন্ত্রণকেন্দ্র থেকে \"%s\" চালান।"
+"অনুগ্রহপূর্বক Mandriva Linux নিয়ন্ত্রণকেন্দ্র থেকে \"%s\" চালান।"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20519,7 +20527,7 @@ msgstr "KDM (কেডিই ডিসপ্লে ম্যানেজার)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr "MdkKDM (ম্যানড্রেকলিনাক্স ডিসপ্লে ম্যানেজার)"
 
 #: standalone/drakedm:37
@@ -20828,18 +20836,18 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 "স্বত্বাধিকারী (C) ২০০১-২০০২ ম্যানড্রেকসফ্‌ট কর্তৃক \n"
 "\n"
 "\n"
 "       ডুপন্ট সেবাস্তিয়ান (মূল সংস্করণ)\n"
 "\n"
-"       চওমেট্টে ডেমিয়েন <dchaumette@mandrakesoft.com>\n"
+"       চওমেট্টে ডেমিয়েন <dchaumette@mandriva.com>\n"
 "\n"
-"       ভিগ্‌নড থিয়েরী <tvignaud@mandrakesoft.com>"
+"       ভিগ্‌নড থিয়েরী <tvignaud@mandriva.com>"
 
 #: standalone/drakfont:520
 #, c-format
@@ -21416,8 +21424,8 @@ msgstr " --doc <link>          - অন্য ওয়েব পেজে সং�
 # সাম
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux সাহায্যকেন্দ্র"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux সাহায্যকেন্দ্র"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22080,7 +22088,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "আপনার মেশিনে কোন সাউন্ডকার্ড পাওয়া যায়নি। অনুগ্রহ করে ভালভাবে দেখুন একটি লিনাক্স-"
 "সমর্থিত সাউন্ডকার্ড সঠিকভাবে লাগানো আছে।\n"
@@ -22089,7 +22097,7 @@ msgstr ""
 "আপনি আমাদের হার্ডওয়ার ডাটাবেজে ঘুরে আসতে পারেন:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24079,7 +24087,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "আপনি মেশিনে কোন টিভি কার্ড পাওয়া যায় নি। অনুগ্রহ করে পরীক্ষা করুন যে লিনাক্স-"
 "সমর্থিত ভিডিও/টিভি কার্ড সঠিকভাবে সংযুক্ত আছে।\n"
@@ -24088,7 +24096,7 @@ msgstr ""
 "আপনি আমাদের হার্ডওয়্যার ডাটাবেজে ঘুরে আসতে পারেন:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -24816,13 +24824,13 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
 "এটা হচ্ছে HardDrake, %s এর একটি হার্ডওয়্যার কনফিগারেশন টুল।\n"
 "<span foreground=\"royalblue3\">সংস্করণ:</span> %s\n"
 "<span foreground=\"royalblue3\">লেখক:</span> থিয়েরি ভিগ্‌নদ &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -24933,8 +24941,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinux টুলসমুহের লগ"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linux টুলসমুহের লগ"
 
 # ##যন্ত্রপাতি
 # Logdrake-এর কোন বাংলা হবে বলে আমার মনে হয়না।
@@ -25475,7 +25483,7 @@ msgstr "সংযোগ সম্পন্ন হয়েছে।"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "কানেকশন হয়নি।\n"
 "ম্যান্ড্রেক-লিনাক্স কন্ট্রোল প্যানেলে আপনার কনফিগারেশন যাচাই করুন।"
@@ -26379,5 +26387,5 @@ msgstr "ইনস্টলেশন ব্যর্থ হয়েছে"
 #~ msgid "You've not selected any font"
 #~ msgstr "আপনি কোন ফন্ট বেছে নেন নি"
 
-#~ msgid "http://www.mandrakelinux.com/en/101errata.php3"
-#~ msgstr "http://www.mandrakelinux.com/en/101errata.php3"
+#~ msgid "http://www.mandrivalinux.com/en/101errata.php3"
+#~ msgstr "http://www.mandrivalinux.com/en/101errata.php3"
diff --git a/perl-install/share/po/br.po b/perl-install/share/po/br.po
index 117c11d19..001601269 100644
--- a/perl-install/share/po/br.po
+++ b/perl-install/share/po/br.po
@@ -1,6 +1,6 @@
 # DrakX e Brezhoneg.
 # Copyright (C) 1999-2003 Mandriva
-# Thierry Vignaud <tvignaud@mandrakesoft.com>, 1999-2005
+# Thierry Vignaud <tvignaud@mandriva.com>, 1999-2005
 # Jañ-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>, 1999-2000
 #
 msgid ""
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: DrakX 10.2\n"
 "POT-Creation-Date: 2005-04-21 14:27+0200\n"
 "PO-Revision-Date: 2005-04-21 14:54+0200\n"
-"Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
+"Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: Brezhoneg <ofisk@wanadoo.fr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1230,7 +1230,7 @@ msgstr "Diba ho yezh"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
 msgstr "Gallout a rit dibab yezhoù all hag a vo hegerz goude staliañ"
@@ -3504,7 +3504,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux 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 ""
@@ -3614,7 +3614,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux 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"
@@ -3625,11 +3625,12 @@ 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 Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux 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"
@@ -3736,10 +3737,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 Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux 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"
@@ -3856,7 +3857,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 Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -3954,12 +3955,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\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"
-"Mandrivalinux system.\n"
+"Mandriva Linux 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"
@@ -3986,7 +3987,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 Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -3995,7 +3996,8 @@ 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 Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4124,7 +4126,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"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux 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."
@@ -4142,7 +4144,7 @@ msgstr "Diaraog"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, 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"
@@ -4171,7 +4173,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 Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4187,7 +4189,7 @@ msgstr "Melestradur an surentez"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux 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"
@@ -4273,7 +4275,7 @@ msgstr "Tremen er mod boas/mailh"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4318,7 +4320,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 Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux 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"
@@ -4327,13 +4329,14 @@ 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 Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4374,7 +4377,8 @@ 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, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux'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"
@@ -4533,7 +4537,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 Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux 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"
@@ -4554,7 +4558,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 Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4654,7 +4658,8 @@ 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"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux 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"
@@ -4671,7 +4676,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"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux 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"
@@ -4733,7 +4738,7 @@ msgstr "Servijerioù"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -5056,7 +5061,7 @@ msgstr "Emaon o jediñ ment ar barzhadur Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 
@@ -5170,13 +5175,13 @@ msgstr "O tizenaouiñ ar rouedad"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -5230,7 +5235,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -5267,7 +5272,7 @@ msgid ""
 "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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -5340,8 +5345,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5349,13 +5354,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "Gourc'hemennoù, peurc'hraet eo ar staliadur.\n"
 "Lamit ar bladenn loc'hañ ha gwaskit enkas evit adloc'hañ.\n"
 "\n"
 "\n"
-"Evit titouroù war palastroù hegerz evit stumm-mañ Mandrivalinux,\n"
+"Evit titouroù war palastroù hegerz evit stumm-mañ Mandriva Linux,\n"
 "sellit ouzh ar Errata war : \n"
 "\n"
 "\n"
@@ -5363,13 +5368,13 @@ msgstr ""
 "\n"
 "\n"
 "Titouroù war gefluniañ ho reizhiad a zo hegerz e rannbennad Goude\n"
-"Staliañ Sturier ofisiel an Arveriad Mandrivalinux."
+"Staliañ Sturier ofisiel an Arveriad Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -5394,7 +5399,7 @@ msgstr "O kregiñ gant al lankad `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -5912,9 +5917,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
-"O taremprediñ al lec'hienn Mandrivalinux evit kaout roll ar pakadoù "
+"O taremprediñ al lec'hienn Mandriva Linux evit kaout roll ar pakadoù "
 "hegerz ..."
 
 #: install_steps_interactive.pm:840
@@ -6124,8 +6129,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Staliadur Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Staliadur Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8698,7 +8703,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -12295,8 +12300,8 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
 
@@ -14043,18 +14048,18 @@ msgstr "Plaenaozañ"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Petra eo Mandrivalinux ?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Petra eo Mandriva Linux ?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Degemer e <b>Mandrivalinux</b> !"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Degemer e <b>Mandriva Linux</b> !"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux 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."
@@ -14063,7 +14068,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux 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 ""
 
@@ -14080,9 +14085,9 @@ msgstr "Degemer er <b>bed dieub</b> !"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux 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 "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
 
@@ -14101,8 +14106,8 @@ msgstr "<b>Ar GPL</b>"
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -14128,17 +14133,17 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux 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."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 
@@ -14150,7 +14155,7 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
@@ -14188,7 +14193,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -14207,7 +14212,7 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
@@ -14225,7 +14230,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -14245,13 +14250,13 @@ msgstr "<b>Mandriva Store</b>"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux Control Center"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux Control Center"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -14271,7 +14276,7 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
@@ -14283,21 +14288,21 @@ msgstr ""
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<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 Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
@@ -14315,17 +14320,19 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -14501,7 +14508,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -14736,14 +14743,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Kreizenn ren Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Kreizenn ren Mandriva Linux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -14766,8 +14773,8 @@ 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 "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -14797,7 +14804,7 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
 msgstr ""
 
 #: share/advertising/28.pl:15
@@ -14808,7 +14815,7 @@ msgstr "<b>Mandriva Online</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
 
@@ -14822,7 +14829,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/advertising/28.pl:21
@@ -14834,14 +14841,14 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
@@ -14860,7 +14867,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -14883,7 +14890,7 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
@@ -14895,21 +14902,21 @@ msgstr "<b>Mandriva Store</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/compssUsers.pl:25
@@ -15258,8 +15265,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 
 #: standalone.pm:63
@@ -15295,7 +15302,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17815,13 +17822,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux Control Center"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux Control Center"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Kreizenn ren Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Kreizenn ren Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18299,14 +18306,14 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux 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 Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18357,7 +18364,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18647,9 +18654,9 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 
 #: standalone/drakfont:520
@@ -19129,8 +19136,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Kreizenn sikourMandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Kreizenn sikourMandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -19711,7 +19718,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 
 #: standalone/draksound:57
@@ -21309,7 +21316,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 
 #: standalone/harddrake2:24
@@ -21995,7 +22002,7 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
 
@@ -22106,8 +22113,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinux Control Center"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linux Control Center"
 
 #: standalone/logdrake:51
 #, c-format
@@ -22613,7 +22620,7 @@ msgstr "Echu eo ar gevreadenn"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341
diff --git a/perl-install/share/po/bs.po b/perl-install/share/po/bs.po
index 48d3a3509..24c302065 100644
--- a/perl-install/share/po/bs.po
+++ b/perl-install/share/po/bs.po
@@ -1305,11 +1305,11 @@ msgstr "Izbor jezika"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux 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 ""
-"Mandrivalinux podržava više jezika. Izaberite jezike koje\n"
+"Mandriva Linux podržava više jezika. Izaberite jezike koje\n"
 "želite instalirati. Oni će biti dostupni kada se završi vaša\n"
 "instalacija i restartujete vaš sistem."
 
@@ -3735,12 +3735,12 @@ msgstr "uključi radio podršku"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Prije nego što nastavimo, trebate pažljivo pročitati uvjete licence. Ona\n"
-"pokriva cijelu Mandrivalinux distribuciju. Ako se slažete sa svim\n"
+"pokriva cijelu Mandriva Linux distribuciju. Ako se slažete sa svim\n"
 "uvjetima u njoj, izaberite opciju \"%s\". Ako ne, klikom na \"%s\" ćete\n"
 "restartovati vaš računar."
 
@@ -3928,13 +3928,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux 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 ""
-"Mandrivalinux instalacija se prostire na nekoliko CDova. Ako je neki\n"
+"Mandriva Linux instalacija se prostire na nekoliko CDova. Ako je neki\n"
 "paket smješten na drugom CDu, DrakX će izbaciti trenutni CD i zamoliti vas\n"
 "da ubacite neki drugi po potrebi. Ako nemate potreban CD pri ruci,\n"
 "samo kliknite na \"%s\", odgovarajući paketi neće biti instalirani."
@@ -3943,11 +3943,12 @@ 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 Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3999,12 +4000,12 @@ msgid ""
 "megabytes."
 msgstr ""
 "Sada je vrijeme da izaberete koje programe želite instalirati na vaš\n"
-"sistem. Za Mandrivalinux su dostupne hiljade paketa, pa da bi\n"
+"sistem. Za Mandriva Linux su dostupne hiljade paketa, pa da bi\n"
 "njihovo upravljanje bilo lakše, organizovani su u grupe slične\n"
 "primjene.\n"
 "\n"
 "Paketi su sortirani u grupe ovisno o tipičnoj namjeni vašeg računara.\n"
-"U Mandrivalinuxu date su četiri predefinisane kategorije. Možete\n"
+"U Mandriva Linuxu date su četiri predefinisane kategorije. Možete\n"
 "miješati i poklapati programe iz raznih grupa, pa tako instalacija ``Radna\n"
 "stanica'' može sadržavati programe iz grupe ``Programiranje''.\n"
 "\n"
@@ -4110,10 +4111,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 Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4143,11 +4144,11 @@ msgstr ""
 "\n"
 "!! Ako izaberete neki serverski paket, zato što ste specifično izabrali taj\n"
 "paket ili zato što je on dio grupe paketa, bićete zamoljeni da potvrdite da\n"
-"zaista želite da taj server bude instaliran. Mandrivalinux obično\n"
+"zaista želite da taj server bude instaliran. Mandriva Linux obično\n"
 "automatski pokreće sve instalirane servise prilikom pokretanja sistema.\n"
 "Čak i ako su sigurni i nemaju poznatih problema u trenutku pakovanja\n"
 "distribucije, sasvim je moguće da su neke sigurnosne rupe otkrivene\n"
-"nakon što je dovršena ova verzija Mandrivalinuxa. Ako niste sigurni\n"
+"nakon što je dovršena ova verzija Mandriva Linuxa. Ako niste sigurni\n"
 "čemu tačno služi taj paket ili zašto ga treba instalirati, kliknite na \"%s"
 "\".\n"
 "Klikom na \"%s\" instalirate navedene servise i oni će biti automatski\n"
@@ -4304,7 +4305,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 Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4360,7 +4361,7 @@ msgid ""
 msgstr ""
 "X (skraćeno od X Window System) je srce GNU/Linux grafičkog interfejsa\n"
 "o kojem ovise sve grafičke okoline (KDE, GNOME, AfterStep,\n"
-"WindowMaker itd.) uključene u Mandrivalinux.\n"
+"WindowMaker itd.) uključene u Mandriva Linux.\n"
 "\n"
 "Biće vam predstavljena lista različitih parametara koje možete promijeniti\n"
 "da biste dobili optimalan grafički prikaz.\n"
@@ -4477,12 +4478,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\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"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4509,7 +4510,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 Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4518,7 +4519,8 @@ 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 Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4538,12 +4540,12 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Na ovom mjestu trebate izabrati gdje želite instalirati Mandrivalinux\n"
+"Na ovom mjestu trebate izabrati gdje želite instalirati Mandriva Linux\n"
 "operativni sistem na vašem hard disku. Ako je disk prazan ili ako postojeći\n"
 "operativni sistem koristi sav prostor na njemu, potrebno je da ga\n"
 "particionirate. U biti, particioniranje hard diska predstavlja logičko\n"
 "organiziranje kako bi se stvorio prostor za instaliranje vašeg novog\n"
-"Mandrivalinux sistema.\n"
+"Mandriva Linux sistema.\n"
 "\n"
 "Pošto su efekti particioniranja obično nepovratni, i mogu voditi do gubitka\n"
 "podataka na eventualnom postojećem operativnom sistemu, particioniranje\n"
@@ -4575,7 +4577,7 @@ msgstr ""
 "podataka, pod uslovom da prethodno defragmentirate Windows particiju\n"
 "i da ona koristi FAT format. Backupovanje vaših podataka je strogo\n"
 "preporučeno. Ova mogućnost je preporučena ako namjeravate koristiti i\n"
-"Mandrivalinux i Microsoft Windows na istom računaru.\n"
+"Mandriva Linux i Microsoft Windows na istom računaru.\n"
 "\n"
 "    Prije izbora ove opcije, molim da imate na umu da će, nakon ove\n"
 "procedure, veličina vaše Microsoft Windows particije biti manja nego\n"
@@ -4743,7 +4745,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4765,7 +4767,7 @@ msgstr ""
 "Kliknite na \"%s\" kada budete spremni za formatiranje particija.\n"
 "\n"
 "Kliknite na \"%s\" ako želite da izaberete druge particije za instalaciju\n"
-"vašeg novog Mandrivalinux operativnog sistema.\n"
+"vašeg novog Mandriva Linux operativnog sistema.\n"
 "\n"
 "Kliknite na \"%s\" da izaberete particije koje želite provjeriti radi\n"
 "loših blokova."
@@ -4782,7 +4784,7 @@ msgstr "Nazad"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4794,7 +4796,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Kada završite instalaciju Mandrivalinuxa, moguće je da su neki paketi\n"
+"Kada završite instalaciju Mandriva Linuxa, moguće je da su neki paketi\n"
 "ažurirani od zadnjeg izdanja. Moguće je da su ispravljeni bugovi ili\n"
 "rješena neka sigurnosna pitanja. Ako želite iskoristiti ova unaprjeđenja,\n"
 "možete ih sada dobaviti sa Interneta. Izaberite \"%s\" ako imate ispravnu\n"
@@ -4822,7 +4824,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 Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4835,7 +4837,7 @@ msgstr ""
 "jednostavnosti korištenja.\n"
 "\n"
 "Ako ne znate šta izabrati, zadržite ponuđenu opciju. Možete promijeniti\n"
-"nivo sigurnosti naknadno koristeći program draksec iz Mandrivalinux\n"
+"nivo sigurnosti naknadno koristeći program draksec iz Mandriva Linux\n"
 "Kontrolnog centra.\n"
 "\n"
 "Polje \"%s\" obavještava sistem o korisniku koji će biti odgovoran za\n"
@@ -4850,7 +4852,7 @@ msgstr "Sigurnosni administrator"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -4921,7 +4923,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Sada trebate izabrati koje particije želite koristiti za instalaciju vašeg\n"
-"Mandrivalinux sistema. Ako su particije već definisane, iz prijašnje\n"
+"Mandriva Linux sistema. Ako su particije već definisane, iz prijašnje\n"
 "GNU/Linux instalacije ili nekim drugim alatom za particioniranje, možete\n"
 "koristiti postojeće particije. U suprotnom, sada morate definisati\n"
 "particije vašeg hard diska.\n"
@@ -5008,7 +5010,7 @@ msgstr "Prekidač normalnog/ekspertnog moda"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5038,7 +5040,7 @@ msgid ""
 msgstr ""
 "Na vašem hard disku ustanovljeno je više od jedne Microsoft particije.\n"
 "Molim izaberite onu koju želite smanjiti kako biste instalirali vaš\n"
-"Mandrivalinux operativni sistem.\n"
+"Mandriva Linux operativni sistem.\n"
 "\n"
 "Svaka particija je navedena ovako: \"Linux ime\", \"Windows ime\",\n"
 "\"Kapacitet\".\n"
@@ -5086,7 +5088,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 Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5095,19 +5097,20 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
 msgstr ""
 "Ovaj korak se aktivira samo ako je na vašem računaru pronađena postojeća\n"
 "GNU/Linux particija.\n"
 "\n"
 "DrakX sada treba znati da li želite izvršiti novu instalaciju ili\n"
-"nadogradnju postojećeg Mandrivalinux sistema:\n"
+"nadogradnju postojećeg Mandriva Linux sistema:\n"
 "\n"
 " * \"%s\". Najčešće ovo će u potpunosti obrisati stari sistem. Ipak,\n"
 "ovisno o vašoj šemi particioniranja, možete spriječiti da neki od vaših\n"
@@ -5116,14 +5119,14 @@ msgstr ""
 "datotečni sistem, trebate koristiti ovu opciju.\n"
 "\n"
 " * \"%s\". Ova vrsta instalacije vam omogućuje da ažurirate pakete\n"
-"koji su trenutno instalirani na vašem Mandrivalinux sistemu. Vaša trenutna\n"
+"koji su trenutno instalirani na vašem Mandriva Linux sistemu. Vaša trenutna\n"
 "šema particioniranja i korisnički podaci neće biti izmijenjeni. Većina\n"
 "ostalih koraka konfiguracije ostaju kao što jesu, slično običnoj "
 "instalaciji.\n"
 "\n"
-"Opcija ''Nadogradi'' bi trebala raditi ispravno na Mandrivalinux sistemima\n"
+"Opcija ''Nadogradi'' bi trebala raditi ispravno na Mandriva Linux sistemima\n"
 "koji koriste verziju \"8.1\" ili kasniju. Obavljanje nadogradnje na ranijim\n"
-"verzijama Mandrivalinuxa, prije verzije \"8.1\", nije preporučeno."
+"verzijama Mandriva Linuxa, prije verzije \"8.1\", nije preporučeno."
 
 #: help.pm:591
 #, c-format
@@ -5181,7 +5184,8 @@ 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, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5221,7 +5225,7 @@ msgstr ""
 "\n"
 "O UTF-8 (Unicode) podršci. Unicode je novi način kodiranja znakova čiji\n"
 "je cilj da obuhvati sve postojeće jezike. Ipak puna podrška za njega pod\n"
-"GNU/Linuxom je još uvijek u razvoju. Iz tog razloga, Mandrivalinux će ga\n"
+"GNU/Linuxom je još uvijek u razvoju. Iz tog razloga, Mandriva Linux će ga\n"
 "koristiti ovisno o drugim izborima korisnika:\n"
 "\n"
 " * Ako izaberete jezike sa raširenim starim kodiranjem (latin1 jezici, "
@@ -5462,7 +5466,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 Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5483,11 +5487,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 Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Sada je vrijeme da izaberete sistem štampe za vaš računar. Drugi\n"
-"operativni sistemi vam možda nude jedan, ali Mandrivalinux nudi\n"
+"operativni sistemi vam možda nude jedan, ali Mandriva Linux nudi\n"
 "dva. Svaki od ovih sistema je najbolji za određenu vrstu konfiguracije.\n"
 "\n"
 "* \"%s\" -- skraćeno za ``štampaj i nemoj stavljati u red'' (print, do not\n"
@@ -5514,7 +5518,7 @@ msgstr ""
 "\n"
 "Ako sada napravite izbor, pa kasnije zaključite da vam se ne sviđa izabrani\n"
 "sistem štampe, možete ga promijeniti pokretanjem PrinterDrake iz\n"
-"Mandrivalinux Kontrolnog centra i klikanjem na dugme \"%s\"."
+"Mandriva Linux Kontrolnog centra i klikanjem na dugme \"%s\"."
 
 #: help.pm:765
 #, c-format
@@ -5632,7 +5636,8 @@ 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"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5649,7 +5654,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"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5701,7 +5706,7 @@ msgstr ""
 "\n"
 "* \"%s\": ako želite, možete podesiti vaš Internet pristup ili pristup\n"
 "lokalnoj mreži. Pogledajte štampanu dokumentaciju ili koristite\n"
-"Mandrivalinux Kontrolni centar nakon što je završena instalacija\n"
+"Mandriva Linux Kontrolni centar nakon što je završena instalacija\n"
 "kako biste koristili ugrađenu pomoć. \n"
 " * \"%s\": omogućuje vam da podesite adrese HTTP i FTP proxyja ako\n"
 "se računar na koji instalirate nalazi iza proxy servera.\n"
@@ -5716,7 +5721,7 @@ msgstr ""
 "* \"%s\": ako želite promijeniti postavke bootloadera, kliknite na to\n"
 "dugme. Ovo bi trebalo biti rezervisano za napredne korisnike. Pogledajte\n"
 "štampanu dokumentaciju ili pomoć za bootloader konfiguraciju uključenu\n"
-"u Mandrivalinux Kontrolni centar.\n"
+"u Mandriva Linux Kontrolni centar.\n"
 "\n"
 "* \"%s\": ovdje možete fino podešavati koji servisi će biti pokrenuti\n"
 "na vašem računaru. Ako planirate koristiti ovaj računar kao server,\n"
@@ -5777,11 +5782,11 @@ msgstr "Servisi"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Izaberite hard disk koji želite obrisati kako biste instalirali vašu novu\n"
-"Mandrivalinux particiju. Budite pažljivi, svi podaci koji se nalaze na\n"
+"Mandriva Linux particiju. Budite pažljivi, svi podaci koji se nalaze na\n"
 "njemu će biti izgubljeni i neće se moći vratiti!"
 
 #: help.pm:863
@@ -6137,12 +6142,12 @@ msgstr "Izračunavam veličinu Windows particije"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Vaša Windows particija je previše fragmentirana. Molim restartujte vaš "
-"računar pod Windows-om, pokrenite ``defrag'' alat, zatim pokrenite "
-"Mandrivalinux instalaciju."
+"računar pod Windows-om, pokrenite ``defrag'' alat, zatim pokrenite Mandriva "
+"Linux instalaciju."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6259,13 +6264,13 @@ msgstr "Zaustavljam mrežu"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -6319,7 +6324,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6356,7 +6361,7 @@ msgid ""
 "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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6383,13 +6388,13 @@ msgstr ""
 "\n"
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -6443,7 +6448,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6480,7 +6485,7 @@ msgstr ""
 "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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6591,8 +6596,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6600,13 +6605,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "Čestitamo, instalacija je završena.\n"
 "Uklonite boot medij i pritisnite Enter da restartujete računar.\n"
 "\n"
 "\n"
-"Za informacije o ispravkama koje su dostupne za ovu verziju Mandrivalinuxa,\n"
+"Za informacije o ispravkama koje su dostupne za ovu verziju Mandriva "
+"Linuxa,\n"
 "pogledajte Errata koja je dostupna na:\n"
 "\n"
 "\n"
@@ -6614,13 +6620,13 @@ msgstr ""
 "\n"
 "\n"
 "Informacije o podešavanju vašeg sistema su dostupne u poglavlju\n"
-"\"Nakon instalacije\" vašeg zvaničnog Mandrivalinux Priručnika za upotrebu."
+"\"Nakon instalacije\" vašeg zvaničnog Mandriva Linux Priručnika za upotrebu."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -6649,12 +6655,12 @@ msgstr "Prelazim na korak `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Vašem sistemu ponestaje resursa. Možda imate neki problem sa instalacijom\n"
-"Mandrivalinuxa. Ako se ovo desi, možete pokušati tekstualnu instalaciju. Za "
+"Mandriva Linuxa. Ako se ovo desi, možete pokušati tekstualnu instalaciju. Za "
 "ovo,\n"
 "pritisnite `F1' prilikom bootanja CDROMa, zatim unesite `text'."
 
@@ -7193,9 +7199,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
-"Kontaktiram Mandrivalinux web stranicu da bih saznao listu dostupnih "
+"Kontaktiram Mandriva Linux web stranicu da bih saznao listu dostupnih "
 "mirrora..."
 
 #: install_steps_interactive.pm:840
@@ -7419,8 +7425,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux instalacija %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux instalacija %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10006,13 +10012,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall podešavanje\n"
 "\n"
-"Podesite lični firewall na ovom Mandrivalinux računaru.\n"
+"Podesite lični firewall na ovom Mandriva Linux računaru.\n"
 "Ako želite moćnu soluciju posebnog firewalla, molim pogledajte\n"
 "specijaliziranu MandrakeSecurity Firewall distribuciju."
 
@@ -14062,11 +14068,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
-"Pokrenite Scannerdrake (Hardver/Skener u Mandrivalinux Kontrolnom centru) "
+"Pokrenite Scannerdrake (Hardver/Skener u Mandriva Linux Kontrolnom centru) "
 "kako biste dijelili vaš skener putem mreže.\n"
 "\n"
 
@@ -16001,23 +16007,23 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Šta je Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Šta je Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Dobro došli u <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Dobro došli u <b>Mandriva Linux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux 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 ""
-"Mandrivalinux je <b>Linux distribucija</b> koja sadržava jezgru sistema, "
+"Mandriva Linux je <b>Linux distribucija</b> koja sadržava jezgru sistema, "
 "koja se naziva <b>operativni sistem</b> (baziranu na Linux kernelu) kao i "
 "<b>mnoštvo programa</b> koji zadovoljavaju sve potrebe koje vam mogu pasti "
 "na pamet."
@@ -16025,10 +16031,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux 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 ""
-"Mandrivalinux je <b>najprijateljskija</b> Linux distribucija danas. On je "
+"Mandriva Linux je <b>najprijateljskija</b> Linux distribucija danas. On je "
 "takođe i jedna od <b>najšire korištenih</b> Linux distribucija na svijetu!"
 
 #: share/advertising/02.pl:13
@@ -16044,14 +16050,14 @@ msgstr "Dobro došli u svijet <b>otvorenog izvornog koda</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux 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 "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
-"Mandrivalinux u potpunosti podržava open-source model. To znači da je ovo "
+"Mandriva Linux u potpunosti podržava open-source model. To znači da je ovo "
 "novo izdanje je rezultat <b>saradnje</b> između <b>Mandriva-ovog tima "
-"programera</b> i <b>međunarodne zajednice</b> Mandrivalinux saradnika."
+"programera</b> i <b>međunarodne zajednice</b> Mandriva Linux saradnika."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16070,11 +16076,11 @@ msgstr "<b>GPL - General Public License</b>"
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Većina softvera koji je uključen u ovoj distribuciji, kao i svi "
-"Mandrivalinux alati, koriste <b>GNU General Public License</b>."
+"Većina softvera koji je uključen u ovoj distribuciji, kao i svi Mandriva "
+"Linux alati, koriste <b>GNU General Public License</b>."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16104,25 +16110,25 @@ msgstr "<b>Uključite se u zajednicu</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux 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."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
-"Mandrivalinux ima jednu od <b>najvećih zajednica</b> korisnika i programera. "
-"Uloga takve zajednice je raznolika, počevši od prijavljivanja bugova do "
-"razvoja novih programa. Zajednica igra <b>ključnu ulogu</b> u svijetu "
-"Mandrivalinuxa."
+"Mandriva Linux ima jednu od <b>najvećih zajednica</b> korisnika i "
+"programera. Uloga takve zajednice je raznolika, počevši od prijavljivanja "
+"bugova do razvoja novih programa. Zajednica igra <b>ključnu ulogu</b> u "
+"svijetu Mandriva Linuxa."
 
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 "Da biste <b>naučili više</b> o našoj dinamičnoj zajednici, molimo posjetite "
-"<b>www.mandrakelinux.com</b> ili direktno <b>www.mandrakelinux.com/en/"
+"<b>www.mandrivalinux.com</b> ili direktno <b>www.mandrivalinux.com/en/"
 "cookerdevel.php3</b> i <b>uključite se</b> u razvoj."
 
 #: share/advertising/05.pl:15
@@ -16133,10 +16139,10 @@ msgstr "<b>Download verzija</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Trenutno instalirate <b>Mandrivalinux Download</b>. To je besplatna verzija "
+"Trenutno instalirate <b>Mandriva Linux Download</b>. To je besplatna verzija "
 "koju Mandriva želi zadržati <b>dostupnom svima</b>."
 
 #: share/advertising/05.pl:19
@@ -16181,8 +16187,8 @@ msgstr "<b>Discovery, Tvoj prvi Linux Desktop</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Trenutno instalirate <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Trenutno instalirate <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16204,8 +16210,8 @@ msgstr "<b>PowerPack, Najbolji Linux Desktop</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Trenutno instalirate <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Trenutno instalirate <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16224,8 +16230,8 @@ msgstr "<b>PowerPack+, Linux rješenje za Desktop i Server</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Trenutno instalirate <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Trenutno instalirate <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16247,13 +16253,14 @@ msgstr "<b>Mandriva proizvodi</b>"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
-msgstr "<b>Mandriva</b> je razvio širok raspon <b>Mandrivalinux</b> proizvoda."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
+msgstr ""
+"<b>Mandriva</b> je razvio širok raspon <b>Mandriva Linux</b> proizvoda."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux proizvodi su:"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux proizvodi su:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16273,11 +16280,11 @@ msgstr "\t* <b>PowerPack+</b>, Linux rješenje za Desktop i Server."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrivalinux za x86-64</b>, Mandrivalinux rješenje kojim ćete izvući "
-"maksimum iz vašeg 64-bitnog procesora."
+"\t* <b>Mandriva Linux za x86-64</b>, Mandriva Linux rješenje kojim ćete "
+"izvući maksimum iz vašeg 64-bitnog procesora."
 
 #: share/advertising/10.pl:15
 #, c-format
@@ -16287,29 +16294,28 @@ msgstr "<b>Mandriva proizvodi (mobilni proizvodi)</b>"
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandriva je razvio dva proizvoda koji vam omogućuju da koristite "
-"Mandrivalinux <b>na bilo kojem računaru</b> bez potrebe da ga ustvari "
-"instalirate:"
+"Mandriva je razvio dva proizvoda koji vam omogućuju da koristite Mandriva "
+"Linux <b>na bilo kojem računaru</b> bez potrebe da ga ustvari instalirate:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, Mandrivalinux distribucija koja se izvršava u potpunosti sa "
-"bootabilnog CD-ROMa."
+"\t* <b>Move</b>, Mandriva Linux distribucija koja se izvršava u potpunosti "
+"sa bootabilnog CD-ROMa."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, Mandrivalinux distribucija preinstalirana na "
+"\t* <b>GlobeTrotter</b>, Mandriva Linux distribucija preinstalirana na "
 "kompaktnom USB hard disku - “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
@@ -16328,19 +16334,22 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, Mandrivalinux Desktop za preduzeća."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Mandriva Linux Desktop za preduzeća."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Mandrivalinux rješenje za servere."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandriva Linux rješenje za servere."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
 msgstr ""
-"\t* <b>Multi-Network Firewall</b>, Mandrivalinux rješenje za sigurnost mreža."
+"\t* <b>Multi-Network Firewall</b>, Mandriva Linux rješenje za sigurnost "
+"mreža."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16541,10 +16550,10 @@ msgstr "<b>Uživajte u širokoj paleti programa</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"U Mandrivalinux meniju naći ćete <b>jednostavne</b> programe <b>za sve "
+"U Mandriva Linux meniju naći ćete <b>jednostavne</b> programe <b>za sve "
 "zadatke</b>:"
 
 #: share/advertising/18.pl:16
@@ -16806,18 +16815,18 @@ msgstr "\t* <b>Postfix</b> i <b>Sendmail</b>: Popularni i moćni mail serveri."
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux Kontrolni centar</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux Kontrolni centar</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrivalinux Kontrolni centar</b> je kolecija najvažnijih alata "
-"specifičnih za Mandrivalinux koji olakšavaju podešavanje vašeg računara."
+"<b>Mandriva Linux Kontrolni centar</b> je kolecija najvažnijih alata "
+"specifičnih za Mandriva Linux koji olakšavaju podešavanje vašeg računara."
 
 #: share/advertising/25.pl:17
 #, c-format
@@ -16842,15 +16851,15 @@ 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 "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Kao i svo računarsko programiranje, za razvoj open-source softwara je "
 "<b>potrebno vrijeme i ljudi</b>. Kako bi poštovao open-source filozofiju, "
 "Mandriva vam prodaje dodatnu vrijednost proizvoda i usluga kako bi "
-"<b>nastavio usavršavati Mandrivalinux</b>. Ako želite <b>podržati open-"
-"source filozofiju</b> kao i razvoj Mandrivalinuxa, <b>molimo vas</b> da "
+"<b>nastavio usavršavati Mandriva Linux</b>. Ako želite <b>podržati open-"
+"source filozofiju</b> kao i razvoj Mandriva Linuxa, <b>molimo vas</b> da "
 "razmotrite kupovinu nekog od naših proizvoda ili usluga!"
 
 #: share/advertising/27.pl:13
@@ -16885,8 +16894,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Navratite danas u <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Navratite danas u <b>store.mandriva.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16896,10 +16905,11 @@ msgstr "<b>Mandriva Club</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
-"<b>Mandriva Club</b> je <b>savršen dodatak</b> vašem Mandrivalinux proizvodu."
+"<b>Mandriva Club</b> je <b>savršen dodatak</b> vašem Mandriva Linux "
+"proizvodu."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -16913,10 +16923,10 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 "\t* <b>Posebni popusti</b> za proizvode i usluge u našoj on-line prodavnici "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -16929,17 +16939,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Učešće u Mandrivalinux <b>korisničkim forumima</b>"
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Učešće u Mandriva Linux <b>korisničkim forumima</b>"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
-"\t* <b>Rani i privilegovani pristup</b>, prije javnog izdanja, Mandrivalinux "
-"<b>ISO imidžima</b>."
+"\t* <b>Rani i privilegovani pristup</b>, prije javnog izdanja, Mandriva "
+"Linux <b>ISO imidžima</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -16959,10 +16969,10 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 "Mandriva Online vam pruža širok izbor usluga za <b>jednostavno ažuriranje</"
-"b> vaših Mandrivalinux sistema:"
+"b> vaših Mandriva Linux sistema:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16987,9 +16997,9 @@ msgstr "\t* Fleksibilno <b>planiranje</b> ažuriranja."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
-"\t* Menadžment <b>svih vaših Mandrivalinux sistema</b> putem jednog "
+"\t* Menadžment <b>svih vaših Mandriva Linux sistema</b> putem jednog "
 "korisničkog računa."
 
 #: share/advertising/30.pl:13
@@ -17001,28 +17011,28 @@ msgstr "<b>Mandriva Expert</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 "Da li vam je potrebna <b>podrška?</b> Upoznajte Mandriva tehničke eksperte "
-"na našoj <b>platformi za tehničku podršku</b> www.mandrakeexpert.com."
+"na našoj <b>platformi za tehničku podršku</b> www.mandrivaexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Zahvaljujući pomoći <b>kvalificiranih eksperata za Mandrivalinux</b>, "
+"Zahvaljujući pomoći <b>kvalificiranih eksperata za Mandriva Linux</b>, "
 "uštedićete mnogo vremena."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
-"Za bilo kakva pitanja u vezi Mandrivalinuxa, možete kupiti incidente za "
-"podršku na <b>store.mandrakesoft.com</b>."
+"Za bilo kakva pitanja u vezi Mandriva Linuxa, možete kupiti incidente za "
+"podršku na <b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17408,8 +17418,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 "[OPTIONS] [PROGRAM_NAME]\n"
 "\n"
@@ -17470,7 +17480,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17484,7 +17494,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Podešavanje Mandrivalinux Terminal Servera\n"
+"Podešavanje Mandriva Linux Terminal Servera\n"
 "--enable         : omogući MTS\n"
 "--disable        : onemogući MTS\n"
 "--start          : pokreni MTS\n"
@@ -20324,13 +20334,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux alat za prijavu bugova"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux alat za prijavu bugova"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux Kontrolni centar"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux Kontrolni centar"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20821,19 +20831,19 @@ msgstr "Pokrenut na bootu"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Interfejs još nije podešen.\n"
-"Pokrenite asistent \"Dodaj interfejs\" iz Mandrivalinux Kontrolnog centra"
+"Pokrenite asistent \"Dodaj interfejs\" iz Mandriva Linux Kontrolnog centra"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Niste podesili nijednu Internet konekciju.\n"
-"Pokrenite asistent \"%s\" iz Mandrivalinux Kontrolnog centra"
+"Pokrenite asistent \"%s\" iz Mandriva Linux Kontrolnog centra"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20883,8 +20893,8 @@ msgstr "KDM (KDE Display Manager)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Mandriva Linux Display Manager)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21188,18 +21198,18 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 "Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (originalna verzija)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 
 #: standalone/drakfont:520
 #, c-format
@@ -21771,8 +21781,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux Centar za pomoć"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux Centar za pomoć"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22042,7 +22052,7 @@ msgid ""
 msgstr ""
 "Sada ćete podesiti instalacioni server, koji se sastoji od PXE servera (DHCP "
 "servera) i TFTP servera.\n"
-"Sa ovom opcijom, moći ćete instalirati Mandrivalinux na druge računare na "
+"Sa ovom opcijom, moći ćete instalirati Mandriva Linux na druge računare na "
 "vašoj lokalnoj mreži koristećiovaj računar kao izvor.\n"
 "\n"
 "Prije nego što nastavite, provjerite da li ste podesili mrežni/internet "
@@ -22435,7 +22445,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "Nije pronađena nijedna zvučna kartica na vašoj mašini. Molim provjerite da "
 "li je ispravno spojena zvučna kartica koja je podržana pod Linuxom.\n"
@@ -22444,7 +22454,7 @@ msgstr ""
 "Možete posjetiti našu bazu hardvera na:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24462,7 +24472,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "Na vašem računaru nije detektovana TV kartica. Molim provjerite da li je "
 "ispravno priključena Video/TV kartica koja je podržana pod Linuxom.\n"
@@ -24471,7 +24481,7 @@ msgstr ""
 "Možete posjetiti našu bazu hardvera na:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25184,13 +25194,13 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
 "Ovo je HardDrake, %s alat za podešavanje hardvera.\n"
 "<span foreground=\"royalblue3\">Verzija:</span> %s\n"
 "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25298,8 +25308,8 @@ msgstr "Izmjena je napravljena, ali da bi stupila na snagu morate se odjaviti"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Dnevnici Mandrivalinux alata"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Dnevnici Mandriva Linux alata"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25812,10 +25822,10 @@ msgstr "Konekcija završena."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Konekcija nije uspjela.\n"
-"Provjerite konfiguraciju u Mandrivalinux Kontrolnom centru."
+"Provjerite konfiguraciju u Mandriva Linux Kontrolnom centru."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/ca.po b/perl-install/share/po/ca.po
index 380d2dad4..ebc8cab4e 100644
--- a/perl-install/share/po/ca.po
+++ b/perl-install/share/po/ca.po
@@ -1276,11 +1276,11 @@ msgstr "Tria d'idioma"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux 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 ""
-"Mandrivalinux pot utilitzar múltiples idiomes. Seleccioneu\n"
+"Mandriva Linux pot utilitzar múltiples idiomes. Seleccioneu\n"
 "els llenguatges que vulgueu instal·lar. Estaran disponibles\n"
 "quan reinicieu el sistema, després que la instal·lació s'hagi completat."
 
@@ -3751,13 +3751,13 @@ msgstr "habilita l'ús de la ràdio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Abans de continuar, llegiu atentament les clàusules de la llicència. "
 "Cobreix\n"
-"tota la distribució Mandrivalinux. Si esteu d'acord amb tots els termes de "
+"tota la distribució Mandriva Linux. Si esteu d'acord amb tots els termes de "
 "la\n"
 "llicència, feu clic al quadre \"%s\"; si no, prémer el botó \"%s\"\n"
 "reiniciarà el vostre ordinador."
@@ -3959,13 +3959,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"La instal·lació del Mandrivalinux està repartida en diversos CD-ROM. Si\n"
+"La instal·lació del Mandriva Linux està repartida en diversos CD-ROM. Si\n"
 "un dels paquets escollits està en un altre CD-ROM, DrakX expulsarà el CD\n"
 "actual i us demanarà que n'inseriu un altre. Si no teniu el CD necessari a\n"
 "mà, premeu \"%s\" i els paquets corresponents no s'instal·laran."
@@ -3974,11 +3974,12 @@ 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 Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4030,10 +4031,10 @@ msgid ""
 "megabytes."
 msgstr ""
 "Ha arribat el moment d'indicar els programes que voleu instal·lar en el\n"
-"sistema. Mandrivalinux té milers de paquets, i per facilitar-ne la\n"
+"sistema. Mandriva Linux té milers de paquets, i per facilitar-ne la\n"
 "gestió s'han distribuït en grups d'aplicacions similars.\n"
 "\n"
-"Mandrivalinux agrupa els paquets en quatre categories. Podeu mesclar i fer\n"
+"Mandriva Linux agrupa els paquets en quatre categories. Podeu mesclar i fer\n"
 "coincidir aplicacions de grups diversos, de manera que una instal·lació\n"
 "d'``Estació de treball'' pot perfectament tenir instal·lades aplicacions\n"
 "de la categoria ``Servidor'' \n"
@@ -4139,10 +4140,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 Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4173,11 +4174,11 @@ msgstr ""
 "\n"
 "Si heu seleccionat un paquet de servidor, intencionadament o perquè\n"
 "formava part d'un grup, se us demanarà que confirmeu si realment voleu\n"
-"instal·lar aquests servidors. Per defecte, Mandrivalinux iniciarà i "
+"instal·lar aquests servidors. Per defecte, Mandriva Linux iniciarà i "
 "instal·larà automàticament qualsevol servidor durant l'arrencada. Tot i que\n"
 "siguin segurs i no tinguin cap problema conegut quan es publica la\n"
 "distribució, és totalment possible que es descobreixin forats de seguretat\n"
-"després que aquesta versió de Mandrivalinux quedi finalitzada.\n"
+"després que aquesta versió de Mandriva Linux quedi finalitzada.\n"
 "Si no sabeu què se suposa que fa un servei en particular, o per què s'està\n"
 "instal·lant, feu clic a \"%s\". Per defecte, si feu clic a \"%s\" els "
 "serveis\n"
@@ -4339,7 +4340,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 Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4396,7 +4397,7 @@ msgstr ""
 "L'X (per sistema X Window) és el cor de la interfície gràfica de GNU/Linux\n"
 "de què depenen tots els entorns gràfics (KDE, GNOME, AfterStep, "
 "WindowMaker,\n"
-"etc.) que venen amb Mandrivalinux.\n"
+"etc.) que venen amb Mandriva Linux.\n"
 "\n"
 "Veureu una relació de diferents paràmetres que podeu canviar per aconseguir\n"
 "una visualització gràfica òptima: Targeta gràfica\n"
@@ -4512,12 +4513,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\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"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4544,7 +4545,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 Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4553,7 +4554,8 @@ 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 Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4575,11 +4577,11 @@ msgid ""
 msgstr ""
 "Ara és quan heu de decidir en quin lloc del vostre disc dur voleu "
 "instal·lar\n"
-"el sistema operatiu Mandrivalinux. Si el disc és buit, o si un sistema\n"
+"el sistema operatiu Mandriva Linux. Si el disc és buit, o si un sistema\n"
 "operatiu existent n'utilitza tot l'espai disponible, us caldrà \n"
 "particionar-lo. Bàsicament, particionar un disc dur consisteix a dividir-lo "
 "de\n"
-"manera lògica per crear espai on instal·lar el nou sistema Mandrivalinux.\n"
+"manera lògica per crear espai on instal·lar el nou sistema Mandriva Linux.\n"
 "\n"
 "Atès que els efectes d'aquest procés solen ser irreversibles i poden\n"
 "implicar pèrdua de dades si ja teniu un sistema operatiu instal·lat, el\n"
@@ -4613,7 +4615,7 @@ msgstr ""
 "de\n"
 "daDES, sempre que la partició de Windows hagi estat desfragmentada\n"
 "prèviament. És molt recomenable, fer una còpia de seguretat de les dades.\n"
-"Aquesta opció és la més recomanable si voleu utilitzar tant Mandrivalinux\n"
+"Aquesta opció és la més recomanable si voleu utilitzar tant Mandriva Linux\n"
 "com Microsoft Windows al mateix ordinador.\n"
 "\n"
 "  Abans de decidir-vos per aquesta opció, penseu que en acabar la partició\n"
@@ -4622,7 +4624,7 @@ msgstr ""
 "programari.\n"
 "\n"
 " *\"%s\": si voleu suprimir totes les dades i particions que teniu al disc\n"
-"dur i substituir-les pel sistema Mandrivalinux, podeu escollir aquesta\n"
+"dur i substituir-les pel sistema Mandriva Linux, podeu escollir aquesta\n"
 "opció. Aneu amb compte, però, perquè, un cop la confirmeu, no podreu fer-vos "
 "enrere.\n"
 "\n"
@@ -4782,7 +4784,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"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4805,7 +4807,7 @@ msgstr ""
 "Feu clic a \"%s\" quan estigueu a punt per formatar les particions.\n"
 "\n"
 "Feu clic a \"%s\" si voleu seleccionar una altra partició per instal·lar\n"
-"el nou sistema Mandrivalinux.\n"
+"el nou sistema Mandriva Linux.\n"
 "\n"
 "Feu clic a \"%s\" si voleu seleccionar particions on cercar-hi blocs "
 "defectuosos."
@@ -4822,7 +4824,7 @@ msgstr "Anterior"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4834,7 +4836,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Ara esteu instal·lant Mandrivalinux, és probable que alguns paquets\n"
+"Ara esteu instal·lant Mandriva Linux, és probable que alguns paquets\n"
 "hagin estat actualitzats desde la data de llançament. Alguns errors poden\n"
 "haver estat resolts, i altres problemes de seguretat poden estar ja "
 "corregits.\n"
@@ -4864,7 +4866,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 Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4878,7 +4880,7 @@ msgstr ""
 "\n"
 "Si no sabeu quin escollir, deixeu l'opció per defecte.. Podreu canviar\n"
 "el nivell de seguretat més tard amb l'eina draksec del\n"
-"Centre de Control Mandrivalinux.\n"
+"Centre de Control Mandriva Linux.\n"
 "\n"
 "El camp \"%s\" pot informar l'usuari del sistema qui serà el responsable\n"
 "de la seguretat. Els missatges de seguretat s'enviaran a aquesta adreça."
@@ -4892,7 +4894,7 @@ msgstr "Administrador de seguretat"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -4963,7 +4965,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Ara és quan heu de decidir quina(es) partició(ns) voleu utilitzar per\n"
-"instal·lar el sistema Mandrivalinux. Si ja s'han definit les particions\n"
+"instal·lar el sistema Mandriva Linux. Si ja s'han definit les particions\n"
 "en una instal·lació anterior de GNU/Linux o mitjançant una altra eina de\n"
 "particionament, podeu utilitzar les particions existents. En cas contrari,\n"
 "s'han de definir particions al disc dur.\n"
@@ -5054,7 +5056,7 @@ msgstr "Commuta entre els modes normal i expert"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5084,7 +5086,7 @@ msgid ""
 msgstr ""
 "S'ha detectat més d'una partició de Microsoft a la unitat de disc.\n"
 "Si us plau, trieu quina d'elles voleu redimensionar per instal·lar el nou\n"
-"sistema operatiu Mandrivalinux.\n"
+"sistema operatiu Mandriva Linux.\n"
 "\n"
 "Cada partició està identificada d'aquesta manera: \"Nom Linux\",\n"
 "\"Nom Windows\" \"Capacitat\".\n"
@@ -5136,7 +5138,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5145,19 +5147,20 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
 msgstr ""
 "Aquest pas només s'activa si s'ha trobat una partició GNU/Linux antiga\n"
 "al vostre ordinador.\n"
 "\n"
 "DrakX necessita saber si voleu realitzar una instal·lació nova o\n"
-"una actualització d'un sistema Mandrivalinux existent:\n"
+"una actualització d'un sistema Mandriva Linux existent:\n"
 "\n"
 " * \"%s\": aquesta opció destrueix gairebé del tot el sistema antic. Si\n"
 "voleu canviar les particions dels discs durs, o el sistema de fitxers,\n"
@@ -5167,14 +5170,15 @@ msgstr ""
 "\n"
 " * \"%s\": aquest tipus d'instal·lació us permet actualitzar els paquets "
 "que\n"
-"ja estan instal·lats al sistema Mandrivalinux. L'esquema de particionament\n"
+"ja estan instal·lats al sistema Mandriva Linux. L'esquema de particionament\n"
 "actual i les dades d'usuari no queden afectades. La majoria de les altres\n"
 "fases de configuració queden disponibles, de manera similar a una\n"
 "instal·lació estàndard.\n"
 "\n"
-"L'opció “Actualitza” ha de funcionar correctament en sistemes Mandrivalinux\n"
+"L'opció “Actualitza” ha de funcionar correctament en sistemes Mandriva "
+"Linux\n"
 "amb la versió \"8.1\" o posteriors. No es recomana realitzar una\n"
-"actualització en versions de Mandrivalinux anteriors a la \"8.1\"."
+"actualització en versions de Mandriva Linux anteriors a la \"8.1\"."
 
 #: help.pm:591
 #, fuzzy, c-format
@@ -5233,7 +5237,8 @@ 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, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5271,7 +5276,7 @@ msgstr ""
 "\n"
 "En quant al suport UTF-8 (unicode): Unicode és una nova codificació de\n"
 "caràcters que cobreix tots els idiomes existents. El suport complet a\n"
-"GNU/Linux encara està sota desenvolupament. Per aquesta raó, Mandrivalinux\n"
+"GNU/Linux encara està sota desenvolupament. Per aquesta raó, Mandriva Linux\n"
 "l'usarà o no depenent de les opcions que esculli l'usuari:\n"
 "\n"
 " * Si escolliu un idioma amb una codificació existent forta(idiomes\n"
@@ -5510,7 +5515,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 Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5531,11 +5536,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 Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Ara cal seleccionar el sistema d'impressió del vostre ordinador. Altres\n"
-"sistemes operatius us poden oferir un, però el Mandrivalinux n'ofereix\n"
+"sistemes operatius us poden oferir un, però el Mandriva Linux n'ofereix\n"
 "dos. Cada sistema d'impressió és el més convenient per a un tipus de\n"
 "configuració determinat.\n"
 "\n"
@@ -5562,7 +5567,7 @@ msgstr ""
 "Si ara feu una tria, i després veieu que el sistema d'impressió no us\n"
 "agrada, podeu canviar-lo executant el PrinterDrake des del Centre de "
 "control\n"
-"de Mandrivalinux i fent clic al botó Expert."
+"de Mandriva Linux i fent clic al botó Expert."
 
 #: help.pm:765
 #, c-format
@@ -5684,7 +5689,8 @@ 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"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5701,7 +5707,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"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5826,11 +5832,11 @@ msgstr "Serveis"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Escolliu el disc dur que voleu buidar per instal·lar la nova partició\n"
-"Mandrivalinux. Aneu amb compte, totes les dades actuals es perdran i no\n"
+"Mandriva Linux. Aneu amb compte, totes les dades actuals es perdran i no\n"
 "es podran recuperar!"
 
 #: help.pm:863
@@ -6187,12 +6193,12 @@ msgstr "S'està calculant la mida de la partició de Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "La partició de Windows està massa fragmentada. Si us plau, reinicieu "
 "l'ordinador sota Windows i executeu l'eina \"defrag\". Llavors, torneu a "
-"començar la instal·lació del Mandrivalinux."
+"començar la instal·lació del Mandriva Linux."
 
 #
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6311,13 +6317,13 @@ msgstr "S'està desactivant la xarxa"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -6371,7 +6377,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6408,7 +6414,7 @@ msgid ""
 "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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6430,11 +6436,11 @@ msgstr ""
 "Introducció\n"
 "\n"
 "D'ara endavant, hom es referirà al sistema operatiu i als diferents\n"
-"components disponibles en la distribució Mandrivalinux com als\n"
+"components disponibles en la distribució Mandriva Linux com als\n"
 "\"Productes de programari\". Els Productes de programari inclouen,\n"
 "però no estan restringits a, el conjunt de programes, mètoDES, regles\n"
 "i documentació relativa al sistema operatiu i els diferents\n"
-"components de la distribució Mandrivalinux.\n"
+"components de la distribució Mandriva Linux.\n"
 "\n"
 "\n"
 "1. Acord de llicència\n"
@@ -6478,7 +6484,7 @@ msgstr ""
 "financeres, multes i costes judicials, o qualsevol altre dany que\n"
 "resultin d'un judici, o qualsevol altre pèrdua d'importància) que\n"
 "resulti de la possessió i utilització dels components de programari o\n"
-"de la seva descàrrega des d'un dels llocs de Mandrivalinux, que\n"
+"de la seva descàrrega des d'un dels llocs de Mandriva Linux, que\n"
 "estiguin prohibides o restringides en alguns països per les lleis\n"
 "locals. Aquesta responsabilitat limitada s'aplica, però no hi està\n"
 "restringida, als potents components criptogràfics inclosos als\n"
@@ -6512,7 +6518,7 @@ msgstr ""
 "Mandriva S.A. es reserva els drets de modificar o adaptar els\n"
 "Productes de programari, totalment o parcialment, per tots els\n"
 "mitjans i amb totes les finalitats.\n"
-"\"Mandriva\", \"Mandrivalinux\" i els logotips associats son marques\n"
+"\"Mandriva\", \"Mandriva Linux\" i els logotips associats son marques\n"
 "registrades de Mandriva S.A.\n"
 "\n"
 "\n"
@@ -6624,8 +6630,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6633,14 +6639,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "Felicitats! La instal·lació ha acabat.\n"
 "Traieu el suport d'arrencada i premeu Retorn per tornar a arrencar.\n"
 "\n"
 "\n"
 "Trobareu la solució als problemes coneguts d'aquesta versió del\n"
-"Mandrivalinux a la fe d'errates que hi ha a \n"
+"Mandriva Linux a la fe d'errates que hi ha a \n"
 "\n"
 "\n"
 "%s\n"
@@ -6648,13 +6654,13 @@ msgstr ""
 "\n"
 "La informació sobre com configurar el vostre sistema està disponible a\n"
 "l'últim capítol d'instal·lació de la Guia Oficial de l'Usuari del\n"
-"Mandrivalinux."
+"Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -6683,12 +6689,13 @@ msgstr "S'està entrant en el pas '%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "El vostre sistema està baix de recursos; podeu tenir algun problema en\n"
-"instal·lar el Mandrivalinux. Si això passa, podeu provar d'instal·lar-lo en\n"
+"instal·lar el Mandriva Linux. Si això passa, podeu provar d'instal·lar-lo "
+"en\n"
 "mode text. Per fer-ho, premeu 'F1' en arrencar des del CD-ROM i escriviu "
 "'text'."
 
@@ -7239,9 +7246,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
-"S'està contactant amb el servidor Mandrivalinux per obtenir la llista de "
+"S'està contactant amb el servidor Mandriva Linux per obtenir la llista de "
 "rèpliques disponibles..."
 
 #: install_steps_interactive.pm:840
@@ -7475,8 +7482,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Instal·lació del Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Instal·lació del Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10084,14 +10091,14 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Configuració del drakfirewall\n"
 "\n"
-"Aquí es configura un tallafocs personal per a aquest ordinador "
-"Mandrivalinux.\n"
+"Aquí es configura un tallafocs personal per a aquest ordinador Mandriva "
+"Linux.\n"
 "Per a una potent solució de tallafocs dedicada, consulteu si us plau la \n"
 "distribució especialitzada MandrakeSecurity Firewall."
 
@@ -14207,8 +14214,8 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
 
@@ -16191,18 +16198,18 @@ msgstr "Atura"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Què és Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Què és Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Benvingut al <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Benvingut al <b>Mandriva Linux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux 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."
@@ -16211,10 +16218,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, fuzzy, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux 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 ""
-"Mandrivalinux és ampliament coneguda com la distribució de Linux més "
+"Mandriva Linux és ampliament coneguda com la distribució de Linux més "
 "amigable, fàcil d'instal·lar i usar."
 
 #: share/advertising/02.pl:13
@@ -16230,15 +16237,15 @@ msgstr "Benvingut al <b>món del Codi Font Obert</b>!"
 #: share/advertising/02.pl:17
 #, fuzzy, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux 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 "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
-"Mandrivalinux està compromès amb el model de codi font obert i respecta "
+"Mandriva Linux està compromès amb el model de codi font obert i respecta "
 "completament la General Public License. Aquesta nova versió és el resultat "
 "de l'esforç col·laboratiu dels desenvolupadors de Mandriva i els "
-"contribuïdors de Mandrivalinux al voltant del món."
+"contribuïdors de Mandriva Linux al voltant del món."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16257,12 +16264,12 @@ msgstr "<b>La GPL</b>"
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "La major part dels programes inclosos en aquesta distribució i totes les "
-"eines de Mandrivalinux estan llicenciades sota la <b>General Public License</"
-"b>."
+"eines de Mandriva Linux estan llicenciades sota la <b>General Public "
+"License</b>."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16293,17 +16300,17 @@ msgstr "<b>Uniu-vos a la comunitat</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux 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."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 
@@ -16315,7 +16322,7 @@ msgstr "<b>Versió de descàrrega</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
@@ -16357,8 +16364,8 @@ msgstr "<b>Discovery, El vostre primer escriptori Linux</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Esteu instal·lant <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Esteu instal·lant <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, fuzzy, c-format
@@ -16378,8 +16385,8 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Esteu instal·lant <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Esteu instal·lant <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16396,8 +16403,8 @@ msgstr "<b>PowerPack+, La solució Linux per escriptoris i servidors</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Esteu instal·lant <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Esteu instal·lant <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16416,15 +16423,15 @@ msgstr "<b>Productes de Mandriva</b>"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
-"<b>Mandriva</b> ha desenvolupat una àmplia gama de productes "
-"<b>Mandrivalinux</b>."
+"<b>Mandriva</b> ha desenvolupat una àmplia gama de productes <b>Mandriva "
+"Linux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Els productes Mandrivalinux són:"
+msgid "The Mandriva Linux products are:"
+msgstr "Els productes Mandriva Linux són:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16444,11 +16451,11 @@ msgstr "\t* <b>PowerPack+</b>, La solució Linux per escriptoris i servidors."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrivalinux per x86-64</b>, La solució Mandrivalinux per obtenir el "
-"màxim del vostre processador de 64-bit."
+"\t* <b>Mandriva Linux per x86-64</b>, La solució Mandriva Linux per obtenir "
+"el màxim del vostre processador de 64-bit."
 
 #: share/advertising/10.pl:15
 #, c-format
@@ -16458,21 +16465,21 @@ msgstr ""
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<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 Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
@@ -16490,17 +16497,19 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -16679,10 +16688,10 @@ msgstr "<b>Disfruteu de la àmplia gama d'aplicacions</b>"
 #: share/advertising/18.pl:15
 #, fuzzy, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Al menú de Mandrivalinux trobareu aplicacions fàcils d'usar per totes les "
+"Al menú de Mandriva Linux trobareu aplicacions fàcils d'usar per totes les "
 "tasques:"
 
 #: share/advertising/18.pl:16
@@ -16931,18 +16940,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Centre de Control Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Centre de Control Mandriva Linux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"El <b>Centre de Control Mandrivalinux</b> és una col·lecció essencial de "
-"utilitats específiques de Mandrivalinux per simplificar la configuració del "
+"El <b>Centre de Control Mandriva Linux</b> és una col·lecció essencial de "
+"utilitats específiques de Mandriva Linux per simplificar la configuració del "
 "vostre ordinador."
 
 #: share/advertising/25.pl:17
@@ -16964,8 +16973,8 @@ 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 "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
@@ -16997,8 +17006,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Passeu-vos avui per <b>store.mandrakesoft.com</b>"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Passeu-vos avui per <b>store.mandriva.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -17008,11 +17017,11 @@ msgstr "<b>Mandriva Club</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
 "<b>Mandriva Club</b> és el <b>company perfecte</b> pel vostre producte "
-"Mandrivalinux."
+"Mandriva Linux."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -17024,7 +17033,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr "\t* Descomptes especials en productes i serveis de Mandriva Store"
 
 #: share/advertising/28.pl:21
@@ -17038,14 +17047,14 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Participació en els <b>fòrums d'usuaris</b> de Mandrivalinux"
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Participació en els <b>fòrums d'usuaris</b> de Mandriva Linux"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
@@ -17064,7 +17073,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -17089,7 +17098,7 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
@@ -17101,21 +17110,21 @@ msgstr "<b>Mandriva Expert</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/compssUsers.pl:25
@@ -17509,16 +17518,17 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 "[OPCIONS] [NOM_DEL_PROGRAMA]\n"
 "\n"
 "OPCIONS:\n"
 "  --help            - imprimeix aquest missatge d'ajuda.\n"
-"  --report          - el programa ha de ser una de les eines de "
-"Mandrivalinux\n"
-"  --incident        - el programa ha de ser una de les eines de Mandrivalinux"
+"  --report          - el programa ha de ser una de les eines de Mandriva "
+"Linux\n"
+"  --incident        - el programa ha de ser una de les eines de Mandriva "
+"Linux"
 
 #: standalone.pm:63
 #, c-format
@@ -17569,7 +17579,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17583,7 +17593,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPCIONS]...\n"
-"Configurador del servidor de terminal de Mandrivalinux (MTS)\n"
+"Configurador del servidor de terminal de Mandriva Linux (MTS)\n"
 "--enable         : habilita l'MTS\n"
 "--disable        : inhabilita l'MTS\n"
 "--start          : inicia l'MTS\n"
@@ -20479,14 +20489,14 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
 msgstr ""
-"Eina per a la comunicació d'errors de programació (bugs) de Mandrivalinux"
+"Eina per a la comunicació d'errors de programació (bugs) de Mandriva Linux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Centre de Control Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Centre de Control Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20987,20 +20997,20 @@ msgstr "Iniciat en l'arrencada"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Aquesta interfície encara no s'ha configurat.\n"
 "Executeu l'auxiliar \"Afegeix una interfície\" del Centre de Control de "
-"Mandrivalinux"
+"Mandriva Linux"
 
 #: 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 Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Aquesta interfície encara no s'ha configurat.\n"
-"Executeu l'auxiliar \"%s\" del Centre de Control de Mandrivalinux"
+"Executeu l'auxiliar \"%s\" del Centre de Control de Mandriva Linux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21050,8 +21060,8 @@ msgstr "KDM (KDE Display Manager)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Mandriva Linux Display Manager)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21363,18 +21373,18 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 "Copyright (C) 2001-2002 per Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versió original)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 
 #: standalone/drakfont:520
 #, c-format
@@ -21973,8 +21983,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Centre d'ajuda de Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Centre d'ajuda de Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22608,7 +22618,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "No s'ha detectat cap targeta de so en el vostre ordinador. Si us plau, "
 "verifiqueu que teniu correctament inserida una targeta de so compatible amb "
@@ -22618,7 +22628,7 @@ msgstr ""
 "Podeu visitar la nostra base de dades de maquinari a:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24273,7 +24283,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "No s'ha detectat cap targeta de TV en el vostre ordinador. Si us plau "
 "verifiqueu que teniu correctament inserida una targeta de Vídeo/TV "
@@ -24283,7 +24293,7 @@ msgstr ""
 "Podeu visitar la nostra base de dades de maquinari a:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #
 #: standalone/harddrake2:24
@@ -25011,13 +25021,13 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
 "Aquest és el HardDrake, l'eina de configuració de maquinari de %s.\n"
 "<span foreground=\"royalblue3\">Versió:</span> %s\n"
 "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25130,7 +25140,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr ""
 
 #: standalone/logdrake:51
@@ -25655,10 +25665,10 @@ msgstr "Connexió completa."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "La connexió ha fallat.\n"
-"Comproveu la vostra configuració al Centre de control de Mandrivalinux."
+"Comproveu la vostra configuració al Centre de control de Mandriva Linux."
 
 #
 #: standalone/net_monitor:341
@@ -26727,17 +26737,17 @@ msgstr "La instal·lació ha fallat"
 #~ msgstr "S'ha produït un error en obrir %s per escriure: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandriva Linux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Aquest és el HardDrake, l'eina de configuració de maquinari de "
-#~ "Mandrivalinux.\n"
+#~ "Aquest és el HardDrake, l'eina de configuració de maquinari de Mandriva "
+#~ "Linux.\n"
 #~ "<span foreground=\"royalblue3\">Versió:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 
 #, fuzzy
@@ -27178,17 +27188,17 @@ msgstr "La instal·lació ha fallat"
 #~ "És impossible de suprimir la impressora \"%s\" d'Star Office/OpenOffice."
 #~ "org/GIMP."
 
-#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
-#~ msgstr "<b>Felicitats per triar Mandrivalinux!</b>"
+#~ msgid "<b>Congratulations for choosing Mandriva Linux!</b>"
+#~ msgstr "<b>Felicitats per triar Mandriva Linux!</b>"
 
 #~ msgid ""
-#~ "Your new Mandrivalinux operating system and its many applications is the "
-#~ "result of collaborative efforts between Mandriva developers and "
-#~ "Mandrivalinux contributors throughout the world."
+#~ "Your new Mandriva Linux operating system and its many applications is the "
+#~ "result of collaborative efforts between Mandriva developers and Mandriva "
+#~ "Linux contributors throughout the world."
 #~ msgstr ""
-#~ "El vostre nou sistema operatiu Mandrivalinux i les seves múltiples "
+#~ "El vostre nou sistema operatiu Mandriva Linux i les seves múltiples "
 #~ "aplicacions són el resultat de l'esforç col·laboratiu dels "
-#~ "desenvolupadors de Mandriva i els contribuïdors de Mandrivalinux al "
+#~ "desenvolupadors de Mandriva i els contribuïdors de Mandriva Linux al "
 #~ "voltant del món."
 
 #~ msgid ""
@@ -27295,8 +27305,8 @@ msgstr "La instal·lació ha fallat"
 #~ "\t* Special download mirror list exclusively for Mandriva Club Members"
 #~ msgstr "\t* Llista de rèpliques exclusiva pels membres del Mandriva Club"
 
-#~ msgid "\t* Voting for software to put in Mandrivalinux"
-#~ msgstr "\t* Votació dels programes a posar en Mandrivalinux"
+#~ msgid "\t* Voting for software to put in Mandriva Linux"
+#~ msgstr "\t* Votació dels programes a posar en Mandriva Linux"
 
 #~ msgid "\t* Plus much more"
 #~ msgstr "\t* i molt més"
@@ -27312,10 +27322,10 @@ msgstr "La instal·lació ha fallat"
 
 #~ msgid ""
 #~ "If you have Linux questions, subscribe to Mandriva Expert at <b>www."
-#~ "mandrakeexpert.com</b>"
+#~ "mandrivaexpert.com</b>"
 #~ msgstr ""
 #~ "Si teniu preguntes en quant a Linux, apunteu-vos a Mandriva Expert <b>www."
-#~ "mandrakeexpert.com</b>"
+#~ "mandrivaexpert.com</b>"
 
 #~ msgid ""
 #~ "If you would like to get involved, please subscribe to the \"Cooker\" "
@@ -27332,22 +27342,23 @@ msgstr "La instal·lació ha fallat"
 #~ "mandrake-linux.com</b>!"
 
 #~ msgid ""
-#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "
+#~ "Mandriva Linux includes the famous graphical desktops KDE and GNOME, plus "
 #~ "the latest versions of the most popular Open Source applications."
 #~ msgstr ""
-#~ "Mandrivalinux inclou els famosos entorns gràfics KDE i GNOME, a més de "
+#~ "Mandriva Linux inclou els famosos entorns gràfics KDE i GNOME, a més de "
 #~ "les últimes versions de les aplicacions de Codi Font Obert més populars."
 
 #~ msgid ""
-#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "
+#~ "Mandriva Linux is widely known as the most user-friendly and the easiest "
 #~ "to install and easy to use Linux distribution."
 #~ msgstr ""
-#~ "Mandrivalinux és ampliament coneguda com la distribució de Linux més "
+#~ "Mandriva Linux és ampliament coneguda com la distribució de Linux més "
 #~ "amigable, fàcil d'instal·lar i usar."
 
-#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandrakemove</b>"
+#~ msgid ""
+#~ "\t* Find out Mandriva Linux on a bootable CD with <b>Mandrakemove</b>"
 #~ msgstr ""
-#~ "\t* Conegui Mandrivalinux en un CD autoarrancable amb <b>Mandrakemove</b>"
+#~ "\t* Conegui Mandriva Linux en un CD autoarrancable amb <b>Mandrakemove</b>"
 
 #~ msgid ""
 #~ "\t* If you use Linux mostly for Office, Internet and Multimedia tasks, "
@@ -27380,8 +27391,8 @@ msgstr "La instal·lació ha fallat"
 #~ msgid "<b>Do you require assistance?</b>"
 #~ msgstr "<b>Necessiteu ajuda?</b>"
 
-#~ msgid "This is the Mandrivalinux <b>Download version</b>."
-#~ msgstr "Això és Mandrivalinux <b>versió de descàrrega</b>."
+#~ msgid "This is the Mandriva Linux <b>Download version</b>."
+#~ msgstr "Això és Mandriva Linux <b>versió de descàrrega</b>."
 
 #~ msgid ""
 #~ "The free download version does not include commercial software, and "
@@ -27393,28 +27404,29 @@ msgstr "La instal·lació ha fallat"
 #~ "gràfiques (com ATI® i NVIDIA®)."
 
 #~ msgid ""
-#~ "Your new Mandrivalinux distribution and its many applications are the "
-#~ "result of collaborative efforts between Mandriva developers and "
-#~ "Mandrivalinux contributors throughout the world."
+#~ "Your new Mandriva Linux distribution and its many applications are the "
+#~ "result of collaborative efforts between Mandriva developers and Mandriva "
+#~ "Linux contributors throughout the world."
 #~ msgstr ""
-#~ "La vostra nova distribució Mandrivalinux i les seves múltiples "
+#~ "La vostra nova distribució Mandriva Linux i les seves múltiples "
 #~ "aplicacions són el resultat de l'esforç col·laboratiu dels "
-#~ "desenvolupadors de Mandriva i els contribuïdors de Mandrivalinux al "
+#~ "desenvolupadors de Mandriva i els contribuïdors de Mandriva Linux al "
 #~ "voltant del món."
 
 #~ msgid "<b>PowerPack+</b>"
 #~ msgstr "<b>PowerPack+</b>"
 
 #~ msgid ""
-#~ "It is the only Mandrivalinux product that includes the groupware solution."
-#~ msgstr "És l'únic producte Mandrivalinux que inclou la solució groupware."
+#~ "It is the only Mandriva Linux product that includes the groupware "
+#~ "solution."
+#~ msgstr "És l'únic producte Mandriva Linux que inclou la solució groupware."
 
 #~ msgid ""
-#~ "When you log into your Mandrivalinux system for the first time, you can "
+#~ "When you log into your Mandriva Linux system for the first time, you can "
 #~ "choose between several popular graphical desktops environments, "
 #~ "including: KDE, GNOME, WindowMaker, IceWM, and others."
 #~ msgstr ""
-#~ "Quan entreu per primer cop a Mandrivalinux, podeu escollir entre els "
+#~ "Quan entreu per primer cop a Mandriva Linux, podeu escollir entre els "
 #~ "populars entorns gràfics d'escriptori, incloent: KDE, GNOME, WindowMaker, "
 #~ "IceWM, i altres."
 
@@ -27447,13 +27459,13 @@ msgstr "La instal·lació ha fallat"
 #~ msgstr "\t* Llibreta d'adreces (servidor i client)"
 
 #~ msgid ""
-#~ "Your new Mandrivalinux distribution is the result of collaborative "
-#~ "efforts between Mandriva developers and Mandrivalinux contributors "
+#~ "Your new Mandriva Linux distribution is the result of collaborative "
+#~ "efforts between Mandriva developers and Mandriva Linux contributors "
 #~ "throughout the world."
 #~ msgstr ""
-#~ "La vostra nova distribució Mandrivalinux és el resultat de l'esforç "
+#~ "La vostra nova distribució Mandriva Linux és el resultat de l'esforç "
 #~ "col·laboratiu dels desenvolupadors de Mandriva i els contribuïdors de "
-#~ "Mandrivalinux al voltant del món."
+#~ "Mandriva Linux al voltant del món."
 
 #~ msgid ""
 #~ "We would like to thank everyone who participated in the development of "
@@ -27523,14 +27535,14 @@ msgstr "La instal·lació ha fallat"
 #~ msgid ""
 #~ "Before continuing, you should carefully read the terms of the license. "
 #~ "It\n"
-#~ "covers the entire Mandrivalinux distribution. If you do agree with all "
+#~ "covers the entire Mandriva Linux distribution. If you do agree with all "
 #~ "the\n"
 #~ "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
 #~ "will reboot your computer."
 #~ msgstr ""
 #~ "Abans de continuar, llegiu atentament les clàusules de la llicència. "
 #~ "Cobreix\n"
-#~ "tota la distribució Mandrivalinux. Si esteu d'acord amb tots els termes "
+#~ "tota la distribució Mandriva Linux. Si esteu d'acord amb tots els termes "
 #~ "de la\n"
 #~ "llicència, feu clic al quadre \"%s\"; si no, prémer el botó \"%s\"\n"
 #~ "reiniciarà el vostre ordinador."
@@ -27648,25 +27660,27 @@ msgstr "La instal·lació ha fallat"
 #~ "Si no hi esteu interessat, desactiveu el quadre \"%s\"."
 
 #~ msgid ""
-#~ "The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+#~ "The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
 #~ "selected package is located on another CD-ROM, DrakX will eject the "
 #~ "current\n"
 #~ "CD and ask you to insert the correct CD as required."
 #~ msgstr ""
-#~ "La instal·lació del Mandrivalinux està repartida en diversos CD-ROM. Si\n"
+#~ "La instal·lació del Mandriva Linux està repartida en diversos CD-ROM. Si\n"
 #~ "un dels paquets escollits està en un altre CD-ROM, DrakX expulsarà el CD\n"
 #~ "actual i us demanarà que n'inseriu un altre."
 
 #~ msgid ""
 #~ "It is now time to specify which programs you wish to install on your\n"
-#~ "system. There are thousands of packages available for Mandrivalinux, and\n"
+#~ "system. There are thousands of packages available for Mandriva Linux, "
+#~ "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. Mandrivalinux sorts packages groups in four categories. You can\n"
+#~ "machine. Mandriva Linux 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"
@@ -27719,11 +27733,11 @@ msgstr "La instal·lació ha fallat"
 #~ "updating an existing system."
 #~ msgstr ""
 #~ "Ha arribat el moment d'indicar els programes que voleu instal·lar en el\n"
-#~ "sistema. Mandrivalinux té milers de paquets, i per facilitar-ne la\n"
+#~ "sistema. Mandriva Linux té milers de paquets, i per facilitar-ne la\n"
 #~ "gestió s'han distribuït en grups d'aplicacions similars.\n"
 #~ "\n"
 #~ "Els paquets s'agrupen segons l'ús que vulgueu donar a l'ordinador.\n"
-#~ "Mandrivalinux agrupa els paquets en quatre categories. Podeu mesclar i "
+#~ "Mandriva Linux agrupa els paquets en quatre categories. Podeu mesclar i "
 #~ "fer\n"
 #~ "coincidir aplicacions de grups diversos, de manera que una instal·lació\n"
 #~ "d'``Estació de treball'' pot perfectament tenir instal·lades aplicacions\n"
@@ -27787,11 +27801,11 @@ msgstr "La instal·lació ha fallat"
 #~ "chose the individual package or because it was part of a group of "
 #~ "packages,\n"
 #~ "you will be asked to confirm that you really want those servers to be\n"
-#~ "installed. By default Mandrivalinux will automatically start any "
+#~ "installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+#~ "security holes were discovered after this version of Mandriva Linux 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"
@@ -27830,13 +27844,13 @@ msgstr "La instal·lació ha fallat"
 #~ "\n"
 #~ "Si heu seleccionat un paquet de servidor, intencionadament o perquè\n"
 #~ "formava part d'un grup, se us demanarà que confirmeu si realment voleu\n"
-#~ "instal·lar aquests servidors. Per defecte, Mandrivalinux iniciarà i "
+#~ "instal·lar aquests servidors. Per defecte, Mandriva Linux iniciarà i "
 #~ "instal·larà automàticament qualsevol servidor durant l'arrencada. Tot i "
 #~ "que\n"
 #~ "siguin segurs i no tinguin cap problema conegut quan es publica la\n"
 #~ "distribució, és totalment possible que es descobreixin forats de "
 #~ "seguretat\n"
-#~ "després que aquesta versió de Mandrivalinux quedi finalitzada.\n"
+#~ "després que aquesta versió de Mandriva Linux quedi finalitzada.\n"
 #~ "Si no sabeu què se suposa que fa un servei en particular, o per què "
 #~ "s'està\n"
 #~ "instal·lant, feu clic a \"%s\". Per defecte, si feu clic a \"%s\" els "
@@ -27871,7 +27885,8 @@ msgstr "La instal·lació ha fallat"
 #~ "You will now set up your Internet/network connection. If you wish to\n"
 #~ "connect your computer to the Internet or to a local network, click \"%s"
 #~ "\".\n"
-#~ "Mandrivalinux will attempt to auto-detect network devices and modems. If\n"
+#~ "Mandriva Linux 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"
@@ -27892,7 +27907,7 @@ msgstr "La instal·lació ha fallat"
 #~ "modems\n"
 #~ "that require additional software to work compared to Normal modems. Some "
 #~ "of\n"
-#~ "those modems actually work under Mandrivalinux, some others do not. You\n"
+#~ "those modems actually work under Mandriva Linux, 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"
@@ -27902,7 +27917,7 @@ msgstr "La instal·lació ha fallat"
 #~ msgstr ""
 #~ "Ara configurareu la connexió a Internet/xarxa. Si voleu connectar\n"
 #~ "el vostre ordinador a Internet o a una xarxa local, feu clic a \"%s\".\n"
-#~ "Mandrivalinux intentarà detectar automàticament els dispositius\n"
+#~ "Mandriva Linux intentarà detectar automàticament els dispositius\n"
 #~ "de xarxa i els mòdems. Si aquesta detecció falla, desactiveu la\n"
 #~ "casella \"%s\". També podeu decidir no configurar la xarxa, o\n"
 #~ "fer-ho més endavant; en aquest cas feu clic al botó \"%s\" per\n"
@@ -27922,7 +27937,7 @@ msgstr "La instal·lació ha fallat"
 #~ "especials\n"
 #~ "integrats de gama baixa que necessiten programari addicional per "
 #~ "funcionar.\n"
-#~ "Alguns d'aquests mòdems funcionen a Mandrivalinux, i d'altres no. Podeu\n"
+#~ "Alguns d'aquests mòdems funcionen a Mandriva Linux, i d'altres no. Podeu\n"
 #~ "consultar una llista de mòdems suportats a LinModems.\n"
 #~ "\n"
 #~ "Podeu consultar el capítol sobre connexions a Internet de la ``Guia\n"
@@ -28057,7 +28072,7 @@ msgstr "La instal·lació ha fallat"
 #~ "X (for X Window System) is the heart of the GNU/Linux graphical "
 #~ "interface\n"
 #~ "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-#~ "WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+#~ "WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 #~ "\n"
 #~ "You will be presented with a list of different parameters to change to "
 #~ "get\n"
@@ -28122,7 +28137,7 @@ msgstr "La instal·lació ha fallat"
 #~ "Linux\n"
 #~ "de què depenen tots els entorns gràfics (KDE, GNOME, AfterStep, "
 #~ "WindowMaker,\n"
-#~ "etc.) que venen amb Mandrivalinux.\n"
+#~ "etc.) que venen amb Mandriva Linux.\n"
 #~ "\n"
 #~ "Veureu una relació de diferents paràmetres que podeu canviar per "
 #~ "aconseguir\n"
@@ -28251,7 +28266,7 @@ msgstr "La instal·lació ha fallat"
 #~ "have to partition the drive. Basically, partitioning a hard drive "
 #~ "consists\n"
 #~ "of logically dividing it to create the space needed to install your new\n"
-#~ "Mandrivalinux system.\n"
+#~ "Mandriva Linux 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 "
@@ -28290,7 +28305,7 @@ msgstr "La instal·lació ha fallat"
 #~ "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 #~ "data, provided you have previously defragmented the Windows partition.\n"
 #~ "Backing up your data is strongly recommended.. Using this option is\n"
-#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "
+#~ "recommended if you want to use both Mandriva Linux and Microsoft Windows "
 #~ "on\n"
 #~ "the same computer.\n"
 #~ "\n"
@@ -28300,7 +28315,7 @@ msgstr "La instal·lació ha fallat"
 #~ "Windows to store your data or to install new software.\n"
 #~ "\n"
 #~ " * \"%s\": if you want to delete all data and all partitions present on\n"
-#~ "your hard drive and replace them with your new Mandrivalinux system,\n"
+#~ "your hard drive and replace them with your new Mandriva Linux system,\n"
 #~ "choose this option. Be careful, because you will not be able to undo "
 #~ "your\n"
 #~ "choice after you confirm.\n"
@@ -28327,12 +28342,12 @@ msgstr "La instal·lació ha fallat"
 #~ msgstr ""
 #~ "Ara és quan heu de decidir en quin lloc del vostre disc dur voleu "
 #~ "instal·lar\n"
-#~ "el sistema operatiu Mandrivalinux. Si el disc és buit, o si un sistema\n"
+#~ "el sistema operatiu Mandriva Linux. Si el disc és buit, o si un sistema\n"
 #~ "operatiu existent n'utilitza tot l'espai disponible, us caldrà \n"
 #~ "particionar-lo. Bàsicament, particionar un disc dur consisteix a dividir-"
 #~ "lo de\n"
-#~ "manera lògica per crear espai on instal·lar el nou sistema "
-#~ "Mandrivalinux.\n"
+#~ "manera lògica per crear espai on instal·lar el nou sistema Mandriva "
+#~ "Linux.\n"
 #~ "\n"
 #~ "Atès que els efectes d'aquest procés solen ser irreversibles i poden\n"
 #~ "implicar pèrdua de dades si ja teniu un sistema operatiu instal·lat, el\n"
@@ -28370,8 +28385,8 @@ msgstr "La instal·lació ha fallat"
 #~ "daDES, sempre que la partició de Windows hagi estat desfragmentada\n"
 #~ "prèviament. És molt recomenable, fer una còpia de seguretat de les "
 #~ "dades.\n"
-#~ "Aquesta opció és la més recomanable si voleu utilitzar tant "
-#~ "Mandrivalinux\n"
+#~ "Aquesta opció és la més recomanable si voleu utilitzar tant Mandriva "
+#~ "Linux\n"
 #~ "com Microsoft Windows al mateix ordinador.\n"
 #~ "\n"
 #~ "  Abans de decidir-vos per aquesta opció, penseu que en acabar la "
@@ -28383,7 +28398,7 @@ msgstr "La instal·lació ha fallat"
 #~ "\n"
 #~ " *\"%s\": si voleu suprimir totes les dades i particions que teniu al "
 #~ "disc\n"
-#~ "dur i substituir-les pel sistema Mandrivalinux, podeu escollir aquesta\n"
+#~ "dur i substituir-les pel sistema Mandriva Linux, podeu escollir aquesta\n"
 #~ "opció. Aneu amb compte, però, perquè, un cop la confirmeu, no podreu fer-"
 #~ "vos enrere.\n"
 #~ "\n"
@@ -28504,7 +28519,7 @@ msgstr "La instal·lació ha fallat"
 #~ "Click on \"%s\" when you are ready to format the partitions.\n"
 #~ "\n"
 #~ "Click on \"%s\" if you want to choose another partition for your new\n"
-#~ "Mandrivalinux operating system installation.\n"
+#~ "Mandriva Linux operating system installation.\n"
 #~ "\n"
 #~ "Click on \"%s\" if you wish to select partitions that will be checked "
 #~ "for\n"
@@ -28532,13 +28547,13 @@ msgstr "La instal·lació ha fallat"
 #~ "Feu clic a \"%s\" quan estigueu a punt per formatar les particions.\n"
 #~ "\n"
 #~ "Feu clic a \"%s\" si voleu seleccionar una altra partició per instal·lar\n"
-#~ "el nou sistema Mandrivalinux.\n"
+#~ "el nou sistema Mandriva Linux.\n"
 #~ "\n"
 #~ "Feu clic a \"%s\" si voleu seleccionar particions on cercar-hi blocs "
 #~ "defectuosos."
 
 #~ msgid ""
-#~ "At the time you are installing Mandrivalinux, it is likely that some\n"
+#~ "At the time you are installing Mandriva Linux, 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"
@@ -28553,7 +28568,7 @@ msgstr "La instal·lació ha fallat"
 #~ "the\n"
 #~ "selected package(s), or \"%s\" to abort."
 #~ msgstr ""
-#~ "Ara esteu instal·lant Mandrivalinux, és probable que alguns paquets\n"
+#~ "Ara esteu instal·lant Mandriva Linux, és probable que alguns paquets\n"
 #~ "hagin estat actualitzats desde la data de llançament. Alguns errors "
 #~ "poden\n"
 #~ "haver estat resolts, i altres problemes de seguretat poden estar ja "
@@ -28599,7 +28614,7 @@ msgstr "La instal·lació ha fallat"
 #~ "\n"
 #~ "Si no sabeu quin escollir, deixeu l'opció per defecte.. Podreu canviar\n"
 #~ "el nivell de seguretat més tard amb l'eina draksec del\n"
-#~ "Centre de Control Mandrivalinux.\n"
+#~ "Centre de Control Mandriva Linux.\n"
 #~ "\n"
 #~ "El camp \"%s\" pot informar l'usuari del sistema qui serà el responsable\n"
 #~ "de la seguretat. Els missatges de seguretat s'enviaran a aquesta adreça."
@@ -28623,7 +28638,7 @@ msgstr "La instal·lació ha fallat"
 #~ "\n"
 #~ "DrakX now needs to know if you want to perform a new install or an "
 #~ "upgrade\n"
-#~ "of an existing Mandrivalinux system:\n"
+#~ "of an existing Mandriva Linux system:\n"
 #~ "\n"
 #~ " * \"%s\": For the most part, this completely wipes out the old system. "
 #~ "If\n"
@@ -28635,21 +28650,21 @@ msgstr "La instal·lació ha fallat"
 #~ "written.\n"
 #~ "\n"
 #~ " * \"%s\": this installation class allows you to update the packages\n"
-#~ "currently installed on your Mandrivalinux system. Your current\n"
+#~ "currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+#~ "Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 #~ "running version \"8.1\" or later. Performing an Upgrade on versions "
 #~ "prior\n"
-#~ "to Mandrivalinux version \"8.1\" is not recommended."
+#~ "to Mandriva Linux version \"8.1\" is not recommended."
 #~ msgstr ""
 #~ "Aquest pas només s'activa si s'ha trobat una partició GNU/Linux antiga\n"
 #~ "al vostre ordinador.\n"
 #~ "\n"
 #~ "DrakX necessita saber si voleu realitzar una instal·lació nova o\n"
-#~ "una actualització d'un sistema Mandrivalinux existent:\n"
+#~ "una actualització d'un sistema Mandriva Linux existent:\n"
 #~ "\n"
 #~ " * \"%s\": aquesta opció destrueix gairebé del tot el sistema antic. Si\n"
 #~ "voleu canviar les particions dels discs durs, o el sistema de fitxers,\n"
@@ -28661,17 +28676,17 @@ msgstr "La instal·lació ha fallat"
 #~ "\n"
 #~ " * \"%s\": aquest tipus d'instal·lació us permet actualitzar els paquets "
 #~ "que\n"
-#~ "ja estan instal·lats al sistema Mandrivalinux. L'esquema de "
+#~ "ja estan instal·lats al sistema Mandriva Linux. L'esquema de "
 #~ "particionament\n"
 #~ "actual i les dades d'usuari no queden afectades. La majoria de les "
 #~ "altres\n"
 #~ "fases de configuració queden disponibles, de manera similar a una\n"
 #~ "instal·lació estàndard.\n"
 #~ "\n"
-#~ "L'opció “Actualitza” ha de funcionar correctament en sistemes "
-#~ "Mandrivalinux\n"
+#~ "L'opció “Actualitza” ha de funcionar correctament en sistemes Mandriva "
+#~ "Linux\n"
 #~ "amb la versió \"8.1\" o posteriors. No es recomana realitzar una\n"
-#~ "actualització en versions de Mandrivalinux anteriors a la \"8.1\"."
+#~ "actualització en versions de Mandriva Linux anteriors a la \"8.1\"."
 
 #~ msgid ""
 #~ "Depending on the language you chose in section , DrakX will "
@@ -28738,7 +28753,8 @@ msgstr "La instal·lació ha fallat"
 #~ "About UTF-8 (unicode) support: Unicode is a new character encoding meant "
 #~ "to\n"
 #~ "cover all existing languages. Though full support for it in GNU/Linux is\n"
-#~ "still under development. For that reason, Mandrivalinux will be using it\n"
+#~ "still under development. For that reason, Mandriva Linux 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"
@@ -28784,8 +28800,8 @@ msgstr "La instal·lació ha fallat"
 #~ "\n"
 #~ "En quant al suport UTF-8 (unicode): Unicode és una nova codificació de\n"
 #~ "caràcters que cobreix tots els idiomes existents. El suport complet a\n"
-#~ "GNU/Linux encara està sota desenvolupament. Per aquesta raó, "
-#~ "Mandrivalinux\n"
+#~ "GNU/Linux encara està sota desenvolupament. Per aquesta raó, Mandriva "
+#~ "Linux\n"
 #~ "l'usarà o no depenent de les opcions que esculli l'usuari:\n"
 #~ "\n"
 #~ " * Si escolliu un idioma amb una codificació existent forta(idiomes\n"
@@ -29022,7 +29038,7 @@ msgstr "La instal·lació ha fallat"
 #~ "checking this box.\n"
 #~ "\n"
 #~ "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"
+#~ "\"%s\"), you must ensure that you have a way to boot your Mandriva Linux\n"
 #~ "system! Be sure you know what you are doing before changing any of the\n"
 #~ "options. !!\n"
 #~ "\n"
@@ -29062,7 +29078,7 @@ msgstr "La instal·lació ha fallat"
 #~ "\n"
 #~ "!! Tingueu en compte que si escolliu no instal·lar un carregador\n"
 #~ "d'arrencada (seleccionant \"%s\"), heu d'estar segurs que teniu alguna\n"
-#~ "manera d'arrencar el vostre sistema Mandrivalinux! Assegureu-vos de\n"
+#~ "manera d'arrencar el vostre sistema Mandriva Linux! Assegureu-vos de\n"
 #~ "saber què feu abans de canviar alguna de les opcions!!\n"
 #~ "\n"
 #~ "Si feu clic al botó \"%s\" d'aquest diàleg accedireu a algunes opcions\n"
@@ -29167,7 +29183,7 @@ msgstr "La instal·lació ha fallat"
 #~ msgid ""
 #~ "Now, it's time to select a printing system for your computer. Other OSs "
 #~ "may\n"
-#~ "offer you one, but Mandrivalinux offers two. Each of the printing "
+#~ "offer you one, but Mandriva Linux offers two. Each of the printing "
 #~ "systems\n"
 #~ "is best suited to particular types of configuration.\n"
 #~ "\n"
@@ -29203,7 +29219,7 @@ msgstr "La instal·lació ha fallat"
 #~ "Center and clicking the expert button."
 #~ msgstr ""
 #~ "Ara cal seleccionar el sistema d'impressió del vostre ordinador. Altres\n"
-#~ "sistemes operatius us poden oferir un, però el Mandrivalinux n'ofereix\n"
+#~ "sistemes operatius us poden oferir un, però el Mandriva Linux n'ofereix\n"
 #~ "dos. Cada sistema d'impressió és el més convenient per a un tipus de\n"
 #~ "configuració determinat.\n"
 #~ "\n"
@@ -29234,7 +29250,7 @@ msgstr "La instal·lació ha fallat"
 #~ "Si ara feu una tria, i després veieu que el sistema d'impressió no us\n"
 #~ "agrada, podeu canviar-lo executant el PrinterDrake des del Centre de "
 #~ "control\n"
-#~ "de Mandrivalinux i fent clic al botó Expert."
+#~ "de Mandriva Linux i fent clic al botó Expert."
 
 #~ msgid ""
 #~ "You can add additional entries in yaboot for other operating systems,\n"
@@ -29625,7 +29641,7 @@ msgstr "La instal·lació ha fallat"
 #~ msgstr "L'mkraid ha fallat"
 
 #~ msgid "<b>Mandrake Control Center</b>"
-#~ msgstr "<b>Centre de Control Mandrivalinux</b>"
+#~ msgstr "<b>Centre de Control Mandriva Linux</b>"
 
 #~ msgid ""
 #~ "The Mandrake Control Center is an essential collection of Mandrake-"
@@ -29654,9 +29670,10 @@ msgstr "La instal·lació ha fallat"
 #~ msgstr "\t* Descomptes especials en productes i serveis de MandrakeStore"
 
 #~ msgid ""
-#~ "\t* Find out Mandrivalinux on a bootable CD with <b>Mandriva Move</b>"
+#~ "\t* Find out Mandriva Linux on a bootable CD with <b>Mandriva Move</b>"
 #~ msgstr ""
-#~ "\t* Conegui Mandrivalinux en un CD autoarrancable amb <b>Mandriva Move</b>"
+#~ "\t* Conegui Mandriva Linux en un CD autoarrancable amb <b>Mandriva Move</"
+#~ "b>"
 
 #~ msgid ""
 #~ "Find all Mandriva products at <b>MandrakeStore</b> -- our full service e-"
diff --git a/perl-install/share/po/cs.po b/perl-install/share/po/cs.po
index 3915da04e..3e8cb8614 100644
--- a/perl-install/share/po/cs.po
+++ b/perl-install/share/po/cs.po
@@ -1312,11 +1312,11 @@ msgstr "Výběr jazyka"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux 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 ""
-"Mandrivalinux podporuje více jazyků. Můžete si zvolit další jazyky,\n"
+"Mandriva Linux podporuje více jazyků. Můžete si zvolit další jazyky,\n"
 "které budou dostupné po instalaci a následném restartu systému."
 
 #: any.pm:752 any.pm:773 help.pm:647
@@ -3735,12 +3735,12 @@ msgstr "Zapnout podporu rádia"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Předtím, než budete pokračovat, přečtěte si pozorně licenční podmínky. Ty\n"
-"se vztahují k celé distribuci Mandrivalinux a pokud s nimi souhlasíte,\n"
+"se vztahují k celé distribuci Mandriva Linux a pokud s nimi souhlasíte,\n"
 "klepněte na tlačítko \"%s\". Pokud ne, klepněte na tlačítko \"%s \" a "
 "počítač bude restartován."
 
@@ -3917,13 +3917,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Distribuce Mandrivalinux je složena z několika CD. Instalační program ví,\n"
+"Distribuce Mandriva Linux je složena z několika CD. Instalační program ví,\n"
 "na kterém disku je umístěn jaký balíček a v případě potřeby vysune CD a "
 "vyžádá\n"
 "si výměnu CD za požadované. Pokud nemáte požadované CD po ruce, klikněte\n"
@@ -3933,11 +3933,12 @@ 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 Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3990,7 +3991,7 @@ msgid ""
 msgstr ""
 "V této chvíli je možné vybrat, které programy chcete nainstalovat na váš "
 "systém.\n"
-"Mandrivalinux obsahuje tisíce balíčků s programy a pro snadnější orientaci\n"
+"Mandriva Linux obsahuje tisíce balíčků s programy a pro snadnější orientaci\n"
 "byly rozděleny do skupin, které sdružují podobné aplikace.\n"
 "\n"
 "Balíčky jsou rozděleny do skupin, které odpovídají tomu, jak je nejčastěji\n"
@@ -4101,10 +4102,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 Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4136,7 +4137,7 @@ msgstr ""
 "!! Pokud se nachází mezi vybranými balíčky serverové programy, ať už "
 "vybrané\n"
 "záměrně nebo jako součást skupiny, zobrazí se dotaz na to,\n"
-"zda opravdu chcete tyto servery nainstalovat. V distribuci Mandrivalinux\n"
+"zda opravdu chcete tyto servery nainstalovat. V distribuci Mandriva Linux\n"
 "jsou tyto servery spuštěny při startu systému. I když v době vydání "
 "distribuce\n"
 "nejsou známy žádné bezpečnostní problémy, mohou se vyskytnout později.\n"
@@ -4287,7 +4288,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 Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4343,7 +4344,7 @@ msgid ""
 msgstr ""
 "X (X Window System) je srdcem grafického rozhraní pro GNU/Linux, které\n"
 "využívají dodávané grafické prostředí (KDE, GNOME, AfterStep, WindowMaker) "
-"se systémem Mandrivalinux.\n"
+"se systémem Mandriva Linux.\n"
 "\n"
 "Nyní bude zobrazen seznam různých parametrů, které je možné změnit pro\n"
 "dosažení optimálního grafického zobrazení\n"
@@ -4461,12 +4462,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\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"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4493,7 +4494,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4502,7 +4503,8 @@ 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 Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4523,10 +4525,10 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "V tomto bodě si musíte rozhodnout, na které diskové oddíly budete\n"
-"instalovat nový operační systém Mandrivalinux. Pokud je disk prázdný\n"
+"instalovat nový operační systém Mandriva Linux. Pokud je disk prázdný\n"
 "nebo existující operační systém používá celý disk, je nutné ho rozdělit.\n"
 "Rozdělení disku spočívá ve vytvoření volného prostoru pro instalaci\n"
-"systému Mandrivalinux.\n"
+"systému Mandriva Linux.\n"
 "\n"
 "Protože rozdělení disku je nenávratná operace, je to velmi nebezpečná\n"
 "akce pro ty uživatele, kteří nemají žádné zkušenosti.\n"
@@ -4555,7 +4557,7 @@ msgstr ""
 "oddíl ve\n"
 "Windows defragmentovali. Je doporučeno zazálohovat vaše data. Tento postup\n"
 "je doporučený, pokud chcete na disku provozovat současně systém\n"
-"Mandrivalinux i Microsoft Windows.\n"
+"Mandriva Linux i Microsoft Windows.\n"
 "\n"
 "   Před výběrem této volby si prosím uvědomte, že velikost oddílu s "
 "Microsoft\n"
@@ -4563,7 +4565,7 @@ msgstr ""
 "uložení dat nebo instalaci programů do Microsoft Windows.\n"
 "\n"
 " * \"%s\": pokud chcete smazat veškerá data a všechny oddíly na disku\n"
-"a použít je pro instalaci systému Mandrivalinux, vyberte toto řešení.\n"
+"a použít je pro instalaci systému Mandriva Linux, vyberte toto řešení.\n"
 "Zde postupujte opatrně, po výběru již není možné vzít tuto volbu zpět.\n"
 "\n"
 "   !! Pokud zvolíte tuto možnost, všechna data na disku budou ztracena.!!\n"
@@ -4725,7 +4727,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"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4749,7 +4751,7 @@ msgstr ""
 "\n"
 "Pokud je vše připraveno pro formátování, klepněte na \"%s\".\n"
 "\n"
-"Pokud chcete vybrat jiné oddíly pro instalaci systému Mandrivalinux,\n"
+"Pokud chcete vybrat jiné oddíly pro instalaci systému Mandriva Linux,\n"
 "klepněte na \"%s\" \n"
 "\n"
 "Klepnutím na \"%s\" můžete vybrat, které oddíly budou otestovány\n"
@@ -4767,7 +4769,7 @@ msgstr "Zpět"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4779,7 +4781,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Pokaždé, když instalujete distribuci Mandrivalinux, je možné, že některé\n"
+"Pokaždé, když instalujete distribuci Mandriva Linux, je možné, že některé\n"
 "balíčky byly od vydání distribuce aktualizovány. Mohly to být opravy chyb\n"
 "či řešení možných bezpečnostních problémů. Pokud chcete využít právě\n"
 "této nabídky, je možné tyto balíčky nyní stáhnout z Internetu. Zvolte \"%s"
@@ -4810,7 +4812,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 Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4838,7 +4840,7 @@ msgstr "Správce zabezpečení"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -4910,7 +4912,7 @@ msgid ""
 msgstr ""
 "V této chvíli je potřeba určit, který(é) oddíl(y) budou použity pro "
 "instalaci\n"
-"systému Mandrivalinux. Pokud byly oddíly již jednou definovány, buď\n"
+"systému Mandriva Linux. Pokud byly oddíly již jednou definovány, buď\n"
 "z předchozí instalace GNU/Linux nebo jiným programem na rozdělení disku,\n"
 "je možné použít právě tyto oddíly. Jinak musí být oddíly nově definovány.\n"
 "\n"
@@ -4998,7 +5000,7 @@ msgstr "Přepne mezi normální/expertním režimem"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5029,7 +5031,7 @@ msgstr ""
 "Instalační program nalezl na disku více než jeden oddíl s Microsoft "
 "Windows.\n"
 "Prosím vyberte si jeden z nich, který je potřeba pro novu instalaci systému\n"
-"Mandrivalinux zmenšit.\n"
+"Mandriva Linux zmenšit.\n"
 "\n"
 "Každý oddíl je zobrazen následovně: \"Pojmenování v Linuxu\",\n"
 "\"Název ve Windows\", \"Velikost\".\n"
@@ -5078,7 +5080,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 Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5087,19 +5089,20 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
 msgstr ""
 "Tento krok se objeví pouze tehdy, pokud je na vašem počítači nalezen starší\n"
 "oddíl GNU/Linuxu.\n"
 "\n"
 "Instalační program potřebuje vědět, zda má provést instalaci nebo pouze\n"
-"aktualizaci existujícího systému Mandrivalinux.\n"
+"aktualizaci existujícího systému Mandriva Linux.\n"
 "\n"
 " * \"%s\": Nejběžnější volba, provede kompletní výmaz starého systému.\n"
 "V závislosti na rozvržení oddílů vašeho starého systému je však možné\n"
@@ -5108,7 +5111,7 @@ msgstr ""
 "souborový systém, použijte tuto volbu.\n"
 "\n"
 " * \"%s\": tato volba provede aktualizaci balíčků instalovaných na vašem\n"
-"systému Mandrivalinux. Aktuální rozmístění diskových oddílů a uživatelská\n"
+"systému Mandriva Linux. Aktuální rozmístění diskových oddílů a uživatelská\n"
 "data zůstanou zachována. Bude ale provedena většina konfiguračních kroků,\n"
 "stejně jako při instalaci.\n"
 "\n"
@@ -5176,7 +5179,8 @@ 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, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5472,7 +5476,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 Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5493,12 +5497,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 Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Zde si můžete vybrat tiskový systém, který budete používat. Jiné OS "
 "nabízejí\n"
-"jeden, Mandrivalinux nabízí dva. Každý z nich je vhodnější pro různé typy\n"
+"jeden, Mandriva Linux nabízí dva. Každý z nich je vhodnější pro různé typy\n"
 "konfigurací.\n"
 "\n"
 " * \"%s\" - což znamená 'print, do not queue' a je vhodný tehdy, pokud máte\n"
@@ -5640,7 +5644,8 @@ 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"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5657,7 +5662,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5707,7 +5712,7 @@ msgstr ""
 " * \"%s\": pokud chcete nyní nastavit připojení k Internetu nebo k lokální\n"
 "síti, klepnutím na tlačítko se spustí průvodce. Plnou dokumentaci naleznete\n"
 "v tištěné příručce, případně můžete po instalaci využít ovládací centrum\n"
-"Mandrivalinux, kde rovněž naleznete kompletní nápovědu.\n"
+"Mandriva Linux, kde rovněž naleznete kompletní nápovědu.\n"
 "\n"
 " * \"%s\": umožňuje nastavit adresu HTTP a FTP proxy, což je užitečné,\n"
 "pokud se počítač nachází za firewallem.\n"
@@ -5724,7 +5729,7 @@ msgstr ""
 " * \"%s\": pokud chcete změnit nastavení zavaděče, můžete to provést\n"
 "klepnutím na toto tlačítko. Změny by měly provádět pouze zkušení uživatelé.\n"
 "Více informací lze nalézt v tištěné dokumentaci nebo online nápověde\n"
-"v ovládacím centru Mandrivalinux.\n"
+"v ovládacím centru Mandriva Linux.\n"
 "\n"
 " * \"%s\": zde si můžete konkrétně určit, které služby budou na vašem "
 "počítači\n"
@@ -5786,10 +5791,10 @@ msgstr "Služby"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Vyberte disk, který chcete smazat pro instalaci oddílu Mandrivalinux.\n"
+"Vyberte disk, který chcete smazat pro instalaci oddílu Mandriva Linux.\n"
 "Pamatujte na to, že všechna data budou ztracena a nelze je již obnovit!"
 
 #: help.pm:863
@@ -6140,7 +6145,7 @@ msgstr "Počítám volné místo na Windows oddílu"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Váš diskový oddíl s Windows je příliš fragmentován. Restartujte počítač do "
@@ -6260,13 +6265,13 @@ msgstr "Zastavuji síť"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -6320,7 +6325,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6357,7 +6362,7 @@ msgid ""
 "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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6378,11 +6383,11 @@ msgid ""
 msgstr ""
 "Úvod\n"
 "\n"
-"Operační systém a různé části dostupné v distribuci Mandrivalinux jsou "
+"Operační systém a různé části dostupné v distribuci Mandriva Linux jsou "
 "nazývány \"Softwarové produkty\" (\"Software Products\"). Softwarové "
 "produkty zahrnují, ale nejsou omezeny, na programy, metody, pravidla a "
 "dokumentaci, vztahující se k operačnímu systému a dalším komponentám "
-"distribuce Mandrivalinux.\n"
+"distribuce Mandriva Linux.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -6436,7 +6441,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6473,7 +6478,7 @@ msgstr ""
 "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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6576,8 +6581,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6585,13 +6590,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "Gratulujeme vám, instalace je dokončena.\n"
 "Vyjměte zaváděcí média a stiskněte Return pro restart.\n"
 "\n"
 "\n"
-"Informace o opravách pro tuto verzi systému Mandrivalinux lze\n"
+"Informace o opravách pro tuto verzi systému Mandriva Linux lze\n"
 "nalézt na stránce Errata dostupné na:\n"
 "\n"
 "\n"
@@ -6599,13 +6604,13 @@ msgstr ""
 "\n"
 "\n"
 "Informace o nastavení systému po instalaci jsou dostupné\n"
-"v příslušné kapitole oficiální uživatelské příručky pro Mandrivalinux."
+"v příslušné kapitole oficiální uživatelské příručky pro Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -6633,11 +6638,11 @@ msgstr "Začínám '%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Váš systém má málo systémových prostředků. Při instalaci Mandrivalinuxu se\n"
+"Váš systém má málo systémových prostředků. Při instalaci Mandriva Linuxu se\n"
 "můžete setkat s různými problémy. Pokud se tak stane, zkuste textovou\n"
 "verzi instalačního programu. Ta se spouští tak, že při startu\n"
 "z CD mechaniky stisknete 'F1' a poté napíšete 'text'."
@@ -7174,8 +7179,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
-msgstr "Kontaktuji web Mandrivalinux pro získání seznamu dostupných zrcadel..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr ""
+"Kontaktuji web Mandriva Linux pro získání seznamu dostupných zrcadel..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7399,8 +7405,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux Instalace %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux Instalace %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9989,13 +9995,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "Nastavení aplikace drakfirewall\n"
 "\n"
-"Zde je možné nastavit osobní firewall pro tento systém Mandrivalinux.\n"
+"Zde je možné nastavit osobní firewall pro tento systém Mandriva Linux.\n"
 "Pro výkonné řešení vyhrazeného firewallu použijte specializovanou\n"
 "distribuci MandrakeSecurity Firewall."
 
@@ -14033,8 +14039,8 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
 "Chcete-li sdílet skener na vaší síti, spusťte nástroj Scannerdrake (lze též "
@@ -15955,23 +15961,23 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Co je to Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Co je to Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Vítá vás <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Vítá vás <b>Mandriva Linux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux 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 ""
-"Mandrivalinux ke <b>distribuce Linuxu</b>, která se skládá z jádra systému, "
+"Mandriva Linux ke <b>distribuce Linuxu</b>, která se skládá z jádra systému, "
 "tzv. <b>operačního systému</b> (založeného na jádře zvaném Linux), a "
 "<b>spousty aplikací</b>, které uspokojí každou potřebu, na kterou si jenom "
 "vzpomenete."
@@ -15979,10 +15985,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux 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 ""
-"Mandrivalinux je <b>uživatelsky nejpřívětivější</b> distribuce Linuxu "
+"Mandriva Linux je <b>uživatelsky nejpřívětivější</b> distribuce Linuxu "
 "dostupná na trhu. Je také jednou z <b>nejpoužívanějších</b> distribucí "
 "Linuxu na světě!"
 
@@ -15999,15 +16005,15 @@ msgstr "Vítejte do <b>světa Open Source</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux 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 "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
-"Mandrivalinux využívá a je plně oddán modelu Open Source. To znamená, že "
+"Mandriva Linux využívá a je plně oddán modelu Open Source. To znamená, že "
 "toto nové vydání je výsledkem <b>spolupráce</b> mezi týmem <b>vývojářů "
 "společnosti Mandriva</b> a <b>celosvětovou komunitou</b> přispěvatelů do "
-"distribuce Mandrivalinux."
+"distribuce Mandriva Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16026,12 +16032,12 @@ msgstr "<b>GPL</b>"
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Většina ze software v této distribuci a všechny nástroje distribuce "
-"Mandrivalinux jsou dostupné pod Obecnou veřejnou licencí (<b>General Public "
-"License</b>)."
+"Většina ze software v této distribuci a všechny nástroje distribuce Mandriva "
+"Linux jsou dostupné pod Obecnou veřejnou licencí (<b>General Public License</"
+"b>)."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16061,25 +16067,25 @@ msgstr "<b>Připojte se ke komunitě</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux 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."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
-"Distribuce Mandrivalinux má jednu z <b>největších komunit</b> uživatelů a "
+"Distribuce Mandriva Linux má jednu z <b>největších komunit</b> uživatelů a "
 "vývojářů. Role takové komunity jsou velmi rozmanité, od hlášení chyb po "
 "vývoj nových aplikací. Komunita hraje <b>klíčovou roli</b> ve světě "
-"distribuce Mandrivalinux."
+"distribuce Mandriva Linux."
 
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 "Chcete-li se <b>dozvědět více</b> o naší dynamické komunitě, navštivte "
-"prosím stránky <b>www.mandrakelinux.com</b> nebo přímo <b>www.mandrakelinux."
+"prosím stránky <b>www.mandrivalinux.com</b> nebo přímo <b>www.mandrakelinux."
 "com/en/cookerdevel.php3</b>, pokud máte zájem přímo se <b>účastnit</b> "
 "vývoje."
 
@@ -16091,10 +16097,10 @@ msgstr "<b>Download verze</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Právě instalujete <b>Mandrivalinux Download</b>. Jedná se o volnou verzi, "
+"Právě instalujete <b>Mandriva Linux Download</b>. Jedná se o volnou verzi, "
 "kterou chce společnost Mandriva <b>poskytnout každému</b>."
 
 #: share/advertising/05.pl:19
@@ -16139,8 +16145,8 @@ msgstr "<b>Discovery, váš první Linuxový desktop</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Právě instalujete produkt <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Právě instalujete produkt <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16162,8 +16168,8 @@ msgstr "<b>PowerPack, nejpokročilejší Linuxový desktop</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Právě instalujete produkt <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Právě instalujete produkt <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16183,8 +16189,8 @@ msgstr "<b>PowerPack+, Linuxové řešení pro desktopy a servery</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Právě instalujete produkt <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Právě instalujete produkt <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16207,15 +16213,15 @@ msgstr "<b>Produkty společnosti Mandriva</b>"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
-"Společnost <b>Mandriva</b> vyvinula širokou řadu produktů <b>Mandrivalinux</"
+"Společnost <b>Mandriva</b> vyvinula širokou řadu produktů <b>Mandriva Linux</"
 "b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Produkty Mandrivalinux jsou:"
+msgid "The Mandriva Linux products are:"
+msgstr "Produkty Mandriva Linux jsou:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16235,10 +16241,10 @@ msgstr "\t* <b>PowerPack+</b>, Linuxové řešení pro desktop i servery."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrivalinux pro x86-64</b>, řešení Mandrivalinux pro co nejlepší "
+"\t* <b>Mandriva Linux pro x86-64</b>, řešení Mandriva Linux pro co nejlepší "
 "využití vašeho 64bitového procesoru."
 
 #: share/advertising/10.pl:15
@@ -16249,29 +16255,29 @@ msgstr "<b>Produkty společnosti Mandriva (produkty Nomad)</b>"
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 "Společnost Mandriva vyvinula dva produkty, které vám umožní používat "
-"distribuci Mandrivalinux <b>na každém počítači</b> a bez potřeby tuto "
+"distribuci Mandriva Linux <b>na každém počítači</b> a bez potřeby tuto "
 "distribuci na nich instalovat:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, distribuce Mandrivalinux, která se výhradně spouští ze "
+"\t* <b>Move</b>, distribuce Mandriva Linux, která se výhradně spouští ze "
 "spustitelného CD-ROM disku."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, distribuce Mandrivalinux předinstalovaná na ultra "
+"\t* <b>GlobeTrotter</b>, distribuce Mandriva Linux předinstalovaná na ultra "
 "kompaktních mobilních discích “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
@@ -16290,18 +16296,20 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, desktop Mandrivalinux pro společnosti."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, desktop Mandriva Linux pro společnosti."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, serverové řešení Mandrivalinux."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, serverové řešení Mandriva Linux."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b>, bezpečnostní řešení Mandrivalinux."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, bezpečnostní řešení Mandriva Linux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16504,10 +16512,10 @@ msgstr "<b>Užívejte širokou řadu aplikací</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"V menu Mandrivalinux najdete <b>jednoduše použitelné</b> aplikace pro "
+"V menu Mandriva Linux najdete <b>jednoduše použitelné</b> aplikace pro "
 "<b>všechny typy úloh</b>:"
 
 #: share/advertising/18.pl:16
@@ -16774,19 +16782,19 @@ msgstr "\t* <b>Postfix</b> a <b>Sendmail</b>: Známé a mocné poštovní server
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Ovládací centrum Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Ovládací centrum Mandriva Linux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Ovládací centrum Mandrivalinux</b> je nepostradatelná sbírka nástrojů "
-"specifických pro distribuci Mandrivalinux, které zjednoduší nastavení vašeho "
-"počítače."
+"<b>Ovládací centrum Mandriva Linux</b> je nepostradatelná sbírka nástrojů "
+"specifických pro distribuci Mandriva Linux, které zjednoduší nastavení "
+"vašeho počítače."
 
 #: share/advertising/25.pl:17
 #, c-format
@@ -16810,16 +16818,16 @@ 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 "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Jako každé jiné počítačové programování, vývoj open source software <b>si "
 "žádá čas a lidi</b>. Aby respektovala filozofii open source, prodává "
 "společnost Mandriva produkty s přidanou hodnotou a služby, díky kterým "
-"<b>vylepšuje distribuci Mandrivalinux</b>. Chcete-li <b>podporovat filozofii "
-"open source</b> a vývoj distribuce Mandrivalinux, <b>zvažte prosím</b> koupi "
-"některého z našich produktů a služeb!"
+"<b>vylepšuje distribuci Mandriva Linux</b>. Chcete-li <b>podporovat "
+"filozofii open source</b> a vývoj distribuce Mandriva Linux, <b>zvažte "
+"prosím</b> koupi některého z našich produktů a služeb!"
 
 #: share/advertising/27.pl:13
 #, c-format
@@ -16852,8 +16860,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Navštivte ještě dnes <b>store.mandrakesoft.com</b>"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Navštivte ještě dnes <b>store.mandriva.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16863,11 +16871,11 @@ msgstr "<b>Mandriva Club</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
-"<b>Mandriva Club</b> je <b>perfektní doplněk</b> k vašemu produktu "
-"Mandrivalinux."
+"<b>Mandriva Club</b> je <b>perfektní doplněk</b> k vašemu produktu Mandriva "
+"Linux."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -16881,10 +16889,10 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 "\t* <b>Speciální slevy</b> na produkty a služby nabízené v online obchodu "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -16897,17 +16905,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Účast v <b>uživatelských fórech</b> distribuce Mandrivalinux."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Účast v <b>uživatelských fórech</b> distribuce Mandriva Linux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Dřívější a privilegovaný přístup</b>, před veřejným vydáním, k <b>ISO "
-"obrazům</b> Mandrivalinux."
+"obrazům</b> Mandriva Linux."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -16927,10 +16935,10 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 "Mandriva Online poskytuje širokou řadu cenných služeb pro <b>snadnou "
-"aktualizaci</b> vašich systémů s distribucí Mandrivalinux:"
+"aktualizaci</b> vašich systémů s distribucí Mandriva Linux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16956,9 +16964,9 @@ msgstr "\t* Flexibilní <b>plánované</b> aktualizace."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
-"\t* Správa <b>všech vašich Mandrivalinux systémů</b> pomocí jednoho účtu."
+"\t* Správa <b>všech vašich Mandriva Linux systémů</b> pomocí jednoho účtu."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -16969,16 +16977,16 @@ msgstr "<b>Mandriva Expert</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 "Potřebujete <b>asistenci</b>? Setkejte se s technickými experty společnosti "
 "Mandriva na naší <b>platformě technické podpory</b> na stránkách www."
-"mandrakeexpert.com."
+"mandrivaexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 "Díky pomoci <b>kvalifikovaných expertů společnosti Mandriva</b> ušetříte "
@@ -16987,11 +16995,11 @@ msgstr ""
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
-"Pro zodpovězení otázek spojených s distribucí Mandrivalinux máte možnost "
-"zakoupit si incidenty technické podpory na <b>store.mandrakesoft.com</b>."
+"Pro zodpovězení otázek spojených s distribucí Mandriva Linux máte možnost "
+"zakoupit si incidenty technické podpory na <b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17376,8 +17384,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 "[VOLBY] [NAZEV_PROGRAMU]\n"
 "\n"
@@ -17439,7 +17447,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17453,7 +17461,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[VOLBY]\n"
-"Nastavení pro Mandrivalinux Terminal Server (MTS)\n"
+"Nastavení pro Mandriva Linux Terminal Server (MTS)\n"
 "--enable         : povolí MTS\n"
 "--disable        : zakáže MTS\n"
 "--start          : spustí MTS\n"
@@ -20278,13 +20286,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Nástroj distribuce Mandrivalinux pro hlášení chyb"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Nástroj distribuce Mandriva Linux pro hlášení chyb"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Ovládací centrum Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Ovládací centrum Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20774,19 +20782,19 @@ msgstr "Spustit při startu"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Toto rozhraní ještě nebylo nastaveno.\n"
-"Spusťte průvodce \"Přidat rozhraní\" z Ovládacího centra Mandrivalinux"
+"Spusťte průvodce \"Přidat rozhraní\" z Ovládacího centra Mandriva Linux"
 
 #: 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 Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Nemáte nastaveno žádné připojení k Internetu.\n"
-"Spusťte průvodce \"%s\" z Ovládacího centra Mandrivalinux"
+"Spusťte průvodce \"%s\" z Ovládacího centra Mandriva Linux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20836,8 +20844,8 @@ msgstr "KDM (Správce obrazovky KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Správce obrazovky Mandrivalinux)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Správce obrazovky Mandriva Linux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21141,18 +21149,18 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 "Copyright ©2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (původní verze)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 
 #: standalone/drakfont:520
 #, c-format
@@ -21721,8 +21729,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Centrum nápovědy Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Centrum nápovědy Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22376,7 +22384,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "V počítači nebyla nalezena žádná zvuková karta karta. Zkontrolujte prosím,"
 "zda podporovaná karta je správně zapojena.\n"
@@ -22385,7 +22393,7 @@ msgstr ""
 "Databázi hardware lze nalézt na:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24398,7 +24406,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "V počítači nebyla nalezena žádná TV karta. Zkontrolujte prosím, zda "
 "podporovaná karta je správně zapojena.\n"
@@ -24407,7 +24415,7 @@ msgstr ""
 "Databázi hardware lze nalézt na:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25121,13 +25129,13 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
 "Toto je HardDrake, nástroj pro nastavení hardware %s.\n"
 "<span foreground=\"royalblue3\">Verze:</span> %s\n"
 "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25236,8 +25244,8 @@ msgstr "Změny jsou provedeny, ale pro aktivaci je nutné provést odhlášení"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Záznamy nástrojů Mandrivalinuxu"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Záznamy nástrojů Mandriva Linuxu"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25750,10 +25758,10 @@ msgstr "Připojení ukončeno."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Připojení selhalo.\n"
-"Ověřte nastavení v ovládacím centru Mandrivalinux."
+"Ověřte nastavení v ovládacím centru Mandriva Linux."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index 230b7d8ea..f24f2bfd8 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -1306,7 +1306,7 @@ msgstr "Dewis iaith"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
 msgstr ""
@@ -3729,12 +3729,12 @@ msgstr "galluogi cynnal radio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Cyn parhau dylech ddarllen amodau'r drwydded yn ofalus. Mae'n ymwneud\n"
-"â holl ddosbarthiad Mandrivalinux. Os ydych yn cytuno â'r holl amodau,\n"
+"â holl ddosbarthiad Mandriva Linux. Os ydych yn cytuno â'r holl amodau,\n"
 "cliciwch flwch \"%s\". Os nad, bydd clicio ar y botwm \"%s\" yn\n"
 "ail gychwyn eich cyfrifiadur."
 
@@ -3894,13 +3894,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mae gosodiad Mandrivalinux i'w gael ar nifer o CD-ROMau. Mae DrakX\n"
+"Mae gosodiad Mandriva Linux i'w gael ar nifer o CD-ROMau. Mae DrakX\n"
 "yn gwybod os yw pecyn penodol wedi ei leoli ar CD-ROM arall a bydd yn bwrw\n"
 "allan y CD cyfredol a gofyn am y llall. Os nad yw'r CD angenrheidiol "
 "gennych\n"
@@ -3910,11 +3910,12 @@ 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 Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3966,11 +3967,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "Mae'n amser penderfynu pa raglenni rydych am eu gosod ar eich\n"
-"system. Mae yna filoedd o becynnau ar gael ar gyfer Mandrivalinux, ond\n"
+"system. Mae yna filoedd o becynnau ar gael ar gyfer Mandriva Linux, ond\n"
 "i'w gwneud hi'n haws eu rheoli maent wedi cael eu gosod mewn grwpiau\n"
 "o raglenni tebyg.\n"
 "\n"
-"Mae Mandrivalinux wedi trefnu'r grwpiau pecynnau i bedwar categori. Mae\n"
+"Mae Mandriva Linux wedi trefnu'r grwpiau pecynnau i bedwar categori. Mae\n"
 "modd dewis a dethol rhaglenni o'r categorïau gwahanol, fel bo \"Man Gwaith"
 "\"\n"
 "yn medru cael rhaglenni o'r categori \"Gweinydd\".\n"
@@ -4073,10 +4074,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 Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4106,11 +4107,11 @@ msgstr ""
 "\n"
 "!! Os oes pecyn gweinydd wedi ei ddewis, yn fwriadol neu am ei fod yn rhan\n"
 "o grwp cyfan, bydd angen i chi gadarnhau eich bod eisiau i'r gweinyddion\n"
-"gael eu gosod. Ym Mandrivalinux mae unrhyw weinydd sydd wedi ei\n"
+"gael eu gosod. Ym Mandriva Linux mae unrhyw weinydd sydd wedi ei\n"
 "osod yn cael ei gychwyn fel rhagosodiad wrth gychwyn. Hyd yn oed os ydynt\n"
 "yn ddiogel a doedd dim materion pryder pan gafodd y dosbarthiad ei ryddhau,\n"
 "mae'n bosibl i fylchau diogelwch gael eu darganfod wedi i'r fersiwn hwn o\n"
-"Mandrivalinux gael ei gwblhau. Os nad ydych yn gwybod beth mae\n"
+"Mandriva Linux gael ei gwblhau. Os nad ydych yn gwybod beth mae\n"
 "gwasanaeth arbennig i fod i'w wneud na pham mae wedi ei osod, yna\n"
 "cliciwch\"%s\". Bydd clicio \"%s\" yn gosod y gwasanaethau hynny a\n"
 "byddant yncael eu cychwyn yn awtomatig drwy ragosodiad!!\n"
@@ -4257,7 +4258,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 Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4313,7 +4314,7 @@ msgid ""
 msgstr ""
 "X (sef X Window System) yw calon rhyngwyneb graffigol GNU/Linux a'r\n"
 "hyn mae'r holl amgylcheddau graffigol (KDE, Gnome, AterStep,\n"
-"WindowMaker, etc) sy'n dod gyda Mandrivalinux yn dibynnu arno.\n"
+"WindowMaker, etc) sy'n dod gyda Mandriva Linux yn dibynnu arno.\n"
 "\n"
 "Byddwch yn derbyn rhestr o baramedrau gwahanol i'w newid i gael\n"
 "y dangosiad graffigol gorau:\n"
@@ -4428,12 +4429,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\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"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4460,7 +4461,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 Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4469,7 +4470,8 @@ 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 Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4490,7 +4492,7 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Mae angen i chi nawr ddewis lle ar eich disg caled i osod eich system\n"
-"weithredu Mandrivalinux. Os yw eich disg caled yn wag neu os oes\n"
+"weithredu Mandriva Linux. Os yw eich disg caled yn wag neu os oes\n"
 "yna system weithredol eisoes yn cymryd yr holl le sydd ar gael, bydd\n"
 "angen i chi greu rhaniadau arno. Yn y bôn, mae rhannu disg caled yn\n"
 "golygu ei rhannu'n rhesymegol i greu lle i osod eich system Mandrake\n"
@@ -4522,14 +4524,14 @@ msgstr ""
 "Mae modd ail lunio maint y rhaniad heb golli data cyn belled eich bod wedi\n"
 "dad-ddarnio rhaniad Windows ac mae'n defnyddio fformat Windows.\n"
 "Argymhellir cadw data wrth gefn hefyd. Argymhellir gwneud hyn os ydych\n"
-"am ddefnyddio Mandrivalinux a Microsoft Windows ar yr un cyfrifiadur.\n"
+"am ddefnyddio Mandriva Linux a Microsoft Windows ar yr un cyfrifiadur.\n"
 "\n"
 "  Cyn gwneud y dewis hwn, cofiwch y bydd maint eich rhaniad Microsoft\n"
 "Windows yn llai nag yw ar hyn o bryd ar ol dilyn y drefn yma. Bydd gennych\n"
 "llai o le yn Microsoft Windows i gadw data neu i osod meddalwedd newydd\n"
 "\n"
 " * \"%s\" os ydych am ddileu'r holl ddata a rhaniadau presennol ar\n"
-"eich disg caled a'u cyfnewid am system Mandrivalinux, yna dewiswch\n"
+"eich disg caled a'u cyfnewid am system Mandriva Linux, yna dewiswch\n"
 "hwn. Byddwch yn ofalus wrth wneud hyn gan na fydd modd troi nôl\n"
 "ar ôl cadarnhau.\n"
 "\n"
@@ -4687,7 +4689,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"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4709,7 +4711,7 @@ msgstr ""
 "Cliciwch \"%s\" pan ydych yn barod i fformatio rhaniadau.\n"
 "\n"
 "Cliciwch \"%s\" os ydych am ddewis rhaniad arall ar gyfer eich gosodiad\n"
-"Mandrivalinux newydd\n"
+"Mandriva Linux newydd\n"
 "\n"
 "Cliciwch \"%s\" os ydych am ddewis rhaniadau i'w gwirio am flociau\n"
 "gwallus ar y ddisg."
@@ -4726,7 +4728,7 @@ msgstr "Blaenorol"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4738,7 +4740,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Erbyn i chi osod Mandrivalinux, mae'n debygol y bydd rhai \n"
+"Erbyn i chi osod Mandriva Linux, mae'n debygol y bydd rhai \n"
 "pecynnau wedi eu diweddaru ers y rhyddhad cychwynnol. Bydd rhai \n"
 "gwallau wedi eu cywiro a materion diogelwch wedi eu datrys. I ganiatáu\n"
 "i chi fanteisio ar hyn mae cynnig i chi eu llwytho i lawr o'r rhyngrwyd.\n"
@@ -4766,7 +4768,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 Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4795,7 +4797,7 @@ msgstr "Cyfrinair Gweinyddwr"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -4866,7 +4868,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Yn awr mae angen i chi ddewis pa raniadau i'w defnyddio ar gyfer gosodiad\n"
-"eich system Mandrivalinux. Os oes rhaniadau wedi eu diffinio eisoes, un\n"
+"eich system Mandriva Linux. Os oes rhaniadau wedi eu diffinio eisoes, un\n"
 "ai drwy osodiad blaenorol o GNU/Linux neu gan offeryn rhannu arall, mae\n"
 "modd i chi ddefnyddio'r rhaniadau presennol. Os nad, rhaid i' rhaniadau'r\n"
 "ddisg caled gael eu diffinio.\n"
@@ -4951,7 +4953,7 @@ msgstr "Amnewid rhwng modd arferol/arbenigol"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4981,7 +4983,7 @@ msgid ""
 msgstr ""
 "Mae mwy nag un rhaniad Microsoft wedi ei ganfod ar eich disg caled.\n"
 "Dewiswch ba un rydych am newid ei faint er mwyn gosod eich\n"
-"system weithredu Mandrivalinux newydd\n"
+"system weithredu Mandriva Linux newydd\n"
 "\n"
 "Mae pob rhaniad wedi ei restri fel hyn: \"Enw Linux\", \"Enw Windows\",\n"
 "\"Maint\".\n"
@@ -5028,7 +5030,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 Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5037,19 +5039,20 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
 msgstr ""
 "Mae'r cam hwn yn cael ei weithredu os oes hen raniad GNU/Linux wedi\n"
 "ei ganfod ar y cyfrifiadur.\n"
 "\n"
 "Bydd DrakX angen gwybod a ydych am osod o'r newydd neu uwchraddio\n"
-"system Mandrivalinux presennol.\n"
+"system Mandriva Linux presennol.\n"
 "\n"
 " *\"%s\" Ar y cyfan, mae hwn yn tynnu'r hen system gyfan oddi ar eich\n"
 "cyfrifiadur. Er hynny, yn ddibynnol ar eich trefn rhannu, mae modd atal\n"
@@ -5059,13 +5062,13 @@ msgstr ""
 "system ffeil, dylech ddewis hwn.\n"
 "\n"
 " *\"%s\": Mae'r dosbarth gosod hwn yn caniatáu i chi ddiweddaru'r\n"
-"pecynnau sydd wedi eu gosod ar eich system Mandrivalinux. Bydd eich\n"
+"pecynnau sydd wedi eu gosod ar eich system Mandriva Linux. Bydd eich\n"
 "rhaniadau presenol a'ch data personol yn cael eu cadw. Bydd y rhan fwyaf\n"
 "o'r camau ffurfweddu ar gael fel gyda'r gosod arferol.\n"
 "\n"
-"Dylai defnyddio \"Diweddaru\" weithio'n iawn ar systemau Mandrivalinux\n"
+"Dylai defnyddio \"Diweddaru\" weithio'n iawn ar systemau Mandriva Linux\n"
 "sy'n rhedeg systemau \"8.1\" neu'n ddiweddarach. Nid yw uwchraddio\n"
-"fersiynau cyn Mandrivalinux \"8.1\" yn cael ei gymeradwyo."
+"fersiynau cyn Mandriva Linux \"8.1\" yn cael ei gymeradwyo."
 
 #: help.pm:591
 #, c-format
@@ -5128,7 +5131,8 @@ 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, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5169,7 +5173,7 @@ msgstr ""
 "Ynghylch cefnogaeth UTF-8 (unicode): Amgodiad nod newydd yw Unicode\n"
 "sydd i gynnwys pob iaith. Er hynny, mae cefnogaeth i bob iaith o fewn\n"
 "GNU/Linux yn dal yn cael ei ddatblygu Oherwydd hynn mae defnydd\n"
-"Mandrivalinux o UTF-8 yn ddibynnol ar ddewis y defnyddiwr:\n"
+"Mandriva Linux o UTF-8 yn ddibynnol ar ddewis y defnyddiwr:\n"
 "\n"
 " * Os ydych yn dewis iaith gyda hen amgodiad cryf (ieithoedd lladin1\n"
 "Rwsieg, Siapanëeg, Tsieinëeg, Corëeg, Thai, Groeg, Twrceg, y rhan\n"
@@ -5420,7 +5424,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 Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5441,7 +5445,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 Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Yma byddwn yn dewis system argraffu i'ch cyfrifiadur ei ddefnyddio. Efallai\n"
@@ -5590,7 +5594,8 @@ 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"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5607,7 +5612,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"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5656,7 +5661,7 @@ msgstr ""
 " \n"
 " * \"%s\": os ydych am ffurfweddu eich mynediad i'r Rhyngrwyd neu\n"
 "eich rhwydwaith lleol, mae modd gwneud hynny. Darllenwch y deunydd\n"
-"ysgrifenedig neu ddefnyddio Canolfan Reoli Mandrivalinux wedi i'r gosod\n"
+"ysgrifenedig neu ddefnyddio Canolfan Reoli Mandriva Linux wedi i'r gosod\n"
 "orffen i fanteisio ar gymorth ar-lein llawn.\n"
 "\n"
 " * \"%s\": os ydych am ffurfweddu cyfeiriadau dirprwyol HTTP ac FTP os\n"
@@ -5673,7 +5678,7 @@ msgstr ""
 " * \"%s\": os hoffech newid ffurfweddiad eich cychwynnwr\n"
 "cliciwch y botwm yma. Ar gyfer defnyddwyr profiadol. Darllenwch y\n"
 "deunydd ysgrifenedig  neu'r cymorth ar-lein am ffurfweddiad\n"
-"cychwynwyr yng Nghanolfan Rheoli Mandrivalinux.\n"
+"cychwynwyr yng Nghanolfan Rheoli Mandriva Linux.\n"
 "\n"
 " *\"%s\": yma bydd modd i chi wneud man newidiadau i'r\n"
 "gwasanaethau sy'n cael eu rhedeg ar eich cyfrifiadur. Os ydych yn\n"
@@ -5735,11 +5740,11 @@ msgstr "Gwasanaethau"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Dewiswch y ddisg galed rydych am ei ddileu er mwy n gosod eich rhaniad\n"
-"Mandrivalinux newydd. Byddwch ofalus, bydd yr holl ddata sydd arno'n\n"
+"Mandriva Linux newydd. Byddwch ofalus, bydd yr holl ddata sydd arno'n\n"
 "cael ei ddileu ac ni fydd modd ei adfer!"
 
 #: help.pm:863
@@ -6091,11 +6096,11 @@ msgstr "Cyfrifo maint rhaniad Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Mae eich rhaniad Windows yn rhy ysgyriog, rhedwch \"defrag\" yn gyntaf o dan "
-"Windows ac yna ailgychwyn gosodi Mandrivalinux."
+"Windows ac yna ailgychwyn gosodi Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6208,13 +6213,13 @@ msgstr "Cau'r rhwydwaith"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -6268,7 +6273,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6305,7 +6310,7 @@ msgid ""
 "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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6327,13 +6332,13 @@ msgstr ""
 "Cyflwyniad\n"
 "\n"
 "Bydd y system weithredu a'r cydrannau gwahanol sydd o fewn dosbarthiad "
-"Mandrivalinux yn\n"
+"Mandriva Linux yn\n"
 "cael eu galw yn \"Gynnyrch Meddalwedd\" o hyn ymlaen. Mae'r Cynnyrch "
 "Meddalwedd yn\n"
 "cynnwys, ond heb eu cyfyngu, i'r  casgliad o raglenni , dulliau, rheolau a "
 "dogfennau mewn\n"
-"perthynas â'r system weithredu a chydrannau gwahanol ddosbarthiad "
-"Mandrivalinux.\n"
+"perthynas â'r system weithredu a chydrannau gwahanol ddosbarthiad Mandriva "
+"Linux.\n"
 "\n"
 "\n"
 "1. Cytundeb Trwyddedu\n"
@@ -6388,7 +6393,7 @@ msgstr ""
 "costau cyfreithiol, a chosb o ganlyniad\n"
 "i achos llys, neu unrhyw golled o ganlyniad) yn codi o lwytho i lawr "
 "cydrannau meddalwedd o un o safleoedd\n"
-" Mandrivalinux, sydd wedi eu gwahardd neu eu hatal mewn rhai gwledydd gan "
+" Mandriva Linux, sydd wedi eu gwahardd neu eu hatal mewn rhai gwledydd gan "
 "gyfreithiau lleol. Mae'r\n"
 "cyfrifoldeb cyfyngedig hwn yn perthyn i , ond heb ei gyfyngu i'r, cydrannau "
 "cryptograffiaeth cryf sy'n cael\n"
@@ -6425,7 +6430,7 @@ msgstr ""
 "ei hawl i newid neu addasu ei Gynnyrch Meddalwedd, yn rhannol neu yn gyfan, "
 "drwy unrhyw ddull ac ar gyfer\n"
 "unrhyw bwrpas.\n"
-"Mae \"Mandriva\", \"Mandrivalinux\"  a'r logos cysylltiedig yn nodau "
+"Mae \"Mandriva\", \"Mandriva Linux\"  a'r logos cysylltiedig yn nodau "
 "masnachol sy'n perthyn i Mandriva S.A.\n"
 "\n"
 "\n"
@@ -6531,8 +6536,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6540,14 +6545,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "Llongyfarchiadau, mae'r gosod wedi ei gwblhau.\n"
 "Tynnwch y cyfrwng cychwyn a chlicio Ailgychwyn.\n"
 "\n"
 "\n"
-"Am wybodaeth am gywiriadau sydd ar gael ar gyfer y rhyddhad hwn o "
-"Mandrivalinux,\n"
+"Am wybodaeth am gywiriadau sydd ar gael ar gyfer y rhyddhad hwn o Mandriva "
+"Linux,\n"
 "cysylltwch â'r atodiad, sydd i'w gael yn:\n"
 "\n"
 "\n"
@@ -6555,13 +6560,13 @@ msgstr ""
 "\n"
 "\n"
 "Mae gwybodaeth ar ffurfweddu eich system ar gael ym mhenawdau ôl osod\n"
-"yr Official Mandrivalinux User's Guide."
+"yr Official Mandriva Linux User's Guide."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -6590,12 +6595,12 @@ msgstr "Cychwyn cam '%s\"\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Mae eich system yn brin o adnoddau. Efallai y cewch anawsterau wrth osod\n"
-"Mandrivalinux. Os bydd hynny'n digwydd, gallwch geisio gwneud gosodiad\n"
+"Mandriva Linux. Os bydd hynny'n digwydd, gallwch geisio gwneud gosodiad\n"
 "testunol. I wneud hynny, gwasgwch F1 wrth gychwyn ar y CD-ROM ac yna rhoi "
 "'text'."
 
@@ -6819,7 +6824,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 "Mae gennych y dewis i gopîo cynnwys y CD ar i'r disg caled cyn gosod "
-"Mandrivalinux.\n"
+"Mandriva Linux.\n"
 "Bydd yna'n parhau o'r disg caled a bydd y pecynnau ar gael unwaith i'r "
 "system gael ei osod yn gyflawn."
 
@@ -7135,8 +7140,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
-msgstr "Cysylltu â safle Mandrivalinux i estyn rhestr o'r drychau sydd ar gael"
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr ""
+"Cysylltu â safle Mandriva Linux i estyn rhestr o'r drychau sydd ar gael"
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7359,8 +7365,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Gosodiad %s Mandrivalinux"
+msgid "Mandriva Linux Installation %s"
+msgstr "Gosodiad %s Mandriva Linux"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9950,14 +9956,14 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "ffurfweddiadur drakfirewall\n"
 "\n"
 "Mae hwn yn ffurfweddu mur gwarchod personol ar gyfer y peiriant \n"
-"Mandrivalinux hwn. Am fur gwarchod pwrpasol pwerus, \n"
+"Mandriva Linux hwn. Am fur gwarchod pwrpasol pwerus, \n"
 "edrychwch ddosbarthiad arbenigol MandrakeSecurity Firewall."
 
 #: network/drakfirewall.pm:164
@@ -14028,12 +14034,12 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
-"Rhedwch Scannerdrake (Caledwedd/Sganiwr yng Nghanolfan Rheoli Mandrivalinux) "
-"i rannu eich sganiwr ar y rhwydwaith.\n"
+"Rhedwch Scannerdrake (Caledwedd/Sganiwr yng Nghanolfan Rheoli Mandriva "
+"Linux) i rannu eich sganiwr ar y rhwydwaith.\n"
 "\n"
 
 #: printer/printerdrake.pm:3933
@@ -15971,33 +15977,33 @@ msgstr "Aros"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Beth yw Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Beth yw Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Croeso i <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Croeso i <b>Mandriva Linux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mae Mandrivalinux yn <b>ddosbarthiad Linux</b> sy'n cynnwys y system graidd, "
-"sef, <b>system weithredu</b> (yn seiliedig ar gnewyllyn Linux) ynghyd â <b> "
-"llawer o raglenni</b> sy'n darparu ar gyfer pob angen."
+"Mae Mandriva Linux yn <b>ddosbarthiad Linux</b> sy'n cynnwys y system "
+"graidd, sef, <b>system weithredu</b> (yn seiliedig ar gnewyllyn Linux) "
+"ynghyd â <b> llawer o raglenni</b> sy'n darparu ar gyfer pob angen."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux 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 ""
-"Mandrivalinux yw'r dosbarthiad Linux mwyaf <b>cyfeillgar</b> heddiw. Mae'n "
+"Mandriva Linux yw'r dosbarthiad Linux mwyaf <b>cyfeillgar</b> heddiw. Mae'n "
 "un o'r dosbarthiadau mwyaf <b>poblogaidd</b> o Linux ar draws y byd i gyd!"
 
 #: share/advertising/02.pl:13
@@ -16013,15 +16019,15 @@ msgstr "Croeso i <b>fyd Cod Agored</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux 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 "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
-"Mae Mandrivalinux yn ymroddedig i fodel cod agored. Mae'n golygu fod y "
+"Mae Mandriva Linux yn ymroddedig i fodel cod agored. Mae'n golygu fod y "
 "rhyddhad newydd yn ganlyniad <b>cydweithrediad</b> rhwng <b>tîm o "
 "ddatblygwyr Mandriva</b> a <b>chyfranwyr cymuned byd eang</b> cyfranwyr "
-"Mandrivalinux."
+"Mandriva Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16040,11 +16046,11 @@ msgstr "<b>Y drwydded GPL</b>"
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 "Mae'r rhan fwyaf o'r feddalwedd sydd wedi ei gynnwys ynghyd â holl offer "
-"Mandrivalinux wedi eu trwyddedu o dan y <b>Drwydded Gyhoeddus Cyffredinol "
+"Mandriva Linux wedi eu trwyddedu o dan y <b>Drwydded Gyhoeddus Cyffredinol "
 "(GPL)</b>"
 
 #: share/advertising/03.pl:17
@@ -16075,25 +16081,25 @@ msgstr "<b>Ymunwch â chymuned</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux 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."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
-"Mae gan Mandrivalinux un o'r <b>cymunedau mwyaf</b> o ddefnyddwyr a "
+"Mae gan Mandriva Linux un o'r <b>cymunedau mwyaf</b> o ddefnyddwyr a "
 "datblygwyr. Mae rôl y gymuned yn eang iawn yn ymestyn o adrodd ar wallau i "
 "ddatblygu rhaglenni newydd. Mae'r gymuned yn chwarae <b>rhan allweddol</b> "
-"ym myd Mandrivalinux."
+"ym myd Mandriva Linux."
 
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
-"I <b>ddysgu mwy</b> am ein cymuned egniol, ewch i <b>www.mandrakelinux.com</"
-"b> neu yn uniongyrchol at <b>www.mandrakelinux.com/ên/cookerdevel.php3</b> "
+"I <b>ddysgu mwy</b> am ein cymuned egniol, ewch i <b>www.mandrivalinux.com</"
+"b> neu yn uniongyrchol at <b>www.mandrivalinux.com/ên/cookerdevel.php3</b> "
 "os hoffech <b>ymuno</b> â'r datblygiadau."
 
 #: share/advertising/05.pl:15
@@ -16104,11 +16110,11 @@ msgstr "<b>Fersiwn Llwytho</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Rydych yn gosod <b> Mandrivalinux Llwytho i Lawr</b>. Hwn yw'r fersiwn rhydd "
-"mae Mandriva am ei ddarparu <b>ar gael i bawb</b>."
+"Rydych yn gosod <b> Mandriva Linux Llwytho i Lawr</b>. Hwn yw'r fersiwn "
+"rhydd mae Mandriva am ei ddarparu <b>ar gael i bawb</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16150,7 +16156,7 @@ msgstr "<b>Discovery, Eich Bwrdd Gwaith Linux Cyntaf</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
 msgstr "Rydych yn gosod <b>Mandrake Discovery</b>"
 
 #: share/advertising/06.pl:17
@@ -16173,8 +16179,8 @@ msgstr "<b>PowerPack, Y Bwrdd Gwaith Linux Gorau</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Rydych yn gosod <b>Mandrivalinux PowerPack</b>"
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Rydych yn gosod <b>Mandriva Linux PowerPack</b>"
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16194,8 +16200,8 @@ msgstr "<b>PowerPack+, Ateb Linux ar gyfer Byrddau gwaith a Gweinyddion</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Rydych yn gosod <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Rydych yn gosod <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16217,14 +16223,15 @@ msgstr "<b>Cynnyrch Mandriva</b>"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
-"Mae <b>Mandriva</b> wedi datblygu ystod eang o gynnyrch <b>Mandrivalinux</b>."
+"Mae <b>Mandriva</b> wedi datblygu ystod eang o gynnyrch <b>Mandriva Linux</"
+"b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Cynnyrch Mandrivalinux yw:"
+msgid "The Mandriva Linux products are:"
+msgstr "Cynnyrch Mandriva Linux yw:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16245,11 +16252,11 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrivalinux ar gyfer x86-64</b>, Ateb Mandrivalinux i wneud y gorau "
-"o'ch prosesydd 64-did."
+"\t* <b>Mandriva Linux ar gyfer x86-64</b>, Ateb Mandriva Linux i wneud y "
+"gorau o'ch prosesydd 64-did."
 
 #: share/advertising/10.pl:15
 #, c-format
@@ -16259,27 +16266,28 @@ msgstr "<b>Cynnyrch Mandriva (Cynnyrch Nomad)</b>"
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mae Mandrivalinux wedi datblygu dau gynnyrch sy'n caniatáu i chi ddefnyddio "
-"Mandrivalinux <b>ar unrhyw gyfrifiadur</b> heb fod angen ei osod:"
+"Mae Mandriva Linux wedi datblygu dau gynnyrch sy'n caniatáu i chi ddefnyddio "
+"Mandriva Linux <b>ar unrhyw gyfrifiadur</b> heb fod angen ei osod:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, dosbarthiad Mandrivalinux sy'n rhedeg yn llwyr o CD-ROM byw."
+"\t* <b>Move</b>, dosbarthiad Mandriva Linux sy'n rhedeg yn llwyr o CD-ROM "
+"byw."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, dosbarthiad Mandrivalinux sydd wedi ei osod yn "
+"\t* <b>GlobeTrotter</b>, dosbarthiad Mandriva Linux sydd wedi ei osod yn "
 "barod ar “LaCie Mobile Hard Drive” bychan iawn"
 
 #: share/advertising/11.pl:13
@@ -16298,20 +16306,22 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
-"\t* <b>Y Bwrdd Gwaith Corfforaethol</b>, Bwrdd Gwaith Mandrivalinux ar gyfer "
-"Busnesau."
+"\t* <b>Y Bwrdd Gwaith Corfforaethol</b>, Bwrdd Gwaith Mandriva Linux ar "
+"gyfer Busnesau."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Y Gweinydd Corfforaethol</b>, Ateb Gweinydd Mandrivalinux."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Y Gweinydd Corfforaethol</b>, Ateb Gweinydd Mandriva Linux."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
-msgstr "\t* <b>Mur Cadarn Aml-Rhwydwaith</b>, Ateb Diogelwch Mandrivalinux."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr "\t* <b>Mur Cadarn Aml-Rhwydwaith</b>, Ateb Diogelwch Mandriva Linux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16510,11 +16520,11 @@ msgstr "<b>Mwynhau'r Ystod Eang o Raglenni</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Yn newislen Mandrivalinux byddwch yn canfod rhaglenni <b>hawdd eu defnyddio</"
-"b> ar gyfer <b>eich holl waith</b>:"
+"Yn newislen Mandriva Linux byddwch yn canfod rhaglenni <b>hawdd eu "
+"defnyddio</b> ar gyfer <b>eich holl waith</b>:"
 
 #: share/advertising/18.pl:16
 #, c-format
@@ -16778,18 +16788,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Canolfan Rheoli Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Canolfan Rheoli Mandriva Linux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"Mae <b>Canolfan Reoli Mandrivalinux</b> yn gasgliad hanfodol o wasanaethau "
-"ar gyfer Mandrivalinux swydd wedi eu cynllunio i symlhau ffurfweddiad eich "
+"Mae <b>Canolfan Reoli Mandriva Linux</b> yn gasgliad hanfodol o wasanaethau "
+"ar gyfer Mandriva Linux swydd wedi eu cynllunio i symlhau ffurfweddiad eich "
 "cyfrifiadur."
 
 #: share/advertising/25.pl:17
@@ -16815,15 +16825,15 @@ 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 "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Fel pob rhaglenni cyfrifiadurol, mae meddalwedd cod agored <b>yn golygu "
 "amser a phobl</b> ar gyfer datblygiad. Er mwyn parchu athroniaeth cod "
 "agored, mae Mandriva yn gwerthu cynnyrch gwerth ychwanegol a gwasanaethau i "
-"<b>barhau i wella Mandrivalinux</b>. Os hoffech chi <b>gefnogi athroniaeth "
-"cod agored</b> a datblygiad Mandrivalinux, <b>os gwelwch chi'n dda</b> "
+"<b>barhau i wella Mandriva Linux</b>. Os hoffech chi <b>gefnogi athroniaeth "
+"cod agored</b> a datblygiad Mandriva Linux, <b>os gwelwch chi'n dda</b> "
 "ystyriwch brynu ein cynnyrch neu ein gwasanaethau!"
 
 #: share/advertising/27.pl:13
@@ -16857,8 +16867,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Ewch i <b> store.mandrakesoft.com</b> heddiw."
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Ewch i <b> store.mandriva.com</b> heddiw."
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16868,11 +16878,11 @@ msgstr "<b>Mandriva Club</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
 "<b>Mandriva Club</b> yw'r <b>cydymaith perffaith</b> ar gyfer eich cynnyrch "
-"Mandrivalinux..."
+"Mandriva Linux..."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -16886,10 +16896,10 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 "\t* <b>Gostyngiadau arbennig</b> ar gyfer cynnyrch a gwasanaethau yn ein "
-"siop ar-lein <b>store.mandrakesoft.com</b>."
+"siop ar-lein <b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -16901,17 +16911,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Cymryd rhan mewn <b>fforymau defnyddwyr</b> Mandrivalinux."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Cymryd rhan mewn <b>fforymau defnyddwyr</b> Mandriva Linux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Mynediad cynnar a breintiol</b>, cyn eu rhyddhau'n gyhoeddus, i "
-"<b>ddelweddau ISO</b> Mandrivalinux."
+"<b>ddelweddau ISO</b> Mandriva Linux."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -16931,10 +16941,10 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 "Mae Mandriva Online yn darparu ystod eang o wasanaethau gwerthfawr ar gyfer "
-"<b>diweddaru'n hawdd</b> eich systemau your Mandrivalinux:"
+"<b>diweddaru'n hawdd</b> eich systemau your Mandriva Linux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16960,8 +16970,9 @@ msgstr "\t* Hyblyg <b>amserlen</b> diweddariadau."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
-msgstr "\t* Rheolaeth o'ch <b>holl systemau Mandrivalinux</b> gydag un cyfrif."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
+msgstr ""
+"\t* Rheolaeth o'ch <b>holl systemau Mandriva Linux</b> gydag un cyfrif."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -16972,28 +16983,28 @@ msgstr "<b>Mandriva Expert</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 "Ydych chi angen <b>cymorth?</b> Mae arbenigwyr technegol Mandriva i'w cael "
-"ar  <b>ein platfform cefnogaeth dechnegol </b> www.mandrakeexpert.com."
+"ar  <b>ein platfform cefnogaeth dechnegol </b> www.mandrivaexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Drwy gymorth <b>arbenigwyr cymwysedig Mandrivalinux</b>, byddwch yn abed "
+"Drwy gymorth <b>arbenigwyr cymwysedig Mandriva Linux</b>, byddwch yn abed "
 "llawer o amser."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
-"Am unrhyw gwestiwn am Mandrivalinux, mae gennych y gallu i brynu cefnogaeth "
-"ar gyfer unrhyw ddigwyddiad o <b>store.mandrakesoft.com</b>."
+"Am unrhyw gwestiwn am Mandriva Linux, mae gennych y gallu i brynu cefnogaeth "
+"ar gyfer unrhyw ddigwyddiad o <b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17382,15 +17393,15 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 "[DEWISIADAU] [PROGRAM_NAME]\n"
 "\n"
 "DEWISIADAU:\n"
 "  --help            - argraffu'r neges cymorth.\n"
-"  --report          - dylai'r rhaglen fod yn un o offer Mandrivalinux\n"
-"  --incident        - ylai'r rhaglen fod yn un o offer Mandrivalinux"
+"  --report          - dylai'r rhaglen fod yn un o offer Mandriva Linux\n"
+"  --incident        - ylai'r rhaglen fod yn un o offer Mandriva Linux"
 
 #: standalone.pm:63
 #, c-format
@@ -17444,7 +17455,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17457,7 +17468,7 @@ msgid ""
 "--delclient      : delete a client machine from MTS (requires MAC address, "
 "IP, nbi image name)"
 msgstr ""
-"Ffurfweddwr Gweinydd Terfynell Mandrivalinux\n"
+"Ffurfweddwr Gweinydd Terfynell Mandriva Linux\n"
 "--enable         : galluogi MTS\n"
 "--disable        : analluogi MTS\n"
 "--start          : cychwyn MTS\n"
@@ -20299,13 +20310,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Offeryn Cofnodi Gwall Mandrivalinux"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Offeryn Cofnodi Gwall Mandriva Linux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Canolfan Rheoli Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Canolfan Rheoli Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20797,7 +20808,7 @@ msgstr "Cychwyn y peiriant"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Nid yw'r rhag wyneb hwn wedi ei ffurfweddu eto.\n"
 "Cychwynnwch y cynorthwyydd \"Ychwanegu rhyngwyneb\" o' Ganolfan Rheoli "
@@ -20807,7 +20818,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Nid oes gennych gyswllt wedi ei ffurfweddu â'r Rhyngrwyd.\n"
 "Cychwynnwch gynorthwy-ydd \"%s\" o Ganolfan Rheoli Mandrake"
@@ -20860,8 +20871,8 @@ msgstr "KDM (rheolwr arddangos KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (rheolwr arddangos Mandrivalinux)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (rheolwr arddangos Mandriva Linux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21165,18 +21176,18 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 "Hawlfraint (C) 2001-2002  Mandriva \n"
 "\n"
 "\n"
 "        DUPONT Sebastien sdupont (fersiwn wreiddiol)\n"
 "\n"
-"        CHAUMETTE Damien<dchaumette@mandrakesoft.com\n"
+"        CHAUMETTE Damien<dchaumette@mandriva.com\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 
 #: standalone/drakfont:520
 #, c-format
@@ -21752,8 +21763,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Canolfan Gymorth Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Canolfan Gymorth Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22415,7 +22426,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "Nid oes Cerdyn Sain wedi ei ganfod ar eich peiriant. Gwriwch fod Cerdyn Sain "
 "sy'n cael ei gynnal gan Linux wedi ei osod yn gywir.\n"
@@ -22424,7 +22435,7 @@ msgstr ""
 "Cewch ymweld â'n cronfa ddata caledwedd yn:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24439,7 +24450,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "Nid oes Cerdyn Teledu wedi ei ganfod ar eich peiriant. Gwiriwch fod Cerdyn "
 "Fideo/Teledu sy'n cael ei gynnal gan Linux wedi ei osod yn gywir.\n"
@@ -24448,7 +24459,7 @@ msgstr ""
 "Cewch ymweld â'n cronfa ddata caledwedd yn:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25162,13 +25173,13 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
 "Dyma HardDrake, offeryn ffurfweddu caledwedd %s.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;tvignaud"
-"\\@mandrakesoft.com&gt;\n"
+"\\@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25278,8 +25289,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Cofnodion Offer Mandrivalinux"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Cofnodion Offer Mandriva Linux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25793,10 +25804,10 @@ msgstr "Cysylltiad wedi ei gwblhau"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Methodd y cysylltiad.\n"
-"Gwiriwch eich ffurfweddiad yng Nghanolfan Rheoli Mandrivalinux."
+"Gwiriwch eich ffurfweddiad yng Nghanolfan Rheoli Mandriva Linux."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/da.po b/perl-install/share/po/da.po
index b258fd6d6..da68b3c54 100644
--- a/perl-install/share/po/da.po
+++ b/perl-install/share/po/da.po
@@ -1317,7 +1317,7 @@ msgstr "Sprogvalg"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
 msgstr ""
@@ -3736,12 +3736,12 @@ msgstr "aktivér radio-understøttelse"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Før du går videre bør du læse betingelserne i licensen omhyggeligt.  Den "
-"omfatter hele Mandrivalinux distributionen. Hvis du er enig i alle "
+"omfatter hele Mandriva Linux distributionen. Hvis du er enig i alle "
 "betingelserne i den, så klik på '%s'-boksen. Hvis ikke, så vil klikning på "
 "\"%s\"-knappen genstarte din maskine."
 
@@ -3916,13 +3916,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux 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 ""
-"Mandrivalinux installationen bliver distribueret på flere cdrom-er. Hvis en "
+"Mandriva Linux installationen bliver distribueret på flere cdrom-er. Hvis en "
 "valgt pakke ligger på en anden cdrom, vil DrakX udskyde den nuværende cd og "
 "bede dig om at isætte den forespurgte cd. Hvis du ikke har den forespurgte "
 "cd ved hånden, så klik bare på '%s' - de tilsvarende pakker vil da ikke "
@@ -3932,11 +3932,12 @@ 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 Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3988,11 +3989,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "Det er nu tid til at angive hvilke pakker du vil installere på dit system. "
-"Der er tusindvis af pakker til dit Mandrivalinux system, og for at gøre det "
+"Der er tusindvis af pakker til dit Mandriva Linux system, og for at gøre det "
 "nemmere at håndtere dem er pakkerne blevet placeret i grupper af lignende "
 "programmer.\n"
 "\n"
-"Mandrivalinux opdeler pakkegrupper i fire kategorier. Du kan vælge og vrage "
+"Mandriva Linux opdeler pakkegrupper i fire kategorier. Du kan vælge og vrage "
 "programmer fra de forskellige grupper, så en installation af "
 "'Arbejdsstation' kan også have programmer fra 'Udvikling'-kategorien "
 "installeret.\n"
@@ -4098,10 +4099,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 Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4132,7 +4133,7 @@ msgstr ""
 "!! Når en server-pakke er blevet valgt, enten fordi du specielt valgte den "
 "individuelle pakke, eller fordi den var en del af en gruppe af pakker, vil "
 "du blive spurgt om at bekræfte at du virkelig ønsker at installere disse "
-"servere. Som standard under Mandrivalinux bliver installerede servere "
+"servere. Som standard under Mandriva Linux bliver installerede servere "
 "startet op ved opstart af maskinen. Selvom de er sikre og ikke har nogen "
 "kendte problemer på udgivelsestidspunktet for distributionen, er det absolut "
 "muligt at sikkerhedshuller blev opdaget efter at denne version af Mandrake "
@@ -4283,7 +4284,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 Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4339,7 +4340,7 @@ msgid ""
 msgstr ""
 "X (for X Window System) er hjertet af GNU/Linux' grafiske grænseflade som "
 "alle de grafiske miljøer (KDE, GNOME, AfterStep, WindowMaker, mv.) der "
-"kommer sammen med Mandrivalinux afhænger af.\n"
+"kommer sammen med Mandriva Linux afhænger af.\n"
 "\n"
 "Du vil se en liste med forskellige parametre der kan ændres for at få den "
 "bedst mulige grafiske fremvisning:\n"
@@ -4455,12 +4456,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\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"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4487,7 +4488,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 Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4496,7 +4497,8 @@ 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 Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4516,11 +4518,11 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Nu skal du vælge hvor på din harddisk du vil installere dit Mandrivalinux-"
+"Nu skal du vælge hvor på din harddisk du vil installere dit Mandriva Linux-"
 "operativsystem. Hvis disken er tom eller et eksisterende operativsystem "
 "bruger alt pladsen på den, bliver du nødt til at partitionere drevet. "
 "Partitionering vil sige at diskdrevet opdeles i logiske dele for at lave den "
-"plads der behøves til at installere dit nye Mandrivalinux-system.\n"
+"plads der behøves til at installere dit nye Mandriva Linux-system.\n"
 "\n"
 "Da partitioneringen af en disk normalt ikke kan fortrydes og kan føre til "
 "tab af data, kan det godt være frustrerende og stressende for uøvede "
@@ -4546,8 +4548,8 @@ msgstr ""
 "Windows-FAT- eller NTFS-partition. Størrelsesændringen kan fortages uden tab "
 "af data, hvis du i forvejen har defragmenteret Windows-partitionen. Det "
 "anbefales på det kraftigste at du laver en sikkerhedskopi først. Denne "
-"mulighed anbefales hvis du vil bruge både Mandrivalinux og Microsoft Windows "
-"på samme maskine.\n"
+"mulighed anbefales hvis du vil bruge både Mandriva Linux og Microsoft "
+"Windows på samme maskine.\n"
 "\n"
 "  Før du vælger denne løsning, bør du forstå at størrelsen på din Microsoft "
 "Windows partition vil blive mindre end da du startede. Du vil have mindre "
@@ -4555,7 +4557,7 @@ msgstr ""
 "nyt programmel.\n"
 "\n"
 " * '%s': Hvis du vil slette alle data på alle partitioner på denne disk og "
-"erstatte dem med dit nye Mandrivalinux-system, kan du vælge denne mulighed. "
+"erstatte dem med dit nye Mandriva Linux-system, kan du vælge denne mulighed. "
 "Vær forsigtig, for du vil ikke være i stand til at fortryde denne handling "
 "efter at du har sagt ja.\n"
 "\n"
@@ -4719,7 +4721,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"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4740,7 +4742,7 @@ msgstr ""
 "Klik på '%s' når du er klar til at formatere partitionerne.\n"
 "\n"
 "Klik på '%s' hvis du ønsker at vælge andre partitioner til at installere dit "
-"nye Mandrivalinux operativsystem.\n"
+"nye Mandriva Linux operativsystem.\n"
 "\n"
 "Klik på '%s' for at vælge partitioner som du ønsker at tjekke for dårlige "
 "blokke."
@@ -4757,7 +4759,7 @@ msgstr "Forrige"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4769,7 +4771,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"På det tidspunkt hvor du installerer Mandrivalinux er det sandsynligt at "
+"På det tidspunkt hvor du installerer Mandriva Linux er det sandsynligt at "
 "nogen af pakkerne er blevet opdaterede siden den oprindelige udgivelse. Fejl "
 "er måske blevet rettet, og sikkerhedsproblemer måske løst. Det er nu muligt "
 "for dig at hente disse ned fra internettet for at disse opdateringer kan "
@@ -4798,7 +4800,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 Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4811,8 +4813,8 @@ msgstr ""
 "bekostning af letheden af anvendelsen.\n"
 "\n"
 "Hvis du ikke véd hvad du skal vælge, så behold den foreslåede mulighed. Du "
-"vil kunne ændre det senere med værktøjet draksec som er en del af "
-"Mandrivalinux Kontrolcentret.\n"
+"vil kunne ændre det senere med værktøjet draksec som er en del af Mandriva "
+"Linux Kontrolcentret.\n"
 "\n"
 "Udfyld '%s'-feltet med epost-adressen på den person, som er ansvarlig for "
 "sikkerhed. Sikkerhedsmeddelelser vil blive sendt til denne adresse."
@@ -4826,7 +4828,7 @@ msgstr "Sikkerhedsadministrator"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -4897,8 +4899,8 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Nu skal du vælge hvilke partitioner som skal bruges til installering af dit "
-"Mandrivalinux system. Hvis partitionerne allerede er blevet defineret, enten "
-"fra en tidligere installation af GNU/Linux eller med et andet "
+"Mandriva Linux system. Hvis partitionerne allerede er blevet defineret, "
+"enten fra en tidligere installation af GNU/Linux eller med et andet "
 "partitioneringsværktøj, kan du bruge de eksisterende partitioner. Ellers "
 "skal disk-partitionerne defineres først.\n"
 "\n"
@@ -4981,7 +4983,7 @@ msgstr "Skift mellem normal og ekspert-tilstand"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5011,7 +5013,7 @@ msgid ""
 msgstr ""
 "Mere end én Microsoft Windows partition er blevet genkendt på dit diskdrev. "
 "Vælg den som du ønsker at ændre størrelse på for at kunne installere dit nye "
-"Mandrivalinux operativsystem.\n"
+"Mandriva Linux operativsystem.\n"
 "\n"
 "Hver partition er listet som følger: 'Linux navn', 'Windows navn', "
 "'Kapacitet'.\n"
@@ -5058,7 +5060,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 Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5067,19 +5069,20 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
 msgstr ""
 "Dette trin bliver kun aktiveret hvis der bliver fundet en eksisterende\n"
 "GNU/Linux partition på din maskine.\n"
 "\n"
 "DrakX skal nu vide om du vil udføre en ny installation eller en opgradering\n"
-"af et eksisterende Mandrivalinux-system.\n"
+"af et eksisterende Mandriva Linux-system.\n"
 "\n"
 " * \"%s\": Dette vil stort sét slette hele det gamle system. Dog kan du "
 "afhængigt af din partitionsopsætning forhindre at nogen af dine ekisterende "
@@ -5088,14 +5091,14 @@ msgstr ""
 "bør du bruge denne mulighed.\n"
 "\n"
 " * \"%s\": Denne installationsklasse lader dig opgradere pakkene som er "
-"installeret på dit nuværende Mandrivalinux-system. Din nuværende "
+"installeret på dit nuværende Mandriva Linux-system. Din nuværende "
 "partitionsopsætning og brugerdata bliver ikke berørt. De fleste andre "
 "konfigurationstrin forbliver tilgængelige, i lighed med en "
 "standardinstallation.\n"
 "\n"
-"\"Opgradér\"-valget bør fungere fint på Mandrivalinux-systemer som kører "
+"\"Opgradér\"-valget bør fungere fint på Mandriva Linux-systemer som kører "
 "version '8.1' eller nyere. Udførelse af Opgradér på versioner tidligere end "
-"Mandrivalinux '8.1' er ikke anbefalet."
+"Mandriva Linux '8.1' er ikke anbefalet."
 
 #: help.pm:591
 #, c-format
@@ -5150,7 +5153,8 @@ 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, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5190,7 +5194,7 @@ msgstr ""
 "\n"
 "Om UTF-8 (ISO 10646)-understøttelse. ISO 10646 er en ny tegnkodning som er "
 "beregnet til at dække alle eksiterende sprog. Dog er fuld understøttelse for "
-"dette i GNU/Linux stadig under udvikling. Af denne årsag vil Mandrivalinux' "
+"dette i GNU/Linux stadig under udvikling. Af denne årsag vil Mandriva Linux' "
 "brug af UTF-8 afhænge af brugerens valg:\n"
 "\n"
 " * Hvis du vælger et sprog som har en lang tradition for tegnkodning (latin1 "
@@ -5430,7 +5434,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 Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5451,7 +5455,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 Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Nu er det tid til at vælge et udskrivningssystem for din maskine. Andre "
@@ -5477,8 +5481,8 @@ msgstr ""
 "administration af printeren.\n"
 "\n"
 "Hvis du laver et valg nu og senere finder ud af at du ikke kan lide dit "
-"udskriftssystem, kan du ændre det ved at køre PrinterDrake fra "
-"Mandrivalinuxs Kontrolcenter, og klikke på '%s'-knappen."
+"udskriftssystem, kan du ændre det ved at køre PrinterDrake fra Mandriva "
+"Linuxs Kontrolcenter, og klikke på '%s'-knappen."
 
 #: help.pm:765
 #, c-format
@@ -5594,7 +5598,8 @@ 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"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5611,7 +5616,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"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5659,7 +5664,7 @@ msgstr ""
 "\n"
 " * \"%s\": Hvis du ønsker at konfigurere din adgang til internet eller "
 "lokalnet, kan du gøre dette nu. Kig i den trykte dokumentation eller brug "
-"Mandrivalinux Kontrolcenter efter installationen er afsluttet for at drage "
+"Mandriva Linux Kontrolcenter efter installationen er afsluttet for at drage "
 "nytte af den fulde indbyggede vejledning. \n"
 "\n"
 " * \"%s\": lader dig konfigurere HTTP- og FTP-proxyadresser, hvis maskinen, "
@@ -5676,7 +5681,7 @@ msgstr ""
 " * \"%s\": Hvis du vil ændre på konfigurationen for opstartsindlæseren, så "
 "klik på denne knap. Dette bør forbeholdes avancerede brugere. Kig i den "
 "trykte dokumentation eller i den indbyggede hjælp om konfiguration af "
-"opstartsindlæser i Mandrivalinux Kontrolcenter.\n"
+"opstartsindlæser i Mandriva Linux Kontrolcenter.\n"
 "\n"
 " * \"%s\": her kan du fininstille hvilke tjenester som skal startes på din "
 "maskine. Hvis du skal bruge maskinen som server er det en god idé at "
@@ -5737,10 +5742,10 @@ msgstr "Tjenester"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Vælg det diskdrev som du vil slette for at installere din nye Mandrivalinux "
+"Vælg det diskdrev som du vil slette for at installere din nye Mandriva Linux "
 "partition. Vær forsigtig, alle data som er på denne partition vil gå tabt og "
 "vil ikke kunne genskabes!"
 
@@ -6094,7 +6099,7 @@ msgstr "Beregner størrelsen på Windows-partitionen"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr "Din Windows partition er for fragmenteret, kør 'defrag' først"
 
@@ -6210,13 +6215,13 @@ msgstr "Lukker netværket ned"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -6245,8 +6250,8 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva 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 "
@@ -6260,8 +6265,8 @@ msgid ""
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva 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 "
@@ -6270,7 +6275,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6304,10 +6309,10 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva 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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6328,20 +6333,20 @@ msgid ""
 msgstr ""
 "Introduktion\n"
 "\n"
-"Operativsystemet og de forskellige komponenter tilgængelige i Mandrivalinux "
+"Operativsystemet og de forskellige komponenter tilgængelige i Mandriva Linux "
 "distributionen vil herefter blive kaldt \"programmelprodukter\". "
 "Programmelprodukterne inkluderer, men er ikke begrænset til: samlingen af "
 "værktøjer, metoder, regler og dokumentation relateret til operativsystemet "
-"og de forskellige komponenter i Mandrivalinux-distributionen.\n"
+"og de forskellige komponenter i Mandriva Linux-distributionen.\n"
 "\n"
 "\n"
 "1. Licensaftale\n"
 "\n"
 "Læs venligst dette dokument omhyggeligt. Dette dokument er en licensaftale "
-"mellem dig og Mandriva S.A., som gælder til disse programmelprodukter. "
-"Ved at installere, kopiere eller bruge disse programmelprodukter accepterer "
-"du udtrykkeligt og fuldt ud at følge denne licensaftale med dens betingelser "
-"og regler. Hvis du er uenig i nogensomhelst del af denne licens, har du ikke "
+"mellem dig og Mandriva S.A., som gælder til disse programmelprodukter. Ved "
+"at installere, kopiere eller bruge disse programmelprodukter accepterer du "
+"udtrykkeligt og fuldt ud at følge denne licensaftale med dens betingelser og "
+"regler. Hvis du er uenig i nogensomhelst del af denne licens, har du ikke "
 "lovtil at installere, kopiere eller bruge disse programmelprodukter. Hvilket "
 "som helst forsøg på at installere, kopiere eller bruge disse "
 "programmelprodukter på en måde som ikke er i overensstemmelse med "
@@ -6353,10 +6358,10 @@ msgstr ""
 "2. Begrænset garanti\n"
 "\n"
 "Programmelprodukterne og tilhørende dokumentation leveres \"som de er\", "
-"uden nogen form for garanti, i den udstrækning lov tillader. Mandriva S."
-"A. vil under ingen omstændigheder efter hvad loven foreskriver være "
-"ansvarlig for specielle, tilfældige, direkte eller indirekte tab af nogen "
-"art (inkluderende uden begrænsninger, skader ved tab af forretning, "
+"uden nogen form for garanti, i den udstrækning lov tillader. Mandriva S.A. "
+"vil under ingen omstændigheder efter hvad loven foreskriver være ansvarlig "
+"for specielle, tilfældige, direkte eller indirekte tab af nogen art "
+"(inkluderende uden begrænsninger, skader ved tab af forretning, "
 "forstyrrelser af forretning, finansielle tab, advokatbistand, erstatninger "
 "som resultat af en retssag eller nogen anden form for følgetab) opstået "
 "under brugen eller mangel på samme af disse programmelprodukter, selv hvis "
@@ -6373,7 +6378,7 @@ msgstr ""
 "finansielle tab, advokatbistand, erstatninger som resultat af en retssag "
 "eller nogen anden form for tab) opstået ved besiddelse eller brug af "
 "programmelkomponenter eller opstået ved hentning af programmelkomponenter "
-"fra et af Mandrivalinux-webstederne som er forbudt eller begrænset i visse "
+"fra et af Mandriva Linux-webstederne som er forbudt eller begrænset i visse "
 "lande ved lokal lov. Dette begrænsede ansvar gælder, men er ikke begrænset "
 "til, de stærke krypteringskomponenter inkluderet i programmelprodukterne.\n"
 "\n"
@@ -6389,9 +6394,8 @@ msgstr ""
 "omhyggeligt før du bruger den. Alle spørgsmål angående en komponent bedes "
 "adresseret til komponentens forfatter og ikke til Mandriva. Programmerne "
 "udviklet af Mandriva S.A. bliver reguleret efter GPL-licensen. "
-"Dokumentationen skrevet af Mandriva S.A. bliver reguleret efter en "
-"specifik licens. Referér venligst til dokumentationen for yderligere "
-"detaljer.\n"
+"Dokumentationen skrevet af Mandriva S.A. bliver reguleret efter en specifik "
+"licens. Referér venligst til dokumentationen for yderligere detaljer.\n"
 "\n"
 "\n"
 "4. Intellektuelle rettigheder\n"
@@ -6400,8 +6404,8 @@ msgstr ""
 "respektive forfattere, og er beskyttet af intellektuelle rettigheds- og "
 "ophavsretslove, gældende for programmel. Mandriva S.A. forbeholder sine "
 "rettigheder til at ændre eller tilpasse programmelprodukterne, helt eller "
-"delvist, med alle midler og til alle formål. \"Mandriva\", \"Mandrivalinux\" "
-"samt de tilhørende logoer er varemærker for Mandriva S.A.  \n"
+"delvist, med alle midler og til alle formål. \"Mandriva\", \"Mandriva Linux"
+"\" samt de tilhørende logoer er varemærker for Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Styrende love\n"
@@ -6499,8 +6503,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6508,27 +6512,27 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "Tillykke, installationen er færdig.\n"
 "Fjern boot-mediet og tryk retur for at genstarte.\n"
 "\n"
 "\n"
-"For information om rettelser til denne udgivelse af Mandrivalinux, se Errata "
-"på:\n"
+"For information om rettelser til denne udgivelse af Mandriva Linux, se "
+"Errata på:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Information om konfigurering af dit system kan du finde i kapitlet om efter-"
-"installation i den Officielle Mandrivalinux Brugervejledning."
+"installation i den Officielle Mandriva Linux Brugervejledning."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -6557,13 +6561,13 @@ msgstr "Går til trin `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Dit system har kun få resurser. Du kan få problemer med at installere\n"
-"Mandrivalinux. Hvis dette sker, kan du prøve en tekst-baseret installation i "
-"stedet\n"
+"Mandriva Linux. Hvis dette sker, kan du prøve en tekst-baseret installation "
+"i stedet\n"
 "Dette gøres ved at trykke 'F1' ved opstart fra cdrommen, og så skrive 'text'."
 
 #: install_steps_gtk.pm:228 install_steps_interactive.pm:624
@@ -7102,9 +7106,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
-"Kontakter Mandrivalinux netsted for at hente listen over tilgængelige spejle"
+"Kontakter Mandriva Linux netsted for at hente listen over tilgængelige spejle"
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7328,8 +7332,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux Installation %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux Installation %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9918,13 +9922,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall-konfigurator\n"
 "\n"
-"Dette konfigurerer en personlig brandmur for denne Mandrivalinux-maskine.\n"
+"Dette konfigurerer en personlig brandmur for denne Mandriva Linux-maskine.\n"
 "For en stærk dedikeret brandmurs-løsning se venligst den specialiserede "
 "MandrakeSecurity Firewall-distribution."
 
@@ -13982,11 +13986,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
-"Kør Scannerdrake (Udstyr/skanner i Mandrivalinux Kontrolcenter) for at dele "
+"Kør Scannerdrake (Udstyr/skanner i Mandriva Linux Kontrolcenter) for at dele "
 "din skanner på netværket.\n"
 "\n"
 
@@ -15919,34 +15923,34 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Hvad er Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Hvad er Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Velkommen til <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Velkommen til <b>Mandriva Linux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux 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 ""
-"Mandrivalinux er en <b>Linux-distribution</b> som består af systemkernen, "
+"Mandriva Linux er en <b>Linux-distribution</b> som består af systemkernen, "
 "kaldet <b>operativsystemet</b> (baseret på Linux-kernen) sammen med <b>en "
 "masse programmer</b> som opfylder alle behov som du kan forestille dig."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux 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 ""
-"Mandrivalinux er den mest <b>brugervenlige</b> Linux-distribution i dag. Det "
-"er også en af de <b>mest brugte</b> Linux-distributioner i verden!"
+"Mandriva Linux er den mest <b>brugervenlige</b> Linux-distribution i dag. "
+"Det er også en af de <b>mest brugte</b> Linux-distributioner i verden!"
 
 #: share/advertising/02.pl:13
 #, c-format
@@ -15961,15 +15965,15 @@ msgstr "Velkommen til <b>verdenen af åben kildetekst</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 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 "
+"Mandriva Linux 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 Mandriva Linux "
 "contributors."
 msgstr ""
-"Mandrivalinux er bundet til Åben Kildettekst-modellen. Dette betyder at "
-"denne nye udgave er resultatet af <b>samarbejdet</b> mellem "
-"<b>Mandriva's team af udviklere</b> og det <b>verdensomspændende "
-"fællesskab</b>  af Mandrivalinux-bidragsydere."
+"Mandriva Linux er bundet til Åben Kildettekst-modellen. Dette betyder at "
+"denne nye udgave er resultatet af <b>samarbejdet</b> mellem <b>Mandriva's "
+"team af udviklere</b> og det <b>verdensomspændende fællesskab</b>  af "
+"Mandriva Linux-bidragsydere."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -15988,10 +15992,10 @@ msgstr "<b>GPL</b>"
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Det meste af programmellet indeholdt i distributionen og alle Mandrivalinux-"
+"Det meste af programmellet indeholdt i distributionen og alle Mandriva Linux-"
 "værktøjerne licensieres under <b>General Public License</b>."
 
 #: share/advertising/03.pl:17
@@ -16022,25 +16026,25 @@ msgstr "<b>Vær med i Fællesskabet</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux 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."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
-"Mandrivalinux har et af de <b>største fællesskaber</b> af brugere og "
+"Mandriva Linux har et af de <b>største fællesskaber</b> af brugere og "
 "udviklere. Sådan et fællesskabs rolle er meget bred, spændende fra "
 "fejlrapportering til udviklingen af nye programmer. Fællesskabet spiller en "
-"<b>nøglerolle</b> i Mandrivalinux-verdenen."
+"<b>nøglerolle</b> i Mandriva Linux-verdenen."
 
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 "For at <b>lære mere</b> om vores dynamiske fællesskab kan du besøge <b>www."
-"mandrakelinux.com</b> eller direkte på <b>www.mandrakelinux.com/en/"
+"mandrivalinux.com</b> eller direkte på <b>www.mandrivalinux.com/en/"
 "cookerdevel.php3</b> hvis du kunne tænke dig at blive <b>involveret</b> i "
 "udviklingen."
 
@@ -16052,11 +16056,11 @@ msgstr "<b>Download version</b>."
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Du installerer nu <b>Mandrivalinux Download</b>. Dette er den frie og gratis "
-"version som Mandriva ønsker at holde <b>tilgængelig for alle</b>."
+"Du installerer nu <b>Mandriva Linux Download</b>. Dette er den frie og "
+"gratis version som Mandriva ønsker at holde <b>tilgængelig for alle</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16101,8 +16105,8 @@ msgstr "<b>Discovery, dit første Linux-skrivebord</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Du installerer nu <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Du installerer nu <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16124,8 +16128,8 @@ msgstr "<b>PowerPack, Det ultimative Linux-skrivebord</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Du installerer nu <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Du installerer nu <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16145,8 +16149,8 @@ msgstr "<b>PowerPack+, Linux-løsningen for skriveborde og servere</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Du installerer nu <b>Mandrivalinux PowerPack+</b>"
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Du installerer nu <b>Mandriva Linux PowerPack+</b>"
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16169,16 +16173,15 @@ msgstr "<b>Mandrivas produkter</b>"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
-"products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
-"<b>Mandriva</b> har udviklet et stort udvalg af <b>Mandrivalinux</b> "
+"<b>Mandriva</b> har udviklet et stort udvalg af <b>Mandriva Linux</b> "
 "produkter."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux produkter er:"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux produkter er:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16198,11 +16201,11 @@ msgstr "\t* <b>PowerPack+</b>, Linux-løsningen for skriveborde og servere."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrivalinux for x86-64</b>, Mandrivalinux-løsningen for få mest ud "
-"af din 64-bit processor."
+"\t* <b>Mandriva Linux for x86-64</b>, Mandriva Linux-løsningen for få mest "
+"ud af din 64-bit processor."
 
 #: share/advertising/10.pl:15
 #, c-format
@@ -16212,30 +16215,30 @@ msgstr "<b>Mandrivas produkter (Nomad Produkter)</b>"
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 "Mandriva har udviklet to produkter, som giver dig mulighed for at bruge "
-"Mandrivalinux <b>på enhver maskine</b> og uden noget behov for faktisk at "
+"Mandriva Linux <b>på enhver maskine</b> og uden noget behov for faktisk at "
 "installere det:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, en Mandrivalinux-distribution som kører udelukkende fra en "
+"\t* <b>Move</b>, en Mandriva Linux-distribution som kører udelukkende fra en "
 "opstartelig CD-ROM."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, en Mandrivalinux-distribution præinstalleret på den "
-"ultra-kompakte “LaCie Mobile Hard Drive”."
+"\t* <b>GlobeTrotter</b>, en Mandriva Linux-distribution præinstalleret på "
+"den ultra-kompakte “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
 #, c-format
@@ -16245,28 +16248,30 @@ msgstr "<b>Mandrivas produkter (professionelle løsninger)</b>"
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandriva products designed to meet the <b>professional "
-"needs</b>:"
+"Below are the Mandriva products designed to meet the <b>professional needs</"
+"b>:"
 msgstr ""
 "Nedenfor er Mandriva-produkterne beregnet til at opfylde de "
 "<b>professionnelle behov</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
-"\t* <b>Corporate Desktop</b>, Mandrivalinux' skrivebord for "
+"\t* <b>Corporate Desktop</b>, Mandriva Linux' skrivebord for "
 "forretningsverdenen."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Mandrivalinux' serverløsning."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandriva Linux' serverløsning."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b>, Mandrivalinux' sikkerhedsløsning."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, Mandriva Linux' sikkerhedsløsning."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16466,10 +16471,10 @@ msgstr "<b>Nyd det store udvalg af programmer</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"I Mandrivalinux-menuen vil du finde applikationer som er <b>nemme</b> at "
+"I Mandriva Linux-menuen vil du finde applikationer som er <b>nemme</b> at "
 "bruge til <b>alle dine opgaver</b>:"
 
 #: share/advertising/18.pl:16
@@ -16736,17 +16741,17 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux Kontrolcenter</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux Kontrolcenter</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrivalinux Kontrolcenter</b> er en essentiel samling af Mandrake-"
+"<b>Mandriva Linux Kontrolcenter</b> er en essentiel samling af Mandrake-"
 "specifikke værktøjer beregnet til at forenkle konfigurationen af din maskine,"
 
 #: share/advertising/25.pl:17
@@ -16771,15 +16776,15 @@ 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 "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Som al anden edb-programmering kræver åben kildetekst-programmel <b>tid og "
 "folk</b> til udvikling. For at respektere filosofien i åben kildetekst "
 "sælger Mandriva added-value produkter og tjenester for at <b>fortsat "
-"forbedre Mandrivalinux</b>. Hvis du ønsker at <b>støtte åben kildetekst-"
-"filosofien</b> og udviklingen af Mandrivalinux, så <b>vær sød</b> at "
+"forbedre Mandriva Linux</b>. Hvis du ønsker at <b>støtte åben kildetekst-"
+"filosofien</b> og udviklingen af Mandriva Linux, så <b>vær sød</b> at "
 "overveje køb af et af vores produkter eller tjenester!"
 
 #: share/advertising/27.pl:13
@@ -16790,11 +16795,11 @@ msgstr "<b>OnlineStore</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandriva products and services, you can visit our "
-"<b>e-commerce platform</b>."
+"To learn more about Mandriva products and services, you can visit our <b>e-"
+"commerce platform</b>."
 msgstr ""
-"Besøg vores <b>e-handelsplatform</b> for at lære mere om Mandrivas "
-"produkter og tjenester."
+"Besøg vores <b>e-handelsplatform</b> for at lære mere om Mandrivas produkter "
+"og tjenester."
 
 #: share/advertising/27.pl:17
 #, c-format
@@ -16812,8 +16817,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Kig forbi i dag på <b>store.mandrakesoft.com</b>"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Kig forbi i dag på <b>store.mandriva.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16823,11 +16828,11 @@ msgstr "<b>Mandriva Club</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
-"<b>Mandriva Club</b> er den <b>perfekte følgesvend</b> til dit Mandrivalinux "
-"produkt.."
+"<b>Mandriva Club</b> er den <b>perfekte følgesvend</b> til dit Mandriva "
+"Linux produkt.."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -16840,10 +16845,10 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 "\t* <b>Specielle rabatter</b> på produkter og tjenester fra vores netbutik "
-"<b>store.mandrakesoft.com</b>"
+"<b>store.mandriva.com</b>"
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -16856,17 +16861,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Deltagelse i Mandrivalinux <b>brugerfora</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Deltagelse i Mandriva Linux <b>brugerfora</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 "\t*<b>Tidlig og priviligeret adgang</b>, før offentlige udgivelser, til "
-"Mandrivalinux-<b>ISO-aftryk</b>."
+"Mandriva Linux-<b>ISO-aftryk</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -16879,17 +16884,17 @@ msgid ""
 "<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandriva Online</b> er en ny førsteklasses tjeneste som Mandriva er "
-"stolt af at tilbyde sine kunder!"
+"<b>Mandriva Online</b> er en ny førsteklasses tjeneste som Mandriva er stolt "
+"af at tilbyde sine kunder!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 "Mandriva Online giver et bredt udvalg af værdifulde tjenester for <b>nem "
-"opdatering</b> af dine Mandrivalinux-systemer:"
+"opdatering</b> af dine Mandriva Linux-systemer:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16913,8 +16918,8 @@ msgstr "\t* Fleksible <b>planlagte</b> opdateringer."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
-msgstr "\t* Styring af <b>alle dine Mandrivalinux-systemer</b> via én konto."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
+msgstr "\t* Styring af <b>alle dine Mandriva Linux-systemer</b> via én konto."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -16925,28 +16930,28 @@ msgstr "<b>Mandriva Expert</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 "Har du behov for <b>assistance?</b> Mød Mandrivas tekniske eksperter på "
-"<b>vores tekniske kundestøtteplatform</b> www.mandrakeexpert.com."
+"<b>vores tekniske kundestøtteplatform</b> www.mandrivaexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Takket være hjælpen fra <b>kvalificerede Mandrivalinux-eksperter</b>, så vil "
-"du spare en masse tid."
+"Takket være hjælpen fra <b>kvalificerede Mandriva Linux-eksperter</b>, så "
+"vil du spare en masse tid."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
-"For alle spørgsmål relateret til Mandrivalinux så har du muligheden for at "
-"købe kundestøttehjælp på <b>store.mandrakesoft.com</b>."
+"For alle spørgsmål relateret til Mandriva Linux så har du muligheden for at "
+"købe kundestøttehjælp på <b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17334,15 +17339,15 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 "[VALGMULIGHEDER] [PROGRAM-NAVN]\n"
 "\n"
 "VALGMULIGHEDER:\n"
 "  --help            - udskriv denne hjælpebesked.\n"
-"  --report          - program bær være én af Mandrivalinux' værktøjer\n"
-"  --incident        - program bær være én af Mandrivalinux' værktøjer"
+"  --report          - program bær være én af Mandriva Linux' værktøjer\n"
+"  --incident        - program bær være én af Mandriva Linux' værktøjer"
 
 #: standalone.pm:63
 #, c-format
@@ -17395,7 +17400,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17409,7 +17414,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Mandrivalinux TerminalServer konfigureringsprogram\n"
+"Mandriva Linux TerminalServer konfigureringsprogram\n"
 "--enable         : aktivér MTS\n"
 "--disable        : deaktivér MTS\n"
 "--start          : start MTS\n"
@@ -17465,8 +17470,8 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 #, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      do not ask first confirmation question in "
-"Mandriva Update 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"
@@ -20243,13 +20248,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux' værktøj til fejlrapportering"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux' værktøj til fejlrapportering"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux Kontrolcenter"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux Kontrolcenter"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20740,19 +20745,19 @@ msgstr "Startede med opstart"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Dette grænsesnit er ikke blevet konfigureret endnu.\n"
-"Kør 'Tilføj et grænsesnit'-hjælperen fra Mandrivalinux Kontrolcentret"
+"Kør 'Tilføj et grænsesnit'-hjælperen fra Mandriva Linux Kontrolcentret"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Du har ikke konfigureret nogen internetforbindelser.\n"
-"Kør '%s'-hjælperen fra Mandrivalinux Kontrolcentret"
+"Kør '%s'-hjælperen fra Mandriva Linux Kontrolcentret"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20802,8 +20807,8 @@ msgstr "KDM (KDE Indlogningshåndterer)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Mandrivalinux Indlogningshåndterer)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Mandriva Linux Indlogningshåndterer)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21107,18 +21112,18 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 "Copyright (C) 2001-2002 ved Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (oprindelig version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 
 #: standalone/drakfont:520
 #, c-format
@@ -21690,8 +21695,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux hjælpecentral"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux hjælpecentral"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22355,7 +22360,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "Intet lydkort blev genkendt på din maskine. Tjek venligst at et lydkort der "
 "understøttes af Linux er korrekt isat.\n"
@@ -22364,7 +22369,7 @@ msgstr ""
 "Du kan besøge vores database over udstyr på:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24376,7 +24381,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "Intet tv-kort blev genkendt på din maskine. Tjek venligst at et video/tv-"
 "kort der understøttes af Linux er korrekt isat.\n"
@@ -24385,7 +24390,7 @@ msgstr ""
 "Du kan besøge vores database over udstyr på:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25097,13 +25102,13 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
 "Dette er HardDrake, et %s-værktøj for konfigurering af maskinel.\n"
 "<span foreground=\"royalblue3\">Version:</span>  %s\n"
 "<span foreground=\"royalblue3\">Author: </span> Thierry Vignaud &lt; "
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25211,8 +25216,8 @@ msgstr "Ændringen er fortaget, men for at være effektiv skal du logge ud"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinux' værktøj-logger"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linux' værktøj-logger"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25726,7 +25731,7 @@ msgstr "Opkobling fuldført."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Tilslutning mislykkedes.\n"
 "Kontrollér konfigurationen i Mandrakes kontrolcentral."
@@ -26751,17 +26756,17 @@ msgstr "Installation mislykkedes"
 #~ msgstr "Fejl ved åbning af %s for skrivning: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandriva Linux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Dette er HardDrake, et Mandrivalinux-værktøj for konfigurering af "
+#~ "Dette er HardDrake, et Mandriva Linux-værktøj for konfigurering af "
 #~ "maskinel.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span>  %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-#~ "tvignaud @mandrakesoft.com&gt;\n"
+#~ "tvignaud @mandriva.com&gt;\n"
 #~ "\n"
 
 #~ msgid "Use Anonymous Bind"
@@ -27187,16 +27192,16 @@ msgstr "Installation mislykkedes"
 #~ "Kunne ikke fjerne printeren \"%s\" fra Star Office/OpenOffice.org/GIMP."
 #~ "org."
 
-#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
-#~ msgstr "<b>Tillykke med valget af Mandrivalinux!</b>"
+#~ msgid "<b>Congratulations for choosing Mandriva Linux!</b>"
+#~ msgstr "<b>Tillykke med valget af Mandriva Linux!</b>"
 
 #~ msgid ""
-#~ "Your new Mandrivalinux operating system and its many applications is the "
-#~ "result of collaborative efforts between Mandriva developers and "
-#~ "Mandrivalinux contributors throughout the world."
+#~ "Your new Mandriva Linux operating system and its many applications is the "
+#~ "result of collaborative efforts between Mandriva developers and Mandriva "
+#~ "Linux contributors throughout the world."
 #~ msgstr ""
-#~ "Dit nye Mandrivalinux-operativsystem og dets mange programmer er "
-#~ "resultatet af samarbejde mellem Mandriva-udviklere og Mandrivalinux-"
+#~ "Dit nye Mandriva Linux-operativsystem og dets mange programmer er "
+#~ "resultatet af samarbejde mellem Mandriva-udviklere og Mandriva Linux-"
 #~ "bidragsydere fra hele verden."
 
 #~ msgid ""
@@ -27315,8 +27320,8 @@ msgstr "Installation mislykkedes"
 #~ "\t* Speciel liste over filhentningsspejle, udelukkende for Mandriva Club-"
 #~ "medlemmer"
 
-#~ msgid "\t* Voting for software to put in Mandrivalinux"
-#~ msgstr "\t* Stem på programmel som skal være med i Mandrivalinux"
+#~ msgid "\t* Voting for software to put in Mandriva Linux"
+#~ msgstr "\t* Stem på programmel som skal være med i Mandriva Linux"
 
 #~ msgid "\t* Plus much more"
 #~ msgstr "\t* Plus meget mere"
@@ -27333,10 +27338,10 @@ msgstr "Installation mislykkedes"
 
 #~ msgid ""
 #~ "If you have Linux questions, subscribe to Mandriva Expert at <b>www."
-#~ "mandrakeexpert.com</b>"
+#~ "mandrivaexpert.com</b>"
 #~ msgstr ""
 #~ "Hvis du har Linux-spørgsmål, så abonnér på Mandriva Expert hos <b>www."
-#~ "mandrakeexpert.com</b>"
+#~ "mandrivaexpert.com</b>"
 
 #~ msgid ""
 #~ "If you would like to get involved, please subscribe to the \"Cooker\" "
@@ -27353,23 +27358,24 @@ msgstr "Installation mislykkedes"
 #~ "<b>www.mandrake-linux.com</b>!"
 
 #~ msgid ""
-#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "
+#~ "Mandriva Linux includes the famous graphical desktops KDE and GNOME, plus "
 #~ "the latest versions of the most popular Open Source applications."
 #~ msgstr ""
-#~ "Mandrivalinux indeholder de berømte grafiske skriveborde KDE og GNOME, "
+#~ "Mandriva Linux indeholder de berømte grafiske skriveborde KDE og GNOME, "
 #~ "plus den nyeste version af de mest populære Frit Programmel-applikationer."
 
 #~ msgid ""
-#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "
+#~ "Mandriva Linux is widely known as the most user-friendly and the easiest "
 #~ "to install and easy to use Linux distribution."
 #~ msgstr ""
-#~ "Mandrivalinux er videnom kendt for at være den mest brugervenlige, "
+#~ "Mandriva Linux er videnom kendt for at være den mest brugervenlige, "
 #~ "nemmeste at installere og letteste at bruge Linux-distribution, som "
 #~ "findes."
 
-#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandrakemove</b>"
+#~ msgid ""
+#~ "\t* Find out Mandriva Linux on a bootable CD with <b>Mandrakemove</b>"
 #~ msgstr ""
-#~ "\t* Find ud af mere om vor Mandrivalinux på en opstartelig CD med "
+#~ "\t* Find ud af mere om vor Mandriva Linux på en opstartelig CD med "
 #~ "Mandrakemove"
 
 #~ msgid ""
@@ -27416,13 +27422,12 @@ msgstr "Installation mislykkedes"
 
 #~ msgid ""
 #~ "<b>MandrakeClustering</b>: the power and speed of a Linux cluster "
-#~ "combined with the stability and easy-of-use of the world-famous "
-#~ "Mandrivalinux distribution. A unique blend for incomparable HPC "
-#~ "performance."
+#~ "combined with the stability and easy-of-use of the world-famous Mandriva "
+#~ "Linux distribution. A unique blend for incomparable HPC performance."
 #~ msgstr ""
 #~ "<b>MandrakeClustering</b>: styrken og hastigheden af en Linux-klynge "
 #~ "kombineret med stabiliteten og brugervenligheden af den verdensberømte "
-#~ "Mandrivalinux-distribution. En unik sammensætning for enestående HPC-"
+#~ "Mandriva Linux-distribution. En unik sammensætning for enestående HPC-"
 #~ "ydelse."
 
 #~ msgid ""
@@ -27440,8 +27445,8 @@ msgstr "Installation mislykkedes"
 #~ msgid "<b>Do you require assistance?</b>"
 #~ msgstr "<b>Har du brug for hjælp?</b>"
 
-#~ msgid "This is the Mandrivalinux <b>Download version</b>."
-#~ msgstr "Dette er Mandrivalinux <b>Download Edition</b>."
+#~ msgid "This is the Mandriva Linux <b>Download version</b>."
+#~ msgstr "Dette er Mandriva Linux <b>Download Edition</b>."
 
 #~ msgid ""
 #~ "The free download version does not include commercial software, and "
@@ -27453,13 +27458,13 @@ msgstr "Installation mislykkedes"
 #~ "RTC) og skærmkort (såsom ATI® og NVIDIA®)."
 
 #~ msgid ""
-#~ "Your new Mandrivalinux distribution and its many applications are the "
-#~ "result of collaborative efforts between Mandriva developers and "
-#~ "Mandrivalinux contributors throughout the world."
+#~ "Your new Mandriva Linux distribution and its many applications are the "
+#~ "result of collaborative efforts between Mandriva developers and Mandriva "
+#~ "Linux contributors throughout the world."
 #~ msgstr ""
-#~ "Din nye Mandrivalinux-distribution og dets mange programmer er resultatet "
-#~ "af samarbejde mellem Mandriva-udviklere og Mandrivalinux-bidragsydere "
-#~ "rundtom i hele verden."
+#~ "Din nye Mandriva Linux-distribution og dets mange programmer er "
+#~ "resultatet af samarbejde mellem Mandriva-udviklere og Mandriva Linux-"
+#~ "bidragsydere rundtom i hele verden."
 
 #~ msgid "<b>PowerPack+</b>"
 #~ msgstr "<b>PowerPack+</b>"
@@ -27474,25 +27479,26 @@ msgstr "Installation mislykkedes"
 #~ "et stort udvalg af serverapplikationer i verdensklasse."
 
 #~ msgid ""
-#~ "It is the only Mandrivalinux product that includes the groupware solution."
+#~ "It is the only Mandriva Linux product that includes the groupware "
+#~ "solution."
 #~ msgstr ""
-#~ "Det er den eneste Mandrivalinux-produkt som inkluderer "
+#~ "Det er den eneste Mandriva Linux-produkt som inkluderer "
 #~ "gruppevareløsningen."
 
 #~ msgid ""
-#~ "When you log into your Mandrivalinux system for the first time, you can "
+#~ "When you log into your Mandriva Linux system for the first time, you can "
 #~ "choose between several popular graphical desktops environments, "
 #~ "including: KDE, GNOME, WindowMaker, IceWM, and others."
 #~ msgstr ""
-#~ "Når du logger ind på dit Mandrivalinux-system for første gang, så kan du "
+#~ "Når du logger ind på dit Mandriva Linux-system for første gang, så kan du "
 #~ "vælge mellem en række populære grafiske skrivebordsmiljøer, inklusive "
 #~ "KDE, GNOME, WindowMaker, IceWM og andre."
 
 #~ msgid ""
-#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
+#~ "In the Mandriva Linux menu you will find easy-to-use applications for all "
 #~ "of your tasks:"
 #~ msgstr ""
-#~ "I Mandrivalinux-menuen vil du finde applikationer som er nemme at bruge "
+#~ "I Mandriva Linux-menuen vil du finde applikationer som er nemme at bruge "
 #~ "til alle dine opgaver:"
 
 #~ msgid ""
@@ -27536,12 +27542,12 @@ msgstr "Installation mislykkedes"
 #~ msgstr "\t* Addressebog (server og klient)"
 
 #~ msgid ""
-#~ "Your new Mandrivalinux distribution is the result of collaborative "
-#~ "efforts between Mandriva developers and Mandrivalinux contributors "
+#~ "Your new Mandriva Linux distribution is the result of collaborative "
+#~ "efforts between Mandriva developers and Mandriva Linux contributors "
 #~ "throughout the world."
 #~ msgstr ""
-#~ "Din nye Mandrivalinux-distribution er et resultat af samarbejde mellem "
-#~ "Mandriva-udviklere og Mandrivalinux-bidragsydere rundt omkring i hele "
+#~ "Din nye Mandriva Linux-distribution er et resultat af samarbejde mellem "
+#~ "Mandriva-udviklere og Mandriva Linux-bidragsydere rundt omkring i hele "
 #~ "verden."
 
 #~ msgid ""
@@ -27610,13 +27616,13 @@ msgstr "Installation mislykkedes"
 #~ msgid ""
 #~ "Before continuing, you should carefully read the terms of the license. "
 #~ "It\n"
-#~ "covers the entire Mandrivalinux distribution. If you do agree with all "
+#~ "covers the entire Mandriva Linux distribution. If you do agree with all "
 #~ "the\n"
 #~ "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
 #~ "will reboot your computer."
 #~ msgstr ""
 #~ "Før du går videre bør du læse betingelserne i licensen omhyggeligt.  Den "
-#~ "omfatter hele Mandrivalinux distributionen. Hvis du er enig i alle "
+#~ "omfatter hele Mandriva Linux distributionen. Hvis du er enig i alle "
 #~ "betingelserne i den, så klik på '%s'-boksen. Hvis ikke, så vil klikning "
 #~ "på \"%s\"-knappen genstarte din maskine."
 
@@ -27718,25 +27724,27 @@ msgstr "Installation mislykkedes"
 #~ "facilitet, så afmarkér boksen med '%s'."
 
 #~ msgid ""
-#~ "The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+#~ "The Mandriva Linux 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 ""
-#~ "Mandrivalinux installationen bliver distribueret på flere cdrom-er. Hvis "
+#~ "Mandriva Linux installationen bliver distribueret på flere cdrom-er. Hvis "
 #~ "en valgt pakke ligger på en anden cdrom, vil DrakX udskyde den nuværende "
 #~ "cd og bede dig om at isætte den rigtige CD, om nødvendigt."
 
 #~ msgid ""
 #~ "It is now time to specify which programs you wish to install on your\n"
-#~ "system. There are thousands of packages available for Mandrivalinux, and\n"
+#~ "system. There are thousands of packages available for Mandriva Linux, "
+#~ "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. Mandrivalinux sorts packages groups in four categories. You can\n"
+#~ "machine. Mandriva Linux sorts packages groups in four categories. You "
+#~ "can\n"
 #~ "mix and match applications from the various categories, so a\n"
 #~ "``Workstation'' installation can still have applications from the\n"
 #~ "``Development'' category installed.\n"
@@ -27789,12 +27797,12 @@ msgstr "Installation mislykkedes"
 #~ "updating an existing system."
 #~ msgstr ""
 #~ "Det er nu tid til at angive hvilke pakker du vil installere på dit "
-#~ "system. Der er tusindvis af pakker til dit Mandrivalinux system, og for "
+#~ "system. Der er tusindvis af pakker til dit Mandriva Linux system, og for "
 #~ "at gøre det nemmere at håndtere dem er pakker blevet placeret i grupper "
 #~ "af lignende programmer.\n"
 #~ "\n"
 #~ "Pakkerne er ordnet i grupper svarende til en bestemt anvendelse af din "
-#~ "maskine. Mandrivalinux opdeler pakkegrupper i fire kategorier. Du kan "
+#~ "maskine. Mandriva Linux opdeler pakkegrupper i fire kategorier. Du kan "
 #~ "vælge og vrage programmer fra de forskellige grupper, så en installation "
 #~ "af 'Arbejdsstation' kan også have programmer fra 'Udvikling'-kategorien "
 #~ "installeret.\n"
@@ -27852,11 +27860,11 @@ msgstr "Installation mislykkedes"
 #~ "chose the individual package or because it was part of a group of "
 #~ "packages,\n"
 #~ "you will be asked to confirm that you really want those servers to be\n"
-#~ "installed. By default Mandrivalinux will automatically start any "
+#~ "installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+#~ "security holes were discovered after this version of Mandriva Linux was\n"
 #~ "finalized. If you do not know what a particular service is supposed to "
 #~ "do\n"
 #~ "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
@@ -27894,11 +27902,11 @@ msgstr "Installation mislykkedes"
 #~ "!! Når en server-pakke er blevet valgt, enten fordi du specielt valgte "
 #~ "den individuelle pakke, eller fordi den var en del af en gruppe af "
 #~ "pakker, vil du blive spurgt om at bekræfte at du virkelig ønsker at "
-#~ "installere disse servere. Som standard under Mandrivalinux bliver "
+#~ "installere disse servere. Som standard under Mandriva Linux bliver "
 #~ "installerede servere startet op ved opstart af maskinen. Selvom de er "
 #~ "sikre og ikke har nogen kendte problemer på udgivelsestidspunktet for "
 #~ "distributionen, er det absolut muligt at sikkerhedshuller blev opdaget "
-#~ "efter at denne version af Mandrivalinux blev færdiggjort. Hvis du ikke "
+#~ "efter at denne version af Mandriva Linux blev færdiggjort. Hvis du ikke "
 #~ "véd hvad en bestemt tjeneste vil gøre eller hvorfor den skal installeres, "
 #~ "så klik '%s' her. Et klik med '%s' her vil installere de nævnte servere "
 #~ "og de vil som standard blive startet automatisk under opstarten!!\n"
@@ -27922,7 +27930,8 @@ msgstr "Installation mislykkedes"
 #~ "You will now set up your Internet/network connection. If you wish to\n"
 #~ "connect your computer to the Internet or to a local network, click \"%s"
 #~ "\".\n"
-#~ "Mandrivalinux will attempt to auto-detect network devices and modems. If\n"
+#~ "Mandriva Linux will attempt to auto-detect network devices and modems. "
+#~ "If\n"
 #~ "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
 #~ "configure the network, or to do it later, in which case clicking the \"%s"
 #~ "\"\n"
@@ -27943,7 +27952,7 @@ msgstr "Installation mislykkedes"
 #~ "modems\n"
 #~ "that require additional software to work compared to Normal modems. Some "
 #~ "of\n"
-#~ "those modems actually work under Mandrivalinux, some others do not. You\n"
+#~ "those modems actually work under Mandriva Linux, some others do not. You\n"
 #~ "can consult the list of supported modems at LinModems.\n"
 #~ "\n"
 #~ "You can consult the ``Starter Guide'' chapter about Internet connections\n"
@@ -27954,7 +27963,7 @@ msgstr "Installation mislykkedes"
 #~ "Du vil nu kunne opsætte din internet- eller netværksopkobling. Hvis du "
 #~ "ønsker at forbinde din maskine til internettet eller til et lokalnetværk "
 #~ "så klik på '%s'.\n"
-#~ "Mandrivalinux vil prøve at automatisk finde netværksenheder og modemer. "
+#~ "Mandriva Linux vil prøve at automatisk finde netværksenheder og modemer. "
 #~ "Hvis denne søgning mislykkes så fjern markeringen i boksen '%s'. Du kan "
 #~ "også vælge at ikke konfigurere netværket, eller gøre det senere; i så "
 #~ "tilfælde vil klik på '%s'-knappen føre dig til næste trin.\n"
@@ -28089,7 +28098,7 @@ msgstr "Installation mislykkedes"
 #~ "X (for X Window System) is the heart of the GNU/Linux graphical "
 #~ "interface\n"
 #~ "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-#~ "WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+#~ "WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 #~ "\n"
 #~ "You will be presented with a list of different parameters to change to "
 #~ "get\n"
@@ -28152,7 +28161,7 @@ msgstr "Installation mislykkedes"
 #~ msgstr ""
 #~ "X (for X Window System) er hjertet af GNU/Linux' grafiske grænseflade som "
 #~ "alle de grafiske miljøer (KDE, GNOME, AfterStep, WindowMaker, mv.) der "
-#~ "kommer sammen med Mandrivalinux afhænger af.\n"
+#~ "kommer sammen med Mandriva Linux afhænger af.\n"
 #~ "\n"
 #~ "Du vil blive vist en liste med forskellige parametre der kan ændres for "
 #~ "at få den bedst mulige grafiske fremvisning:\n"
@@ -28275,7 +28284,7 @@ msgstr "Installation mislykkedes"
 #~ "have to partition the drive. Basically, partitioning a hard drive "
 #~ "consists\n"
 #~ "of logically dividing it to create the space needed to install your new\n"
-#~ "Mandrivalinux system.\n"
+#~ "Mandriva Linux system.\n"
 #~ "\n"
 #~ "Because the process of partitioning a hard drive is usually irreversible\n"
 #~ "and can lead to lost data if there is an existing operating system "
@@ -28314,7 +28323,7 @@ msgstr "Installation mislykkedes"
 #~ "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 #~ "data, provided you have previously defragmented the Windows partition.\n"
 #~ "Backing up your data is strongly recommended.. Using this option is\n"
-#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "
+#~ "recommended if you want to use both Mandriva Linux and Microsoft Windows "
 #~ "on\n"
 #~ "the same computer.\n"
 #~ "\n"
@@ -28324,7 +28333,7 @@ msgstr "Installation mislykkedes"
 #~ "Windows to store your data or to install new software.\n"
 #~ "\n"
 #~ " * \"%s\": if you want to delete all data and all partitions present on\n"
-#~ "your hard drive and replace them with your new Mandrivalinux system,\n"
+#~ "your hard drive and replace them with your new Mandriva Linux system,\n"
 #~ "choose this option. Be careful, because you will not be able to undo "
 #~ "your\n"
 #~ "choice after you confirm.\n"
@@ -28349,11 +28358,12 @@ msgstr "Installation mislykkedes"
 #~ "refer to the ``Managing Your Partitions'' section in the ``Starter "
 #~ "Guide''."
 #~ msgstr ""
-#~ "Nu skal du vælge hvor på din harddisk du vil installere dit Mandrivalinux-"
-#~ "operativsystem. Hvis disken er tom eller et eksisterende operativsystem "
-#~ "bruger alt pladsen på den, bliver du nødt til at partitionere drevet. "
-#~ "Partitionering vil sige at diskdrevet opdeles i logiske dele for at lave "
-#~ "den plads der behøves til at installere dit nye Mandrivalinux-system.\n"
+#~ "Nu skal du vælge hvor på din harddisk du vil installere dit Mandriva "
+#~ "Linux-operativsystem. Hvis disken er tom eller et eksisterende "
+#~ "operativsystem bruger alt pladsen på den, bliver du nødt til at "
+#~ "partitionere drevet. Partitionering vil sige at diskdrevet opdeles i "
+#~ "logiske dele for at lave den plads der behøves til at installere dit nye "
+#~ "Mandriva Linux-system.\n"
 #~ "\n"
 #~ "Da partitioneringen af en disk normalt ikke kan fortrydes og kan føre til "
 #~ "tab af data, hvis der allerede er et eksisterende operativsystem "
@@ -28381,7 +28391,7 @@ msgstr "Installation mislykkedes"
 #~ "Windows-FAT- eller NTFS-partition. Størrelsesændringen kan fortages uden "
 #~ "tab af data, hvis du i forvejen har defragmenteret Windows-partitionen. "
 #~ "Det anbefales på det kraftigste at du laver en sikkerhedskopi først. "
-#~ "Denne mulighed anbefales hvis du vil bruge både Mandrivalinux og "
+#~ "Denne mulighed anbefales hvis du vil bruge både Mandriva Linux og "
 #~ "Microsoft Windows på samme maskine.\n"
 #~ "\n"
 #~ "  Før du vælger denne løsning, bør du forstå at størrelsen på din "
@@ -28390,7 +28400,7 @@ msgstr "Installation mislykkedes"
 #~ "eller installere nyt programmel.\n"
 #~ "\n"
 #~ " * '%s': hvis du vil slette alle data på alle partitioner på denne disk "
-#~ "og erstatte dem med dit nye Mandrivalinux-system, kan du vælge denne "
+#~ "og erstatte dem med dit nye Mandriva Linux-system, kan du vælge denne "
 #~ "mulighed. Vær forsigtig, for du vil ikke være i stand til at fortryde "
 #~ "dine ændringer efter at du har sagt ja.\n"
 #~ "\n"
@@ -28500,7 +28510,7 @@ msgstr "Installation mislykkedes"
 #~ "Click on \"%s\" when you are ready to format the partitions.\n"
 #~ "\n"
 #~ "Click on \"%s\" if you want to choose another partition for your new\n"
-#~ "Mandrivalinux operating system installation.\n"
+#~ "Mandriva Linux operating system installation.\n"
 #~ "\n"
 #~ "Click on \"%s\" if you wish to select partitions that will be checked "
 #~ "for\n"
@@ -28526,13 +28536,13 @@ msgstr "Installation mislykkedes"
 #~ "Klik på '%s' når du er klar til at formatere partitionerne.\n"
 #~ "\n"
 #~ "Klik på '%s' hvis du ønsker at vælge andre partitioner til at installere "
-#~ "dit nye Mandrivalinux operativsystem.\n"
+#~ "dit nye Mandriva Linux operativsystem.\n"
 #~ "\n"
 #~ "Klik på '%s' for at vælge partitioner som du ønsker at tjekke for dårlige "
 #~ "blokke."
 
 #~ msgid ""
-#~ "At the time you are installing Mandrivalinux, it is likely that some\n"
+#~ "At the time you are installing Mandriva Linux, it is likely that some\n"
 #~ "packages will have been updated since the initial release. Bugs may have\n"
 #~ "been fixed, security issues resolved. To allow you to benefit from these\n"
 #~ "updates, you are now able to download them from the Internet. Check \"%s"
@@ -28547,7 +28557,7 @@ msgstr "Installation mislykkedes"
 #~ "the\n"
 #~ "selected package(s), or \"%s\" to abort."
 #~ msgstr ""
-#~ "På det tidspunkt hvor du installerer Mandrivalinux er det sandsynligt at "
+#~ "På det tidspunkt hvor du installerer Mandriva Linux er det sandsynligt at "
 #~ "nogen af pakkerne er blevet opdaterede siden den oprindelige udgivelse. "
 #~ "Fejl er måske blevet rettet, og sikkerhedsproblemer måske løst. Det er nu "
 #~ "muligt for dig at hente disse ned fra internettet for at disse "
@@ -28611,7 +28621,7 @@ msgstr "Installation mislykkedes"
 #~ "\n"
 #~ "DrakX now needs to know if you want to perform a new install or an "
 #~ "upgrade\n"
-#~ "of an existing Mandrivalinux system:\n"
+#~ "of an existing Mandriva Linux system:\n"
 #~ "\n"
 #~ " * \"%s\": For the most part, this completely wipes out the old system. "
 #~ "If\n"
@@ -28623,22 +28633,22 @@ msgstr "Installation mislykkedes"
 #~ "written.\n"
 #~ "\n"
 #~ " * \"%s\": this installation class allows you to update the packages\n"
-#~ "currently installed on your Mandrivalinux system. Your current\n"
+#~ "currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+#~ "Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 #~ "running version \"8.1\" or later. Performing an Upgrade on versions "
 #~ "prior\n"
-#~ "to Mandrivalinux version \"8.1\" is not recommended."
+#~ "to Mandriva Linux version \"8.1\" is not recommended."
 #~ msgstr ""
 #~ "Dette trin bliver kun aktiveret hvis der bliver fundet en eksisterende\n"
 #~ "GNU/Linux partition på din maskine.\n"
 #~ "\n"
 #~ "DrakX skal nu vide om du vil udføre en ny installation eller en "
 #~ "opgradering\n"
-#~ "af et eksisterende Mandrivalinux-system.\n"
+#~ "af et eksisterende Mandriva Linux-system.\n"
 #~ "\n"
 #~ " * \"%s\": Dette vil stort sét slette hele det gamle system. Hvis du "
 #~ "ønsker at ændre hvordan diskene bliver partitioneret, eller ændre på "
@@ -28647,14 +28657,14 @@ msgstr "Installation mislykkedes"
 #~ "blive overskrevne. \n"
 #~ "\n"
 #~ " * \"%s\": Denne installationsklasse lader dig opgradere pakkene som er "
-#~ "installeret på dit nuværende Mandrivalinux-system. Din nuværende "
+#~ "installeret på dit nuværende Mandriva Linux-system. Din nuværende "
 #~ "partitionsopsætning og brugerdata bliver ikke berørt. De fleste andre "
 #~ "konfigurationstrin forbliver tilgængelige, i lighed med en "
 #~ "standardinstallation.\n"
 #~ "\n"
-#~ "\"Opgradér\"-valget bør fungere på Mandrivalinux-systemer som kører "
+#~ "\"Opgradér\"-valget bør fungere på Mandriva Linux-systemer som kører "
 #~ "version 8.1 eller nyere. Udførelse af Opgradér på versioner tidligere end "
-#~ "Mandrivalinux 8.1 er ikke anbefalet."
+#~ "Mandriva Linux 8.1 er ikke anbefalet."
 
 #~ msgid ""
 #~ "Depending on the language you chose in section , DrakX will "
@@ -28714,7 +28724,8 @@ msgstr "Installation mislykkedes"
 #~ "About UTF-8 (unicode) support: Unicode is a new character encoding meant "
 #~ "to\n"
 #~ "cover all existing languages. Though full support for it in GNU/Linux is\n"
-#~ "still under development. For that reason, Mandrivalinux will be using it\n"
+#~ "still under development. For that reason, Mandriva Linux will be using "
+#~ "it\n"
 #~ "or not depending on the user choices:\n"
 #~ "\n"
 #~ " * If you choose a languages with a strong legacy encoding (latin1\n"
@@ -28963,7 +28974,7 @@ msgstr "Installation mislykkedes"
 #~ "checking this box.\n"
 #~ "\n"
 #~ "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"
+#~ "\"%s\"), you must ensure that you have a way to boot your Mandriva Linux\n"
 #~ "system! Be sure you know what you are doing before changing any of the\n"
 #~ "options. !!\n"
 #~ "\n"
@@ -29001,7 +29012,7 @@ msgstr "Installation mislykkedes"
 #~ "\n"
 #~ "Vær opmærksom på at hvis du vælger ikke at installere en opstartsindlæser "
 #~ "(ved at vælge '%s'), skal du være sikker på at du har en anden måde at "
-#~ "starte dit Mandrivalinux-system op på! Vær sikker på hvad du gør hvis du "
+#~ "starte dit Mandriva Linux-system op på! Vær sikker på hvad du gør hvis du "
 #~ "ændrer nogen af tilvalgene her!\n"
 #~ "\n"
 #~ "Et klik på '%s'-knappen i denne dialog vil tilbyde avancerede muligheder "
@@ -29094,7 +29105,7 @@ msgstr "Installation mislykkedes"
 #~ msgid ""
 #~ "Now, it's time to select a printing system for your computer. Other OSs "
 #~ "may\n"
-#~ "offer you one, but Mandrivalinux offers two. Each of the printing "
+#~ "offer you one, but Mandriva Linux offers two. Each of the printing "
 #~ "systems\n"
 #~ "is best suited to particular types of configuration.\n"
 #~ "\n"
@@ -29628,11 +29639,11 @@ msgstr "Installation mislykkedes"
 #~ "værktøjer til at forenkle konfigurationen af din maskine,"
 
 #~ msgid ""
-#~ "Find all Mandriva products and services at <b>MandrakeStore</b> -- "
-#~ "our full service e-commerce platform."
+#~ "Find all Mandriva products and services at <b>MandrakeStore</b> -- our "
+#~ "full service e-commerce platform."
 #~ msgstr ""
-#~ "Find alle Mandriva-produkter og -tjenester på <b>MandrakeStore</b> -- "
-#~ "vor fuldstændige e-handelsplatform."
+#~ "Find alle Mandriva-produkter og -tjenester på <b>MandrakeStore</b> -- vor "
+#~ "fuldstændige e-handelsplatform."
 
 #~ msgid "Become a <b>MandrakeClub</b> member!"
 #~ msgstr "Bliv medlem af <b>MandrakeClub</b>!"
@@ -29653,14 +29664,15 @@ msgstr "Installation mislykkedes"
 #~ msgid "\t* Special discounts for products and services at MandrakeStore"
 #~ msgstr "\t* Specielle rabatter for produkter og tjenester hos MandrakeStore"
 
-#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandriva Move</b>"
+#~ msgid ""
+#~ "\t* Find out Mandriva Linux on a bootable CD with <b>Mandriva Move</b>"
 #~ msgstr ""
-#~ "\t* Find ud af mere om vor Mandrivalinux på en opstartelig CD med "
+#~ "\t* Find ud af mere om vor Mandriva Linux på en opstartelig CD med "
 #~ "Mandriva Move"
 
 #~ msgid ""
-#~ "Find all Mandriva products at <b>MandrakeStore</b> -- our full "
-#~ "service e-commerce platform."
+#~ "Find all Mandriva products at <b>MandrakeStore</b> -- our full service e-"
+#~ "commerce platform."
 #~ msgstr ""
 #~ "Find alle Mandriva-produkter hos <b>MandrakeStore</b> - vores "
 #~ "fuldstændige e-handelplatform."
@@ -29669,10 +29681,10 @@ msgstr "Installation mislykkedes"
 #~ msgstr "<b>Bliv medlem af MandrakeClub!</b>"
 
 #~ msgid ""
-#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
+#~ "In the Mandriva Linux menu you will find easy-to-use applications for all "
 #~ "tasks:"
 #~ msgstr ""
-#~ "I Mandrivalinux-menuen vil du finde nemme applikationer for alle opgaver:"
+#~ "I Mandriva Linux-menuen vil du finde nemme applikationer for alle opgaver:"
 
 #~ msgid ""
 #~ "\t* Take charge of your personal data with the integrated personal "
@@ -29709,7 +29721,6 @@ msgstr "Installation mislykkedes"
 #~ "  --report          - program bær være én af Mandrakes værktøjer\n"
 #~ "  --incident        - program bær være én af Mandrakes værktøjer"
 
-
 #~ msgid ""
 #~ "This interface has not been configured yet.\n"
 #~ "Run the \"Add an interface\" assistant from the Mandrake Control Center"
@@ -29826,13 +29837,6 @@ msgstr "Installation mislykkedes"
 #~ msgid "Please insert the Boot floppy used in drive %s"
 #~ msgstr "Indsæt opstartsdisketten i diskette-drevet %s"
 
-#~ msgid ""
-#~ "Take advantage of valuable benefits, products and services by joining "
-#~ "Mandriva Club, such as:"
-#~ msgstr ""
-#~ "Drag nytte af værdifulde fordele, produkter og tjenester ved at være med "
-#~ "i Mandriva Club, med:"
-
 #~ msgid "TCP/IP"
 #~ msgstr "TCP/IP"
 
diff --git a/perl-install/share/po/de.po b/perl-install/share/po/de.po
index a2fa5c8e7..050c5f42f 100644
--- a/perl-install/share/po/de.po
+++ b/perl-install/share/po/de.po
@@ -1327,11 +1327,11 @@ msgstr "Sprachauswahl"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux 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 ""
-"Mandrivalinux unterstützt verschiedene Sprachen. Wählen\n"
+"Mandriva Linux unterstützt verschiedene Sprachen. Wählen\n"
 "Sie die Sprachen, die Sie installieren wollen.Diese stehen Ihnen zur\n"
 "Verfügung, nachdem die Installation fertig ist und Sie einen Neustart\n"
 "durchgeführt haben."
@@ -3781,12 +3781,12 @@ msgstr "Radio Unterstützung aktivieren"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Lesen Sie bitte aufmerksam die Lizenz, bevor Sie fortfahren. Sie umfasst\n"
-"die gesamte Mandrivalinux Distribution. Sollten Sie nicht in allen Punkten\n"
+"die gesamte Mandriva Linux Distribution. Sollten Sie nicht in allen Punkten\n"
 "zustimmen, betätigen Sie bitte die Schaltfläche „%s“, um die Installation\n"
 "abzubrechen. Um mit der Installation fortzufahren, betätigen Sie die\n"
 "Schaltfläche „%s“."
@@ -3963,17 +3963,17 @@ msgstr ""
 "„zweitniedrigste SCSI-ID“, etc."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux 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 Mandrivalinux-Distribution wird auf mehreren CD-ROMs ausgeliefert. Es\n"
+"Die Mandriva Linux-Distribution wird auf mehreren CD-ROMs ausgeliefert. Es\n"
 "kann daher vorkommen, dass DrakX Pakete von anderen, als der\n"
 "Installations-CD-ROM installieren will. In diesem Fall wird es die aktuelle\n"
 "CD auswerfen und nach einer anderen fragen. Wenn Sie dieses CD nicht haben,\n"
@@ -3981,16 +3981,17 @@ msgstr ""
 "nicht installiert."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 #: help.pm:92
 #, 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 Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux 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"
@@ -4042,7 +4043,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Nun ist es Zeit sich zu entscheiden, welche Programme Sie auf Ihrem Rechner\n"
-"installieren wollen. Es gibt tausende von Paketen für Mandrivalinux, und\n"
+"installieren wollen. Es gibt tausende von Paketen für Mandriva Linux, und\n"
 "Sie müssen sie nicht alle auswendig kennen.\n"
 "\n"
 "Die Pakete sind nach ihrer Verwendung in vier Kategorien eingeteilt. Sie\n"
@@ -4138,7 +4139,7 @@ msgid "Truly minimal install"
 msgstr "Minimal-Installation"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 #: help.pm:149
 #, c-format
 msgid ""
@@ -4153,10 +4154,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 Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux 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 Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux 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"
@@ -4188,7 +4189,8 @@ msgstr ""
 "!! Es kommt vor, dass Server- und Dienst-Pakete angewählt wurden - entweder\n"
 "absichtlich, oder als Paket einer ganzen Gruppe; sollte das der Fall sein,\n"
 "werden Sie nun gefragt, ob Sie diese wirklich installiert haben wollen.\n"
-"Unter Mandrivalinux werden installierte Server und Dienste automatisch beim\n"
+"Unter Mandriva Linux werden installierte Server und Dienste automatisch "
+"beim\n"
 "Betriebssystemstart gestartet. Selbst wenn zum Zeitpunkt, als die\n"
 "Distribution zusammengestellt wurde, keine Sicherheitslücken oder Fehler in\n"
 "diesen Paketen bekannt waren, ist natürlich nicht auszuschließen, dass\n"
@@ -4340,13 +4342,13 @@ msgstr ""
 "Bedürfnissen am besten entspricht."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 #: help.pm:231
 #, c-format
 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 Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4402,7 +4404,7 @@ msgid ""
 msgstr ""
 "X (das X Window System) ist das Herz der grafischen Benutzeroberfläche von\n"
 "GNU/Linux. Es bildet die Grundlage für die Vielzahl grafischer\n"
-"Benutzerumgebungen, die Mandrivalinux Ihnen anbietet (wie etwa KDE, GNOME,\n"
+"Benutzerumgebungen, die Mandriva Linux Ihnen anbietet (wie etwa KDE, GNOME,\n"
 "AfterStep oder WindowMaker).\n"
 "\n"
 "Sie erhalten eine Liste möglicher Parameter, mit deren Hilfe Sie die\n"
@@ -4521,16 +4523,16 @@ msgstr ""
 "Versuch die grafische Umgebung zu konfigurieren erfolglos waren."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\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"
-"Mandrivalinux system.\n"
+"Mandriva Linux 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"
@@ -4557,7 +4559,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 Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4566,7 +4568,8 @@ 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 Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4586,11 +4589,11 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Sie müssen nun entscheiden, wo auf Ihrer/n Festplatte(n) Ihr Mandrivalinux\n"
+"Sie müssen nun entscheiden, wo auf Ihrer/n Festplatte(n) Ihr Mandriva Linux\n"
 "System installiert werden soll. Sofern alles leer ist bzw. ein\n"
 "Betriebssystem alles belegt, müssen die Platte(n) neu partitioniert werden.\n"
 "Prinzipiell besteht das Partitionieren der Platte(n) darin, den\n"
-"Plattenplatz so aufzuteilen, dass Ihr Mandrivalinux darauf installiert\n"
+"Plattenplatz so aufzuteilen, dass Ihr Mandriva Linux darauf installiert\n"
 "werden kann.\n"
 "\n"
 "Da dieser Schritt normalerweise irreversibel ist und auch zu Datenverlusten\n"
@@ -4621,7 +4624,7 @@ msgstr ""
 "defragmentiert. Dennoch sollten Sie vor diesem Schritt eine Sicherungskopie\n"
 "Ihrer Daten auf einem anderem Medium als der zu verändernden Festplatte\n"
 "vornehmen. Sie sollten diese Variante wählen, falls Sie beide\n"
-"Betriebssysteme (Microsoft Windows und Mandrivalinux) nebeneinander nutzen\n"
+"Betriebssysteme (Microsoft Windows und Mandriva Linux) nebeneinander nutzen\n"
 "wollen.\n"
 "\n"
 "   Bevor Sie sich für diese Variante entscheiden, sei hier noch einmal\n"
@@ -4629,7 +4632,7 @@ msgstr ""
 "als momentan.\n"
 "\n"
 " * „%s“: Falls Sie alle Daten Ihrer Platte verlieren, und sie durch Ihr\n"
-"neues Mandrivalinux System ersetzen wollen, wählen Sie diese Schaltfläche.\n"
+"neues Mandriva Linux System ersetzen wollen, wählen Sie diese Schaltfläche.\n"
 "Beachten Sie, dass dieser Schritt nicht rückgängig gemacht werden kann.\n"
 "\n"
 "   !! Wenn Sie diese Variante wählen, werden alle Ihre Daten auf der Platte\n"
@@ -4776,7 +4779,7 @@ msgid "Save packages selection"
 msgstr "Paketauswahl speichern"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 #: help.pm:412
 #, c-format
 msgid ""
@@ -4797,7 +4800,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"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux 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."
@@ -4819,7 +4822,7 @@ msgstr ""
 "Schaltfläche „%s“, um mit dem Formatieren der Partitionen zu beginnen.\n"
 "\n"
 "Betätigen Sie „%s“, wenn Sie eine andere Partition für Ihr neues\n"
-"Mandrivalinux vorgesehen haben.\n"
+"Mandriva Linux vorgesehen haben.\n"
 "\n"
 "Betätigen Sie die Schaltfläche „%s“, falls Sie Partitionen auf defekte\n"
 "Blöcke untersuchen wollen."
@@ -4834,11 +4837,11 @@ msgid "Previous"
 msgstr "Zurück"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, 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"
@@ -4850,7 +4853,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandrivalinux\n"
+"Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandriva Linux\n"
 "Installation bereits einige Pakete aktualisiert wurden, etwa da noch Fehler\n"
 "entdeckt und beseitigt wurden oder da in Paketen Sicherheitslücken entdeckt\n"
 "wurden, für die bereits Lösungen existieren. Um von diesen aktualisierten\n"
@@ -4874,7 +4877,7 @@ msgid "Install"
 msgstr "Installation"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 #: help.pm:447
 #, c-format
 msgid ""
@@ -4885,7 +4888,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 Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4899,7 +4902,7 @@ msgstr ""
 "\n"
 "Sollten Sie sich an dieser Stelle nicht sicher sein, so behalten Sie die\n"
 "Standardeinstellung bei. Sie können die Ebene später noch mittels draksec\n"
-"im Mandrivalinux Control Center anpassen.\n"
+"im Mandriva Linux Control Center anpassen.\n"
 "\n"
 "Das Feld „%s“ dient dazu, dem System mitzuteilen, wer für die Sicherheit\n"
 "dieses Rechners verantwortlich ist. An dieses Kennzeichen/diese E-Mail\n"
@@ -4911,12 +4914,12 @@ msgid "Security Administrator"
 msgstr "Sicherheitsadministrator:"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 #: help.pm:461
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux 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"
@@ -5074,13 +5077,13 @@ msgid "Toggle between normal/expert mode"
 msgstr "In den Normal-Modus wechseln"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 #: help.pm:533
 #, c-format
 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"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5109,7 +5112,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Es wurde mehr als eine Windows-Partition gefunden. Wählen Sie bitte, welche\n"
-"Sie verkleinern wollen, um Platz für Ihr neues Mandrivalinux zu schaffen.\n"
+"Sie verkleinern wollen, um Platz für Ihr neues Mandriva Linux zu schaffen.\n"
 "\n"
 "Die Partitionen werden folgendermaßen aufgelistet: „Linux-Name“,\n"
 "„Windows-Name“, „Kapazität“.\n"
@@ -5151,7 +5154,7 @@ msgstr ""
 "Sie über die Schaltfläche „%s“ eine vollständigere Liste erzwingen."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 #: help.pm:569
 #, c-format
 msgid ""
@@ -5159,7 +5162,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 Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux 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"
@@ -5168,35 +5171,36 @@ 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 Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux 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 Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
 msgstr ""
 "Dieser Schritt wird nur aufgerufen, wenn mindestens eine GNU/Linux\n"
 "Partition auf Ihren Festplatten gefunden wird.\n"
 "\n"
 "DrakX fragt Sie nun nach der gewünschten Installationsart. Sie haben die\n"
 "Wahl zwischen einer Aktualisierung einer bereits vorhandenen\n"
-"Mandrivalinux-Version oder einer kompletten Neuinstallation:\n"
+"Mandriva Linux-Version oder einer kompletten Neuinstallation:\n"
 "\n"
-" * „%s“: Entfernt komplett ältere Versionen von Mandrivalinux, die noch\n"
+" * „%s“: Entfernt komplett ältere Versionen von Mandriva Linux, die noch\n"
 "installiert sind - um genau zu sein, können Sie je nach aktuellem Inhalt\n"
 "Ihrer Platte auch einige ältere Linux- oder anderweitige Partitionen\n"
 "unangetastet behalten. Diese Installationsart ist gut, wenn Sie die\n"
 "Partitionseinteilung auf Ihrer Festplatte sowieso ändern oder das benutzte\n"
 "Dateisystem austauschen wollen\n"
 "\n"
-" * „%s“: Mit dieser Variante können Sie eine existierende Mandrivalinux\n"
+" * „%s“: Mit dieser Variante können Sie eine existierende Mandriva Linux\n"
 "Version aktualisieren. Die Partitionstabellen sowie die persönlichen\n"
 "Verzeichnisse der Anwender bleiben erhalten. Alle anderen\n"
 "Installationsschritte werden wie bei einer Installation ausgeführt.\n"
 "\n"
-"Aktualisierungen von Mandrivalinux „8.1“ oder neueren Systemen sollten\n"
-"problemlos funktionieren. Ältere Versionen von Mandrivalinux sollten Sie\n"
+"Aktualisierungen von Mandriva Linux „8.1“ oder neueren Systemen sollten\n"
+"problemlos funktionieren. Ältere Versionen von Mandriva Linux sollten Sie\n"
 "nicht zu aktualisieren versuchen."
 
 #: help.pm:591
@@ -5238,7 +5242,7 @@ msgstr ""
 "Layout umschalten wollen."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 #: help.pm:609
 #, c-format
 msgid ""
@@ -5256,7 +5260,8 @@ 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, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux'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"
@@ -5297,7 +5302,7 @@ msgstr ""
 "Zur UTF-8 (Unicode) Unterstützung: Unicode ist ein Zeichenkodierung, die\n"
 "die existierenden Kodierungen ablösen soll und die Zeichen aller\n"
 "existierender Sprachen beinhalten. Komplette Unterstützung in GNU/Linux ist\n"
-"leider immer noch nicht gegeben. Daher verwendet Mandrivalinux diese\n"
+"leider immer noch nicht gegeben. Daher verwendet Mandriva Linux diese\n"
 "Kodierung nur auf Wunsch des Anwenders:\n"
 "\n"
 " * Falls Sie eine Sprache nutzen, die eine gut unterstütztes Kodierung\n"
@@ -5550,12 +5555,12 @@ msgstr ""
 "genau wissen was Sie tun."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 #: help.pm:742
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux 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"
@@ -5576,11 +5581,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 Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Hier können Sie das Drucksystem für Ihren Rechner wählen. Andere\n"
-"Betriebssysteme bieten Ihnen nur eines, bei Mandrivalinux können Sie\n"
+"Betriebssysteme bieten Ihnen nur eines, bei Mandriva Linux können Sie\n"
 "zwischen zwei verschiedenen wählen. jedes dieser Systeme ist für eine\n"
 "bestimmte Konfiguration des Systems am besten geeignet.\n"
 "\n"
@@ -5603,7 +5608,8 @@ msgstr ""
 "starten. „%s“ bietet grafische Konfigurations- und Druckmenüs.\n"
 "\n"
 "Sie können diese Wahl später immer wieder ändern, indem Sie PrinterDrake\n"
-"aus dem Mandrivalinux Control Center starten und dort die Schaltfläche „%s“\n"
+"aus dem Mandriva Linux Control Center starten und dort die Schaltfläche „%"
+"s“\n"
 "betätigen."
 
 #: help.pm:765
@@ -5683,7 +5689,7 @@ msgid "Sound card"
 msgstr "Soundkarte"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 #: help.pm:791
 #, c-format
 msgid ""
@@ -5730,7 +5736,8 @@ 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"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux 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"
@@ -5747,7 +5754,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"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux 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"
@@ -5798,7 +5805,7 @@ msgstr ""
 "\n"
 " * „%s“: Falls Sie Ihren Internetzugang oder Ihr lokales Netzwerk nun\n"
 "einrichten wollen, können Sie das hier tun. Lesen Sie sich dazu die\n"
-"gedruckte Dokumentation durch oder benutzen Sie das Mandrivalinux Control\n"
+"gedruckte Dokumentation durch oder benutzen Sie das Mandriva Linux Control\n"
 "Center nachdem die Installation beendet ist.\n"
 "\n"
 " * „%s“: Hier können Sie HTTP- und FTP-Proxyadressen eintragen falls Ihre\n"
@@ -5817,10 +5824,10 @@ msgstr ""
 "(„Bootloader“) ändern wollen, wählen Sie diese Schaltfläche. Es sei\n"
 "angemerkt, dass dieser Punkt sich an fortgeschrittenere Nutzer richtet.\n"
 "Hilfe finden Sie in der gedruckten Dokumentation oder im integrierten\n"
-"Hilfeteil des Mandrivalinux Control Center.\n"
+"Hilfeteil des Mandriva Linux Control Center.\n"
 "\n"
 " * „%s“: Sie können hier die Dienste wählen, die ab dem Start von\n"
-"Mandrivalinux zur Verfügung gestellt werden sollen. Wollen Sie den Rechner\n"
+"Mandriva Linux zur Verfügung gestellt werden sollen. Wollen Sie den Rechner\n"
 "als Server verwenden, sollten Sie unbedingt einen Blick auf diese Liste\n"
 "werfen."
 
@@ -5876,16 +5883,16 @@ msgid "Services"
 msgstr "Dienste"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 #: help.pm:858
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Bitte wählen Sie die Festplatte, die Sie löschen wollen, um Ihr neues\n"
-"Mandrivalinux zu installieren. Bedenken Sie dabei, dass alle Daten auf\n"
+"Mandriva Linux zu installieren. Bedenken Sie dabei, dass alle Daten auf\n"
 "dieser Platte nach diesem Schritt unwiederbringlich verloren sind!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -6242,7 +6249,7 @@ msgstr "Berechne die Größe der Windows-Partition"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Ihre Windows-Partition ist zu sehr fragmentiert.\n"
@@ -6369,13 +6376,13 @@ msgstr "Netzwerkverbindung trennen"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -6429,7 +6436,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 Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6466,7 +6473,7 @@ msgid ""
 "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"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6486,21 +6493,21 @@ msgid ""
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Bei dieser Übersetzung handelt es sich um eine inoffizielle Übersetzung\n"
-"der Mandrivalinux-Lizenz in die deutsche Sprache. Sie ist keine\n"
+"der Mandriva Linux-Lizenz in die deutsche Sprache. Sie ist keine\n"
 "rechtsverbindliche Darstellung der Lizenzbedingungen der Software in\n"
 "dieser Distribution - nur der ursprüngliche französische Text der\n"
-"Mandrivalinux-Lizenz ist rechtsverbindlich. Wir hoffen aber, dass diese\n"
+"Mandriva Linux-Lizenz ist rechtsverbindlich. Wir hoffen aber, dass diese\n"
 "Übersetzung den deutschsprechenden Benutzern das Verständnis dieser\n"
 "Lizenz erleichtert.\n"
 "\n"
 "\n"
 "Einführung\n"
 "\n"
-"Das Betriebssystem und die anderen Komponenten, die in Mandrivalinux\n"
+"Das Betriebssystem und die anderen Komponenten, die in Mandriva Linux\n"
 "enthalten sind, werden hier „Software-Produkte“ genannt. Die\n"
 "Software-Produkte umfassen, aber sind nicht beschränkt auf, die\n"
 "Gesamtheit der Programme, Methoden, Regeln, und Dokumentation, welche\n"
-"zum Betriebssystem und den anderen Komponenten der Mandrivalinux\n"
+"zum Betriebssystem und den anderen Komponenten der Mandriva Linux\n"
 "Distribution gehören.\n"
 "\n"
 "\n"
@@ -6580,7 +6587,7 @@ msgstr ""
 "Softwareprodukte geschützt.\n"
 "Mandriva S. A. behält sich das Recht vor, die Software-Produkte zu\n"
 "modifizieren und anzupassen.\n"
-"„Mandrake“, „Mandrivalinux“ und entsprechende Logos sind eingetragene\n"
+"„Mandrake“, „Mandriva Linux“ und entsprechende Logos sind eingetragene\n"
 "Warenzeichen der Mandriva S. A..\n"
 "\n"
 "\n"
@@ -6688,8 +6695,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6697,7 +6704,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "Herzlichen Glückwunsch, die Installation ist abgeschlossen.\n"
 "Entfernen Sie die Startmedien (CD-ROMs / Disketten) und drücken Sie die "
@@ -6709,13 +6716,13 @@ msgstr ""
 "%s\n"
 "\n"
 "Wie Sie Ihr System warten können, erfahren Sie im Kapitel „Nach der "
-"Installation“ im offiziellen Benutzerhandbuch von Mandrivalinux."
+"Installation“ im offiziellen Benutzerhandbuch von Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -6744,7 +6751,7 @@ msgstr "Beginn von Schritt „%s“\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -7297,9 +7304,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
-"Kontaktiere Mandrivalinux Web-Server, um eine Liste verfügbarer Pakete zu "
+"Kontaktiere Mandriva Linux Web-Server, um eine Liste verfügbarer Pakete zu "
 "erhalten..."
 
 #: install_steps_interactive.pm:840
@@ -7529,8 +7536,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux-Installation %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux-Installation %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10118,14 +10125,14 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "DrakFirewall-Konfigurator\n"
 "\n"
 "Hiermit konfigurieren Sie eine persönliche Firewall für diesen\n"
-"Mandrivalinux-Rechner. Sollten Sie an einer speziellen ausgereiften\n"
+"Mandriva Linux-Rechner. Sollten Sie an einer speziellen ausgereiften\n"
 "Firewall-Lösung interessiert sein, schauen Sie sich nach der speziell\n"
 "dafür entwickelten MandrakeSecurity-Firewall-Distribution um."
 
@@ -14217,11 +14224,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
-"Starten Sie Scannerdrake (Hardware/Scanner im Mandrivalinux "
+"Starten Sie Scannerdrake (Hardware/Scanner im Mandriva Linux "
 "Kontrollzentrum), um Ihren Scanner im Netzwerk freizugeben.\n"
 "\n"
 
@@ -16218,23 +16225,23 @@ msgstr "Stopp"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Was ist Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Was ist Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Willkommen zu <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Willkommen zu <b>Mandriva Linux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux 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 ""
-"Mandrivalinux ist eine <b>Linuxdistribution</b>, die sowohl den Kern des "
+"Mandriva Linux ist eine <b>Linuxdistribution</b>, die sowohl den Kern des "
 "Systems umfasst, der <b>Betriebssystem</b> (basierend auf dem Linux-Kernel) "
 "genannt wird, als auch <b>eine Menge Anwendungen</b>, die jeden Bedarf "
 "abdecken, den Sie sich vorstellen können."
@@ -16242,10 +16249,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux 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 ""
-"Mandrivalinux ist die <b>benutzerfreundlichste</b> Linuxdistribution "
+"Mandriva Linux ist die <b>benutzerfreundlichste</b> Linuxdistribution "
 "heutzutage. Sie ist außerdem eine der <b>am weitesten verbreiteten</b> "
 "Linuxdistributionen weltweit!"
 
@@ -16262,12 +16269,12 @@ msgstr "Willkommen in der <b>Open Source Welt</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux 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 "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
-"Mandrivalinux verpflichtet sich dem Open-Source-Modell. Das bedeutet, dass "
+"Mandriva Linux verpflichtet sich dem Open-Source-Modell. Das bedeutet, dass "
 "diese neue Ausgabe das Resultat der <b>Zusammenarbeit</b> zwischen "
 "<b>Mandrivas Entwicklern</b> und der <b>weltweiten Gemeinschaft</b> von "
 "Mitwirkenden ist."
@@ -16289,12 +16296,11 @@ msgstr "<b>Die GPL</b>"
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Ein Großteil der in der Distribution enthaltenen Programme und alle "
-"Mandrivalinux-Werkzeuge sind unter der <b>General Public License</b> "
-"lizensiert."
+"Ein Großteil der in der Distribution enthaltenen Programme und alle Mandriva "
+"Linux-Werkzeuge sind unter der <b>General Public License</b> lizensiert."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16325,25 +16331,25 @@ msgstr "<b>Treten Sie der Gemeinschaft bei</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux 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."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
-"Mandrivalinux hat eine der <b>größten Gemeinschaften</b> von Nutzern und "
+"Mandriva Linux hat eine der <b>größten Gemeinschaften</b> von Nutzern und "
 "Entwicklern. Die Rolle dieser Gemeinschaft ist sehr umfassend und erstreckt "
 "sich von Fehlerberichten bis zur Entwicklung neuer Anwendungen. Die "
-"Gemeinschaft spielt eine <b>Schlüsselrolle</b> in der Mandrivalinux-Welt."
+"Gemeinschaft spielt eine <b>Schlüsselrolle</b> in der Mandriva Linux-Welt."
 
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 "Um mehr über unsere dynamische Gemeinschaft zu <b>erfahren</b>, besuchen Sie "
-"bitte <b>www.mandrakelinux.com</b> oder direkt <b>www.mandrakelinux.com/en/"
+"bitte <b>www.mandrivalinux.com</b> oder direkt <b>www.mandrivalinux.com/en/"
 "cookerdevel.php3</b>, wenn Sie sich in die Entwicklung <b>einbringen</b> "
 "wollen."
 
@@ -16355,10 +16361,10 @@ msgstr "<b>Download-Version</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Sie installieren <b>Mandrivalinux Download</b>. Das ist die freie Version, "
+"Sie installieren <b>Mandriva Linux Download</b>. Das ist die freie Version, "
 "die Mandriva <b>für jeden zur Verfügung</b> stellt."
 
 #: share/advertising/05.pl:19
@@ -16404,8 +16410,8 @@ msgstr "<b>Discovery, Ihr erster Linux-Desktop</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Sie installieren <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Sie installieren <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16427,8 +16433,8 @@ msgstr "<b>PowerPack, der ultimative Linux-Desktop</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Sie installieren <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Sie installieren <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16448,8 +16454,8 @@ msgstr "<b>PowerPack+, die Linuxlösung für Desktops und Server</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Sie installieren <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Sie installieren <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16472,15 +16478,15 @@ msgstr "<b>Mandriva Produkte</b>"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
-"<b>Mandriva</b> hat eine breite Auswahl an <b>Mandrivalinux</b>-Produkten "
+"<b>Mandriva</b> hat eine breite Auswahl an <b>Mandriva Linux</b>-Produkten "
 "entwickelt."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Die Mandrivalinux Produkte sind:"
+msgid "The Mandriva Linux products are:"
+msgstr "Die Mandriva Linux Produkte sind:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16500,11 +16506,11 @@ msgstr "\t* <b>PowerPack+</b>, die Linuxlösung für Desktops und Server."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrivalinux für x86-64</b>, die Mandrivalinux-Lösung, um das Beste "
-"aus Ihrem 64-Bit-Prozessor zu machen."
+"\t* <b>Mandriva Linux für x86-64</b>, die Mandriva Linux-Lösung, um das "
+"Beste aus Ihrem 64-Bit-Prozessor zu machen."
 
 #: share/advertising/10.pl:15
 #, c-format
@@ -16514,28 +16520,28 @@ msgstr "<b>Mandriva Produkte (Nomaden-Produkte)</b>"
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandriva hat zwei Produkte entwickelt, die es Ihnen erlauben, Mandrivalinux "
+"Mandriva hat zwei Produkte entwickelt, die es Ihnen erlauben, Mandriva Linux "
 "<b>auf jedem Rechner</b> ohne vorherige Installation zu verwenden:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, eine Mandrivalinux-Distribution, die komplett von einer "
+"\t* <b>Move</b>, eine Mandriva Linux-Distribution, die komplett von einer "
 "startbaren CD-ROM läuft."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, eine Mandrivalinux-Distribution vorinstalliert auf "
+"\t* <b>GlobeTrotter</b>, eine Mandriva Linux-Distribution vorinstalliert auf "
 "der ultra-kompakten „LaCie Mobilen Festplatte“."
 
 #: share/advertising/11.pl:13
@@ -16554,19 +16560,22 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, der Mandrivalinux-Desktop für Geschäfte."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
+msgstr ""
+"\t* <b>Corporate Desktop</b>, der Mandriva Linux-Desktop für Geschäfte."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, die Mandrivalinux-Serverlösung."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, die Mandriva Linux-Serverlösung."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
 msgstr ""
-"\t* <b>Multi-Network-Firewall</b>, die Mandrivalinux-Sicherheitslösung."
+"\t* <b>Multi-Network-Firewall</b>, die Mandriva Linux-Sicherheitslösung."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16770,10 +16779,10 @@ msgstr "<b>Genießen Sie die breite Auswahl an Anwendungen</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Im Mandrivalinux-Menü finden Sie <b>einfach zu bedienende</b> Anwendungen "
+"Im Mandriva Linux-Menü finden Sie <b>einfach zu bedienende</b> Anwendungen "
 "für <b>alle Ihre Aufgaben</b>:"
 
 #: share/advertising/18.pl:16
@@ -17045,18 +17054,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux Kontrollzentrum</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux Kontrollzentrum</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"Das <b>Mandrivalinux-Kontrollzentrum</b> ist eine wesentliche Sammlung der "
-"Mandrivalinux-spezifischen Werkzeuge um die Einrichtung des Computers zu "
+"Das <b>Mandriva Linux-Kontrollzentrum</b> ist eine wesentliche Sammlung der "
+"Mandriva Linux-spezifischen Werkzeuge um die Einrichtung des Computers zu "
 "vereinfachen."
 
 #: share/advertising/25.pl:17
@@ -17082,16 +17091,17 @@ 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 "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Wie jede andere Software, benötigt auch Open Source Software <b>Zeit und "
 "Leute</b> für ihre Entwicklung. Um die Open Source Philosophie anzuerkennen, "
-"verkauft Mandriva Mehrwertprodukte und Dienstleistungen, um <b>Mandrivalinux "
-"zu verbessern</b>. Wenn Sie die Open Source Philosophy und die Entwicklung "
-"von Mandrivalinux <b>unterstützen</b> wollen, ziehen Sie <b>bitte</b> den "
-"Kauf eines unserer Produkte oder Dienstleistungen in Betracht!"
+"verkauft Mandriva Mehrwertprodukte und Dienstleistungen, um <b>Mandriva "
+"Linux zu verbessern</b>. Wenn Sie die Open Source Philosophy und die "
+"Entwicklung von Mandriva Linux <b>unterstützen</b> wollen, ziehen Sie "
+"<b>bitte</b> den Kauf eines unserer Produkte oder Dienstleistungen in "
+"Betracht!"
 
 #: share/advertising/27.pl:13
 #, c-format
@@ -17124,8 +17134,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Schauen Sie noch heute unter <b>store.mandrakesoft.com</b> rein!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Schauen Sie noch heute unter <b>store.mandriva.com</b> rein!"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -17135,11 +17145,11 @@ msgstr "<b>Mandriva Club</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
-"<b>Mandriva Club</b> ist der <b>perfekte Begleiter</b> für Ihr Mandrivalinux-"
-"Produkt."
+"<b>Mandriva Club</b> ist der <b>perfekte Begleiter</b> für Ihr Mandriva "
+"Linux-Produkt."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -17153,10 +17163,10 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 "\t* <b>Spezialrabatte</b> auf Produkte und Dienstleistungen unseres Online-"
-"Warenhauses <b>store.mandrakesoft.com</b>."
+"Warenhauses <b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -17169,17 +17179,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Teilnahme an Mandrivalinux <b>Nutzerforen</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Teilnahme an Mandriva Linux <b>Nutzerforen</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Früher und privilegierter Zugriff</b>, vor der öffentlichen Ausgabe, "
-"auf Mandrivalinux <b>ISO-Abbilder</b>."
+"auf Mandriva Linux <b>ISO-Abbilder</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -17199,10 +17209,10 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 "Mandriva Online bietet eine breite Palette wertvoller Dienstleistungen zur "
-"<b>einfachen Aktualisierung</b> Ihres Mandrivalinux-Systems:"
+"<b>einfachen Aktualisierung</b> Ihres Mandriva Linux-Systems:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17227,8 +17237,9 @@ msgstr "\t* Flexible <b>planmäßige</b> Aktualisierungen."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
-msgstr "\t* Verwaltung <b>all Ihrer Mandrivalinux-Systeme</b> mit einem Konto."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
+msgstr ""
+"\t* Verwaltung <b>all Ihrer Mandriva Linux-Systeme</b> mit einem Konto."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -17239,27 +17250,27 @@ msgstr "<b>Mandriva Expert</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 "Benötigen Sie <b>Unterstützung?</b> Treffen Sie Mandrivas Technikexperten "
-"auf <b>unserer technischen Supportplattform</b> www.mandrakeexpert.com."
+"auf <b>unserer technischen Supportplattform</b> www.mandrivaexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Dank der <b>qualifzierten Mandrivalinux-Experten</b> werden Sie eine Menge "
+"Dank der <b>qualifzierten Mandriva Linux-Experten</b> werden Sie eine Menge "
 "Zeit sparen."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
-"Zu jeder Frage bezüglich Mandrivalinux können Sie Support unter <b>store."
+"Zu jeder Frage bezüglich Mandriva Linux können Sie Support unter <b>store."
 "mandrakesoft.com</b> kaufen."
 
 #: share/compssUsers.pl:25
@@ -17648,8 +17659,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 "[OPTIONEN] [PROGRAMMNAME]\n"
 "\n"
@@ -17712,7 +17723,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -20609,13 +20620,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux Fehlerberichte"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux Fehlerberichte"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux Kontrollzentrum"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux Kontrollzentrum"
 
 #: standalone/drakbug:48
 #, c-format
@@ -21108,20 +21119,20 @@ msgstr "Beim Hochfahren gestartet"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Diese Schnittstelle wurde noch nicht eingerichtet.\n"
-"Starten Sie den Assistenten „Schnittstelle hinzufügen“ im Mandrivalinux "
+"Starten Sie den Assistenten „Schnittstelle hinzufügen“ im Mandriva Linux "
 "Kontrollzentrum."
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Sie haben noch keine eingerichtete Internetverbindung.\n"
-"Starten Sie den Assistenten „%s“ im Mandrivalinux Kontrollzentrum."
+"Starten Sie den Assistenten „%s“ im Mandriva Linux Kontrollzentrum."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21171,8 +21182,8 @@ msgstr "KDM (KDE Display Manager)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Mandriva Linux Display Manager)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21476,18 +21487,18 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 "Copyright © 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (Orginalversion)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 
 #: standalone/drakfont:520
 #, c-format
@@ -22070,8 +22081,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux Hilfezentrum"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux Hilfezentrum"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22736,7 +22747,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "Auf Ihrem System wurde keine Soundkarte gefunden. Bitte stellen Sie sicher, "
 "daß\n"
@@ -22746,7 +22757,7 @@ msgstr ""
 "Sie können unsere Hardware-Datenbank einsehen unter:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24777,7 +24788,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "Auf Ihrem System wurde keine TV-Karte gefunden. Bitte stellen Sie sicher, "
 "daß\n"
@@ -24787,7 +24798,7 @@ msgstr ""
 "Sie können unsere Hardware-Datenbank einsehen unter:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25505,13 +25516,13 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
 "Das ist HardDrake, ein %s Hardware-Konfigurationswerkzeug.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25623,8 +25634,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinux Werkzeugprotokolle"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linux Werkzeugprotokolle"
 
 #: standalone/logdrake:51
 #, c-format
@@ -26141,10 +26152,10 @@ msgstr "Verbindung fertiggestellt."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Verbinden fehlgeschlagen.\n"
-"Überprüfen Sie Ihre Konfiguration im Mandrivalinux Kontrollzentrum."
+"Überprüfen Sie Ihre Konfiguration im Mandriva Linux Kontrollzentrum."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -27006,2066 +27017,3 @@ msgstr ""
 #, c-format
 msgid "Installation failed"
 msgstr "Die Installation schlug fehl!"
-
-#~ msgid ""
-#~ "Mandriva Linux 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 ""
-#~ "Mandriva Linux unterstützt verschiedene Sprachen. Wählen\n"
-#~ "Sie die Sprachen, die Sie installieren wollen.Diese stehen Ihnen zur\n"
-#~ "Verfügung, nachdem die Installation fertig ist und Sie einen Neustart\n"
-#~ "durchgeführt haben."
-
-#~ msgid ""
-#~ "Before continuing, you should carefully read the terms of the license. "
-#~ "It\n"
-#~ "covers the entire Mandriva Linux distribution. If you agree with all the\n"
-#~ "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
-#~ "button will reboot your computer."
-#~ msgstr ""
-#~ "Lesen Sie bitte aufmerksam die Lizenz, bevor Sie fortfahren. Sie umfasst\n"
-#~ "die gesamte Mandriva Linux Distribution. Sollten Sie nicht in allen "
-#~ "Punkten\n"
-#~ "zustimmen, betätigen Sie bitte die Schaltfläche „%s“, um die "
-#~ "Installation\n"
-#~ "abzubrechen. Um mit der Installation fortzufahren, betätigen Sie die\n"
-#~ "Schaltfläche „%s“."
-
-#~ msgid ""
-#~ "The Mandriva Linux 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 Mandriva Linux-Distribution wird auf mehreren CD-ROMs ausgeliefert. "
-#~ "Es\n"
-#~ "kann daher vorkommen, dass DrakX Pakete von anderen, als der\n"
-#~ "Installations-CD-ROM installieren will. In diesem Fall wird es die "
-#~ "aktuelle\n"
-#~ "CD auswerfen und nach einer anderen fragen. Wenn Sie dieses CD nicht "
-#~ "haben,\n"
-#~ "klicken Sie einfach auf „%s“. Die entsprechenden Pakete werden in dem "
-#~ "Fall\n"
-#~ "nicht installiert."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-#~ msgid ""
-#~ "It's now time to specify which programs you wish to install on your "
-#~ "system.\n"
-#~ "There are thousands of packages available for Mandriva Linux, and to make "
-#~ "it\n"
-#~ "simpler to manage, they have been placed into groups of similar\n"
-#~ "applications.\n"
-#~ "\n"
-#~ "Mandriva Linux 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"
-#~ "\n"
-#~ " * \"%s\": if you plan to use your machine as a workstation, select one "
-#~ "or\n"
-#~ "more of the groups in the workstation category.\n"
-#~ "\n"
-#~ " * \"%s\": if you plan on using your machine for programming, select the\n"
-#~ "appropriate groups from that category. The special \"LSB\" group will\n"
-#~ "configure your system so that it complies as much as possible with the\n"
-#~ "Linux Standard Base specifications.\n"
-#~ "\n"
-#~ "   Selecting the \"LSB\" group will also install the \"2.4\" kernel "
-#~ "series,\n"
-#~ "instead of the default \"2.6\" one. This is to ensure 100%%-LSB "
-#~ "compliance\n"
-#~ "of the system. However, if you do not select the \"LSB\" group you will\n"
-#~ "still have a system which is nearly 100%% LSB-compliant.\n"
-#~ "\n"
-#~ " * \"%s\": if your machine is intended to be a server, select which of "
-#~ "the\n"
-#~ "more common services you wish to install on your machine.\n"
-#~ "\n"
-#~ " * \"%s\": this is where you will choose your preferred graphical\n"
-#~ "environment. At least one must be selected if you want to have a "
-#~ "graphical\n"
-#~ "interface available.\n"
-#~ "\n"
-#~ "Moving the mouse cursor over a group name will display a short "
-#~ "explanatory\n"
-#~ "text about that group.\n"
-#~ "\n"
-#~ "You can check the \"%s\" box, which is useful if you're familiar with "
-#~ "the\n"
-#~ "packages being offered or if you want to have total control over what "
-#~ "will\n"
-#~ "be installed.\n"
-#~ "\n"
-#~ "If you start the installation in \"%s\" mode, you can deselect all "
-#~ "groups\n"
-#~ "and prevent the installation of any new packages. This is useful for\n"
-#~ "repairing or updating an existing system.\n"
-#~ "\n"
-#~ "If you deselect all groups when performing a regular installation (as\n"
-#~ "opposed to an upgrade), a dialog will pop up suggesting different "
-#~ "options\n"
-#~ "for a minimal installation:\n"
-#~ "\n"
-#~ " * \"%s\": install the minimum number of packages possible to have a\n"
-#~ "working graphical desktop.\n"
-#~ "\n"
-#~ " * \"%s\": installs the base system plus basic utilities and their\n"
-#~ "documentation. This installation is suitable for setting up a server.\n"
-#~ "\n"
-#~ " * \"%s\": will install the absolute minimum number of packages "
-#~ "necessary\n"
-#~ "to get a working Linux system. With this installation you will only have "
-#~ "a\n"
-#~ "command-line interface. The total size of this installation is about 65\n"
-#~ "megabytes."
-#~ msgstr ""
-#~ "Nun ist es Zeit sich zu entscheiden, welche Programme Sie auf Ihrem "
-#~ "Rechner\n"
-#~ "installieren wollen. Es gibt tausende von Paketen für Mandriva Linux, "
-#~ "und\n"
-#~ "Sie müssen sie nicht alle auswendig kennen.\n"
-#~ "\n"
-#~ "Die Pakete sind nach ihrer Verwendung in vier Kategorien eingeteilt. Sie\n"
-#~ "können Pakete aus verschiedenen Kategorien nach Belieben mischen, sodass\n"
-#~ "beispielsweise eine „Workstation“-Installation auch Bestandteile einer\n"
-#~ "„Server“-Installation aufweisen kann.\n"
-#~ "\n"
-#~ " * „%s“: Falls Ihr Rechner als Arbeitsplatzrechner verwendet werden "
-#~ "soll,\n"
-#~ "markieren Sie eine oder mehrere Gruppen.\n"
-#~ "\n"
-#~ " * „%s“: Falls Sie mit Ihrem Rechner programmieren wollen, sollten Sie\n"
-#~ "diese Gruppe markieren. Die spezielle Gruppe „LSB“ wird Ihr System\n"
-#~ "möglichst eng an den Vorgaben der Linux Standard Base ausrichten.\n"
-#~ "\n"
-#~ "   Die Auswahl der „LSB“-Gruppe bewirkt auch, dass der Kernel „2.4“\n"
-#~ "anstelle des standardmäßigen Kernel „2.6“ installiert wird, um die 100%%"
-#~ "ige\n"
-#~ "Einhaltung der-LSB-Bedingungen zu garantieren. Allerdings erhalten Sie "
-#~ "auch\n"
-#~ "ohne die Auswahl der „LSB“-Gruppe ein nahezu 100%%ig LSB-konformes "
-#~ "System.\n"
-#~ "\n"
-#~ " * „%s“: Wenn Ihre Maschine ein Server werden soll, können Sie hier die\n"
-#~ "wichtigsten Dienste auswählen, die auf Ihren Rechner installiert werden\n"
-#~ "sollen.\n"
-#~ "\n"
-#~ " * „%s“: Wählen Sie hier Ihre bevorzugte grafische Arbeitsoberfläche. "
-#~ "Wenn\n"
-#~ "Sie eine grafische Oberfläche verwenden wollen, so müssen Sie hier\n"
-#~ "zumindest eine Gruppe auswählen.\n"
-#~ "\n"
-#~ "Wenn Sie die Maus über eine Gruppe bewegen, erhalten Sie einen kurzen\n"
-#~ "erklärenden Text über die Gruppe.\n"
-#~ "\n"
-#~ "Sie können auch die „%s“ markieren. Das macht Sinn, wenn Sie die Pakete\n"
-#~ "genau kennen oder wenn Sie volle Kontrolle darüber haben wollen, was\n"
-#~ "installiert werden soll.\n"
-#~ "\n"
-#~ "Haben Sie die Installation als „%s“ gestartet, können Sie die "
-#~ "Markierungen\n"
-#~ "aller Gruppen entfernen, um die Installation neuer Pakete zu vermeiden.\n"
-#~ "Hierdurch werden nur bereits installierte Pakete aktualisiert oder\n"
-#~ "repariert.\n"
-#~ "\n"
-#~ "Wenn Sie bei einer normalen Installation alle Gruppen de-markieren\n"
-#~ "erscheint ein Dialog, der Ihnen verschiedene Optionen für eine\n"
-#~ "Minimal-Installation anbietet:\n"
-#~ "\n"
-#~ " * „%s“ Installiert eine rudimentäre grafische Oberfläche;\n"
-#~ "\n"
-#~ " * „%s“ Installiert das Basissystem zuzüglich grundlegender Werkzeuge\n"
-#~ "inklusive deren Dokumentation. Dies ist die sinnvollste Wahl für eine\n"
-#~ "Serverinstallation.\n"
-#~ "\n"
-#~ " * „%s“ Sie erhalten eine komplett „nackte“ 65MB große\n"
-#~ "GNU/Linux-Distribution. Es versteht sich von selbst, dass das nur eine\n"
-#~ "Kommandozeileninstallation sein kann."
-
-#~ msgid ""
-#~ "If you choose to install packages individually, the installer will "
-#~ "present\n"
-#~ "a tree containing all packages classified by groups and subgroups. While\n"
-#~ "browsing the tree, you can select entire groups, subgroups, or "
-#~ "individual\n"
-#~ "packages.\n"
-#~ "\n"
-#~ "Whenever you select a package on the tree, a description will appear on "
-#~ "the\n"
-#~ "right to let you know the purpose of that package.\n"
-#~ "\n"
-#~ "!! 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 Mandriva Linux 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 Mandriva Linux 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"
-#~ "\n"
-#~ "The \"%s\" option is used to disable the warning dialog which appears\n"
-#~ "whenever the installer automatically selects a package to resolve a\n"
-#~ "dependency issue. Some packages depend on others and the installation of\n"
-#~ "one particular package may require the installation of another package. "
-#~ "The\n"
-#~ "installer can determine which packages are required to satisfy a "
-#~ "dependency\n"
-#~ "to successfully complete the installation.\n"
-#~ "\n"
-#~ "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
-#~ "package list created during a previous installation. This is useful if "
-#~ "you\n"
-#~ "have a number of machines that you wish to configure identically. "
-#~ "Clicking\n"
-#~ "on this icon will ask you to insert the floppy disk created at the end "
-#~ "of\n"
-#~ "another installation. See the second tip of the last step on how to "
-#~ "create\n"
-#~ "such a floppy."
-#~ msgstr ""
-#~ "Falls Sie sich für die einzelne Paketauswahl entschieden haben erhalten "
-#~ "Sie eine\n"
-#~ "Baumliste aller Pakete, nach Gruppen und Untergruppen klassifiziert. "
-#~ "Beim\n"
-#~ "Durchstöbern des Baums können Sie Gruppen, Untergruppen oder einzelne "
-#~ "Pakete\n"
-#~ "auswählen.\n"
-#~ "\n"
-#~ "Wenn Sie ein Paket auswählen, erscheint rechts eine kurze Beschreibung.\n"
-#~ "\n"
-#~ "!! Es kommt vor, dass Server- und Dienst-Pakete angewählt wurden - "
-#~ "entweder\n"
-#~ "absichtlich, oder als Paket einer ganzen Gruppe; sollte das der Fall "
-#~ "sein,\n"
-#~ "werden Sie nun gefragt, ob Sie diese wirklich installiert haben wollen.\n"
-#~ "Unter Mandriva Linux werden installierte Server und Dienste automatisch "
-#~ "beim\n"
-#~ "Betriebssystemstart gestartet. Selbst wenn zum Zeitpunkt, als die\n"
-#~ "Distribution zusammengestellt wurde, keine Sicherheitslücken oder Fehler "
-#~ "in\n"
-#~ "diesen Paketen bekannt waren, ist natürlich nicht auszuschließen, dass\n"
-#~ "später solche Fehler gefunden werden. Sollten Sie also nicht wissen, "
-#~ "wovon\n"
-#~ "hier die Rede ist, wählen Sie sicherheitshalber lieber „%s“. Falls Sie "
-#~ "mit\n"
-#~ "„%s“ antworten, werden die Dienste und Server installiert und stehen "
-#~ "Ihnen\n"
-#~ "nach der Installation standardmäßig zur Verfügung. !!\n"
-#~ "\n"
-#~ "Die Option „%s“ unterdrückt nur die Warnungen, die erscheinen, wenn das\n"
-#~ "Installationsprogramm Pakete automatisch markiert, um "
-#~ "Paketabhängigkeiten\n"
-#~ "aufzulösen, wenn Sie ein Paket auswählen. Einige Pakete hängen von der\n"
-#~ "Existenz anderer Pakete ab und die Installation eines Paketes mag die\n"
-#~ "Installation eines anderen voraussetzen. Das Installprogramm ist in der\n"
-#~ "Lage, diese Abhängigkeiten zu erkennen und zu erfüllen.\n"
-#~ "\n"
-#~ "Das kleine Diskettensymbol am unteren Rand der Liste ermöglicht es "
-#~ "Ihnen,\n"
-#~ "die während einer vorangegangenen Installation gespeicherte Paketauswahl\n"
-#~ "erneut zu verwenden. Durch Betätigen der Schaltfläche öffnen Sie einen\n"
-#~ "Dialog, der Sie auffordert, die Diskette einzulegen, die die Auswahl der\n"
-#~ "früheren Installation enthält. Um zu erfahren, wie Sie diese Diskette\n"
-#~ "erstellen, lesen Sie bitte den zweiten Tipp des vorangegangenen\n"
-#~ "Installationsschrittes."
-
-#~ 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 Mandriva Linux rely upon.\n"
-#~ "\n"
-#~ "You'll see a list of different parameters to change to get an optimal\n"
-#~ "graphical display.\n"
-#~ "\n"
-#~ "Graphic Card\n"
-#~ "\n"
-#~ "   The installer will normally automatically detect and configure the\n"
-#~ "graphic card installed on your machine. If this is not correct, you can\n"
-#~ "choose from this list the card you actually have installed.\n"
-#~ "\n"
-#~ "   In the situation where different servers are available for your card,\n"
-#~ "with or without 3D acceleration, you're asked to choose the server which\n"
-#~ "best suits your needs.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Monitor\n"
-#~ "\n"
-#~ "   Normally the installer will automatically detect and configure the\n"
-#~ "monitor connected to your machine. If it is not correct, you can choose\n"
-#~ "from this list the monitor which is connected to your computer.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Resolution\n"
-#~ "\n"
-#~ "   Here you can choose the resolutions and color depths available for "
-#~ "your\n"
-#~ "graphics hardware. Choose the one which best suits your needs (you will "
-#~ "be\n"
-#~ "able to make changes after the installation). A sample of the chosen\n"
-#~ "configuration is shown in the monitor picture.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Test\n"
-#~ "\n"
-#~ "   Depending on your hardware, this entry might not appear.\n"
-#~ "\n"
-#~ "   The system will try to open a graphical screen at the desired\n"
-#~ "resolution. If you see the test message during the test and answer \"%s"
-#~ "\",\n"
-#~ "then DrakX will proceed to the next step. If you do not see it, then it\n"
-#~ "means that some part of the auto-detected configuration was incorrect "
-#~ "and\n"
-#~ "the test will automatically end after 12 seconds and return you to the\n"
-#~ "menu. Change settings until you get a correct graphical display.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Options\n"
-#~ "\n"
-#~ "   This steps allows you to choose whether you want your machine to\n"
-#~ "automatically switch to a graphical interface at boot. Obviously, you "
-#~ "may\n"
-#~ "want to check \"%s\" if your machine is to act as a server, or if you "
-#~ "were\n"
-#~ "not successful in getting the display configured."
-#~ msgstr ""
-#~ "X (das X Window System) ist das Herz der grafischen Benutzeroberfläche "
-#~ "von\n"
-#~ "GNU/Linux. Es bildet die Grundlage für die Vielzahl grafischer\n"
-#~ "Benutzerumgebungen, die Mandriva Linux Ihnen anbietet (wie etwa KDE, "
-#~ "GNOME,\n"
-#~ "AfterStep oder WindowMaker).\n"
-#~ "\n"
-#~ "Sie erhalten eine Liste möglicher Parameter, mit deren Hilfe Sie die\n"
-#~ "Grafikausgabe ändern können:\n"
-#~ "\n"
-#~ "Grafikkarte\n"
-#~ "\n"
-#~ "   DrakX erkennt normalerweise automatisch Ihre Grafikkarte und richtet "
-#~ "sie\n"
-#~ "entsprechend ein. Sollten dabei Probleme auftreten, können Sie in der "
-#~ "hier\n"
-#~ "aufgeführten Liste Ihr Modell auswählen.\n"
-#~ "\n"
-#~ "   Falls für Ihre Karte verschiedene Server zur Verfügung stehen, etwa "
-#~ "mit\n"
-#~ "und ohne 3D-Beschleunigung, werden Sie gebeten, den zu wählen, der Ihren\n"
-#~ "Bedürfnissen am besten entspricht.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Monitor\n"
-#~ "\n"
-#~ "   DrakX erkennt normalerweise automatisch Ihren Monitor. Sollten dabei\n"
-#~ "Probleme auftreten, können Sie in der hier aufgeführten Liste Ihr Modell\n"
-#~ "auswählen.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Auflösung\n"
-#~ "\n"
-#~ "   Sie können hier Auflösung und Farbtiefe für Ihre Hardware wählen.\n"
-#~ "Entscheiden Sie sich, welche Variante Ihren Wünschen am ehesten "
-#~ "entspricht\n"
-#~ "(Sie können diese Angaben natürlich nach der Installation noch ändern).\n"
-#~ "Anhand des abgebildeten Monitors können Sie sich einen sofortigen "
-#~ "Eindruck\n"
-#~ "bilden.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Test\n"
-#~ "\n"
-#~ "   Je nach Hardware kann es sein, dass dieser Eintrag nicht erscheint.\n"
-#~ "\n"
-#~ "   DrakX versucht eine Testbild mit denen von Ihnen gewünschten\n"
-#~ "Einstellungen zu öffnen. Falls Sie während des Tests einen Dialog sehen, "
-#~ "in\n"
-#~ "dem Sie gefragt werden, ob sie die getroffenen Einstellungen behalten\n"
-#~ "wollen, antworten Sie mit „%s“, damit DrakX mit dem nächsten\n"
-#~ "Installationsschritt fortfährt. Sollten Sie die Nachricht nicht sehen,\n"
-#~ "bedeutet das, dass eine oder mehrere getroffene Einstellungen nicht "
-#~ "korrekt\n"
-#~ "sind. Nach 12 Sekunden sollten Sie wieder das Installationsmenü sehen. "
-#~ "Sie\n"
-#~ "können nun die Einstellungen ändern, bis Sie das Testbild sehen.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Optionen\n"
-#~ "\n"
-#~ "   Sie können direkt bei Betriebssystemstart die grafische Umgebung\n"
-#~ "aktivieren. Durch Betätigen der Schaltfläche „%s“ wird in eine reine\n"
-#~ "Textumgebung gestartet. Das ist sinnvoll für Server oder wenn Sie bei "
-#~ "dem\n"
-#~ "Versuch die grafische Umgebung zu konfigurieren erfolglos waren."
-
-#~ msgid ""
-#~ "You now need to decide where you want to install the Mandriva Linux\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"
-#~ "Mandriva Linux 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"
-#~ "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
-#~ "simplifies this process. Before continuing with this step, read through "
-#~ "the\n"
-#~ "rest of this section and above all, take your time.\n"
-#~ "\n"
-#~ "Depending on the configuration of your hard drive, several options are\n"
-#~ "available:\n"
-#~ "\n"
-#~ " * \"%s\". This option will perform an automatic partitioning of your "
-#~ "blank\n"
-#~ "drive(s). If you use this option there will be no further prompts.\n"
-#~ "\n"
-#~ " * \"%s\". The wizard has detected one or more existing Linux partitions "
-#~ "on\n"
-#~ "your hard drive. If you want to use them, choose this option. You will "
-#~ "then\n"
-#~ "be asked to choose the mount points associated with each of the "
-#~ "partitions.\n"
-#~ "The legacy mount points are selected by default, and for the most part "
-#~ "it's\n"
-#~ "a good idea to keep them.\n"
-#~ "\n"
-#~ " * \"%s\". If Microsoft Windows is installed on your hard drive and "
-#~ "takes\n"
-#~ "all the space available on it, you will have to create free space for\n"
-#~ "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
-#~ "data (see ``Erase entire disk'' solution) or resize your Microsoft "
-#~ "Windows\n"
-#~ "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 Mandriva Linux and Microsoft Windows "
-#~ "on\n"
-#~ "the same computer.\n"
-#~ "\n"
-#~ "   Before choosing this option, please understand that after this\n"
-#~ "procedure, the size of your Microsoft Windows partition will be smaller\n"
-#~ "than when you started. You'll have less free space under Microsoft "
-#~ "Windows\n"
-#~ "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 Mandriva Linux system, "
-#~ "choose\n"
-#~ "this option. Be careful, because you will not be able to undo this "
-#~ "operation\n"
-#~ "after you confirm.\n"
-#~ "\n"
-#~ "   !! If you choose this option, all data on your disk will be "
-#~ "deleted. !!\n"
-#~ "\n"
-#~ " * \"%s\". This option appears when the hard drive is entirely taken by\n"
-#~ "Microsoft Windows. Choosing this option will simply erase everything on "
-#~ "the\n"
-#~ "drive and begin fresh, partitioning everything from scratch.\n"
-#~ "\n"
-#~ "   !! If you choose this option, all data on your disk will be lost. !!\n"
-#~ "\n"
-#~ " * \"%s\". Choose this option if you want to manually partition your "
-#~ "hard\n"
-#~ "drive. Be careful -- it is a powerful but dangerous choice and you can "
-#~ "very\n"
-#~ "easily lose all your data. That's why this option is really only\n"
-#~ "recommended if you have done something like this before and have some\n"
-#~ "experience. For more instructions on how to use the DiskDrake utility,\n"
-#~ "refer to the ``Managing Your Partitions'' section in the ``Starter "
-#~ "Guide''."
-#~ msgstr ""
-#~ "Sie müssen nun entscheiden, wo auf Ihrer/n Festplatte(n) Ihr Mandriva "
-#~ "Linux\n"
-#~ "System installiert werden soll. Sofern alles leer ist bzw. ein\n"
-#~ "Betriebssystem alles belegt, müssen die Platte(n) neu partitioniert "
-#~ "werden.\n"
-#~ "Prinzipiell besteht das Partitionieren der Platte(n) darin, den\n"
-#~ "Plattenplatz so aufzuteilen, dass Ihr Mandriva Linux darauf installiert\n"
-#~ "werden kann.\n"
-#~ "\n"
-#~ "Da dieser Schritt normalerweise irreversibel ist und auch zu "
-#~ "Datenverlusten\n"
-#~ "führen kann haben manche unerfahrenen User Hemmungen, diesen Schritt\n"
-#~ "auszuführen. Glücklicherweise enthält DrakX einen Assistenten, der den\n"
-#~ "Prozess sehr vereinfacht. Lesen Sie dennoch vor Beginn im Handbuch die\n"
-#~ "entsprechenden Passagen und lassen Sie sich Zeit mit der Entscheidung.\n"
-#~ "\n"
-#~ "Abhängig vom aktuellen Zustand Ihrer Platte(n) haben Sie verschiedene\n"
-#~ "Alternativen:\n"
-#~ "\n"
-#~ " * „%s“: Dies führt einfach dazu, dass Ihre leere(n) Festplatte(n)\n"
-#~ "automatisch partitioniert werden; Sie müssen sich also um nichts weiter\n"
-#~ "kümmern.\n"
-#~ "\n"
-#~ " * „%s“: Der Assistent hat eine oder mehrere existierende Linux-"
-#~ "Partitionen\n"
-#~ "auf Ihrer Platte gefunden. Wählen Sie diese Schaltfläche, falls Sie sie\n"
-#~ "behalten wollen. Sie werden dann gebeten, die Einhängpunkte der "
-#~ "Partitionen\n"
-#~ "anzugeben. Als Vorgabe erhalten Sie die Einhängpunkte der gefundenen\n"
-#~ "Distribution, normalerweise ist es nicht nötig diese zu ändern.\n"
-#~ "\n"
-#~ " * „%s“: Falls der gesamte Plattenplatz aktuell für Microsoft Windows™\n"
-#~ "verschwendet ist, müssen Sie für GNU/Linux Platz schaffen. Um dies zu\n"
-#~ "erreichen, können Sie entweder Ihre Microsoft Windows™ Partition(en)\n"
-#~ "samt Daten löschen (siehe „Komplette Platte löschen“) oder Ihre "
-#~ "Microsoft\n"
-#~ "Windows NTFS oder FAT Partition verkleinern. Letzteres geht ohne\n"
-#~ "Datenverlust, vorausgesetzt Sie haben ihre Windows Partition(en) vorher\n"
-#~ "defragmentiert. Dennoch sollten Sie vor diesem Schritt eine "
-#~ "Sicherungskopie\n"
-#~ "Ihrer Daten auf einem anderem Medium als der zu verändernden Festplatte\n"
-#~ "vornehmen. Sie sollten diese Variante wählen, falls Sie beide\n"
-#~ "Betriebssysteme (Microsoft Windows und Mandriva Linux) nebeneinander "
-#~ "nutzen\n"
-#~ "wollen.\n"
-#~ "\n"
-#~ "   Bevor Sie sich für diese Variante entscheiden, sei hier noch einmal\n"
-#~ "betont, dass das bedeutet, Sie haben weniger Platz für Microsoft Windows\n"
-#~ "als momentan.\n"
-#~ "\n"
-#~ " * „%s“: Falls Sie alle Daten Ihrer Platte verlieren, und sie durch Ihr\n"
-#~ "neues Mandriva Linux System ersetzen wollen, wählen Sie diese "
-#~ "Schaltfläche.\n"
-#~ "Beachten Sie, dass dieser Schritt nicht rückgängig gemacht werden kann.\n"
-#~ "\n"
-#~ "   !! Wenn Sie diese Variante wählen, werden alle Ihre Daten auf der "
-#~ "Platte\n"
-#~ "gelöscht! !!\n"
-#~ "\n"
-#~ " * „%s“: Diese Option erscheint, wenn der gesamte Platz von Microsoft\n"
-#~ "Windows eingenommen wird. Bei der Auswahl der Option wird einfach der\n"
-#~ "gesamte Inhalt der Platte gelöscht und neu partitioniert.\n"
-#~ "\n"
-#~ "   !! Wenn Sie diese Variante wählen, werden alle Ihre Daten auf der "
-#~ "Platte\n"
-#~ "gelöscht! !!\n"
-#~ "\n"
-#~ " * „%s“: Wenn Sie Ihre Festplatte selbst von Hand partitionieren wollen,\n"
-#~ "dann können Sie diese Option wählen. Seien Sie bitte sehr sorgfältig, "
-#~ "wenn\n"
-#~ "Sie diese Lösung wählen, da Sie zwar alle möglichen Einstellungen\n"
-#~ "vornehmen, aber gleichzeitig auch sehr leicht Daten verlieren können. "
-#~ "Diese\n"
-#~ "Option ist nur geeignet, wenn Sie wissen, was Sie tun. Um zu erfahren, "
-#~ "wie\n"
-#~ "Sie DiskDrake verwenden können, lesen Sie bitte das Kapitel „Ihre\n"
-#~ "Partitionen verwalten“ im „Starter Handbuch“."
-
-#~ msgid ""
-#~ "If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
-#~ "reformat some of them and erase any data they contain. To do so, please\n"
-#~ "select those partitions as well.\n"
-#~ "\n"
-#~ "Please note that it's not necessary to reformat all pre-existing\n"
-#~ "partitions. You must reformat the partitions containing the operating\n"
-#~ "system (such as \"/\", \"/usr\" or \"/var\") but you do not have to "
-#~ "reformat\n"
-#~ "partitions containing data that you wish to keep (typically \"/home\").\n"
-#~ "\n"
-#~ "Please be careful when selecting partitions. After the formatting is\n"
-#~ "completed, all data on the selected partitions will be deleted and you\n"
-#~ "will not be able to recover it.\n"
-#~ "\n"
-#~ "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"
-#~ "Mandriva Linux 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."
-#~ msgstr ""
-#~ "Sie erhalten hier die Möglichkeit bereits existierende Partitionen neu "
-#~ "zu\n"
-#~ "formatieren, um die darauf vorhandenen Daten zu löschen. Markieren Sie\n"
-#~ "diese einfach ebenfalls in der Liste.\n"
-#~ "\n"
-#~ "Es sei angemerkt, dass nicht alle Partitionen neu formatiert werden "
-#~ "müssen.\n"
-#~ "Sie sollten normalerweise nur die Partitionen neu formatieren, die\n"
-#~ "Systemdateien, jedoch keine Privatdaten enthalten (etwa „/“, „/usr“ oder\n"
-#~ "„/var“). Partitionen wie etwa „/home“ sollten Sie normalerweise nicht "
-#~ "neu\n"
-#~ "formatieren.\n"
-#~ "\n"
-#~ "Seien Sie sorgfältig bei der Auswahl der Partitionen. Nach dem "
-#~ "Formatieren\n"
-#~ "sind alle zuvor darauf existierenden Daten unwiederbringlich verloren.\n"
-#~ "\n"
-#~ "Wenn Sie alle Einstellungen vorgenommen haben, betätigen Sie die\n"
-#~ "Schaltfläche „%s“, um mit dem Formatieren der Partitionen zu beginnen.\n"
-#~ "\n"
-#~ "Betätigen Sie „%s“, wenn Sie eine andere Partition für Ihr neues\n"
-#~ "Mandriva Linux vorgesehen haben.\n"
-#~ "\n"
-#~ "Betätigen Sie die Schaltfläche „%s“, falls Sie Partitionen auf defekte\n"
-#~ "Blöcke untersuchen wollen."
-
-#~ msgid ""
-#~ "By the time you install Mandriva Linux, 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"
-#~ "have a working Internet connection, or \"%s\" if you prefer to install\n"
-#~ "updated packages later.\n"
-#~ "\n"
-#~ "Choosing \"%s\" will display a list of web locations from which updates "
-#~ "can\n"
-#~ "be retrieved. You should choose one near to you. A package-selection "
-#~ "tree\n"
-#~ "will appear: review the selection, and press \"%s\" to retrieve and "
-#~ "install\n"
-#~ "the selected package(s), or \"%s\" to abort."
-#~ msgstr ""
-#~ "Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandriva Linux\n"
-#~ "Installation bereits einige Pakete aktualisiert wurden, etwa da noch "
-#~ "Fehler\n"
-#~ "entdeckt und beseitigt wurden oder da in Paketen Sicherheitslücken "
-#~ "entdeckt\n"
-#~ "wurden, für die bereits Lösungen existieren. Um von diesen "
-#~ "aktualisierten\n"
-#~ "Paketen Gebrauch zu machen, wird Ihnen nun angeboten, diese aus dem\n"
-#~ "Internet nachzuladen. Betätigen Sie die Schaltfläche „%s“, wenn Sie "
-#~ "einen\n"
-#~ "Internetzugang haben, um die Pakete zu installieren, andernfalls "
-#~ "betätigen\n"
-#~ "Sie die Schaltfläche „%s“. Sie können diese Pakete natürlich auch "
-#~ "jederzeit\n"
-#~ "nach der Installation noch installieren.\n"
-#~ "\n"
-#~ "Betätigen der Schaltfläche „%s“ zeigt Ihnen eine Liste von Servern, von\n"
-#~ "denen Sie die Aktualisierungen herunterladen können. Wählen Sie einen in\n"
-#~ "Ihrer Nähe. Sie erhalten dann einen Paketauswahldialog: Kontrollieren "
-#~ "Sie\n"
-#~ "die Auswahl und bestätigen Sie diese durch Betätigen von „%s“. Die "
-#~ "Pakete\n"
-#~ "werden nun angefordert und installiert. Sollten Sie das nicht wünschen,\n"
-#~ "betätigen Sie einfach die Schaltfläche „%s“."
-
-#~ msgid ""
-#~ "At this point, DrakX will allow you to choose the security level you "
-#~ "desire\n"
-#~ "for your machine. As a rule of thumb, the security level should be set\n"
-#~ "higher if the machine is to contain crucial data, or if it's to be "
-#~ "directly\n"
-#~ "exposed to the Internet. The trade-off that a higher security level is\n"
-#~ "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 Mandriva "
-#~ "Linux\n"
-#~ "Control Center.\n"
-#~ "\n"
-#~ "Fill the \"%s\" field with the e-mail address of the person responsible "
-#~ "for\n"
-#~ "security. Security messages will be sent to that address."
-#~ msgstr ""
-#~ "Nun ist es an der Zeit, mittels DrakX die gewünschte Sicherheitsebene "
-#~ "für\n"
-#~ "Ihr System festzulegen. Als Faustregel sollte hier dienen: Je "
-#~ "zugänglicher\n"
-#~ "die Maschine ist und je kritischer die auf ihr gesicherten Daten sind,\n"
-#~ "desto höher sollte die Sicherheitsebene sein. Andererseits geht die\n"
-#~ "gewonnene Sicherheit zulasten der Benutzerfreundlichkeit und "
-#~ "Einfachheit.\n"
-#~ "\n"
-#~ "Sollten Sie sich an dieser Stelle nicht sicher sein, so behalten Sie die\n"
-#~ "Standardeinstellung bei. Sie können die Ebene später noch mittels "
-#~ "draksec\n"
-#~ "im Mandriva Linux Control Center anpassen.\n"
-#~ "\n"
-#~ "Das Feld „%s“ dient dazu, dem System mitzuteilen, wer für die Sicherheit\n"
-#~ "dieses Rechners verantwortlich ist. An dieses Kennzeichen/diese E-Mail\n"
-#~ "Adresse werden sicherheitsrelevante Informationen per E-Mail versandt."
-
-#~ msgid ""
-#~ "At this point, you need to choose which partition(s) will be used for "
-#~ "the\n"
-#~ "installation of your Mandriva Linux 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"
-#~ "\n"
-#~ "To create partitions, you must first select a hard drive. You can select\n"
-#~ "the disk for partitioning by clicking on ``hda'' for the first IDE "
-#~ "drive,\n"
-#~ "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
-#~ "\n"
-#~ "To partition the selected hard drive, you can use these options:\n"
-#~ "\n"
-#~ " * \"%s\": this option deletes all partitions on the selected hard drive\n"
-#~ "\n"
-#~ " * \"%s\": this option enables you to automatically create ext3 and swap\n"
-#~ "partitions in the free space of your hard drive\n"
-#~ "\n"
-#~ "\"%s\": gives access to additional features:\n"
-#~ "\n"
-#~ " * \"%s\": saves the partition table to a floppy. Useful for later\n"
-#~ "partition-table recovery if necessary. It is strongly recommended that "
-#~ "you\n"
-#~ "perform this step.\n"
-#~ "\n"
-#~ " * \"%s\": allows you to restore a previously saved partition table from "
-#~ "a\n"
-#~ "floppy disk.\n"
-#~ "\n"
-#~ " * \"%s\": if your partition table is damaged, you can try to recover it\n"
-#~ "using this option. Please be careful and remember that it does not "
-#~ "always\n"
-#~ "work.\n"
-#~ "\n"
-#~ " * \"%s\": discards all changes and reloads the partition table that was\n"
-#~ "originally on the hard drive.\n"
-#~ "\n"
-#~ " * \"%s\": un-checking this option will force users to manually mount "
-#~ "and\n"
-#~ "unmount removable media such as floppies and CD-ROMs.\n"
-#~ "\n"
-#~ " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-#~ "hard drive. This is recommended if you do not have a good understanding "
-#~ "of\n"
-#~ "partitioning.\n"
-#~ "\n"
-#~ " * \"%s\": use this option to cancel your changes.\n"
-#~ "\n"
-#~ " * \"%s\": allows additional actions on partitions (type, options, "
-#~ "format)\n"
-#~ "and gives more information about the hard drive.\n"
-#~ "\n"
-#~ " * \"%s\": when you are finished partitioning your hard drive, this will\n"
-#~ "save your changes back to disk.\n"
-#~ "\n"
-#~ "When defining the size of a partition, you can finely set the partition\n"
-#~ "size by using the Arrow keys of your keyboard.\n"
-#~ "\n"
-#~ "Note: you can reach any option using the keyboard. Navigate through the\n"
-#~ "partitions using [Tab] and the [Up/Down] arrows.\n"
-#~ "\n"
-#~ "When a partition is selected, you can use:\n"
-#~ "\n"
-#~ " * Ctrl-c to create a new partition (when an empty partition is "
-#~ "selected)\n"
-#~ "\n"
-#~ " * Ctrl-d to delete a partition\n"
-#~ "\n"
-#~ " * Ctrl-m to set the mount point\n"
-#~ "\n"
-#~ "To get information about the different file system types available, "
-#~ "please\n"
-#~ "read the ext2FS chapter from the ``Reference Manual''.\n"
-#~ "\n"
-#~ "If you are installing on a PPC machine, you will want to create a small "
-#~ "HFS\n"
-#~ "``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-#~ "bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-#~ "may find it a useful place to store a spare kernel and ramdisk images "
-#~ "for\n"
-#~ "emergency boot situations."
-#~ msgstr ""
-#~ "Sie müssen nun entscheiden, auf welche(n) Partition(en) Ihr neues "
-#~ "Mandriva\n"
-#~ "Linux System installiert werden soll. Falls bereits Partitionen "
-#~ "existieren\n"
-#~ "(etwa von einer früheren Installation von GNU/Linux oder durch das "
-#~ "Erzeugen\n"
-#~ "mit einem anderen Partitionierungswerkzeug), können Sie diese verwenden.\n"
-#~ "Anderenfalls müssen Sie Partitionen definieren.\n"
-#~ "\n"
-#~ "Um Partitionen zu erzeugen müssen Sie erst eine Festplatte wählen. Sie\n"
-#~ "können die Platte wählen in dem Sie „hda“ für die erste IDE-Platte "
-#~ "wählen,\n"
-#~ "„sda“ für die erste SCSI-Platte, usw.\n"
-#~ "\n"
-#~ "Um die gewählte Platte zu partitionieren stehen folgende Möglichkeiten "
-#~ "zur\n"
-#~ "Verfügung:\n"
-#~ "\n"
-#~ " * „%s“: Betätigen dieser Schaltfläche löscht alle Partitionen auf der\n"
-#~ "markierten Festplatte.\n"
-#~ "\n"
-#~ " * „%s“: Dieser Punkt aktiviert die automatische ext3- und\n"
-#~ "Swap-Partitionen-Erstellung im ungenutzten Bereich Ihrer Festplatte.\n"
-#~ "\n"
-#~ "„%s“: bietet Zugriff auf weitere Möglichkeiten:\n"
-#~ "\n"
-#~ " * „%s“: Sie können hiermit Ihre aktuelle Partitionstabelle auf Diskette\n"
-#~ "speichern.\n"
-#~ "\n"
-#~ " * „%s“: Mit dieser Schaltfläche können Sie eine vorher auf Diskette\n"
-#~ "gesicherte Partitionstabelle wieder herstellen.\n"
-#~ "\n"
-#~ " * „%s“: Sollte Ihre Partitionstabelle zerstört worden sein, können Sie\n"
-#~ "versuchen, mit dieser Schaltfläche eine Restaurierung vorzunehmen. Seien\n"
-#~ "Sie vorsichtig! Es ist nicht unwahrscheinlich, dass dieser Versuch fehl\n"
-#~ "schlägt.\n"
-#~ "\n"
-#~ " * „%s“: Alle Änderungen verwerfen und mit der ursprünglichen\n"
-#~ "Partitionstabelle neu beginnen.\n"
-#~ "\n"
-#~ " * „%s“: Entfernen dieser Markierung führt dazu, dass die Anwender\n"
-#~ "hinterher die Wechselmedien manuell ein- und aushängen müssen.\n"
-#~ "\n"
-#~ " * „%s“: Falls Sie keine Ahnung haben wie Sie die Festplatte "
-#~ "partitionieren\n"
-#~ "sollen, wählen Sie diese Schaltfläche. Sie überlassen damit die gesamte\n"
-#~ "Arbeit unserem Assistenten, der mittels „Abra Kadabra“™ Ihre Platte\n"
-#~ "partitioniert.\n"
-#~ "\n"
-#~ " * „%s“: Mit dieser Schaltfläche können Sie alle Einstellungen "
-#~ "rückgängig\n"
-#~ "machen.\n"
-#~ "\n"
-#~ " * „%s“: Anbieten bzw. Maskieren von Zusatzmöglichkeiten.\n"
-#~ "\n"
-#~ " * „%s“: Nachdem Sie das Partitionieren Ihrer Festplatte beendet haben,\n"
-#~ "aktivieren Sie diese Schaltfläche, um Ihre Änderungen zu speichern.\n"
-#~ "\n"
-#~ "Wenn Sie die Größe einer Partition festlegen wollen, können Sie die\n"
-#~ "Feineinstellungen mit den Rechts- / Links-Pfeiltasten Ihrer Tastatur\n"
-#~ "vornehmen.\n"
-#~ "\n"
-#~ "Information: Sie können alle Einstellungen per Tastatur vornehmen. "
-#~ "Mittels\n"
-#~ "[Tab] und den Hoch-/Runter-Pfeiltasten können Sie sich bewegen.\n"
-#~ "\n"
-#~ "Wenn eine Partition ausgewählt ist, können Sie mittels:\n"
-#~ "\n"
-#~ " * Strg-C - eine neue Partition erstellen (wenn Sie auf einer leeren\n"
-#~ "Partition sind)\n"
-#~ "\n"
-#~ " * Strg-D - die Partition löschen\n"
-#~ "\n"
-#~ " * Strg-M - den Einhängpunkt festlegen.\n"
-#~ "\n"
-#~ "Um mehr Informationen über die verschiedenen Dateisystemtypen zu "
-#~ "erhalten,\n"
-#~ "lesen Sie bitte das Kapitel ext2FS in der „Referenz“.\n"
-#~ "\n"
-#~ "Falls Sie die Installation auf einem PPC-Rechner vornehmen, sollten Sie\n"
-#~ "eine mindestens 1MB, große HFS Start-Partition für den\n"
-#~ "Betriebssystemstarter yaboot erstellen. Wenn Sie diese Partition etwas\n"
-#~ "größer dimensionieren, etwa 50MB, haben Sie einen geeigneten Platz, um\n"
-#~ "einen Rettungskern samt RamDisk abzulegen, um in Notfällen starten zu\n"
-#~ "können."
-
-#~ 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"
-#~ "Mandriva Linux operating system.\n"
-#~ "\n"
-#~ "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
-#~ "\"Capacity\".\n"
-#~ "\n"
-#~ "\"Linux name\" is structured: \"hard drive type\", \"hard drive number"
-#~ "\",\n"
-#~ "\"partition number\" (for example, \"hda1\").\n"
-#~ "\n"
-#~ "\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-#~ "\"sd\" if it is a SCSI hard drive.\n"
-#~ "\n"
-#~ "\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With "
-#~ "IDE\n"
-#~ "hard drives:\n"
-#~ "\n"
-#~ " * \"a\" means \"master hard drive on the primary IDE controller\";\n"
-#~ "\n"
-#~ " * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
-#~ "\n"
-#~ " * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
-#~ "\n"
-#~ " * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
-#~ "\n"
-#~ "With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
-#~ "\"second lowest SCSI ID\", etc.\n"
-#~ "\n"
-#~ "\"Windows name\" is the letter of your hard drive under Windows (the "
-#~ "first\n"
-#~ "disk or partition is called \"C:\")."
-#~ msgstr ""
-#~ "Es wurde mehr als eine Windows-Partition gefunden. Wählen Sie bitte, "
-#~ "welche\n"
-#~ "Sie verkleinern wollen, um Platz für Ihr neues Mandriva Linux zu "
-#~ "schaffen.\n"
-#~ "\n"
-#~ "Die Partitionen werden folgendermaßen aufgelistet: „Linux-Name“,\n"
-#~ "„Windows-Name“, „Kapazität“.\n"
-#~ "\n"
-#~ "„Linux-Name“ hat folgende Struktur: „Festplattentyp“, "
-#~ "„Festplattennummer“,\n"
-#~ "„Partitionsnummer“ (etwa „hda1“).\n"
-#~ "\n"
-#~ "„Festplattentyp“ ist „hd“, falls Ihre Platte eine IDE/ATAPI-Platte ist, "
-#~ "und\n"
-#~ "„sd“, wenn es sich um eine SCSI-Platte handelt.\n"
-#~ "\n"
-#~ "„Festplattennummer“ ist immer der Buchstabe hinter dem Festplattentyp. "
-#~ "Bei\n"
-#~ "IDE-Platten bedeutet:\n"
-#~ "\n"
-#~ " * „a“ ist „Master-Platte am primären IDE-Controller“;\n"
-#~ "\n"
-#~ " * „b“ ist „Slave-Platte am primären IDE-Controller“;\n"
-#~ "\n"
-#~ " * „c“ ist „Master-Platte am sekundären IDE-Controller“;\n"
-#~ "\n"
-#~ " * „d“ ist „Slave-Platte am sekundären IDE-Controller“;\n"
-#~ "\n"
-#~ "Bei SCSI-Platten steht „a“ für „niedrigste SCSI-ID“, „b“ für\n"
-#~ "„zweitniedrigste SCSI-ID“, etc.\n"
-#~ "\n"
-#~ "„Windows-Name“ ist der Buchstabe, den die Partition (vermutlich) unter\n"
-#~ "Windows erhalten würde (die erste Partition der ersten Platte heißt „C:“)."
-
-#~ msgid ""
-#~ "This step is activated only if an existing GNU/Linux partition has been\n"
-#~ "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 Mandriva Linux 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"
-#~ "your existing data (notably \"home\" directories) from being over-"
-#~ "written.\n"
-#~ "If you wish to change how your hard drives are partitioned, or to change\n"
-#~ "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 Mandriva Linux 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 Mandriva Linux systems\n"
-#~ "running version \"8.1\" or later. Performing an upgrade on versions "
-#~ "prior\n"
-#~ "to Mandriva Linux version \"8.1\" is not recommended."
-#~ msgstr ""
-#~ "Dieser Schritt wird nur aufgerufen, wenn mindestens eine GNU/Linux\n"
-#~ "Partition auf Ihren Festplatten gefunden wird.\n"
-#~ "\n"
-#~ "DrakX fragt Sie nun nach der gewünschten Installationsart. Sie haben die\n"
-#~ "Wahl zwischen einer Aktualisierung einer bereits vorhandenen\n"
-#~ "Mandriva Linux-Version oder einer kompletten Neuinstallation:\n"
-#~ "\n"
-#~ " * „%s“: Entfernt komplett ältere Versionen von Mandriva Linux, die noch\n"
-#~ "installiert sind - um genau zu sein, können Sie je nach aktuellem Inhalt\n"
-#~ "Ihrer Platte auch einige ältere Linux- oder anderweitige Partitionen\n"
-#~ "unangetastet behalten. Diese Installationsart ist gut, wenn Sie die\n"
-#~ "Partitionseinteilung auf Ihrer Festplatte sowieso ändern oder das "
-#~ "benutzte\n"
-#~ "Dateisystem austauschen wollen\n"
-#~ "\n"
-#~ " * „%s“: Mit dieser Variante können Sie eine existierende Mandriva Linux\n"
-#~ "Version aktualisieren. Die Partitionstabellen sowie die persönlichen\n"
-#~ "Verzeichnisse der Anwender bleiben erhalten. Alle anderen\n"
-#~ "Installationsschritte werden wie bei einer Installation ausgeführt.\n"
-#~ "\n"
-#~ "Aktualisierungen von Mandriva Linux „8.1“ oder neueren Systemen sollten\n"
-#~ "problemlos funktionieren. Ältere Versionen von Mandriva Linux sollten "
-#~ "Sie\n"
-#~ "nicht zu aktualisieren versuchen."
-
-#~ msgid ""
-#~ "The first step is to choose your preferred language.\n"
-#~ "\n"
-#~ "Your choice of preferred language will affect the installer, the\n"
-#~ "documentation, and the system in general. First select the region you're\n"
-#~ "located in, then the language you speak.\n"
-#~ "\n"
-#~ "Clicking on the \"%s\" button will allow you to select other languages "
-#~ "to\n"
-#~ "be installed on your workstation, thereby installing the language-"
-#~ "specific\n"
-#~ "files for system documentation and applications. For example, if Spanish\n"
-#~ "users are to use your machine, select English as the default language in\n"
-#~ "the tree view and \"%s\" in the Advanced section.\n"
-#~ "\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, Mandriva Linux'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"
-#~ "languages, Russian, Japanese, Chinese, Korean, Thai, Greek, Turkish, "
-#~ "most\n"
-#~ "iso-8859-2 languages), the legacy encoding will be used by default;\n"
-#~ "\n"
-#~ " * Other languages will use unicode by default;\n"
-#~ "\n"
-#~ " * If two or more languages are required, and those languages are not "
-#~ "using\n"
-#~ "the same encoding, then unicode will be used for the whole system;\n"
-#~ "\n"
-#~ " * Finally, unicode can also be forced for use throughout the system at "
-#~ "a\n"
-#~ "user's request by selecting the \"%s\" option independently of which\n"
-#~ "languages were been chosen.\n"
-#~ "\n"
-#~ "Note that you're not limited to choosing a single additional language. "
-#~ "You\n"
-#~ "may choose several, or even install them all by selecting the \"%s\" "
-#~ "box.\n"
-#~ "Selecting support for a language means translations, fonts, spell "
-#~ "checkers,\n"
-#~ "etc. will also be installed for that language.\n"
-#~ "\n"
-#~ "To switch between the various languages installed on your system, you "
-#~ "can\n"
-#~ "launch the \"localedrake\" command as \"root\" to change the language "
-#~ "used\n"
-#~ "by the entire system. Running the command as a regular user will only\n"
-#~ "change the language settings for that particular user."
-#~ msgstr ""
-#~ "Als ersten Schritt wählen Sie bitte die gewünschte Sprache.\n"
-#~ "\n"
-#~ "Wählen Sie Ihre bevorzugte Sprache für den Installationsvorgang und\n"
-#~ "Systemlaufzeit. Wählen Sie zuerst die Region, in der Sie sich befinden,\n"
-#~ "anschließend die Sprache, die Sie sprechen.\n"
-#~ "\n"
-#~ "Durch Betätigen der Schaltfläche „%s“ erhalten Sie die Möglichkeit, "
-#~ "weitere\n"
-#~ "Sprachen auf Ihrem Rechner zu installieren, um diese später verwenden zu\n"
-#~ "können. Wollen Sie etwa Spaniern muttersprachlichen Zugang zu Ihrem "
-#~ "System\n"
-#~ "erlauben, wählen Sie Deutsch als Hauptsprache in der Liste und im\n"
-#~ "Fortgeschrittenen-Bereich „%s“.\n"
-#~ "\n"
-#~ "Zur UTF-8 (Unicode) Unterstützung: Unicode ist ein Zeichenkodierung, die\n"
-#~ "die existierenden Kodierungen ablösen soll und die Zeichen aller\n"
-#~ "existierender Sprachen beinhalten. Komplette Unterstützung in GNU/Linux "
-#~ "ist\n"
-#~ "leider immer noch nicht gegeben. Daher verwendet Mandriva Linux diese\n"
-#~ "Kodierung nur auf Wunsch des Anwenders:\n"
-#~ "\n"
-#~ " * Falls Sie eine Sprache nutzen, die eine gut unterstütztes Kodierung\n"
-#~ "verwendet (Sprachen mit Lateinischen Zeichen, Russisch, Griechisch,\n"
-#~ "Japanisch, Chinesisch, Koreanisch, Thailändisch), wird standardmäßig das\n"
-#~ "klassische Kodierung beibehalten;\n"
-#~ "\n"
-#~ " * Alle anderen Sprachen verwenden standardmäßig Unicode;\n"
-#~ "\n"
-#~ " * Fall Sie zwei oder mehr Sprachen verwenden wollen, die "
-#~ "unterschiedliche\n"
-#~ "klassische Kodierungen verwenden, wird ebenfalls Unicode verwendet;\n"
-#~ "\n"
-#~ " * Schlussendlich kann Unicode vom Anwender auch für Sprachen mit\n"
-#~ "klassischer Kodierung ausgewählt werden, indem er den Punkt „%s“ "
-#~ "markiert.\n"
-#~ "\n"
-#~ "Sie sind nicht auf eine weitere Sprache begrenzt. Sie können so viele\n"
-#~ "auswählen, wie Sie wollen, ja sogar alle, indem Sie die Schaltfläche „%"
-#~ "s“\n"
-#~ "verwenden. Das Auswählen einer Sprache beeinflusst die installierten\n"
-#~ "Übersetzungen der Programme, Schriften, Rechtschreibkorrekturen, etc.\n"
-#~ "\n"
-#~ "Um die Spracheinstellungen des ganzen Systems zwischen verschiedenen\n"
-#~ "Sprachen umzuschalten, starten Sie einfach „localedrake“ unter dem\n"
-#~ "privilegierten Kennzeichen „root“. Wollen Sie die Einstellungen nur für "
-#~ "ein\n"
-#~ "Kennzeichen ändern starten Sie denselben Befehl mit eben diesem\n"
-#~ "Kennzeichen."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
-#~ msgid ""
-#~ "Now, it's time to select a printing system for your computer. Other\n"
-#~ "operating systems may offer you one, but Mandriva Linux 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"
-#~ "if you have a direct connection to your printer, you want to be able to\n"
-#~ "panic out of printer jams, and you do not have networked printers. (\"%s"
-#~ "\"\n"
-#~ "will handle only very simple network cases and is somewhat slow when "
-#~ "used\n"
-#~ "within networks.) It's recommended that you use \"pdq\" if this is your\n"
-#~ "first experience with GNU/Linux.\n"
-#~ "\n"
-#~ " * \"%s\" stands for `` Common Unix Printing System'' and is an "
-#~ "excellent\n"
-#~ "choice for printing to your local printer or to one halfway around the\n"
-#~ "planet. It's simple to configure and can act as a server or a client for\n"
-#~ "the ancient \"lpd\" printing system, so it's compatible with older\n"
-#~ "operating systems which may still need print services. While quite\n"
-#~ "powerful, the basic setup is almost as easy as \"pdq\". If you need to\n"
-#~ "emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon.\n"
-#~ "\"%s\" includes graphical front-ends for printing or choosing printer\n"
-#~ "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 Mandriva Linux\n"
-#~ "Control Center and clicking on the \"%s\" button."
-#~ msgstr ""
-#~ "Hier können Sie das Drucksystem für Ihren Rechner wählen. Andere\n"
-#~ "Betriebssysteme bieten Ihnen nur eines, bei Mandriva Linux können Sie\n"
-#~ "zwischen zwei verschiedenen wählen. jedes dieser Systeme ist für eine\n"
-#~ "bestimmte Konfiguration des Systems am besten geeignet.\n"
-#~ "\n"
-#~ " * „%s“ -- Es steht für „print, do not queue“ (engl. für „Drucken ohne\n"
-#~ "Warteschlange“). Falls Sie einen Drucker haben, der direkt an Ihrem "
-#~ "Rechner\n"
-#~ "hängt und Sie keine Netzwerkdrucker verwenden wollen, ist dies das\n"
-#~ "Drucksystem Ihrer Wahl. „%s“ kann zwar auch mit Netzwerkdruckern umgehen, "
-#~ "ist\n"
-#~ "dabei aber extrem langsam. Wählen Sie „pdq“, wenn Sie ein GNU/Linux "
-#~ "Neuling\n"
-#~ "sind.\n"
-#~ "\n"
-#~ " * „%s“ - Mit dem „Common Unix Printing System“ (engl. für „Allgemeines\n"
-#~ "Unix-Drucksystem“) können Sie ebensogut auf Ihrem direkt angeschlossenen\n"
-#~ "Drucker drucken, wie auf einem Drucker, der an einem Server auf der "
-#~ "anderen\n"
-#~ "Seite der Welt hängt. Es ist einfach zu bedienen und kann sowohl als "
-#~ "Server\n"
-#~ "als auch als Klient für das alte „lpd“-Drucksystem verwendet werden - Es\n"
-#~ "ist somit rückwärtskompatibel. Es ist sehr mächtig, in seiner\n"
-#~ "Grundeinstellung verhält es sich jedoch genau wie „pdq“. Wenn Sie einen\n"
-#~ "„lpd“ Server benötigen, müssen Sie einfach nur den „cups-lpd“ Dämon\n"
-#~ "starten. „%s“ bietet grafische Konfigurations- und Druckmenüs.\n"
-#~ "\n"
-#~ "Sie können diese Wahl später immer wieder ändern, indem Sie PrinterDrake\n"
-#~ "aus dem Mandriva Linux Control Center starten und dort die Schaltfläche „%"
-#~ "s“\n"
-#~ "betätigen."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
-#~ msgid ""
-#~ "As a review, DrakX will present a summary of information it has gathered\n"
-#~ "about your system. Depending on the hardware installed on your machine, "
-#~ "you\n"
-#~ "may have some or all of the following entries. Each entry is made up of "
-#~ "the\n"
-#~ "hardware item to be configured, followed by a quick summary of the "
-#~ "current\n"
-#~ "configuration. Click on the corresponding \"%s\" button to make the "
-#~ "change.\n"
-#~ "\n"
-#~ " * \"%s\": check the current keyboard map configuration and change it if\n"
-#~ "necessary.\n"
-#~ "\n"
-#~ " * \"%s\": check the current country selection. If you're not in this\n"
-#~ "country, click on the \"%s\" button and choose another. If your country\n"
-#~ "is not in the list shown, click on the \"%s\" button to get the complete\n"
-#~ "country list.\n"
-#~ "\n"
-#~ " * \"%s\": by default, DrakX deduces your time zone based on the country\n"
-#~ "you have chosen. You can click on the \"%s\" button here if this is not\n"
-#~ "correct.\n"
-#~ "\n"
-#~ " * \"%s\": verify the current mouse configuration and click on the "
-#~ "button\n"
-#~ "to change it if necessary.\n"
-#~ "\n"
-#~ " * \"%s\": clicking on the \"%s\" button will open the printer\n"
-#~ "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-#~ "Guide'' for more information on how to set up a new printer. The "
-#~ "interface\n"
-#~ "presented in our manual is similar to the one used during installation.\n"
-#~ "\n"
-#~ " * \"%s\": if a sound card is detected on your system, it'll be "
-#~ "displayed\n"
-#~ "here. If you notice the sound card is not the one actually present on "
-#~ "your\n"
-#~ "system, you can click on the button and choose a different driver.\n"
-#~ "\n"
-#~ " * \"%s\": if you have a TV card, this is where information about its\n"
-#~ "configuration will be displayed. If you have a TV card and it is not\n"
-#~ "detected, click on \"%s\" to try to configure it manually.\n"
-#~ "\n"
-#~ " * \"%s\": you can click on \"%s\" to change the parameters associated "
-#~ "with\n"
-#~ "the card if you feel the configuration is wrong.\n"
-#~ "\n"
-#~ " * \"%s\": by default, DrakX configures your graphical interface in\n"
-#~ "\"800x600\" or \"1024x768\" resolution. If that does not suit you, click "
-#~ "on\n"
-#~ "\"%s\" to reconfigure your graphical interface.\n"
-#~ "\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"
-#~ "Mandriva Linux 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"
-#~ "you're installing on is to be located behind a proxy server.\n"
-#~ "\n"
-#~ " * \"%s\": this entry allows you to redefine the security level as set in "
-#~ "a\n"
-#~ "previous step ().\n"
-#~ "\n"
-#~ " * \"%s\": if you plan to connect your machine to the Internet, it's a "
-#~ "good\n"
-#~ "idea to protect yourself from intrusions by setting up a firewall. "
-#~ "Consult\n"
-#~ "the corresponding section of the ``Starter Guide'' for details about\n"
-#~ "firewall settings.\n"
-#~ "\n"
-#~ " * \"%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"
-#~ "Mandriva Linux 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"
-#~ "idea to review this setup."
-#~ msgstr ""
-#~ "Nun bekommen Sie eine Zusammenfassung verschiedener Informationen Ihres\n"
-#~ "Systems. Je nach vorhandener Hardware sehen Sie hier (oder eben nicht) "
-#~ "die\n"
-#~ "folgende Einträge. Jeder Eintrag besteht aus einem konfigurierbaren "
-#~ "Gerät\n"
-#~ "gefolgt vom dessen aktuellen Zustand. Durch Betätigen der Schaltfläche „%"
-#~ "s“\n"
-#~ "können Sie diesen ändern.\n"
-#~ "\n"
-#~ " * „%s“: Kontrollieren Sie die aktuelle Tastaturvorgabe und wählen Sie "
-#~ "die\n"
-#~ "Schaltfläche, falls Sie die Vorgabe ändern wollen.\n"
-#~ "\n"
-#~ " * „%s“: Kontrollieren Sie, ob die Auswahl des Staates, in dem Sie sich\n"
-#~ "befinden korrekt ist. Falls nicht, betätigen Sie bitte die Schaltfläche\n"
-#~ "„%s“ und wählen Sie den richtigen. Ist Ihr Staat nicht in der Liste, "
-#~ "können\n"
-#~ "Sie über die Schaltfläche „%s“ eine vollständigere Liste erzwingen.\n"
-#~ "\n"
-#~ " * „%s“: DrakX versucht die Zeitzone anhand des gewählten Staates zu\n"
-#~ "setzen. Sollte diese Auswahl nicht korrekt sein können Sie durch "
-#~ "Betätige\n"
-#~ "der Schaltfläche „%s“ Ihre lokale Zeitzone setzen.\n"
-#~ "\n"
-#~ " * „%s“: Kontrollieren Sie die konfigurierte Maus und betätigen Sie, "
-#~ "falls\n"
-#~ "notwendig, die Schaltfläche.\n"
-#~ "\n"
-#~ " * „%s“: Durch Anwahl der Schaltfläche „%s“ startet den "
-#~ "Druckerassistenten.\n"
-#~ "Weitere Informationen zu diesem Assistenten erhalten Sie im Drucker-"
-#~ "Kapitel\n"
-#~ "des „Starter Handbuch“. Das dort vorgestellte Programm entspricht dem\n"
-#~ "während der Installation angebotenen.\n"
-#~ "\n"
-#~ " * „%s“: Falls eine Soundkarte in Ihrem Rechner gefunden wurde, wird sie\n"
-#~ "hier angezeigt. Sollte die von DrakX getroffene Auswahl nicht korrekt "
-#~ "sein,\n"
-#~ "betätigen Sie einfach die Schaltfläche, um sie zu korrigieren.\n"
-#~ "\n"
-#~ " * „%s“: Falls eine TV-Karte in Ihrem Rechner gefunden wurde, wird sie "
-#~ "hier\n"
-#~ "angezeigt. Falls Sie eine TV-Karte besitzen, die hier nicht richtig "
-#~ "erkannt\n"
-#~ "wurde, können Sie versuchen, diese manuell einzurichten. Betätigen Sie\n"
-#~ "einfach die Schaltfläche „%s“.\n"
-#~ "\n"
-#~ " * „%s“: Falls eine ISDN Karte in Ihrem Rechner gefunden wurde, wird sie\n"
-#~ "hier angezeigt. Durch Anwahl der Schaltfläche „%s“ können Sie die "
-#~ "Parameter\n"
-#~ "ändern.\n"
-#~ "\n"
-#~ " * „%s“: DrakX richtet Ihre Grafikumgebung normalerweise in der "
-#~ "Auflösung\n"
-#~ "„800×600“ bzw. „1024×768“ ein. Sollte Ihnen das nicht zusagen, können "
-#~ "Sie\n"
-#~ "es durch betätigen der Schaltfläche „%s“ ändern.\n"
-#~ "\n"
-#~ " * „%s“: Falls Sie Ihren Internetzugang oder Ihr lokales Netzwerk nun\n"
-#~ "einrichten wollen, können Sie das hier tun. Lesen Sie sich dazu die\n"
-#~ "gedruckte Dokumentation durch oder benutzen Sie das Mandriva Linux "
-#~ "Control\n"
-#~ "Center nachdem die Installation beendet ist.\n"
-#~ "\n"
-#~ " * „%s“: Hier können Sie HTTP- und FTP-Proxyadressen eintragen falls "
-#~ "Ihre\n"
-#~ "Maschine die Verbindung über einen Proxyserver abwickelt.\n"
-#~ "\n"
-#~ " * „%s“: Dieser Eintrag ermöglicht es Ihnen, die Sicherheitsebene Ihres\n"
-#~ "Systems zu ändern, die Sie in einem früheren Installationsschritt ()\n"
-#~ "gewählt haben.\n"
-#~ "\n"
-#~ " * „%s“: Falls Sie Ihren Rechner mit dem Internet verbinden wollen, ist "
-#~ "es\n"
-#~ "sinnvoll sich vor ungebetenen Eindringlingen durch Einrichten einer\n"
-#~ "Firewall zu schützen. Weitere Informationen erhalten Sie im „Starter\n"
-#~ "Handbuch“.\n"
-#~ "\n"
-#~ " * „%s“: Falls Sie die Konfiguration Ihres Betriebssystemstarters\n"
-#~ "(„Bootloader“) ändern wollen, wählen Sie diese Schaltfläche. Es sei\n"
-#~ "angemerkt, dass dieser Punkt sich an fortgeschrittenere Nutzer richtet.\n"
-#~ "Hilfe finden Sie in der gedruckten Dokumentation oder im integrierten\n"
-#~ "Hilfeteil des Mandriva Linux Control Center.\n"
-#~ "\n"
-#~ " * „%s“: Sie können hier die Dienste wählen, die ab dem Start von\n"
-#~ "Mandriva Linux zur Verfügung gestellt werden sollen. Wollen Sie den "
-#~ "Rechner\n"
-#~ "als Server verwenden, sollten Sie unbedingt einen Blick auf diese Liste\n"
-#~ "werfen."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
-#~ msgid ""
-#~ "Choose the hard drive you want to erase in order to install your new\n"
-#~ "Mandriva Linux partition. Be careful, all data on this drive will be "
-#~ "lost\n"
-#~ "and will not be recoverable!"
-#~ msgstr ""
-#~ "Bitte wählen Sie die Festplatte, die Sie löschen wollen, um Ihr neues\n"
-#~ "Mandriva Linux zu installieren. Bedenken Sie dabei, dass alle Daten auf\n"
-#~ "dieser Platte nach diesem Schritt unwiederbringlich verloren sind!"
-
-#~ msgid ""
-#~ "Your Windows partition is too fragmented. Please reboot your computer "
-#~ "under Windows, run the ``defrag'' utility, then restart the Mandriva "
-#~ "Linux installation."
-#~ msgstr ""
-#~ "Ihre Windows-Partition ist zu sehr fragmentiert.\n"
-#~ "Starten Sie bitte erst „defrag“ unter Windows."
-
-#~ msgid ""
-#~ "Introduction\n"
-#~ "\n"
-#~ "The operating system and the different components available in the "
-#~ "Mandriva Linux distribution \n"
-#~ "shall be called the \"Software Products\" hereafter. The Software "
-#~ "Products include, but are not \n"
-#~ "restricted to, the set of programs, methods, rules and documentation "
-#~ "related to the operating \n"
-#~ "system and the different components of the Mandriva Linux distribution.\n"
-#~ "\n"
-#~ "\n"
-#~ "1. License Agreement\n"
-#~ "\n"
-#~ "Please read this document carefully. This document is a license agreement "
-#~ "between you and  \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"
-#~ "the Software Products. \n"
-#~ "Any attempt to install, duplicate or use the Software Products in a "
-#~ "manner which does not comply \n"
-#~ "with the terms and conditions of this License is void and will terminate "
-#~ "your rights under this \n"
-#~ "License. Upon termination of the License,  you must immediately destroy "
-#~ "all copies of the \n"
-#~ "Software Products.\n"
-#~ "\n"
-#~ "\n"
-#~ "2. Limited Warranty\n"
-#~ "\n"
-#~ "The Software Products and attached documentation are provided \"as is\", "
-#~ "with no warranty, to the \n"
-#~ "extent permitted by law.\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 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, 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 Mandriva Linux sites  which are prohibited or restricted in "
-#~ "some countries by local laws.\n"
-#~ "This limited liability applies to, but is not restricted to, the strong "
-#~ "cryptography components \n"
-#~ "included in the Software Products.\n"
-#~ "\n"
-#~ "\n"
-#~ "3. The GPL License and Related Licenses\n"
-#~ "\n"
-#~ "The Software Products consist of components created by different persons "
-#~ "or entities.  Most \n"
-#~ "of these components are governed under the terms and conditions of the "
-#~ "GNU General Public \n"
-#~ "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 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"
-#~ "4. Intellectual Property Rights\n"
-#~ "\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"
-#~ "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\", \"Mandriva Linux\" and associated logos are trademarks of "
-#~ "Mandriva S.A.  \n"
-#~ "\n"
-#~ "\n"
-#~ "5. Governing Laws \n"
-#~ "\n"
-#~ "If any portion of this agreement is held void, illegal or inapplicable by "
-#~ "a court judgment, this \n"
-#~ "portion is excluded from this contract. You remain bound by the other "
-#~ "applicable sections of the \n"
-#~ "agreement.\n"
-#~ "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 Mandriva S.A.  \n"
-#~ msgstr ""
-#~ "Bei dieser Übersetzung handelt es sich um eine inoffizielle Übersetzung\n"
-#~ "der Mandriva Linux-Lizenz in die deutsche Sprache. Sie ist keine\n"
-#~ "rechtsverbindliche Darstellung der Lizenzbedingungen der Software in\n"
-#~ "dieser Distribution - nur der ursprüngliche französische Text der\n"
-#~ "Mandriva Linux-Lizenz ist rechtsverbindlich. Wir hoffen aber, dass diese\n"
-#~ "Übersetzung den deutschsprechenden Benutzern das Verständnis dieser\n"
-#~ "Lizenz erleichtert.\n"
-#~ "\n"
-#~ "\n"
-#~ "Einführung\n"
-#~ "\n"
-#~ "Das Betriebssystem und die anderen Komponenten, die in Mandriva Linux\n"
-#~ "enthalten sind, werden hier „Software-Produkte“ genannt. Die\n"
-#~ "Software-Produkte umfassen, aber sind nicht beschränkt auf, die\n"
-#~ "Gesamtheit der Programme, Methoden, Regeln, und Dokumentation, welche\n"
-#~ "zum Betriebssystem und den anderen Komponenten der Mandriva Linux\n"
-#~ "Distribution gehören.\n"
-#~ "\n"
-#~ "\n"
-#~ "1. Lizenzabkommen\n"
-#~ "\n"
-#~ "Bitte lesen Sie dieses Dokument sorgfältig. Dieses Dokument ist ein\n"
-#~ "Lizenzabkommen zwischen Ihnen und Mandriva S. A. welches sich auf\n"
-#~ "die Software-Produkte bezieht.\n"
-#~ "Durch Installation, Duplizierung oder Benutzung der Software-Produkte in\n"
-#~ "irgendeiner Art und Weise erklären Sie sich mit den Bedingungen dieser\n"
-#~ "Lizenz einverstanden.\n"
-#~ "Wenn Sie mit irgendeinem Punkt dieser Lizenz nicht einverstanden sind,\n"
-#~ "ist es Ihnen nicht erlaubt, die Software-Produkte zu installieren,\n"
-#~ "duplizieren oder zu benutzen.\n"
-#~ "Mit jedem Versuch, die Software-Produkte in einer Art und Weise zu\n"
-#~ "benutzen, die nicht den Bedingungen dieser Lizenz entspricht, verlieren\n"
-#~ "Sie die Ihnen mit dieser Lizenz eingeräumten Rechte. In diesem Fall\n"
-#~ "haben Sie unverzüglich alle Kopien der Software-Produkte zu vernichten.\n"
-#~ "\n"