various Mandrake -> Mandriva changes

author: Pablo Saratxaga <pablo@mandriva.com> 2005-04-23 17:14:40 +0000
committer: Pablo Saratxaga <pablo@mandriva.com> 2005-04-23 17:14:40 +0000
commit: 51e407e126f0746aed8b86e733da2ef71698ded8 (patch)
tree: ad215f35cd3b3ee195ea42648078f71745c7126b
parent: ca012347134ab4eec6f196b5f86c9fc1f25cb5b7 (diff)
download: drakx-51e407e126f0746aed8b86e733da2ef71698ded8.tar
drakx-51e407e126f0746aed8b86e733da2ef71698ded8.tar.gz
drakx-51e407e126f0746aed8b86e733da2ef71698ded8.tar.bz2
drakx-51e407e126f0746aed8b86e733da2ef71698ded8.tar.xz
drakx-51e407e126f0746aed8b86e733da2ef71698ded8.zip
0 files changed, 0 insertions, 0 deletions
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"
-#~ "\n"
-#~ "2. Eingeschränkte Garantie\n"
-#~ "\n"
-#~ "Die Software-Produkte und die beigefügte Dokumentation werden dem\n"
-#~ "Benutzer lediglich zur Verfügung gestellt, es wird keinerlei Garantie\n"
-#~ "gegeben soweit es gesetzlich zulässig ist.\n"
-#~ "Mandriva S. A. haftet unter keinen Umständen, soweit gesetzlich\n"
-#~ "zulässig, für direkte oder indirekte Schäden irgendwelcher Art,\n"
-#~ "(inklusive uneingeschränkten Schäden aufgrund Verlust von\n"
-#~ "Geschäftsbeziehungen, Unterbrechung von Geschäftsvorgängen,\n"
-#~ "finanziellen Verlust, Gebühren oder Strafen aufgrund gerichtlicher\n"
-#~ "Entscheide, oder jegliche Folgeschäden) die aufgrund der Benutzung oder\n"
-#~ "der Unmöglichkeit der Benutzung der Software-Produkte entstehen, auch\n"
-#~ "wenn Mandriva S. A. über die Möglichkeit und das Auftreten\n"
-#~ "derartiger Schäden unterrichtet wurde.\n"
-#~ "\n"
-#~ "\n"
-#~ "EINGESCHRÄNKTE VERANTWORTLICHKEIT BEZOGEN AUF DEN BESITZ UND DIE\n"
-#~ "BENUTZUNG VON SOFTWARE, DIE IN EINIGEN LÄNDERN VERBOTEN IST.\n"
-#~ "\n"
-#~ "\n"
-#~ "Soweit gesetzlich zulässig, haften Mandriva S. A. und deren\n"
-#~ "Vertreiber unter keinen Umständen für direkte oder indirekte Schäden\n"
-#~ "irgendwelcher Art, (inklusive uneingeschränkten Schäden aufgrund Verlust\n"
-#~ "von Geschäftsbeziehungen, Unterbrechung von Geschäftsvorgängen,\n"
-#~ "finanziellen Verlust, Gebühren oder Strafen aufgrund gerichtlicher\n"
-#~ "Entscheide, oder jegliche Folgeschäden) die aufgrund des Besitzes und\n"
-#~ "der Benutzung von Software-Komponenten oder aufgrund des Ladens von\n"
-#~ "Software-Komponenten von den Internet-Servern von Mandriva S. A.,\n"
-#~ "deren Besitz und Benutzung in einigen Ländern aufgrund lokaler Gesetze\n"
-#~ "nicht gestattet ist, entstehen.\n"
-#~ "Diese Einschränkung der Verantwortlichkeit bezieht sich auch, aber nicht\n"
-#~ "nur, auf die Komponenten für starke Kryptografie enthalten in den\n"
-#~ "Software-Produkten.\n"
-#~ "\n"
-#~ "\n"
-#~ "3. Die GPL und verwandte Lizenzen\n"
-#~ "\n"
-#~ "Die Software-Produkte bestehen aus Komponenten, die von verschiedenen\n"
-#~ "Personen und Einrichtungen erstellt wurden. Die meisten Komponenten\n"
-#~ "unterliegen den Bedingungen der GNU General Public License, im folgenden\n"
-#~ "„GPL“ genannt, oder ähnlichen Lizenzen. Die meisten dieser Lizenzen\n"
-#~ "erlauben es, die Komponenten, die diesen Lizenzen unterliegen, zu\n"
-#~ "benutzen, zu duplizieren, anzupassen, und weiterzugeben. Bitte lesen sie\n"
-#~ "sorgfältig die Bedingungen der Lizenzabkommen von jeder Komponente,\n"
-#~ "bevor Sie sie benutzen. Jegliche Frage zur Lizenz einer Komponente ist "
-#~ "an\n"
-#~ "den Autor der Komponente und nicht an Mandriva S. A. zu richten. Die\n"
-#~ "von Mandriva S. A. erstellten Programme unterliegen der GPL.\n"
-#~ "Von Mandriva S. A. geschriebene Dokumentation unterliegt einer\n"
-#~ "spezifischen Lizenz. Bitte lesen Sie die Dokumentation für weitere\n"
-#~ "Details.\n"
-#~ "\n"
-#~ "\n"
-#~ "4. Geistiges Eigentum\n"
-#~ "\n"
-#~ "Alle Rechte an den Komponenten der Software-Produkte liegen bei den\n"
-#~ "entsprechenden Autoren und sind durch die Urheberrechtsgesetze für\n"
-#~ "Softwareprodukte geschützt.\n"
-#~ "Mandriva S. A. behält sich das Recht vor, die Software-Produkte zu\n"
-#~ "modifizieren und anzupassen.\n"
-#~ "„Mandrake“, „Mandriva Linux“ und entsprechende Logos sind eingetragene\n"
-#~ "Warenzeichen der Mandriva S. A..\n"
-#~ "\n"
-#~ "\n"
-#~ "5. Gesetzliche Bestimmungen\n"
-#~ "\n"
-#~ "Wenn irgendein Teil dieses Lizenzabkommens durch einen Gerichtsentscheid\n"
-#~ "für ungültig, illegal oder inakzeptabel erklärt wird, wird dieser Teil\n"
-#~ "aus dem Abkommen ausgeschlossen. Sie bleiben weiterhin an die anderen,\n"
-#~ "anwendbaren Teile gebunden.\n"
-#~ "Die Bedingungen dieses Lizenzabkommens unterliegen den Gesetzen von\n"
-#~ "Frankreich. Alle Unstimmigkeiten bezüglich der Bedingungen dieser Lizenz\n"
-#~ "werden vorzugsweise außergerichtlich beigelegt. Letztes Mittel ist das\n"
-#~ "zuständige Gericht in Paris, Frankreich.\n"
-#~ "Zu jeglicher Frage zu diesem Dokument kontaktieren Sie bitte\n"
-#~ "Mandriva S. A.\n"
-
-#~ msgid ""
-#~ "Congratulations, installation is complete.\n"
-#~ "Remove the boot media and press return to reboot.\n"
-#~ "\n"
-#~ "\n"
-#~ "For information on fixes which are available for this release of Mandriva "
-#~ "Linux,\n"
-#~ "consult the Errata available from:\n"
-#~ "\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "\n"
-#~ "Information on configuring your system is available in the post\n"
-#~ "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 "
-#~ "Eingabetaste zum Neustart Ihres Rechners.\n"
-#~ "\n"
-#~ "Für Informationen zu Sicherheitsaktualisierungen dieser Version von "
-#~ "Mandriva Linux informieren Sie sich bitte unter \n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Wie Sie Ihr System warten können, erfahren Sie im Kapitel „Nach der "
-#~ "Installation“ im offiziellen Benutzerhandbuch von Mandriva Linux."
-
-#~ msgid "http://www.mandrivalinux.com/en/errata.php3"
-#~ msgstr "http://www.mandrivalinux.com/en/errata.php3"
-
-#~ msgid "No floppy drive available"
-#~ msgstr "Kein Disketten-Laufwerk verfügbar"
-
-#~ msgid ""
-#~ "Your system is low on resources. You may have some problem installing\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 ""
-#~ "Ihr Rechner hat nicht genug Ressourcen. Vermutlich werden bei der \n"
-#~ "Installation Probleme auftreten. In diesem Fall sollten Sie eine \n"
-#~ "Text-Installation versuchen. Drücken Sie dafür <F1> während dem \n"
-#~ "Installationsstart und geben Sie „text“ an der Eingabeaufforderung \n"
-#~ "ein."
-
-#~ msgid "Please insert the Update Modules floppy in drive %s"
-#~ msgstr ""
-#~ "Bitte legen Sie die Diskette der zu aktualisierenden Module in Laufwerk %"
-#~ "s ein."
-
-#~ msgid ""
-#~ "Contacting Mandriva Linux web site to get the list of available mirrors..."
-#~ msgstr ""
-#~ "Kontaktiere Mandriva Linux Web-Server, um eine Liste verfügbarer Pakete "
-#~ "zu erhalten..."
-
-#~ msgid "Mandriva Linux Installation %s"
-#~ msgstr "Mandriva Linux-Installation %s"
-
-#~ msgid ""
-#~ "_: keyboard\n"
-#~ "Tifinagh (+latin/arabic)"
-#~ msgstr "Tifinagh (+latainisch/arabisch)"
-
-#~ msgid "No network card"
-#~ msgstr "Keine Netzwerkkarte"
-
-#~ msgid ""
-#~ "drakfirewall configurator\n"
-#~ "\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"
-#~ "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."
-
-#~ msgid ""
-#~ "The following protocols can be used to configure an ethernet connection. "
-#~ "Please choose the one you want to use"
-#~ msgstr ""
-#~ "Die folgenden Protokolle können zu Konfiguration der Netzwerkkarte "
-#~ "genutzt werden. Bitte Auswahl treffen."
-
-#~ msgid "Use already installed driver (%s)"
-#~ msgstr "Einen bereits installierten Treiber (%s) verwenden"
-
-#~ msgid "Use Wi-Fi Protected Access (WPA)"
-#~ msgstr "Benutze Wi-Fi Protected Access (WPA)"
-
-#~ msgid ""
-#~ "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 Mandriva Linux "
-#~ "Kontrollzentrum), um Ihren Scanner im Netzwerk freizugeben.\n"
-#~ "\n"
-
-#~ msgid "<b>What is Mandriva Linux?</b>"
-#~ msgstr "<b>Was ist Mandriva Linux?</b>"
-
-#~ msgid "Welcome to <b>Mandriva Linux</b>!"
-#~ msgstr "Willkommen zu <b>Mandriva Linux</b>!"
-
-#~ 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 ""
-#~ "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."
-
-#~ 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 ""
-#~ "Mandriva Linux ist die <b>benutzerfreundlichste</b> Linuxdistribution "
-#~ "heutzutage. Sie ist außerdem eine der <b>am weitesten verbreiteten</b> "
-#~ "Linuxdistributionen weltweit!"
-
-#~ 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 ""
-#~ "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."
-
-#~ 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 ""
-#~ "Ein Großteil der in der Distribution enthaltenen Programme und alle "
-#~ "Mandriva Linux-Werkzeuge sind unter der <b>General Public License</b> "
-#~ "lizensiert."
-
-#~ 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 ""
-#~ "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 Mandriva Linux-"
-#~ "Welt."
-
-#~ 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 ""
-#~ "Um mehr über unsere dynamische Gemeinschaft zu <b>erfahren</b>, besuchen "
-#~ "Sie 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."
-
-#~ 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 ""
-#~ "Sie installieren <b>Mandriva Linux Download</b>. Das ist die freie "
-#~ "Version, die Mandriva <b>für jeden zur Verfügung</b> stellt."
-
-#~ msgid "You are now installing <b>Mandriva Linux Discovery</b>."
-#~ msgstr "Sie installieren <b>Mandriva Linux Discovery</b>."
-
-#~ msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
-#~ msgstr "Sie installieren <b>Mandriva Linux PowerPack</b>."
-
-#~ msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
-#~ msgstr "Sie installieren <b>Mandriva Linux PowerPack+</b>."
-
-#~ msgid ""
-#~ "<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> "
-#~ "products."
-#~ msgstr ""
-#~ "<b>Mandriva</b> hat eine breite Auswahl an <b>Mandriva Linux</b>-"
-#~ "Produkten entwickelt."
-
-#~ msgid "The Mandriva Linux products are:"
-#~ msgstr "Die Mandriva Linux Produkte sind:"
-
-#~ msgid ""
-#~ "\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for "
-#~ "making the most of your 64-bit processor."
-#~ msgstr ""
-#~ "\t* <b>Mandriva Linux für x86-64</b>, die Mandriva Linux-Lösung, um das "
-#~ "Beste aus Ihrem 64-Bit-Prozessor zu machen."
-
-#~ 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 ""
-#~ "Mandriva hat zwei Produkte entwickelt, die es Ihnen erlauben, Mandriva "
-#~ "Linux <b>auf jedem Rechner</b> ohne vorherige Installation zu verwenden:"
-
-#~ msgid ""
-#~ "\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
-#~ "bootable CD-ROM."
-#~ msgstr ""
-#~ "\t* <b>Move</b>, eine Mandriva Linux-Distribution, die komplett von einer "
-#~ "startbaren CD-ROM läuft."
-
-#~ msgid ""
-#~ "\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on "
-#~ "the ultra-compact “LaCie Mobile Hard Drive”."
-#~ msgstr ""
-#~ "\t* <b>GlobeTrotter</b>, eine Mandriva Linux-Distribution vorinstalliert "
-#~ "auf der ultra-kompakten „LaCie Mobilen Festplatte“."
-
-#~ msgid ""
-#~ "\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
-#~ msgstr ""
-#~ "\t* <b>Corporate Desktop</b>, der Mandriva Linux-Desktop für Unternehmen."
-
-#~ msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
-#~ msgstr "\t* <b>Corporate Server</b>, die Mandriva Linux-Serverlösung."
-
-#~ msgid ""
-#~ "\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
-#~ msgstr ""
-#~ "\t* <b>Multi-Network-Firewall</b>, die Mandriva Linux-Sicherheitslösung."
-
-#~ msgid ""
-#~ "In the Mandriva Linux menu you will find <b>easy-to-use</b> applications "
-#~ "for <b>all of your tasks</b>:"
-#~ msgstr ""
-#~ "Im Mandriva Linux-Menü finden Sie <b>einfach zu bedienende<b/> "
-#~ "Anwendungen für <b>alle Ihre Aufgaben</b>:"
-
-#~ msgid "<b>Mandriva Linux Control Center</b>"
-#~ msgstr "<b>Mandriva Linux Kontrollzentrum</b>"
-
-#~ 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 ""
-#~ "Das <b>Mandriva Linux-Kontrollzentrum</b> ist eine wesentliche Sammlung "
-#~ "der Mandriva Linux-spezifischen Werkzeuge um die Einrichtung des "
-#~ "Computers zu vereinfachen."
-
-#~ 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 ""
-#~ "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>Mandriva Linux zu verbessern</b>. Wenn Sie die Open Source Philosophie "
-#~ "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!"
-
-#~ msgid "Stop by today at <b>store.mandriva.com</b>!"
-#~ msgstr "Schauen Sie noch heute unter <b>store.mandriva.com</b> rein!"
-
-#~ msgid ""
-#~ "<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 Mandriva "
-#~ "Linux-Produkt."
-
-#~ msgid ""
-#~ "\t* <b>Special discounts</b> on products and services of our online store "
-#~ "<b>store.mandriva.com</b>."
-#~ msgstr ""
-#~ "\t* <b>Spezialrabatte</b> auf Produkte und Dienstleistungen unseres "
-#~ "Online-Warenhauses <b>store.mandriva.com</b>."
-
-#~ msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
-#~ msgstr "\t* Teilnahme an Mandriva Linux <b>Nutzerforen</b>."
-
-#~ msgid ""
-#~ "\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 Mandriva Linux <b>ISO-Abbilder</b>."
-
-#~ msgid ""
-#~ "Mandriva Online provides a wide range of valuable services for <b>easily "
-#~ "updating</b> your Mandriva Linux systems:"
-#~ msgstr ""
-#~ "Mandriva Online bietet eine breite Palette wertvoller Dienstleistungen "
-#~ "zur <b>einfachen Aktualisierung</b> Ihres Mandriva Linux-Systems:"
-
-#~ msgid ""
-#~ "\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."
-
-#~ msgid ""
-#~ "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-#~ "<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.mandrivaexpert.com."
-
-#~ msgid ""
-#~ "Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will "
-#~ "save a lot of time."
-#~ msgstr ""
-#~ "Dank der <b>qualifzierten Mandriva Linux-Experten</b> werden Sie eine "
-#~ "Menge Zeit sparen."
-
-#~ msgid ""
-#~ "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 Mandriva Linux können Sie Support unter <b>store."
-#~ "mandriva.com</b> kaufen."
-
-#~ msgid ""
-#~ "[OPTIONS]...\n"
-#~ "Mandriva Linux Terminal Server Configurator\n"
-#~ "--enable         : enable MTS\n"
-#~ "--disable        : disable MTS\n"
-#~ "--start          : start MTS\n"
-#~ "--stop           : stop MTS\n"
-#~ "--adduser        : add an existing system user to MTS (requires "
-#~ "username)\n"
-#~ "--deluser        : delete an existing system user from MTS (requires "
-#~ "username)\n"
-#~ "--addclient      : add a client machine to MTS (requires MAC address, IP, "
-#~ "nbi image name)\n"
-#~ "--delclient      : delete a client machine from MTS (requires MAC "
-#~ "address, IP, nbi image name)"
-#~ msgstr ""
-#~ "[OPTIONEN]...\n"
-#~ "Mandrake Terminal-Server-Konfigurator\n"
-#~ "--enable         : MTS einschalten\n"
-#~ "--disable        : MTS ausschalten\n"
-#~ "--start          : MTS starten\n"
-#~ "--stop           : MTS anhalten\n"
-#~ "--adduser        : einen existierenden Systemnutzer zu MTS hinzufügen "
-#~ "(benötigt Nutzernamen)\n"
-#~ "--deluser        : einen existierenden Systemnutzer von MTS löschen "
-#~ "(benötigt Nutzernamen)\n"
-#~ "--addclient      : einen Client zu MTS hinzufügen (benötigt MAC Adresse, "
-#~ "IP, Name des NBI-Abbildes)\n"
-#~ "--delclient      : einen Client von MTS löschen (benötigt MAC Adresse, "
-#~ "IP, Name des NBI-Abbildes)"
-
-#~ msgid ""
-#~ "[OPTION]...\n"
-#~ "  --no-confirmation      do not ask first confirmation question in "
-#~ "MandrakeUpdate mode\n"
-#~ "  --no-verify-rpm        do not verify packages signatures\n"
-#~ "  --changelog-first      display changelog before filelist in the "
-#~ "description window\n"
-#~ "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
-#~ msgstr ""
-#~ "[OPTION]...\n"
-#~ "  --no-confirmation      keine Fragen im MandrakeUpdate-Modus stellen\n"
-#~ "  --no-verify-rpm        Paketsignaturen nicht überprüfen\n"
-#~ "  --changelog-first      Änderungsprotokoll vor Dateiliste anzeigen\n"
-#~ "  --merge-all-rpmnew     Zusammenlegen aller .rpmnew/.rpmsave-Dateien "
-#~ "vorschlagen"
-
-#~ msgid "Mandriva Linux Bug Report Tool"
-#~ msgstr "Mandriva Linux Fehlerberichte"
-
-#~ msgid "Mandriva Linux Control Center"
-#~ msgstr "Mandriva Linux Kontrollzentrum"
-
-#~ msgid ""
-#~ "This interface has not been configured yet.\n"
-#~ "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 Mandriva Linux "
-#~ "Kontrollzentrum."
-
-#~ msgid ""
-#~ "You do not have any configured Internet connection.\n"
-#~ "Run the \"%s\" assistant from the Mandriva Linux Control Center"
-#~ msgstr ""
-#~ "Sie haben noch keine eingerichtete Internetverbindung.\n"
-#~ "Starten Sie den Assistenten „%s“ im Mandriva Linux Kontrollzentrum."
-
-#~ msgid "MdkKDM (Mandriva Linux Display Manager)"
-#~ msgstr "MdkKDM (Mandriva Linux Display Manager)"
-
-#~ msgid ""
-#~ "Copyright (C) 2001-2002 by Mandriva \n"
-#~ "\n"
-#~ "\n"
-#~ "       DUPONT Sebastien (original version)\n"
-#~ "\n"
-#~ "       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
-#~ "\n"
-#~ "       VIGNAUD Thierry <tvignaud@mandriva.com>"
-#~ msgstr ""
-#~ "Copyright © 2001-2002 by Mandriva \n"
-#~ "\n"
-#~ "\n"
-#~ "       DUPONT Sebastien (Orginalversion)\n"
-#~ "\n"
-#~ "       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
-#~ "\n"
-#~ "       VIGNAUD Thierry <tvignaud@mandriva.com>"
-
-#~ msgid "You've not selected any font"
-#~ msgstr "Sie haben keine Schriftart ausgewählt"
-
-#~ msgid "Mandriva Linux Help Center"
-#~ msgstr "Mandriva Linux Hilfezentrum"
-
-#~ msgid "Save and close"
-#~ msgstr "Abspeichern und Schließen"
-
-#~ msgid "Network: %s"
-#~ msgstr "Netzwerk: %s"
-
-#~ msgid "Mode: %s"
-#~ msgstr "Modus: %s"
-
-#~ msgid "IP: %s"
-#~ msgstr "IP: %s"
-
-#~ msgid "Encryption: %s"
-#~ msgstr "Verschlüsselung: %s"
-
-#~ msgid "Gateway: %s"
-#~ msgstr "Gateway: %s"
-
-#~ msgid "Signal: %s"
-#~ msgstr "Signal: %s"
-
-#~ 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@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@mandriva.com&gt;\n"
-#~ "\n"
-
-#~ msgid "Mandriva Linux Tools Logs"
-#~ msgstr "Mandriva Linux Werkzeugprotokolle"
-
-#~ msgid ""
-#~ "Connection failed.\n"
-#~ "Verify your configuration in the Mandriva Linux Control Center."
-#~ msgstr ""
-#~ "Verbinden fehlgeschlagen.\n"
-#~ "Überprüfen Sie Ihre Konfiguration im Mandriva Linux Kontrollzentrum."
diff --git a/perl-install/share/po/el.po b/perl-install/share/po/el.po
index 555aaf81f..5ea75a08e 100644
--- a/perl-install/share/po/el.po
+++ b/perl-install/share/po/el.po
@@ -1260,11 +1260,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"
 "εγκατάστασης και την επανεκκίνηση του συστήματός σας."
 
@@ -3639,7 +3639,7 @@ msgstr "ενεργοποίηση ραδιοφώνου"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
@@ -3819,13 +3819,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 είναι μοιρασμένο σε αρκετά CD-ROM. Το \n"
+"Η εγκατάσταση του Mandriva Linux είναι μοιρασμένο σε αρκετά CD-ROM. Το \n"
 "DrakX ξέρει αν ένα επιλεγμένο πακέτο υπάρχει σε άλλο CD-ROM, θα εξάγει το \n"
 "τρέχον CD και θα ζητήσει να εισάγετε ένα άλλο όταν αυτό θα χρειαστεί."
 
@@ -3833,11 +3833,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"
@@ -3994,10 +3995,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"
@@ -4179,7 +4180,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"
@@ -4347,12 +4348,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"
@@ -4379,7 +4380,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"
@@ -4388,7 +4389,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"
@@ -4607,7 +4609,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."
@@ -4649,7 +4651,7 @@ msgstr "Προηγούμενο"
 #: 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"
@@ -4689,7 +4691,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"
@@ -4714,7 +4716,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"
@@ -4873,7 +4875,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"
@@ -4950,7 +4952,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"
@@ -4959,13 +4961,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 ""
 "ενεργοποίηση τώρα Linux\n"
 "\n"
@@ -5041,7 +5044,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"
@@ -5277,7 +5281,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"
@@ -5298,7 +5302,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"
@@ -5447,7 +5451,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"
@@ -5464,7 +5469,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"
@@ -5526,11 +5531,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. ΠΡΟΣΟΧΗ: Όλα τα δεδομένα θα διαγραφούν\n"
+"την νέα κατάτμηση Mandriva Linux. ΠΡΟΣΟΧΗ: Όλα τα δεδομένα θα διαγραφούν\n"
 "και θα είναι αδύνατη η επαναφορά τους!"
 
 #: help.pm:863
@@ -5883,12 +5888,12 @@ 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 είναι πολύ κατακερματισμένη, παρακαλώ τρέξτε πρώτα "
 "το ``defrag'' μέσα από τα Windows και ξεκινήστε ξανά την εγκατάσταση του  "
-"Mandrivalinux "
+"Mandriva Linux "
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6004,13 +6009,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"
@@ -6039,8 +6044,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 "
@@ -6054,8 +6059,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 "
@@ -6064,7 +6069,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"
@@ -6098,10 +6103,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"
@@ -6276,8 +6281,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"
@@ -6285,14 +6290,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 ""
 "Συγχαρητήρια, η εγκατάσταση ολοκληρώθηκε.\n"
 "Αφαιρέστε την δισκέτα ή το CD εκκίνησης και πατήστε return για "
 "επανεκκίνηση.\n"
 "\n"
 "\n"
-"Για πληροφορίες σχετικά με διορθώσεις αυτής της έκδοσης του Mandrivalinux,\n"
+"Για πληροφορίες σχετικά με διορθώσεις αυτής της έκδοσης του Mandriva Linux,\n"
 "συμβουλευτείτε την σελίδα: \n"
 "\n"
 "\n"
@@ -6301,13 +6306,13 @@ msgstr ""
 "\n"
 "Πληροφορίες σχετικά με τις ρυθμίσεις του συστήματός σας υπάρχουν στο "
 "σχετικό\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
@@ -6336,13 +6341,13 @@ 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, μετά γράψτε `text'."
 
@@ -6883,9 +6888,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 για λήψη των διαθέσιμων τόπων "
+"Σύνδεση με την τοποθεσία της Mandriva Linux για λήψη των διαθέσιμων τόπων "
 "λήψης..."
 
 #: install_steps_interactive.pm:840
@@ -7107,8 +7112,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
@@ -9692,7 +9697,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 ""
@@ -13573,8 +13578,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 ""
 
@@ -15487,18 +15492,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."
@@ -15507,7 +15512,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 ""
 
@@ -15524,9 +15529,9 @@ 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 "
+"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 ""
 
@@ -15545,8 +15550,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
@@ -15572,17 +15577,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 ""
 
@@ -15594,7 +15599,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 ""
 
@@ -15632,7 +15637,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
@@ -15651,7 +15656,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
@@ -15669,7 +15674,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
@@ -15684,18 +15689,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
@@ -15716,7 +15720,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 ""
 
@@ -15728,21 +15732,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 ""
 
@@ -15754,23 +15758,25 @@ msgstr ""
 #: 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 ""
 
 #: 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
@@ -15946,7 +15952,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 ""
 
@@ -16181,14 +16187,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 ""
 
@@ -16211,21 +16217,21 @@ 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
 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 ""
 
 #: share/advertising/27.pl:17
@@ -16242,7 +16248,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
@@ -16253,7 +16259,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 ""
 
@@ -16267,7 +16273,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
@@ -16279,14 +16285,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
@@ -16305,7 +16311,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
@@ -16328,7 +16334,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
@@ -16340,21 +16346,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
@@ -16652,7 +16658,7 @@ msgstr ""
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
-msgstr "Κέντρο Ελέγχου Mandrivalinux"
+msgstr "Κέντρο Ελέγχου Mandriva Linux"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -16731,8 +16737,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
@@ -16779,7 +16785,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"
@@ -16845,8 +16851,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"
@@ -19442,13 +19448,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
 msgstr "Εργαλείο Αναφοράς Σφαλμάτων Mandrake"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Κέντρο Ελέγχου Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Κέντρο Ελέγχου Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19926,7 +19932,7 @@ msgstr "Ξεκίνησαν στην εκκίνηση"
 #, 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 ""
 "Η διεπαφή δεν έχει ρυθμιστή ακόμα. \n"
 "Εκτελέστε τον οδηγό ρύθμισης στην κυρίως οθόνη"
@@ -19935,7 +19941,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 ""
 "Η διεπαφή δεν έχει ρυθμιστή ακόμα. \n"
 "Εκτελέστε τον οδηγό ρύθμισης στην κυρίως οθόνη"
@@ -19988,7 +19994,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20292,9 +20298,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
@@ -20842,7 +20848,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "Κέντρο Ελέγχου Mandrake"
 
 #: standalone/drakhelp:36
@@ -21458,7 +21464,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"
@@ -21467,7 +21473,7 @@ msgstr ""
 "Μπορείτε να επισκεφτείτε τη βάση δεδομένων υλικού στο:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, fuzzy, c-format
@@ -23090,7 +23096,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 ""
 "Δεν βρέθηκε κάρτα τηλεόρασης στο μηχάνημά σας.Παρακαλώ βεβαιωθείτε ότι μια "
 "υποστηριζόμενη κάρτα στο Linux είναι συνδεμένη.\n"
@@ -23099,7 +23105,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
@@ -23794,13 +23800,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, ένα εργαλείο ρύθμισης της 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"
 
 #: standalone/harddrake2:243
@@ -23910,7 +23916,7 @@ msgstr "Η αλλαγή έγινε, αλλά για να ισχύσει θα π�
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "Επεξήγηση Εργαλείων της Mandrake"
 
 #: standalone/logdrake:51
@@ -24420,10 +24426,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
@@ -24658,7 +24664,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
@@ -24699,7 +24705,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
@@ -25772,9 +25778,6 @@ msgstr "Η εγκατάσταση απέτυχε"
 #~ msgid "mkraid failed"
 #~ msgstr "αποτυχία mkraid"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid ""
 #~ "Connection failed.\n"
 #~ "Verify your configuration in the Mandrake Control Center."
diff --git a/perl-install/share/po/eo.po b/perl-install/share/po/eo.po
index aa812c194..e1b97df22 100644
--- a/perl-install/share/po/eo.po
+++ b/perl-install/share/po/eo.po
@@ -1238,7 +1238,7 @@ msgstr "Mianmaro"
 #: 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 ""
@@ -3558,7 +3558,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 ""
@@ -3668,7 +3668,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"
@@ -3679,11 +3679,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"
@@ -3790,10 +3791,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"
@@ -3918,7 +3919,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"
@@ -4016,12 +4017,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"
@@ -4048,7 +4049,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"
@@ -4057,7 +4058,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"
@@ -4186,7 +4188,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."
@@ -4204,7 +4206,7 @@ msgstr "Antaŭa"
 #: 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"
@@ -4233,7 +4235,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"
@@ -4249,7 +4251,7 @@ msgstr "Malproksimaj lpd Printilaj Opcioj"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4335,7 +4337,7 @@ msgstr "Ŝanĝu al Normala reĝimo"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4380,7 +4382,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"
@@ -4389,13 +4391,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
@@ -4436,7 +4439,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"
@@ -4614,7 +4618,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"
@@ -4635,7 +4639,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 ""
 "Nun estas tempo por elekti pressistemon por via komputilo. Aliaj mastrum-"
@@ -4784,7 +4788,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"
@@ -4801,7 +4806,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"
@@ -4863,7 +4868,7 @@ msgstr "Servoj"
 #, 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 ""
 
@@ -5191,7 +5196,7 @@ msgstr "Kalkulante la liberan spacon sur la Vindoza subdisko"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Via Vindoza subdisko estas tro fragmentigata, bonvole uzu ``defrag'' antaŭe"
@@ -5309,13 +5314,13 @@ msgstr "Haltas de la reto"
 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"
@@ -5369,7 +5374,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"
@@ -5406,7 +5411,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"
@@ -5531,8 +5536,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"
@@ -5540,14 +5545,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
@@ -5576,7 +5581,7 @@ msgstr "Eniras paŝon `%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 ""
@@ -6117,7 +6122,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 ""
 "Mi kontaktas la Linuks-Mandrakan retpaĝon por havigi la liston de "
 "disponeblaj speguloj..."
@@ -6333,7 +6338,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
+msgid "Mandriva Linux Installation %s"
 msgstr "Linuks-Mandrejka Instalado %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -8907,7 +8912,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 ""
@@ -12532,8 +12537,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 ""
 
@@ -14284,18 +14289,18 @@ msgstr "Haltu"
 
 #: 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 "Bonvenon ĉe <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Bonvenon ĉ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."
@@ -14304,7 +14309,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 ""
 
@@ -14321,9 +14326,9 @@ msgstr "Provu konfiguraĵon"
 #: 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 ""
 
@@ -14342,8 +14347,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
@@ -14369,17 +14374,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 ""
 
@@ -14391,7 +14396,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 ""
 
@@ -14429,7 +14434,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
@@ -14448,7 +14453,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
@@ -14466,7 +14471,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
@@ -14486,12 +14491,12 @@ msgstr "Konekti al la interreto"
 #: 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
@@ -14512,7 +14517,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 ""
 
@@ -14524,21 +14529,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 ""
 
@@ -14556,17 +14561,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
@@ -14742,7 +14749,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 ""
 
@@ -14977,14 +14984,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux-Regejo</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux-Regejo</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 ""
 
@@ -15007,8 +15014,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 ""
 
@@ -15038,7 +15045,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
@@ -15049,7 +15056,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 ""
 
@@ -15063,7 +15070,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
@@ -15075,14 +15082,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
@@ -15101,7 +15108,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
@@ -15124,7 +15131,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
@@ -15136,21 +15143,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
@@ -15523,15 +15530,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 ""
 "[OPCIOJ] [PROGRAM_NOMO]\n"
 "\n"
 "OPCIOJ:\n"
 "  --help            - montru tiun help-mesaĝon.\n"
-"  --report          - programo estu iu de Mandrivalinux iloj\n"
-"  --incident        - programo estu iu de Mandrivalinux iloj"
+"  --report          - programo estu iu de Mandriva Linux iloj\n"
+"  --incident        - programo estu iu de Mandriva Linux iloj"
 
 #: standalone.pm:63
 #, c-format
@@ -15578,7 +15585,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"
@@ -18114,13 +18121,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
 msgstr "Konekti al la interreto"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux-Regejo"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux-Regejo"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18594,14 +18601,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
@@ -18652,7 +18659,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18949,9 +18956,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
@@ -19456,7 +19463,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "Irigilo por la Mandrajka helpo"
 
 #: standalone/drakhelp:36
@@ -20043,7 +20050,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
@@ -21643,7 +21650,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
@@ -22329,7 +22336,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 ""
 
@@ -22438,7 +22445,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "Konekti al la interreto"
 
 #: standalone/logdrake:51
@@ -22942,7 +22949,7 @@ msgstr "Speco de konekto"
 #, 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/es.po b/perl-install/share/po/es.po
index 0d13b108b..a5cde9bda 100644
--- a/perl-install/share/po/es.po
+++ b/perl-install/share/po/es.po
@@ -3,9 +3,9 @@
 # translation of DrakX-es.po to Spanish
 # spanish translation of DrakX
 # Copyright (C) 2000, 2001,2002 Mandriva S.A.
-# Fabian Mandelbaum <fabman@mandrakesoft.com>, 2000, 2001, 2002,2003, 2004.
+# Fabian Mandelbaum <fabman@mandriva.com>, 2000, 2001, 2002,2003, 2004.
 # Fabian Mandelbaum <fmandelbaum@hotmail.com>, 2003, 2004.
-# Pablo Saratxaga <pablo@mandrakesoft.com>, 2004.
+# Pablo Saratxaga <pablo@mandriva.com>, 2004.
 # Jaime Crespo <505201@unizar.es>, 2004, 2005.
 # José Manuel Pérez <jmprodu@hotmail.com>, 2005.
 #
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "También puede continuar sin una llave USB - todavía podrá\n"
 "utilizar Mandriva Move como un Sistema Operativo\n"
-"Mandrivalinux \"en vivo\" normal."
+"Mandriva Linux \"en vivo\" normal."
 
 #: ../move/move.pm:483
 #, c-format
@@ -139,7 +139,7 @@ msgstr ""
 "\n"
 "\n"
 "También puede continuar sin una llave USB - todavía podrá\n"
-"utilizar Mandriva Move como un Sistema Operativo Mandrivalinux \"en vivo\" "
+"utilizar Mandriva Move como un Sistema Operativo Mandriva Linux \"en vivo\" "
 "normal."
 
 #: ../move/move.pm:494
@@ -1326,11 +1326,11 @@ msgstr "Selección del 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 puede soportar múltiples idiomas. Seleccione\n"
+"Mandriva Linux puede soportar múltiples idiomas. Seleccione\n"
 "los que desea instalar. Los mismos estarán disponibles cuando\n"
 "su instalación esté completa y Usted reinicie su sistema."
 
@@ -3760,17 +3760,17 @@ msgid "enable radio support"
 msgstr "habilitar el soporte para radio"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:11
 #, 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 ""
 "Antes de continuar, debería leer cuidadosamente los términos de la\n"
-"licencia. La misma cubre a toda la distribución Mandrivalinux. Si está de\n"
+"licencia. La misma cubre a toda la distribución Mandriva Linux. Si está de\n"
 "acuerdo con todos los términos en la misma, haga clic en el botón \"%s\".\n"
 "Si no, haga clic en el botón \"%s\" lo que reiniciará su computadora."
 
@@ -3781,7 +3781,7 @@ msgid "Accept"
 msgstr "Aceptar"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:17
 #, c-format
 msgid ""
@@ -3886,7 +3886,7 @@ msgid "Advanced"
 msgstr "Avanzada"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:54
 #, c-format
 msgid ""
@@ -3956,33 +3956,34 @@ msgstr ""
 "significa \"segunda SCSI ID menor\", etc."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/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 ""
-"La instalación de Mandrivalinux se distribuye en varios CD-ROM. Si un\n"
+"La instalación de Mandriva Linux se distribuye en varios CD-ROM. Si un\n"
 "paquete seleccionado se encuentra en otro CD-ROM, DrakX expulsará el CD\n"
 "corriente y le pedirá que inserte el necesario. Si no tiene el CD necesario\n"
 "a mano, simplemente haga clic sobre \"%s\", no se instalarán los paquetes\n"
 "correspondientes."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/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"
@@ -4034,11 +4035,12 @@ msgid ""
 "megabytes."
 msgstr ""
 "Ahora es el momento de especificar los programas que desea instalar en su\n"
-"sistema. Hay miles de paquetes disponibles para Mandrivalinux, y para hacer\n"
+"sistema. Hay miles de paquetes disponibles para Mandriva Linux, y para "
+"hacer\n"
 "más simple el manejo de los paquetes, los mismos se han puesto en grupos de\n"
 "aplicaciones similares.\n"
 "\n"
-"Mandrivalinux clasifica los grupos de paquetes en cuatro categorías. Puede\n"
+"Mandriva Linux clasifica los grupos de paquetes en cuatro categorías. Puede\n"
 "mezclar y hacer coincidir aplicaciones de varias categorías, por lo que una\n"
 "instalación de \"Estación de trabajo\" puede tener instaladas aplicaciones\n"
 "de la categoría \"Desarrollo\".\n"
@@ -4131,7 +4133,7 @@ msgid "Truly minimal install"
 msgstr "Instalación realmente mínima"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:149
 #, c-format
 msgid ""
@@ -4146,10 +4148,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"
@@ -4184,11 +4186,11 @@ msgstr ""
 "seleccionó específicamente el paquete individual o porque el mismo era\n"
 "parte de un grupo de paquetes, se le pedirá que confirme que realmente\n"
 "desea que se instalen esos servidores. De manera predeterminada,\n"
-"Mandrivalinux iniciará automáticamente todos los servicios instalados al\n"
+"Mandriva Linux iniciará automáticamente todos los servicios instalados al\n"
 "momento del arranque. Aunque estos son seguros y no tienen problemas\n"
 "conocidos al momento en que se publicó la distribución, es muy posible que\n"
 "se descubran vulnerabilidades en la seguridad luego que se terminó con esta\n"
-"versión de Mandrivalinux. Si no sabe que es lo que se supone que hace un\n"
+"versión de Mandriva Linux. Si no sabe que es lo que se supone que hace un\n"
 "servicio o la razón por la cual se está instalando, entonces haga clic\n"
 "sobre \"%s\". Si hace clic sobre \"%s\" se instalarán todos los servicios\n"
 "listados y los mismos se iniciarán automáticamente al momento del arranque.\n"
@@ -4215,7 +4217,7 @@ msgid "Automatic dependencies"
 msgstr "Dependencias automáticas"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:183
 #, c-format
 msgid ""
@@ -4238,7 +4240,7 @@ msgid "Configure"
 msgstr "Configurar"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:189
 #, c-format
 msgid ""
@@ -4277,7 +4279,7 @@ msgstr ""
 "que realmente necesita. !!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:206
 #, c-format
 msgid ""
@@ -4319,7 +4321,7 @@ msgid "Automatic time synchronization"
 msgstr "Sincronización automática de la hora"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:220
 #, c-format
 msgid ""
@@ -4344,13 +4346,13 @@ msgstr ""
 "servidor que mejor satisface sus necesidades."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/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"
@@ -4406,7 +4408,7 @@ msgid ""
 msgstr ""
 "X (por \"X Window System\") es el corazón de la interfaz gráfica de\n"
 "GNU/Linux en el que se apoyan todos los entornos gráficos (KDE, GNOME,\n"
-"AfterStep, WindowMaker, etc.) que se incluyen con Mandrivalinux.\n"
+"AfterStep, WindowMaker, etc.) que se incluyen con Mandriva Linux.\n"
 "\n"
 "Se le presentará la lista de parámetros diferentes a cambiar para obtener\n"
 "una presentación gráfica óptima.\n"
@@ -4462,7 +4464,7 @@ msgstr ""
 "configuración de su pantalla."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:288
 #, c-format
 msgid ""
@@ -4479,7 +4481,7 @@ msgstr ""
 "elegir el monitor que realmente posee."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:295
 #, c-format
 msgid ""
@@ -4498,7 +4500,7 @@ msgstr ""
 "monitor se muestra un ejemplo de la configuración elegida."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:303
 #, c-format
 msgid ""
@@ -4511,7 +4513,7 @@ msgstr ""
 "que mejor satisface sus necesidades."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:308
 #, c-format
 msgid ""
@@ -4530,16 +4532,16 @@ msgstr ""
 "configuración de su pantalla."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/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"
@@ -4566,7 +4568,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"
@@ -4575,7 +4577,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"
@@ -4596,11 +4599,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Ahora necesita elegir el lugar de su disco rígido donde se instalará su\n"
-"sistema operativo Mandrivalinux. Si su disco rígido está vacío o si un\n"
+"sistema operativo Mandriva Linux. Si su disco rígido está vacío o si un\n"
 "sistema operativo existente está utilizando todo el espacio disponible,\n"
 "necesitará particionar el disco. Básicamente, particionar un disco rígido\n"
 "consiste en dividirlo lógicamente para crear espacio para instalar su\n"
-"sistema Mandrivalinux nuevo.\n"
+"sistema Mandriva Linux nuevo.\n"
 "\n"
 "Debido a que el proceso de particionado de un disco rígido por lo general\n"
 "es irreversible y puede llevar a pérdida de datos, el particionado puede\n"
@@ -4630,7 +4633,7 @@ msgstr ""
 "realizar sin la pérdida de datos, siempre y cuando Usted haya\n"
 "desfragmentado con anterioridad la partición Windows. Es altamente\n"
 "recomendable hacer una copia de respaldo de sus datos. Se recomienda usar\n"
-"esta solución si desea utilizar tanto Mandrivalinux como Microsoft Windows\n"
+"esta solución si desea utilizar tanto Mandriva Linux como Microsoft Windows\n"
 "en la misma computadora.\n"
 "\n"
 "   Antes de elegir esta opción, por favor comprenda que después de este\n"
@@ -4640,7 +4643,7 @@ msgstr ""
 "\n"
 " * \"%s\". Si desea borrar todos los datos y todas las particiones\n"
 "presentes en su disco rígido y reemplazarlos con su nuevo sistema\n"
-"Mandrivalinux, seleccione esta opción. Tenga cuidado con esta solución ya\n"
+"Mandriva Linux, seleccione esta opción. Tenga cuidado con esta solución ya\n"
 "que no podrá revertir su elección después de confirmarla.\n"
 "\n"
 "   !! Si elige esta opción, se perderán todos los datos en su disco. !!\n"
@@ -4690,7 +4693,7 @@ msgid "Custom disk partitioning"
 msgstr "Particionamiento de disco personalizado"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:377
 #, c-format
 msgid ""
@@ -4784,7 +4787,7 @@ msgid "Save packages selection"
 msgstr "Guardar la selección de paquetes"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:412
 #, c-format
 msgid ""
@@ -4805,7 +4808,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."
@@ -4828,7 +4831,7 @@ msgstr ""
 "Haga clic sobre \"%s\" cuando esté listo para formatear las particiones.\n"
 "\n"
 "Haga clic sobre \"%s\" si desea elegir otra partición para la instalación\n"
-"de su sistema operativo Mandrivalinux nuevo.\n"
+"de su sistema operativo Mandriva Linux nuevo.\n"
 "\n"
 "Haga clic sobre \"%s\" si desea seleccionar las particiones del disco en\n"
 "las que se buscarán bloques defectuosos."
@@ -4843,11 +4846,11 @@ msgid "Previous"
 msgstr "Anterior"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/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"
@@ -4859,7 +4862,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Es probable que cuando instale Mandrivalinux algunos paquetes se hayan\n"
+"Es probable que cuando instale Mandriva Linux algunos paquetes se hayan\n"
 "actualizado desde la publicación inicial. Se pueden haber corregido errores\n"
 "y solucionado problemas de seguridad. Para permitir que Usted se beneficie\n"
 "de estas actualizaciones, ahora las puede descargar desde la Internet.\n"
@@ -4879,7 +4882,7 @@ msgid "Install"
 msgstr "Instalar"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:447
 #, c-format
 msgid ""
@@ -4890,7 +4893,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"
@@ -4904,7 +4907,7 @@ msgstr ""
 "\n"
 "Si no sabe cual elegir, mantenga la opción predeterminada. Podrá cambiarla\n"
 "más adelante con la herramienta draksec, que es parte del Centro de Control\n"
-"de Mandrivalinux.\n"
+"de Mandriva Linux.\n"
 "\n"
 "Complete el campo \"%s\" con la dirección de correo electrónico de la\n"
 "persona responsable de la seguridad. Los mensajes relativos a la seguridad\n"
@@ -4916,12 +4919,12 @@ msgid "Security Administrator"
 msgstr "Administrador de seguridad"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/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"
@@ -4992,7 +4995,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Ahora necesita elegir qué particiones se utilizarán para la instalación de\n"
-"su sistema Mandrivalinux. Si ya se han definido particiones, ya sea por\n"
+"su sistema Mandriva Linux. Si ya se han definido particiones, ya sea por\n"
 "una instalación previa de GNU/Linux o con otra herramienta de particionado,\n"
 "puede utilizarlas. De lo contrario, se deben definir particiones en el\n"
 "disco rígido.\n"
@@ -5080,13 +5083,13 @@ msgid "Toggle between normal/expert mode"
 msgstr "Cambiar entre el modo normal/experto"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/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"
@@ -5116,7 +5119,7 @@ msgid ""
 msgstr ""
 "Se ha detectado más de una partición Microsoft Windows en su disco rígido.\n"
 "Por favor, elija aquella a la cual desea cambiar el tamaño para poder\n"
-"instalar su sistema operativo Mandrivalinux nuevo.\n"
+"instalar su sistema operativo Mandriva Linux nuevo.\n"
 "\n"
 "Cada partición se lista como sigue: \"Nombre Linux\", \"Nombre Windows\",\n"
 "\"Capacidad\".\n"
@@ -5149,7 +5152,7 @@ msgstr ""
 "primer disco o partición se denomina \"C:\")."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:564
 #, c-format
 msgid ""
@@ -5164,7 +5167,7 @@ msgstr ""
 "\"%s\" para obtener la lista completa de países."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:569
 #, c-format
 msgid ""
@@ -5172,7 +5175,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"
@@ -5181,19 +5184,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 ""
 "Este paso se activa sólo si se encontró una partición GNU/Linux existente\n"
 "en su máquina.\n"
 "\n"
 "DrakX ahora necesita saber si desea realizar una instalación nueva o una\n"
-"actualización de un sistema Mandrivalinux existente:\n"
+"actualización de un sistema Mandriva Linux existente:\n"
 "\n"
 " * \"%s\". En gran parte, esta opción borrará por completo el sistema\n"
 "anterior. Sin embargo, dependiendo de su esquema de particiones, puede\n"
@@ -5202,18 +5206,20 @@ msgstr ""
 "particionan sus discos, debería usar esta opción.\n"
 "\n"
 " * \"%s\": Esta clase de instalación le permite actualizar los paquetes que\n"
-"en este momento están instalados en su sistema Mandrivalinux. No se alteran\n"
+"en este momento están instalados en su sistema Mandriva Linux. No se "
+"alteran\n"
 "las particiones corrientes de sus discos ni los datos de los usuarios. La\n"
 "mayoría de los otros pasos de configuración permanecen disponibles y son\n"
 "similares a una instalación estándar.\n"
 "\n"
 "El uso de la opción \"Actualizar\" debería funcionar sin problemas para los\n"
-"sistemas Mandrivalinux que corren la versión \"8.1\" o una posterior. No se\n"
+"sistemas Mandriva Linux que corren la versión \"8.1\" o una posterior. No "
+"se\n"
 "recomienda realizar una actualización sobre versiones anteriores a\n"
-"Mandrivalinux versión \"8.1\"."
+"Mandriva Linux versión \"8.1\"."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:591
 #, c-format
 msgid ""
@@ -5253,7 +5259,7 @@ msgstr ""
 "la distribución del teclado entre la latina y la no latina."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:609
 #, c-format
 msgid ""
@@ -5271,7 +5277,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"
@@ -5312,7 +5319,7 @@ msgstr ""
 "Acerca del soporte UTF-8 (Unicode): Unicode es una codificación nueva de\n"
 "caracteres que pretende cubrir todos los idiomas existentes. Sin embargo,\n"
 "el soporte completo para Unicode bajo GNU/Linux todavía está en desarrollo.\n"
-"Por esta razón, Mandrivalinux lo usará o no dependiendo de las elecciones\n"
+"Por esta razón, Mandriva Linux lo usará o no dependiendo de las elecciones\n"
 "del usuario:\n"
 "\n"
 " * Si elige un idioma con codificación legada fuerte (idiomas latin1, ruso,\n"
@@ -5347,7 +5354,7 @@ msgid "Espanol"
 msgstr "Français"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:650
 #, c-format
 msgid ""
@@ -5429,7 +5436,7 @@ msgid "Universal | Any PS/2 & USB mice"
 msgstr "Universal | Cualquier ratón PS/2 y USB"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:684
 #, c-format
 msgid ""
@@ -5440,7 +5447,7 @@ msgstr ""
 "bajo Windows se denomina \"ttyS0\" bajo GNU/Linux."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:688
 #, c-format
 msgid ""
@@ -5527,7 +5534,7 @@ msgid "authentication"
 msgstr "autenticación"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:725
 #, c-format
 msgid ""
@@ -5567,12 +5574,12 @@ msgstr ""
 "solamente si sabe lo que está haciendo."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/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"
@@ -5593,12 +5600,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 ""
 "Ahora es el momento de seleccionar un sistema de impresión para su\n"
 "computadora. Otros sistemas operativos pueden ofrecerle uno, pero\n"
-"Mandrivalinux le ofrece dos. Cada uno de los sistemas de impresión es más\n"
+"Mandriva Linux le ofrece dos. Cada uno de los sistemas de impresión es más\n"
 "adecuado para tipos de configuración particulares.\n"
 "\n"
 " * \"%s\" - \"print, do not queue\" (imprimir sin poner en cola) es la\n"
@@ -5621,7 +5628,7 @@ msgstr ""
 "\n"
 "Si hace una elección ahora y más tarde encuentra que a Usted no le gusta su\n"
 "sistema de impresión, puede cambiarlo ejecutando PrinterDrake desde el\n"
-"Centro de Control de Mandrivalinux y haciendo clic sobre el botón \"%s\"."
+"Centro de Control de Mandriva Linux y haciendo clic sobre el botón \"%s\"."
 
 #: help.pm:765
 #, c-format
@@ -5639,7 +5646,7 @@ msgid "Expert"
 msgstr "Experto"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:768
 #, c-format
 msgid ""
@@ -5680,7 +5687,7 @@ msgstr ""
 "controlador."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:786
 #, c-format
 msgid ""
@@ -5700,7 +5707,7 @@ msgid "Sound card"
 msgstr "Tarjeta de sonido"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:791
 #, c-format
 msgid ""
@@ -5747,7 +5754,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"
@@ -5764,7 +5772,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"
@@ -5816,7 +5824,7 @@ msgstr ""
 "\n"
 " * \"%s\": si desea configurar ahora el acceso a la Internet o a su red\n"
 "local, puede hacerlo ahora. Consulte la documentación impresa o utilice el\n"
-"Centro de Control de Mandrivalinux luego que finalizó la instalación para\n"
+"Centro de Control de Mandriva Linux luego que finalizó la instalación para\n"
 "aprovechar la ayuda en línea completa.\n"
 "\n"
 " * \"%s\": permite configurar las direcciones de los proxy HTTP y FTP si la\n"
@@ -5835,7 +5843,7 @@ msgstr ""
 "haga clic sobre este botón. Esto debería estar reservado para los usuarios\n"
 "avanzados. Consulte la documentación impresa o la ayuda en línea acerca de\n"
 "la configuración del cargador de arranque en el Centro de Control de\n"
-"Mandrivalinux.\n"
+"Mandriva Linux.\n"
 "\n"
 " * \"%s\": por medio de esta entrada podrá tener un control fino sobre qué\n"
 "servicios correrán en su máquina. Si planifica utilizar esta máquina como\n"
@@ -5893,20 +5901,20 @@ msgid "Services"
 msgstr "Servicios"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/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 ""
 "Elija la unidad de disco que desea borrar para instalar su partición\n"
-"Mandrivalinux nueva. Tenga cuidado, ¡se perderán todos los datos presentes\n"
+"Mandriva Linux nueva. Tenga cuidado, ¡se perderán todos los datos presentes\n"
 "en dicha unidad de disco y no se podrán recuperar!."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 #: help.pm:863
 #, c-format
 msgid ""
@@ -6261,7 +6269,7 @@ msgstr "Calculando el espacio de la partición Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Su partición Windows está muy fragmentada, por favor primero ejecute \"defrag"
@@ -6384,13 +6392,13 @@ msgstr "Bajando la red"
 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"
@@ -6444,7 +6452,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"
@@ -6481,7 +6489,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"
@@ -6511,12 +6519,12 @@ msgstr ""
 "Introducción\n"
 "\n"
 "El sistema operativo y los diferentes componentes disponibles en\n"
-"la distribución Mandrivalinux se denominarán \"Productos Software\"\n"
+"la distribución Mandriva Linux se denominarán \"Productos Software\"\n"
 "en adelante.\n"
 "Los Productos Software incluyen, pero no están restringidos a,\n"
 "el conjunto de programas, métodos, reglas y documentación\n"
 "relativas al sistema operativo y a los diferentes componentes de la\n"
-"distribución Mandrivalinux.\n"
+"distribución Mandriva Linux.\n"
 "\n"
 "\n"
 "1. Acuerdo de Licencia\n"
@@ -6565,7 +6573,7 @@ msgstr ""
 "de un juicio en la corte, o cualquier pérdida consecuente) como\n"
 "consecuencia de la posesión y el uso de los componentes software\n"
 "o como consecuencia de la descarga de los componentes\n"
-"software desde alguno de los sitios Mandrivalinux, los cuales están\n"
+"software desde alguno de los sitios Mandriva Linux, los cuales están\n"
 "prohibidos o restringidos en algunos países por las leyes locales.\n"
 "Esta responsabilidad limitada se aplica, pero no esta limitada, a los\n"
 "componentes de criptografía fuerte incluídos en los Productos Software.\n"
@@ -6599,7 +6607,7 @@ msgstr ""
 "Mandriva S.A. se reserva el derecho de modificar o adaptar los\n"
 "Productos Software, como un todo o en parte, por todos los medios\n"
 "y para cualquier propósito.\n"
-"\"Mandriva\", \"Mandrivalinux\" y los logos asociados están registrados\n"
+"\"Mandriva\", \"Mandriva Linux\" y los logos asociados están registrados\n"
 "por Mandriva S.A.\n"
 "\n"
 "\n"
@@ -6714,8 +6722,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"
@@ -6723,14 +6731,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 ""
 "Felicidades, la instalación está completa.\n"
 "Extraiga el soporte de arranque y presione Intro para reiniciar.\n"
 "\n"
 "\n"
 "Para obtener información sobre correcciones disponibles para esta versión\n"
-"de Mandrivalinux, consulte el archivo de erratas disponible en\n"
+"de Mandriva Linux, consulte el archivo de erratas disponible en\n"
 "\n"
 "\n"
 "%s\n"
@@ -6738,14 +6746,14 @@ msgstr ""
 "\n"
 "Hay información disponible sobre cómo configurar su sistema en el capítulo "
 "de\n"
-"configuración tras la instalación de la Guía del Usuario de Mandrivalinux "
+"configuración tras la instalación de la Guía del Usuario de Mandriva Linux "
 "oficial."
 
 #. -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
@@ -6774,12 +6782,12 @@ msgstr "Entrando en la etapa '%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 ""
 "Su sistema tiene pocos recursos. Puede tener algún problema instalando\n"
-"Mandrivalinux. Si eso ocurre, puede intentar una instalación tipo texto.\n"
+"Mandriva Linux. Si eso ocurre, puede intentar una instalación tipo texto.\n"
 "Para ello, presione 'F1' cuando arranque desde el CDROM, e introduzca 'text'."
 
 #: install_steps_gtk.pm:228 install_steps_interactive.pm:624
@@ -7323,9 +7331,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 ""
-"Contactando con el sitio web de Mandrivalinux para obtener la lista de las "
+"Contactando con el sitio web de Mandriva Linux para obtener la lista de las "
 "réplicas disponibles"
 
 #: install_steps_interactive.pm:840
@@ -7553,8 +7561,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Instalación %s de Mandrivalinux"
+msgid "Mandriva Linux Installation %s"
+msgstr "Instalación %s de Mandriva Linux"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10143,13 +10151,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 ""
 "configurador de drakfirewall\n"
 "\n"
-"Esto configura un cortafuegos personal para esta máquina Mandrivalinux.\n"
+"Esto configura un cortafuegos personal para esta máquina Mandriva Linux.\n"
 "Para una solución potente de cortafuegos dedicada, por favor eche un "
 "vistazo\n"
 "a la distribución especializada MandrakeSecurity Firewall."
@@ -14253,12 +14261,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 ""
-"Ejecute Scannerdrake (Hardware/Escáner en en Centro de Control de "
-"Mandrivalinux) para compartir su escáner en la red.\n"
+"Ejecute Scannerdrake (Hardware/Escáner en en Centro de Control de Mandriva "
+"Linux) para compartir su escáner en la red.\n"
 "\n"
 
 #: printer/printerdrake.pm:3933
@@ -16230,23 +16238,23 @@ msgstr "Parar"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>¿Qué es Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>¿Qué es Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "¡Bienvenido a <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "¡Bienvenido a <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 es una <b>distribución Linux</b> que incluye la base del "
+"Mandriva Linux es una <b>distribución Linux</b> que incluye la base del "
 "sistema, llamado el <b>sistema operativo</b> (basado en el núcleo Linux) así "
 "como <b>una gran cantidad de programas</b> que cubren todas las cosas que le "
 "gustaría hacer."
@@ -16254,12 +16262,12 @@ 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 es la distribución más <b>amigable</b> hoy en día. "
-"¡Mandrivalinux es también una de las distribuciones Linux <b>más usadas</b> "
-"en todo el mundo!"
+"Mandriva Linux es la distribución más <b>amigable</b> hoy en día. ¡Mandriva "
+"Linux es también una de las distribuciones Linux <b>más usadas</b> en todo "
+"el mundo!"
 
 #: share/advertising/02.pl:13
 #, c-format
@@ -16274,15 +16282,15 @@ msgstr "¡Bienvenido al <b>mundo del Código Abierto</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 está comprometido con el modelo Open Source. Ello significa "
+"Mandriva Linux está comprometido con el modelo Open Source. Ello significa "
 "que esta nueva versión es el resultado de la <b>colaboración</b> entre el "
 "<b>equipo de desarrolladores de Mandriva</b> y la <b>comunidad mundial</b> "
-"de contribuyentes de Mandrivalinux."
+"de contribuyentes de Mandriva Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16301,11 +16309,11 @@ 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 mayoría de los programas incluidos en esta distribución, así como todas "
-"las herramientas de Mandrivalinux están bajo la <b>Licencia Pública General "
+"las herramientas de Mandriva Linux están bajo la <b>Licencia Pública General "
 "(GPL)</b>."
 
 #: share/advertising/03.pl:17
@@ -16338,25 +16346,25 @@ msgstr "<b>¡Únase a la comunidad!</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 posee una de las <b>mayores comunidades</b> de usuarios y "
+"Mandriva Linux posee una de las <b>mayores comunidades</b> de usuarios y "
 "desarrolladores. El rol de dicha comunidad es muy amplio, yendo de las "
 "notificaciones de errores al desarrollo de nuevos programas. La comunidad "
-"juega un <b>papel clave</b> en el mundo de Mandrivalinux."
+"juega un <b>papel clave</b> en el mundo de 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 ""
 "Para <b>saber más</b> acerca de nuestra dinámica comunidad, por favor, "
-"visite <b>www.mandrakelinux.com</b> o directamente <b>www.mandrakelinux.com/"
+"visite <b>www.mandrivalinux.com</b> o directamente <b>www.mandrivalinux.com/"
 "en/cookerdevel.php3</b> si desea <b>involucrarse</b> en el desarrollo."
 
 #: share/advertising/05.pl:15
@@ -16367,10 +16375,10 @@ msgstr "<b>Versión de descarga</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 ""
-"Instalando <b>Mandrivalinux \"Download\"</b>. Esta es la versión gratuita "
+"Instalando <b>Mandriva Linux \"Download\"</b>. Esta es la versión gratuita "
 "que Mandriva desea mantener <b>disponible a todo el mundo</b>."
 
 #: share/advertising/05.pl:19
@@ -16415,8 +16423,8 @@ msgstr "<b>Discovery, Su primer escritorio Linux</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Instalando <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Instalando <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16438,8 +16446,8 @@ msgstr "<b>PowerPack, lo último en el escritorio Linux</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Instalando <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Instalando <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16459,8 +16467,8 @@ msgstr "<b>PowerPack+, La solución Linux para escritorios y servidores</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Ya está instalando <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Ya está instalando <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16482,15 +16490,15 @@ msgstr "<b>Productos 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 desarrollado una amplia gama de productos "
-"<b>Mandrivalinux</b>."
+"<b>Mandriva</b> ha desarrollado una amplia gama de productos <b>Mandriva "
+"Linux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Los productos Mandrivalinux son:"
+msgid "The Mandriva Linux products are:"
+msgstr "Los productos Mandriva Linux son:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16510,11 +16518,11 @@ msgstr "\t* <b>PowerPack+</b>, La solución Linux para escritorio y servidor."
 #: 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 para x86-64</b>, La solución de Mandrivalinux para dar "
-"lo mejor de su procesador de 64 bits."
+"\t* <b>Mandriva Linux para x86-64</b>, La solución de Mandriva Linux para "
+"dar lo mejor de su procesador de 64 bits."
 
 #: share/advertising/10.pl:15
 #, c-format
@@ -16524,28 +16532,28 @@ msgstr "<b>Productos Mandriva (Productos Nómada)</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 ha desarrollado dos productos que le permiten usar Mandrivalinux "
+"Mandriva ha desarrollado dos productos que le permiten usar Mandriva Linux "
 "<b>en cualquier ordenador</b> sin necesidad de instalación."
 
 #: 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>, una distribución de Mandrivalinux que se ejecuta de forma "
+"\t* <b>Move</b>, una distribución de Mandriva Linux que se ejecuta de forma "
 "completa desde una CD-ROM autoarrancable."
 
 #: 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>Trotamundo («GlobeTrotter»)</b>, es una distribución Mandrivalinux "
+"\t* <b>Trotamundo («GlobeTrotter»)</b>, es una distribución Mandriva Linux "
 "preinstalada en el disco duro ultra-compacto  “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
@@ -16564,22 +16572,24 @@ 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>Corporate Desktop</b>, El escritorio empresarial de Mandrivalinux."
+"\t* <b>Corporate Desktop</b>, El escritorio empresarial de Mandriva Linux."
 
 #: 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>Corporate Server</b>, La solución para servidor de Mandrivalinux."
+"\t* <b>Corporate Server</b>, La solución para servidor de Mandriva Linux."
 
 #: 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>, La solución para la seguridad de "
-"Mandrivalinux."
+"\t* <b>Multi-Network Firewall</b>, La solución para la seguridad de Mandriva "
+"Linux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16782,11 +16792,11 @@ msgstr "<b>Aprecie la amplia gama de programas</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 ""
-"En el menú Mandrivalinux encontrará aplicaciones <b>fáciles de usar</b> para "
-"<b>todas sus tareas</b>:"
+"En el menú Mandriva Linux encontrará aplicaciones <b>fáciles de usar</b> "
+"para <b>todas sus tareas</b>:"
 
 #: share/advertising/18.pl:16
 #, c-format
@@ -17055,18 +17065,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Centro de control de Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Centro de control de 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>Centro de Control de Mandrivalinux</b> es una colección esencial de "
-"utilitarios específicos de Mandrivalinux para simplificar la configuración "
+"El <b>Centro de Control de Mandriva Linux</b> es una colección esencial de "
+"utilitarios específicos de Mandriva Linux para simplificar la configuración "
 "de su computadora."
 
 #: share/advertising/25.pl:17
@@ -17092,15 +17102,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 ""
 "Como todos los programas de ordenador, el software de código abierto "
 "<b>requiere tiempo y personas</b> para su desarrollo. Para continuar la "
 "filosofía del código abierto, Mandriva vende productos de valor añadido y "
-"servicios para <b>seguir mejorando Mandrivalinux</b>. Si desea <b>apoyar a "
-"la filosofía de código abierto</b> y al desarrollo de Mandrivalinux, <b>por "
+"servicios para <b>seguir mejorando Mandriva Linux</b>. Si desea <b>apoyar a "
+"la filosofía de código abierto</b> y al desarrollo de Mandriva Linux, <b>por "
 "favor</b>, ¡considere el comprar uno de nuestros productos o servicios!"
 
 #: share/advertising/27.pl:13
@@ -17134,8 +17144,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Visítela hoy mismo en <b>store.mandrakesoft.com</b>"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Visítela hoy mismo en <b>store.mandriva.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -17145,11 +17155,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> es el <b>compañero perfecto</b> de su producto "
-"Mandrivalinux ..."
+"<b>Mandriva Club</b> es el <b>compañero perfecto</b> de su producto Mandriva "
+"Linux ..."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -17163,10 +17173,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>Descuentos especiales</b> sobre productos y servicios en nuestra "
-"tienda en línea <b>store.mandrakesoft.com</b>."
+"tienda en línea <b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -17179,17 +17189,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Participar en los <b>foros de usuarios</b> de Mandrivalinux."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Participar en los <b>foros de usuarios</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 ""
 "\t* <b>Acceso privilegiado y con anterioridad</b>, antes del lanzamiento "
-"público, de las <b>imágenes ISO</b> de Mandrivalinux ."
+"público, de las <b>imágenes ISO</b> de Mandriva Linux ."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -17209,10 +17219,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 aporta un amplio espectro de valiosos servicios para la "
-"<b>fácil actualización</b> de sus sistemas Mandrivalinux:"
+"<b>fácil actualización</b> de sus sistemas Mandriva Linux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17238,9 +17248,9 @@ msgstr "\t* Flexibilidad en la <b>programación</b>de actualizaciones."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
-"\t* Gestión de <b>todos sus sistemas Mandrivalinux</b> con una única cuenta."
+"\t* Gestión de <b>todos sus sistemas Mandriva Linux</b> con una única cuenta."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -17251,28 +17261,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 ""
 "¿Necesita <b>ayuda?</b> Encuentre técnicos expertos de Mandriva en<b>nuestra "
-"plataforma de soporte técnico</b> www.mandrakeexpert.com."
+"plataforma de soporte técnico</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 ""
-"Gracias a la ayuda de <b>expertos cualificado en Mandrivalinux</b>, ahorrará "
-"mucho tiempo."
+"Gracias a la ayuda de <b>expertos cualificado en Mandriva Linux</b>, "
+"ahorrará mucho tiempo."
 
 #: 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 ""
-"Para cualquier pregunta relacionada con Mandrivalinux, tiene la posibilidad "
-"de adquirir soporte de incidentes en <b>store.mandrakesoft.com</b>."
+"Para cualquier pregunta relacionada con Mandriva Linux, tiene la posibilidad "
+"de adquirir soporte de incidentes en <b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17661,8 +17671,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 ""
 "[OPCIONES] [NOMBRE_PROGRAMA]\n"
 "\n"
@@ -17726,7 +17736,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"
@@ -17740,7 +17750,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPCIONES]...\n"
-"Configurador del Servidor de Terminales de Mandrivalinux\n"
+"Configurador del Servidor de Terminales de Mandriva Linux\n"
 "--enable         : habilitar MTS\n"
 "--disable        : deshabilitar MTS\n"
 "--start          : iniciar MTS\n"
@@ -20598,13 +20608,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Herramienta de Reporte de Errores de Mandrivalinux"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Herramienta de Reporte de Errores de Mandriva Linux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Centro de control de Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Centro de control de Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -21097,20 +21107,20 @@ msgstr "Iniciado al arranque"
 #, 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 ""
 "Todavía no se ha configurado esta interfaz.\n"
 "Lance el asistente \"Añadir una interfaz\" desde el Centro 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 ""
 "Todavía no tiene ninguna conexión a Internet configurada.\n"
-"Lance el asistente \"%s\" desde el Centro de Control de Mandrivalinux"
+"Lance el asistente \"%s\" desde el Centro 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
@@ -21160,8 +21170,8 @@ msgstr "XDM (administrador de conexión KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "XDM (administrador de conexión Mandrivalinux)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "XDM (administrador de conexión Mandriva Linux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21467,18 +21477,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 por Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versión 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
@@ -22061,8 +22071,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Centro de ayuda de Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Centro de ayuda de Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22729,7 +22739,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 se detectó tarjeta de sonido en su máquina. Por favor, verifique que "
 "tiene conectada correctamente una tarjeta de sonido soportada por Linux.\n"
@@ -22738,7 +22748,7 @@ msgstr ""
 "Puede visitar nuestra base de datos de hardware en:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24759,7 +24769,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 se detectó tarjeta de TV en su máquina. Por favor, verifique que tiene "
 "conectada correctamente una tarjeta de vídeo/TV soportada por Linux.\n"
@@ -24768,7 +24778,7 @@ msgstr ""
 "Puede visitar nuestra base de datos de hardware en:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25490,13 +25500,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 ""
 "Este es HardDrake, una herramienta de configuración de hardware de %s.\n"
 "<span foreground=\"royalblue3\">Versión:</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
@@ -25606,8 +25616,8 @@ msgstr "Se ha realizado el cambio, pero no se hará efectivo hasta que salga"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Registros de las Herramientas Mandrivalinux"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Registros de las Herramientas Mandriva Linux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -26130,10 +26140,10 @@ msgstr "Conexión 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 ""
 "Falló la conexión.\n"
-"Verifique su configuración en el Centro de Control de Mandrivalinux."
+"Verifique su configuración en el Centro de Control de Mandriva Linux."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po
index bd34352f5..41004bb9a 100644
--- a/perl-install/share/po/et.po
+++ b/perl-install/share/po/et.po
@@ -1307,11 +1307,11 @@ msgstr "Keelevalik"
 #: 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 toetab paljusid keeli. Valige keeled, mida\n"
+"Mandriva Linux toetab paljusid keeli. Valige keeled, mida\n"
 "soovite paigaldada. Kui paigaldamine on lõpetatud ja Te teete\n"
 "süsteemile taaskäivituse, saate neid kasutada."
 
@@ -3715,12 +3715,12 @@ msgstr "raadiotoe lubamine"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
 "Enne jätkamist lugege hoolikalt läbi litsentsileping. See kehtib kogu\n"
-"Mandrivalinuxi distributsiooni kohta. Kui Te kõigi selle tingimustega\n"
+"Mandriva Linuxi distributsiooni kohta. Kui Te kõigi selle tingimustega\n"
 "nõus olete, märkige ära kast \"%s\". Kui Teile aga miski ei meeldi, siis\n"
 "klõps nupule \"%s\" sooritab arvuti taaskäivitamise."
 
@@ -3898,13 +3898,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The 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 ""
-"Mandrivalinuxi paigalduspaketid on jagatud mitme CD vahel.\n"
+"Mandriva Linuxi paigalduspaketid on jagatud mitme CD vahel.\n"
 "DrakX suudab ära tunda, kui valitud pakett asub muul CD-l,\n"
 "ning väljastab siis seesoleva CD ja palub sisestada selle,\n"
 "mida parajasti vaja läheb.\n"
@@ -3915,11 +3915,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"
@@ -3971,7 +3972,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Nüüd on aeg valida rakendused, mida soovite oma süsteemi paigaldada.\n"
-"Mandrivalinux pakub tuhandeid pakette ja mõistagi ei eelda keegi,\n"
+"Mandriva Linux pakub tuhandeid pakette ja mõistagi ei eelda keegi,\n"
 "et Te neid kõiki juba ette tunneksite.\n"
 "\n"
 "Paketid on rühmitatud gruppidesse vastavalt nende kasutusalale.\n"
@@ -4082,10 +4083,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default 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"
@@ -4116,11 +4117,11 @@ msgstr ""
 "!! Kui tahtlikult või seetõttu, et asi kuulus gruppi,\n"
 "on valitud mõni serveripakett, palutakse Teilt kinnitust,\n"
 "et Te ikka tõesti soovite neid servereid paigaldada.\n"
-"Mandrivalinux käivitab kõik paigaldatud serverid vaikimisi alglaadimise "
+"Mandriva Linux käivitab kõik paigaldatud serverid vaikimisi alglaadimise "
 "ajal.\n"
 "Isegi kui nad olid turvalised ja teadaolevalt probleemivabad ajal,\n"
 "mis valmis distributsioon, võib kergesti juhtuda,\n"
-"et pärast Mandrivalinuxi praeguse versiooni valmimist leiti neist "
+"et pärast Mandriva Linuxi praeguse versiooni valmimist leiti neist "
 "turvaauke.\n"
 "Kui Te ei tea, mida konkreetne teenus pakub või miks see üldse "
 "paigaldatakse,\n"
@@ -4273,7 +4274,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"
@@ -4329,7 +4330,7 @@ msgid ""
 msgstr ""
 "X (ehk X Window System) kujutab endast GNU/Linuxi graafilise "
 "kasutajaliidese\n"
-"tuuma ja südant, millele toetuvad kõik Mandrivalinuxiga kaasas käivad\n"
+"tuuma ja südant, millele toetuvad kõik Mandriva Linuxiga kaasas käivad\n"
 "graafilised töökeskkonnad (KDE, GNOME, AfterStep, WindowMaker jne).\n"
 "\n"
 "Siin näidatakse Teile tervet nimekirja parameetreid, mida saab muuta,\n"
@@ -4452,12 +4453,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"
@@ -4484,7 +4485,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"
@@ -4493,7 +4494,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"
@@ -4513,12 +4515,12 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Olete jõudnud punkti, kus peate otsustama, kuhu täpselt Mandrivalinux\n"
+"Olete jõudnud punkti, kus peate otsustama, kuhu täpselt Mandriva Linux\n"
 "oma kõvakettal paigaldada. Kui kõvaketas on tühi või mõni muu\n"
 "operatsioonisüsteem seda täielikult kasutab, on vaja see osadeks jagada\n"
 "ehk partitsioneerida.\n"
 "Partitsioneerimine on tegevus, mille käigus tekitatakse kettale loogilised\n"
-"piirkonnad Teie uue Mandrivalinuxi süsteemi paigaldamiseks.\n"
+"piirkonnad Teie uue Mandriva Linuxi süsteemi paigaldamiseks.\n"
 "\n"
 "Kuna kõvaketta jagamine on pöördumatu protsess, siis peab kogemusteta\n"
 "kasutaja olema iseäranis ettevaatlik! Selle tegevuse lihtsustamiseks ja\n"
@@ -4548,7 +4550,7 @@ msgstr ""
 "defragmenteerinud. Siiski ei tule kindlasti kahjuks ka andmetest varukoopia\n"
 "valmistamine... See lahendus on soovitatav, kui tahate kasutada ühes "
 "arvutis\n"
-"nii Mandrivalinuxit kui Microsoft Windowsit.\n"
+"nii Mandriva Linuxit kui Microsoft Windowsit.\n"
 "\n"
 "   Enne selle valiku kasuks otsustamist pidage silmas, et kirjeldatud "
 "protseduuri\n"
@@ -4558,7 +4560,7 @@ msgstr ""
 "paigaldamiseks.\n"
 "\n"
 " * \"%s\": kui soovite kustutada kõik andmed ja partitsioonid, mis\n"
-"kõvakettal parajasti on, ning asendada need uue Mandrivalinuxi süsteemiga, "
+"kõvakettal parajasti on, ning asendada need uue Mandriva Linuxi süsteemiga, "
 "on\n"
 "see õige valik. Aga tasub olla ettevaatlik, sest pärast selle valiku "
 "langetamist\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."
@@ -4747,7 +4749,7 @@ msgstr ""
 "\n"
 "Klõpsake \"%s\", kui olete vormindamiseks valmis.\n"
 "\n"
-"Klõpsake \"%s\", kui soovite valida oma uue Mandrivalinuxi süsteemi\n"
+"Klõpsake \"%s\", kui soovite valida oma uue Mandriva Linuxi süsteemi\n"
 "paigaldamiseks mõne muu partitsiooni.\n"
 "\n"
 "Klõpsake \"%s\", kui soovite valida partitsioone, millel kontrollitaks\n"
@@ -4765,7 +4767,7 @@ msgstr "Eelmine"
 #: 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"
@@ -4777,7 +4779,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"On tõenäoline, et praegu, kui Te paigaldate Mandrivalinuxit, on mõned\n"
+"On tõenäoline, et praegu, kui Te paigaldate Mandriva Linuxit, on mõned\n"
 "paketid jõudnud pärast väljalaset juba uuenduskuuri üle elada. Mõnes on ära\n"
 "parandatud paar väiksemat viga, mõnes turvaprobleemid. Et võiksite neist\n"
 "uuendustest tulu lõigata, on Teil nüüd võimalik need Internetist alla "
@@ -4810,7 +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"
@@ -4823,7 +4825,7 @@ msgstr ""
 "enamasti kasutamise mõnevõrra keerukamaks.\n"
 "\n"
 "Kui Te ei tea, mida valida, jätke kehtima vaikimisi pakutud valik. Hiljem\n"
-"saate turvataset muuta Mandrivalinuxi juhtimiskeskuses abivahendiga "
+"saate turvataset muuta Mandriva Linuxi juhtimiskeskuses abivahendiga "
 "Draksec.\n"
 "\n"
 "Väli \"%s\" on mõeldud süsteemi turvalisuse eest vastutava kasutaja\n"
@@ -4838,7 +4840,7 @@ msgstr "Turvaadministraator"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4908,7 +4910,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Nüüd peate valima partitsiooni(d), kuhu soovite Mandrivalinuxi paigaldada.\n"
+"Nüüd peate valima partitsiooni(d), kuhu soovite Mandriva Linuxi paigaldada.\n"
 "Kui need on juba olemas kas GNU/Linuxi varasema paigalduse või mõne muu\n"
 "kettajagamisvahendi tegevuse tulemusena, võite kasutada olemasolevaid\n"
 "partitsioone. Vastasel juhul tuleb need luua.\n"
@@ -5000,7 +5002,7 @@ msgstr "Tava- ja ekspertrežiimi lülitamine"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"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 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Teie arvuti kõvakettal on rohkem kui üks Microsoft Windowsi partitsioon.\n"
-"Palun valige välja see, mille suurust soovite Mandrivalinuxi jaoks muuta.\n"
+"Palun valige välja see, mille suurust soovite Mandriva Linuxi jaoks muuta.\n"
 "\n"
 "Teie abistamiseks on igal partitsioonil näidatud \"Nimi Linuxis\", \"Nimi "
 "Windowsis\" ja \"Mahutavus\".\n"
@@ -5076,7 +5078,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing 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"
@@ -5085,19 +5087,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 ""
 "Seda sammu on vaja ainult siis, kui masinas leiti varasem\n"
 "GNU/Linuxi partitsioon.\n"
 "\n"
 "DrakX soovib nüüd teada, kas tahate paigaldada uue süsteemi või uuendada\n"
-"olemasolevat Mandrivalinuxi süsteemi:\n"
+"olemasolevat Mandriva Linuxi süsteemi:\n"
 "\n"
 " * \"%s\": üldiselt pühib see vana süsteemi täielikult minema. Kui\n"
 "soovite muuta praeguseid partitsioone või failisüsteemi, siis võiks seda "
@@ -5106,13 +5109,13 @@ msgstr ""
 "ülekirjutamise eest päästa.\n"
 "\n"
 " * \"%s\": see paigaldamisviis võimaldab uuendada praegu olemasolevasse\n"
-"Mandrivalinuxi süsteemi paigaldatud pakette. Kettajagamisskeemi ega "
+"Mandriva Linuxi süsteemi paigaldatud pakette. Kettajagamisskeemi ega "
 "kasutajate\n"
 "andmeid ei muudeta. Enamik seadistussamme on kasutatavad sarnaselt "
 "tavapärasele\n"
 "paigaldamisele.\n"
 "\n"
-"Võimalus \"Uuendus\" peaks toimima edukalt Mandrivalinuxi süsteemides\n"
+"Võimalus \"Uuendus\" peaks toimima edukalt Mandriva Linuxi süsteemides\n"
 "alates versioonist 8.1. Uuenduse proovimist varasemate versioonide peal\n"
 "me siiski ei soovita."
 
@@ -5168,7 +5171,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"
@@ -5206,7 +5210,7 @@ msgstr ""
 "\n"
 "Mõni sõna UTF-8 (unicode) toetuse kohta. Unicode on uus kodeering, mis\n"
 "peaks hõlmama kõiki keeli. Selle täielik toetus ei ole GNU/Linuxis\n"
-"siiski veel täielikult teostatud. Seetõttu lähtub Mandrivalinux selle\n"
+"siiski veel täielikult teostatud. Seetõttu lähtub Mandriva Linux selle\n"
 "kasutamisel või mittekasutamisel järgmistest asjaoludest:\n"
 "\n"
 " * Kui valite keele, mis üldreeglina kasutab muud kodeeringut (latin1 \n"
@@ -5447,7 +5451,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"
@@ -5468,12 +5472,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 ""
 "Siin saate valida oma arvuti trükkimissüsteemi. Teised "
 "operatsioonisüsteemid\n"
-"võivad Teile pakkuda vaid üht süsteemi, kuid Mandrivalinuxi puhul saate\n"
+"võivad Teile pakkuda vaid üht süsteemi, kuid Mandriva Linuxi puhul saate\n"
 "valida tervelt kahe seast.\n"
 "\n"
 " * \"%s\" - mis tähendab \"trüki kohe\" (\"print, do not queue\") - tuleks "
@@ -5498,7 +5502,7 @@ msgstr ""
 "trükkimiseks või printeri seadistamiseks.\n"
 "\n"
 "Kui leiate hiljem, et siinkohal langetatud valik polnud vahest kõige parem,\n"
-"siis saate seda muuta Mandrivalinuxi juhtimiskeskuses PrinterDrake abil,\n"
+"siis saate seda muuta Mandriva Linuxi juhtimiskeskuses PrinterDrake abil,\n"
 "klõpsates seal nupule \"%s\"."
 
 #: help.pm:765
@@ -5620,7 +5624,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"
@@ -5637,7 +5642,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"
@@ -5698,7 +5703,7 @@ msgstr ""
 "\n"
 " * \"%s\": kui soovite muuta alglaaduri seadistusi, klõpsake\n"
 "sellele nupule. See on mõeldud siiski vaid kogenud kasutajatele.\n"
-"Täpsemat infot leiab käsiraamatust või Mandrivalinuxi juhtimiskeskusest.\n"
+"Täpsemat infot leiab käsiraamatust või Mandriva Linuxi juhtimiskeskusest.\n"
 "\n"
 " * \"%s\": saate täpselt kontrollida, millised teenused Teie\n"
 "süsteemis töötavad. Kui kavatsete kasutada oma masinat serverina, kuluks\n"
@@ -5759,10 +5764,10 @@ msgstr "Teenused"
 #, 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 ""
-"Valige kõvaketas, mida soovite puhastada oma uue Mandrivalinuxi\n"
+"Valige kõvaketas, mida soovite puhastada oma uue Mandriva Linuxi\n"
 "paigaldamiseks. Ettevaatust, kõik sellel leiduvad andmed hävitatakse\n"
 "ja neid ei saa enam taastada."
 
@@ -6116,12 +6121,12 @@ msgstr "Vaba ruumi arvutamine Windowsi partitsioonil"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Teie Windowsi partitsioon on fragmenteerunud. Palun tehke arvutile uus "
 "alglaadimine, käivitage Windows ja seejärel utiliit \"defrag\" ning tulge "
-"siis Mandrivalinuxi paigaldamise juurde tagasi."
+"siis Mandriva Linuxi paigaldamise juurde tagasi."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6236,13 +6241,13 @@ msgstr "Võrgu seiskamine"
 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"
@@ -6296,7 +6301,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"
@@ -6333,7 +6338,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"
@@ -6357,13 +6362,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"
@@ -6417,7 +6422,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"
@@ -6454,7 +6459,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"
@@ -6564,8 +6569,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"
@@ -6573,27 +6578,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 ""
 "Õnnitleme, paigaldamine on edukalt lõpetatud.\n"
 "Võtke palun välja diskett ja/või CD ja vajutage Enter alglaadimiseks.\n"
 "\n"
 "\n"
 "Informatsiooni selle distributsiooni paranduste kohta (Errata) saab\n"
-"Mandrivalinuxi koduleheküljelt:\n"
+"Mandriva Linuxi koduleheküljelt:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Abi süsteemi edasiseks seadistamiseks saab eelkõige\n"
-"Mandrivalinuxi kasutaja käsiraamatust."
+"Mandriva Linuxi kasutaja käsiraamatust."
 
 #. -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
@@ -6621,7 +6626,7 @@ msgstr "Järgmine samm: %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 ""
@@ -7151,7 +7156,7 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 "Teil on nüüd võimalus alla laadida uuendatud pakette. Need on välja lastud\n"
-"pärast Mandrivalinuxi distributsiooni ilmumist ja võivad sisaldada vigade\n"
+"pärast Mandriva Linuxi distributsiooni ilmumist ja võivad sisaldada vigade\n"
 "parandusi või turvauuendusi.\n"
 "\n"
 "Allalaadimiseks peab Teil olema töötav internetiühendus.\n"
@@ -7161,9 +7166,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 ""
-"Mandrivalinuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."
+"Mandriva Linuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7386,8 +7391,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinuxi paigaldamine %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linuxi paigaldamine %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9973,7 +9978,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 ""
@@ -14021,11 +14026,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 ""
-"Oma skänneri väljajagamiseks võrgus käivitage Scannerdrake (Mandrivalinuxi "
+"Oma skänneri väljajagamiseks võrgus käivitage Scannerdrake (Mandriva Linuxi "
 "juhtimiskeskuses rubriik Riistvara/Skänner).\n"
 "\n"
 
@@ -15933,23 +15938,23 @@ msgstr "Peata"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Mis on Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Mis on Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Tere tulemast <b>Mandrivalinuxisse</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Tere tulemast <b>Mandriva Linuxisse</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 on <b>Linuxi distributsioon</b>, mis koosneb süsteemi "
+"Mandriva Linux on <b>Linuxi distributsioon</b>, mis koosneb süsteemi "
 "tuumikust ehk <b>operatsioonisüsteemist</b> (selle aluseks on Linuxi kernel) "
 "ning <b>paljudest rakendustest</b>, mis rahuldavad ilmselt küll kõik Teie "
 "vajadused."
@@ -15957,10 +15962,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 on kõige <b>kasutajasõbralikum</b> Linuxi distributsioon. See "
+"Mandriva Linux on kõige <b>kasutajasõbralikum</b> Linuxi distributsioon. See "
 "on üks maailma <b>kõige kasutatavamaid</b> distributsioone!"
 
 #: share/advertising/02.pl:13
@@ -15976,13 +15981,13 @@ msgstr "Tere tulemast <b>vaba tarkvara maailma</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 toetab kõigiti vaba tarkvara. Ka praegune väljalase on "
-"<b>Mandrivai arendajate meeskonna</b> ja Mandrivalinuxi <b>üleilmse "
+"Mandriva Linux toetab kõigiti vaba tarkvara. Ka praegune väljalase on "
+"<b>Mandrivai arendajate meeskonna</b> ja Mandriva Linuxi <b>üleilmse "
 "kaasautorite kogukonna</b> <b>ühise koostöö</b> vili."
 
 #: share/advertising/02.pl:19
@@ -16002,10 +16007,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 ""
-"Suuremat osa distributsiooni kaasatud tarkvara ja kõiki Mandrivalinuxi "
+"Suuremat osa distributsiooni kaasatud tarkvara ja kõiki Mandriva Linuxi "
 "abivahendeid levitatakse <b>Üldise Avaliku Litsentsi</b> (GPL) alusel."
 
 #: share/advertising/03.pl:17
@@ -16031,31 +16036,31 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Liituge Mandrivalinuxi kogukonnaga</b>"
+msgstr "<b>Liituge Mandriva Linuxi kogukonnaga</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 ""
-"Mandrivalinuxi kasutajad ja arendajad moodustavad <b>väga suure kogukonna</"
+"Mandriva Linuxi kasutajad ja arendajad moodustavad <b>väga suure kogukonna</"
 "b>. Selle liikmete tegevusvaldkond on äärmiselt lai, ulatudes vigade "
-"teatamisest kuni uute rakenduste väljatöötamiseni. Kogukonnal on "
-"Mandrivalinuxi maailmas lausa <b>võtmeroll</b>."
+"teatamisest kuni uute rakenduste väljatöötamiseni. Kogukonnal on Mandriva "
+"Linuxi maailmas lausa <b>võtmeroll</b>."
 
 #: 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 ""
 "Kui soovite meie toimekast kogukonnast <b>rohkem teada saada</b>, külastage "
-"palun veebisaiti <b>www.mandrakelinux.com</b> või kui soovite "
-"arendustegevuses <b>kaasa lüüa</b>, siis ka <b>www.mandrakelinux.com/en/"
+"palun veebisaiti <b>www.mandrivalinux.com</b> või kui soovite "
+"arendustegevuses <b>kaasa lüüa</b>, siis ka <b>www.mandrivalinux.com/en/"
 "cookerdevel.php3</b>."
 
 #: share/advertising/05.pl:15
@@ -16066,10 +16071,10 @@ msgstr "<b>Allatõmmatav versioon</b> (\"Download version\")"
 #: 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 ""
-"Paigaldate praegu <b>Mandrivalinuxi allatõmmatavat</b> versiooni. See on "
+"Paigaldate praegu <b>Mandriva Linuxi allatõmmatavat</b> versiooni. See on "
 "vaba versioon, mis Mandrivai tahtmist mööda on <b>kättesaadav kõigile</b>."
 
 #: share/advertising/05.pl:19
@@ -16114,8 +16119,8 @@ msgstr "<b>Discovery - Teie esimene Linuxi töölaud</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Paigaldate praegu <b>Mandrivalinuxi Discovery</b> versiooni."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Paigaldate praegu <b>Mandriva Linuxi Discovery</b> versiooni."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16137,8 +16142,8 @@ msgstr "<b>PowerPack - tipptasemel Linuxi töölaud</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Paigaldate praegu <b>Mandrivalinuxi PowerPack</b> versiooni."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Paigaldate praegu <b>Mandriva Linuxi PowerPack</b> versiooni."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16158,8 +16163,8 @@ msgstr "<b>PowerPack+ - Linuxi lahendus töölaudadele ja serveritele</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Paigaldate praegu <b>Mandrivalinuxi PowerPack+</b> versiooni."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Paigaldate praegu <b>Mandriva Linuxi PowerPack+</b> versiooni."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16182,14 +16187,14 @@ msgstr "<b>Mandrivai tooted</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> on välja töötanud terve rea <b>Mandrivalinuxi</b> tooteid."
+"<b>Mandriva</b> on välja töötanud terve rea <b>Mandriva Linuxi</b> tooteid."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux koosseisu kuuluvad järgmised tooted:"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux koosseisu kuuluvad järgmised tooted:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16209,10 +16214,10 @@ msgstr "\t* <b>PowerPack+</b> - Linuxi lahendus töölaudadele ja serveritele."
 #: 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> - Mandrivalinuxi lahendus, mis sobib "
+"\t* <b>Mandriva Linux for x86-64</b> - Mandriva Linuxi lahendus, mis sobib "
 "kõige paremini Teie 64-bitisele protsessorile."
 
 #: share/advertising/10.pl:15
@@ -16223,29 +16228,29 @@ msgstr "<b>Mandrivai tooted (kaasaskantavad)</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 on välja töötanud kaks toodet, mis lubavad Teil kasutada "
-"Mandrivalinuxit <b>suvalises arvutis</b>, ilma et peaksite seda tegelikult "
-"arvutisse paigaldamagi:"
+"Mandriva on välja töötanud kaks toodet, mis lubavad Teil kasutada Mandriva "
+"Linuxit <b>suvalises arvutis</b>, ilma et peaksite seda tegelikult arvutisse "
+"paigaldamagi:"
 
 #: 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> - Mandrivalinuxi distributsioon, mis töötab täielikult "
+"\t* <b>Move</b> - Mandriva Linuxi distributsioon, mis töötab täielikult "
 "alglaaditava CD pealt."
 
 #: 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> - Mandrivalinuxi distributsioon, mis on juba "
+"\t* <b>GlobeTrotter</b> - Mandriva Linuxi distributsioon, mis on juba "
 "paigaldatud ülikompaktsele LaCie välisele kõvakettale."
 
 #: share/advertising/11.pl:13
@@ -16264,18 +16269,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> - Mandrivalinuxi töölaud firmadele."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b> - Mandriva Linuxi töölaud firmadele."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b> - Mandrivalinuxi serverilahendus."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b> - Mandriva Linuxi serverilahendus."
 
 #: 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> - Mandrivalinuxi turvalahendus."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b> - Mandriva Linuxi turvalahendus."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16477,10 +16484,10 @@ msgstr "<b>Ääretu valik rakendusi igaks vajaduseks</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 ""
-"Mandrivalinuxi menüüst leiab <b>hõlpsasti kasutatavad</b> rakendused "
+"Mandriva Linuxi menüüst leiab <b>hõlpsasti kasutatavad</b> rakendused "
 "<b>igaks vajaduseks</b>:"
 
 #: share/advertising/18.pl:16
@@ -16743,19 +16750,19 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinuxi juhtimiskeskus</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linuxi juhtimiskeskus</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>Mandrivalinuxi juhtimiskeskus</b> koondab ühtekokku olulised, "
-"Mandrivalinuxile spetsiifilised tööriistad, et Te saaksite oma arvutit "
-"lihtsamalt ja mugavamalt seadistada."
+"<b>Mandriva Linuxi juhtimiskeskus</b> koondab ühtekokku olulised, Mandriva "
+"Linuxile spetsiifilised tööriistad, et Te saaksite oma arvutit lihtsamalt ja "
+"mugavamalt seadistada."
 
 #: share/advertising/25.pl:17
 #, c-format
@@ -16779,14 +16786,14 @@ 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 ""
 "Nagu programmeerimine üldse, nõuab ka vaba tarkvara arendamiseks <b>aega ja "
 "inimesi</b>. Vaba tarkvara põhimõtete vaimu elushoidmiseks müüb Mandriva oma "
-"tooteid ja teenuseid, et <b>aidata arendada Mandrivalinuxit</b>. Kui ka Teie "
-"soovite <b>toetada vaba tarkvara põhimõtteid</b> ning Mandrivalinuxi "
+"tooteid ja teenuseid, et <b>aidata arendada Mandriva Linuxit</b>. Kui ka "
+"Teie soovite <b>toetada vaba tarkvara põhimõtteid</b> ning Mandriva Linuxi "
 "arendustegevust, kaaluge <b>palun</b> mõtet osta mõni meie toode või teenus!"
 
 #: share/advertising/27.pl:13
@@ -16820,8 +16827,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Astuge juba täna läbi aadressilt <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Astuge juba täna läbi aadressilt <b>store.mandriva.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16831,10 +16838,10 @@ 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> on <b>suurepärane kaaslane</b> Teie Mandrivalinuxi "
+"<b>Mandriva Club</b> on <b>suurepärane kaaslane</b> Teie Mandriva Linuxi "
 "tootele."
 
 #: share/advertising/28.pl:19
@@ -16849,10 +16856,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* Toodete ja teenuste <b>spetsiaalne allahindlus</b> meie Internetipoes "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -16865,17 +16872,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Osalemine Mandrivalinuxi <b>kasutajate foorumitel</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Osalemine Mandriva Linuxi <b>kasutajate foorumitel</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>Varane ja privilegeeritud ligipääs</b> juba enne ametlikku väljalaset "
-"Mandrivalinuxi <b>ISO-tõmmistele</b>."
+"Mandriva Linuxi <b>ISO-tõmmistele</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -16895,9 +16902,9 @@ 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 tähendab mitmeid hinnalisi teenuseid oma Mandrivalinuxi "
+"Mandriva Online tähendab mitmeid hinnalisi teenuseid oma Mandriva Linuxi "
 "süsteemi <b>hõlpsaks uuendamiseks</b>:"
 
 #: share/advertising/29.pl:18
@@ -16923,9 +16930,9 @@ msgstr "\t* Paindlik uuenduste <b>ajastamine</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>Kõigi oma Mandrivalinuxi süsteemide</b> haldamine ühe konto alt."
+"\t* <b>Kõigi oma Mandriva Linuxi süsteemide</b> haldamine ühe konto alt."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -16936,28 +16943,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 ""
 "Läheb Teil vaja <b>veidi abi</b>? Mandrivai asjatundjad on valmis seda Teile "
-"osutama <b>meie tehnilise toe keskkonnas</b> www.mandrakeexpert.com."
+"osutama <b>meie tehnilise toe keskkonnas</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>Kvalifitseeritud Mandrivalinuxi ekspertide</b> abiga võite kokku hoida "
+"<b>Kvalifitseeritud Mandriva Linuxi ekspertide</b> abiga võite kokku hoida "
 "hulganisti aega ja vaeva."
 
 #: 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 ""
-"Iga Mandrivalinuxiga seotud küsimuse puhul on Teil võimalik osta konkreetne "
-"tugiteenus meie Internetikaupluses <b>store.mandrakesoft.com</b>."
+"Iga Mandriva Linuxiga seotud küsimuse puhul on Teil võimalik osta konkreetne "
+"tugiteenus meie Internetikaupluses <b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17341,15 +17348,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 ""
 "[VÕTMED] [RAKENDUSE_NIMI]\n"
 "\n"
 "VÕTMED:\n"
 "  --help            - näitab käesolevat abiteadet.\n"
-"  -report           - rakendus peab olema üks Mandrivalinuxi tööriistadest\n"
-"  -incident         - rakendus peab olema üks Mandrivalinuxi tööriistadest"
+"  -report           - rakendus peab olema üks Mandriva Linuxi tööriistadest\n"
+"  -incident         - rakendus peab olema üks Mandriva Linuxi tööriistadest"
 
 #: standalone.pm:63
 #, c-format
@@ -17404,7 +17411,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"
@@ -17418,7 +17425,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[VÕTMED]...\n"
-"Mandrivalinuxi terminaliserveri seadistaja\n"
+"Mandriva Linuxi terminaliserveri seadistaja\n"
 "--enable         : lubab MTSi\n"
 "--disable        : keelab MTSi\n"
 "--start          : käivitab MTSi\n"
@@ -20254,13 +20261,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinuxi vigadest teatamise vahend"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linuxi vigadest teatamise vahend"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinuxi juhtimiskeskus"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linuxi juhtimiskeskus"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20751,19 +20758,19 @@ msgstr "Käivitub laadimisel"
 #, 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 ""
 "Seda liidest ei ole veel seadistatud.\n"
-"Käivitage Mandrivalinuxi juhtimiskeskuses nõustaja \"Liidese lisamine\""
+"Käivitage Mandriva Linuxi juhtimiskeskuses nõustaja \"Liidese lisamine\""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Internetiühendust ei ole veel seadistatud.\n"
-"Käivitage Mandrivalinuxi juhtimiskeskuses nõustaja \"%s\""
+"Käivitage Mandriva Linuxi juhtimiskeskuses nõustaja \"%s\""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20813,8 +20820,8 @@ msgstr "KDM (KDE kuvahaldur)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MkdKDM (Mandrivalinuxi kuvahaldur)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MkdKDM (Mandriva Linuxi kuvahaldur)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21118,18 +21125,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 ""
 "Autoriõigus (C) 2001-2002: Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (algversioon)\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
@@ -21699,8 +21706,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinuxi abikeskus"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linuxi abikeskus"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22353,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 ""
 "Teie masinas ei leitud helikaarti. Kontrollige palun, et Linuxi toega "
 "helikaart on korrektselt ühendatud.\n"
@@ -22362,7 +22369,7 @@ msgstr ""
 "Meie riistvara andmebaasi saab näha aadressil:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24377,7 +24384,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 ""
 "Teie süsteemis ei leitud TV-kaarti. Kontrollige palun, et Linuxi toega video/"
 "TV-kaart on korrektselt ühendatud.\n"
@@ -24386,7 +24393,7 @@ msgstr ""
 "Meie riistvara andmebaasi saate külastada aadressil:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25092,13 +25099,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 ""
 "See on HardDrake - %si riistvara seadistamisvahend.\n"
 "<span foreground=\"royalblue3\">Versioon:</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
@@ -25207,8 +25214,8 @@ msgstr "Muudatus on tehtud, aga selle rakendamiseks tuleb välja logida"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinuxi vahendite logi"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linuxi vahendite logi"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25720,10 +25727,10 @@ msgstr "Ühendus on loodud."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Ühenduse loomine ebaõnnestus.\n"
-"Kontrollige palun seadistusi Mandrivalinuxi juhtimiskeskuse abil."
+"Kontrollige palun seadistusi Mandriva Linuxi juhtimiskeskuse abil."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/eu.po b/perl-install/share/po/eu.po
index 32f82048e..76700eb11 100644
--- a/perl-install/share/po/eu.po
+++ b/perl-install/share/po/eu.po
@@ -1313,11 +1313,11 @@ msgstr "Hizkuntza aukera"
 #: 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-ek hainbat hizkuntza onar ditzake. Hautatu\n"
+"Mandriva Linux-ek hainbat hizkuntza onar ditzake. Hautatu\n"
 "instalatu nahi dituzun hizkuntzak. Instalazioa osatzean eta\n"
 "sistema berrabiaraztean, erabilgarri egongo dira."
 
@@ -3738,12 +3738,12 @@ msgstr "gaitu irrati-euskarria"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
 "Aurrera jarraitu aurretik lizentziaren baldintzak arretaz irakurri. \n"
-"Mandrivalinux banaketa osoa hartzen du. Baldintza guztiekin ados \n"
+"Mandriva Linux banaketa osoa hartzen du. Baldintza guztiekin ados \n"
 "bazaude, hautatu \"%s\" laukia. Onartzen ez badituzu, \"%s\" botoian klik\n"
 "egin eta ordenagailua berrabiaraziko da."
 
@@ -3855,7 +3855,7 @@ msgid "Advanced"
 msgstr "Aurreratua"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:54
 #, c-format
 msgid ""
@@ -3925,33 +3925,34 @@ msgstr ""
 "\"bigarren SCSI ID baxuena\", etab."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.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 ""
-"Mandrivalinux instalazioa zenbait CD-ROMetan banatuta dago. \n"
+"Mandriva Linux instalazioa zenbait CD-ROMetan banatuta dago. \n"
 "Hautatutako pakete bat beste CD-ROM batean badago, DrakX-k du\n"
 "uneko CDa egotziko eta behar den CDa sartzeko eskatuko dizu.\n"
 "Eskatzen zaizun CDa ez badaukazu eskura, sakatu \"%s\",\n"
 "dagozkion paketeak ez dira instalatuko."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.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"
@@ -4003,10 +4004,10 @@ msgid ""
 "megabytes."
 msgstr ""
 "Sisteman zein programa instalatu nahi dituzun zehazteko garaia da.\n"
-"Mandrivalinux-erako milaka pakete dituzu erabilgarri, eta kudeaketa\n"
+"Mandriva Linux-erako milaka pakete dituzu erabilgarri, eta kudeaketa\n"
 "errazteko, antzeko aplikazioen multzotan kokatu dira.\n"
 "\n"
-"Mandrivalinux-ek pakete multzoak lau kategoriatan antolatzen ditu.\n"
+"Mandriva Linux-ek pakete multzoak lau kategoriatan antolatzen ditu.\n"
 "Kategoria anitzetako aplikazioak nahastu eta bateratu ditzakezu, honela\n"
 "\"Lanpostua\" instalazio batek \"Zerbitzari\" kategoriako aplikazioak\n"
 "instalatuta izan ditzake.\n"
@@ -4099,7 +4100,7 @@ msgid "Truly minimal install"
 msgstr "Instalazio minimo-minimoa"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:149
 #, c-format
 msgid ""
@@ -4114,10 +4115,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"
@@ -4149,10 +4150,10 @@ msgstr ""
 "Zerbitzari pakete bat hautatu bada, pakete hori zehazki hautatu duzulako\n"
 "edo pakete-talde bateko zati zelako, zerbitzari horiek instalatu nahi "
 "dituzula\n"
-" berresteko eskatuko zaizu. Lehenespenez Mandrivalinux-ek instalatutako\n"
+" berresteko eskatuko zaizu. Lehenespenez Mandriva Linux-ek instalatutako\n"
 "edozein zerbitzu abioan automatikoki abiaraziko du. Nahiz eta seguruak\n"
 " diren eta arazo ezagunik ez duten banaketa kaleratzeko garaian, guztiz\n"
-" posible da Mandrivalinux bertsio hau amaitu eta gero segurtasun zuloak\n"
+" posible da Mandriva Linux bertsio hau amaitu eta gero segurtasun zuloak\n"
 " aurkitu izana. Ez badakizu zerbitzu zehatz batek zer egiten duen edo "
 "zergatik\n"
 " instalatu den, klikatu \"%s\". \"%s \" klikatzeak zerrendatutako "
@@ -4200,7 +4201,7 @@ msgid "Configure"
 msgstr "Konfiguratu"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:189
 #, c-format
 msgid ""
@@ -4239,7 +4240,7 @@ msgstr ""
 "soilik hautatu!!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:206
 #, c-format
 msgid ""
@@ -4307,7 +4308,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with 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"
@@ -4362,7 +4363,7 @@ msgid ""
 "not successful in getting the display configured."
 msgstr ""
 "X (X Window sistema) GNU/Linux-en interfaze grafikoaren bihotza da,\n"
-" Mandrivalinux-ekin bildutako ingurune grafiko guztiek (KDE, Gnome,\n"
+" Mandriva Linux-ekin bildutako ingurune grafiko guztiek (KDE, Gnome,\n"
 "Afterstep, WindowMaker...) erabiltzen dutena.\n"
 "\n"
 "Bistaratze grafiko optimoa lortzeko aldatu daitekeen parametro zerrenda\n"
@@ -4462,7 +4463,7 @@ msgstr ""
 "zaizu."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:308
 #, c-format
 msgid ""
@@ -4481,16 +4482,16 @@ msgstr ""
 "bistaratzea konfiguratzea lortzen ez baduzu."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.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"
@@ -4517,7 +4518,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both 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"
@@ -4526,7 +4527,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"
@@ -4546,11 +4548,11 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Hona iritsita, Mandrivalinux sistema eragilea disko zurrunean non\n"
+"Hona iritsita, Mandriva Linux sistema eragilea disko zurrunean non\n"
 "instalatu aukeratu behar duzu. Zure disko zurruna hutsik badago edo\n"
 "lehendik dagoen sistema eragile batek leku erabilgarri guztia betetzen\n"
 "badu, diska zatikatu beharko duzu. Disko zurruna zatikatzea, funtsean,  \n"
-"diskoa logikoki zatitzea da, Mandrivalinux sistema berria instalatzeko\n"
+"diskoa logikoki zatitzea da, Mandriva Linux sistema berria instalatzeko\n"
 "behar den lekua sortzeko.\n"
 "\n"
 "Disko zurruna zatikatzeko prozesua normalean itzulbiderik gabea denez\n"
@@ -4581,7 +4583,7 @@ msgstr ""
 " edo NTFS partizioei neurria aldatu. Neurri aldaketa datu galerarik gabe\n"
 "gauzatu daiteke baldin eta aurretik Windows partizioa desfragmentatu\n"
 " baduzu. Oso gomendagarria da datuen babeskopiak egitea. Aukera hau\n"
-" erabiltzea gomendatzen da Mandrivalinux eta Microsoft Windows, biak,\n"
+" erabiltzea gomendatzen da Mandriva Linux eta Microsoft Windows, biak,\n"
 " konputagailu berean erabili nahi badituzu.\n"
 "\n"
 "   Aukera hau hautatu aurretik, ulertu ezazu prozedura honen ondoren,\n"
@@ -4590,7 +4592,7 @@ msgstr ""
 "zure datuak gorde edo software berria instalatzeko.\n"
 "\n"
 " * \"%s\": Disko zurrunean dauden datu eta partizio guztiak ezabatu eta \n"
-"Mandrivalinux sistema berriarekin ordeztu nahi badituzu, hautatu aukera\n"
+"Mandriva Linux sistema berriarekin ordeztu nahi badituzu, hautatu aukera\n"
 " hau. Kontuz, berretsi ondoren ezingo baituzu eragiketa desegin.\n"
 "\n"
 "   !! Aukera hau hautatzen baduzu, diskoko datu guztiak ezabatuko dira. !!\n"
@@ -4640,7 +4642,7 @@ msgid "Custom disk partitioning"
 msgstr "Disko-partizio pertsonalizatua"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:377
 #, c-format
 msgid ""
@@ -4736,7 +4738,7 @@ msgid "Save packages selection"
 msgstr "Gorde pakete-hautapena"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:412
 #, c-format
 msgid ""
@@ -4757,7 +4759,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."
@@ -4778,7 +4780,7 @@ msgstr ""
 "\n"
 "Klikatu \"%s\" partizioak eratzeko prest zaudenean.\n"
 "\n"
-"Klikatu \"%s\" Mandrivalinux sistema eragile berria instalatzeko beste "
+"Klikatu \"%s\" Mandriva Linux sistema eragile berria instalatzeko beste "
 "partizio\n"
 " bat aukeratu nahi baduzu.\n"
 "\n"
@@ -4795,11 +4797,11 @@ msgid "Previous"
 msgstr "Aurrekoa"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.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"
@@ -4811,7 +4813,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 instalatzen duzunerako, litekeena da pakete batzuk\n"
+"Mandriva Linux instalatzen duzunerako, litekeena da pakete batzuk\n"
 "hasierako argitalpenetik aldatu izana. Baliteke akatsak zuzendu eta \n"
 "segurtasun arazoak konpondu izatea. Eguneratzeez baliatu ahal izan\n"
 "zaitezen, orain, Internetetik jaitsi ditzakezu. Markatu \"%s\" dabilen "
@@ -4831,7 +4833,7 @@ msgid "Install"
 msgstr "Instalatu"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:447
 #, c-format
 msgid ""
@@ -4842,7 +4844,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"
@@ -4855,7 +4857,7 @@ msgstr ""
 "ezartzean, normalean erabilera erraztasuna galtzen da.\n"
 "\n"
 "Zer aukeratu ez badakizu, hautatu aukera lehenetsia. Gero aldatu \n"
-"ahal izango duzu draksec tresnarekin, Mandrivalinux Aginte Gunearen\n"
+"ahal izango duzu draksec tresnarekin, Mandriva Linux Aginte Gunearen\n"
 "zati bat.\n"
 "\n"
 "Bete \"%s\" eremua segurtasun arduradunaren postaE helbidearekin.\n"
@@ -4867,12 +4869,12 @@ msgid "Security Administrator"
 msgstr "Segurtasun-administratzailea"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.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"
@@ -4942,7 +4944,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Orain, Mandrivalinux sistema instalatzeko zein partizio erabiliko\n"
+"Orain, Mandriva Linux sistema instalatzeko zein partizio erabiliko\n"
 "d(ir)en aukeratu behar duzu. Partizioak jadanik definituta badaude,\n"
 "(GNU/Linux-en aurreko instalazio batek edo beste partizio-tresna batek\n"
 "definituta), lehendik dauden partizioak erabil ditzakezu. Bestela, disko \n"
@@ -5030,13 +5032,13 @@ msgid "Toggle between normal/expert mode"
 msgstr "Aldatu modu normalera/aditu modura"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.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"
@@ -5065,7 +5067,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Microsoft partizio bat baino gehiago aurkitu dira zure disko zurrunean.\n"
-"Hautatu zeinen tamaina aldatu nahi duzun, Mandrivalinux sistema\n"
+"Hautatu zeinen tamaina aldatu nahi duzun, Mandriva Linux sistema\n"
 "berria instalatu ahal izateko.\n"
 "\n"
 "Partizioak honela azaltzen dira: \"Linux izena\", \"Windows izena\"\n"
@@ -5119,7 +5121,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"
@@ -5128,37 +5130,38 @@ 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 ""
 "Zure makinan GNU/Linux partizio zahar bat aurkitzen bada bakarrik\n"
 "aktibatzen da urrats hau.\n"
 "\n"
 "DrakX-k orain jakin behar du instalazio berri bat egin behar duzun edo\n"
-"lehendik dagoen Mandrivalinux sistema baten bertsioa berritu nahi duzun:\n"
+"lehendik dagoen Mandriva Linux sistema baten bertsioa berritu nahi duzun:\n"
 "\n"
 " * \"%s\": Zatirik handienean, sistema zaharra guztiz ezabatzen du. \n"
 "Disko zurruneko partizio-banaketa aldatu nahi baduzu, edo fitxategi-sistema\n"
 "aldatu, erabili aukera hau. Nolanahi ere, zure partizio-eskemaren arabera,\n"
 "lehendik dauden datu batzuk gainidaztea saihestu dezakezu.\n"
 "\n"
-" * \"%s\" instalazio-mota honek unean Mandrivalinux sisteman \n"
+" * \"%s\" instalazio-mota honek unean Mandriva Linux sisteman \n"
 "instalatuta dituzun paketeak eguneratzeko aukera ematen du. Uneko \n"
 "partizio-eskema eta erabiltzaile-datuak ez dira aldatzen. Bestelako \n"
 "konfigurazio-urrats gehienak erabilgarri mantentzen dira, instalazio\n"
 "estandarretan bezalatsu.\n"
 "\n"
-"``Bertsio-berritu'' aukerak ondo funtzionatu behar luke Mandrivalinux\n"
-"sistemaren \"8.1\" bertsioetan edo berriagoetan. Mandrivalinux-en \"8.1\" \n"
+"``Bertsio-berritu'' aukerak ondo funtzionatu behar luke Mandriva Linux\n"
+"sistemaren \"8.1\" bertsioetan edo berriagoetan. Mandriva Linux-en \"8.1\" \n"
 "baino bertsio zaharragoetan ez da gomendatzen Bertsio-berritzea."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:591
 #, c-format
 msgid ""
@@ -5199,7 +5202,7 @@ msgstr ""
 "laster-teklak konfiguratzeko aukera emango dizu."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:609
 #, c-format
 msgid ""
@@ -5217,7 +5220,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"
@@ -5259,7 +5263,8 @@ msgstr ""
 "UTF-8 (unicode) euskarriari buruz: Unicode karaktere kodeketa berri bat da,\n"
 "existitzen diren hizkuntza guztiak hartu nahi dituena. Hala ere, "
 "berarentzako\n"
-"erabateko euskarria oraindik garatzen ari da GNU/Linux-en, Mandrivalinux-en\n"
+"erabateko euskarria oraindik garatzen ari da GNU/Linux-en, Mandriva Linux-"
+"en\n"
 "UTF-8 erabilera erabiltzailearen hautaketen araberakoa da:\n"
 "\n"
 " * Jatorrizko kodeketa ahaltsua duen hizkuntza bat aukeratzen baduzu \n"
@@ -5293,7 +5298,7 @@ msgid "Espanol"
 msgstr "Gaztelania"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:650
 #, c-format
 msgid ""
@@ -5373,7 +5378,7 @@ msgid "Universal | Any PS/2 & USB mice"
 msgstr "Unibertsala | Edozein PS/2 eta USB sagu"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:684
 #, c-format
 msgid ""
@@ -5384,7 +5389,7 @@ msgstr ""
 "\"ttyS0\" izena du GNU/Linux-en."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:688
 #, c-format
 msgid ""
@@ -5506,12 +5511,12 @@ msgstr ""
 "badakizu."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.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"
@@ -5532,11 +5537,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 ""
 "Inprimatzeko sistema bat hautatzeko unea da orain.Eeste sistema eragile \n"
-"batzuk bakarra eskainiko dizute, baina Mandrivalinux-ek bi eskaintzen ditu.\n"
+"batzuk bakarra eskainiko dizute, baina Mandriva Linux-ek bi eskaintzen "
+"ditu.\n"
 "Inprimaketa sistema bakoitza egokiago da konfigurazio mota batzuetarako.\n"
 "\n"
 " * \"%s\" -- ``print, do not queue'' esapidearen akronimoa da, eta aukera\n"
@@ -5557,7 +5563,7 @@ msgstr ""
 "hautatzeko eta inprimagailua kudeatzeko interfaze grafikoak ditu.\n"
 "\n"
 "Hautapena orain egiten baduzu, eta beranduago ohartzen bazara zure\n"
-" inprimaketa sistema ez zaizula guztoko Mandrivalinux Aginte Guneko\n"
+" inprimaketa sistema ez zaizula guztoko Mandriva Linux Aginte Guneko\n"
 " PrintDrake exekutatuz eta \"%s\" botoian klik eginez alda zenezake."
 
 #: help.pm:765
@@ -5576,7 +5582,7 @@ msgid "Expert"
 msgstr "Aditu"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:768
 #, c-format
 msgid ""
@@ -5679,7 +5685,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"
@@ -5696,7 +5703,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"
@@ -5764,7 +5771,7 @@ msgstr ""
 "\n"
 " * \"%s\": abio zamatzailearen konfigurazioa aldatu nahi baduzu, klikatu\n"
 "botoi hontan. Erabiltzaile aurreratuek bakarrik erabili behar lukete. Jo\n"
-"inprimatutako dokumentaziora edo Mandrivalinux Aginte Guneko\n"
+"inprimatutako dokumentaziora edo Mandriva Linux Aginte Guneko\n"
 " abio-zamatzailearen konfigurazioari buruzko lerroko laguntzara.\n"
 "\n"
 " * \"%s\": sarrera honen bitartez zehatz doitu dezakezu zure makinan\n"
@@ -5826,20 +5833,20 @@ msgid "Services"
 msgstr "Zerbitzuak"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.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 ""
-"Hautatu Mandrivalinux partizio berria instalatu ahal izateko ezabatu nahi\n"
+"Hautatu Mandriva Linux partizio berria instalatu ahal izateko ezabatu nahi\n"
 "duzun disko zurruna. Kontuz ibili, unitate horretako datu guztiak galdu\n"
 "egingo dira eta ezin izango dira berreskuratu!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:863
 #, c-format
 msgid ""
@@ -6191,11 +6198,11 @@ msgstr "Windows-en partizioaren tamaina kalkulatzen"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "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."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6309,13 +6316,13 @@ msgstr "Sarea ixten"
 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"
@@ -6369,7 +6376,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"
@@ -6406,7 +6413,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"
@@ -6427,10 +6434,10 @@ msgid ""
 msgstr ""
 "Sarrera\n"
 "\n"
-"Mandrivalinux banaketako sistema eragileari eta erabilgarri dauden osagaiei"
+"Mandriva Linux banaketako sistema eragileari eta erabilgarri dauden osagaiei"
 "\"Software-produktuak\"\n"
 "deituko zaie aurrerantzean. Software-produktuetan sartzen dira, besteak \n"
-"beste, Mandrivalinux banaketako sistema eragileari eta osagaiei "
+"beste, Mandriva Linux banaketako sistema eragileari eta osagaiei "
 "dagozkienprogramak, \n"
 "metodoak, arauak eta dokumentazioa.\n"
 "\n"
@@ -6479,7 +6486,7 @@ msgstr ""
 "dute, ezein kasutan, \n"
 "erantzukizunik izango herrialde batzuetan, bertako legeek debekatutako edo "
 "mugatutako software-osagaiak edo\n"
-"Mandrivalinux-en guneetatik deskargatutako software-osagaiak eduki eta "
+"Mandriva Linux-en guneetatik deskargatutako software-osagaiak eduki eta "
 "erabiltzearen ondorioz \n"
 "sortutako kalte berezi ustekabeko, zuzeneko edo zeharkakoengatik (lana "
 "galtzea, lana etetea \n"
@@ -6521,8 +6528,8 @@ msgstr ""
 "Mandriva S.A.k eskubidea du Software-produktuak bere osotasunean edo zatika "
 "aldatzeko, \n"
 "edozein bide erabiliz eta helburu guztietarako.\n"
-"\"Mandriva\", \"Mandrivalinux\" eta asoziatutako logotipoak Mandriva S.A.ren "
-"marka erregistratuak dira.  \n"
+"\"Mandriva\", \"Mandriva Linux\" eta asoziatutako logotipoak Mandriva S.A."
+"ren marka erregistratuak dira.  \n"
 "\n"
 "\n"
 "5. Lege eraentzaileak \n"
@@ -6630,8 +6637,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"
@@ -6639,27 +6646,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 ""
 "Zorionak, instalazioa burutu da.\n"
 "Atera abioko diskoa eta sakatu itzulera-tekla berrabiarazteko.\n"
 "\n"
 "\n"
-"Mandrivalinux-en bertsio honetarako erabilgarri dauden konponbideen \n"
+"Mandriva Linux-en bertsio honetarako erabilgarri dauden konponbideen \n"
 "informaziorako, kontsultatu Erratak helbide honetan:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"Zure sistema konfiguratzeko informazioa Mandrivalinux-en Erabiltzailearen\n"
+"Zure sistema konfiguratzeko informazioa Mandriva Linux-en Erabiltzailearen\n"
 "Gida Ofizialeko instalatu ondorengo azalpenei buruzko kapituluan duzu."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: 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
@@ -6688,11 +6695,11 @@ msgstr "`%s'. urratsean sartzen\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 ""
-"Sistemak baliabide gutxi ditu. Arazoak izan ditzakezu Mandrivalinux \n"
+"Sistemak baliabide gutxi ditu. Arazoak izan ditzakezu Mandriva Linux \n"
 "instalatzeko. Horrela bada, testu-instalazioa egiten saia zaitezke. \n"
 "Horretarako, sakatu `F1' CD-ROMetik abiaraztean, eta idatzi `text'."
 
@@ -7232,9 +7239,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 gunearekin konektatzen, ispilu erabilgarrien zerrenda "
+"Mandriva Linux web gunearekin konektatzen, ispilu erabilgarrien zerrenda "
 "lortzeko..."
 
 #: install_steps_interactive.pm:840
@@ -7459,8 +7466,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux %s instalazioa"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux %s instalazioa"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10048,13 +10055,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 konfiguratzailea\n"
 "\n"
-"Mandrivalinux makinarako suebaki pertsonal bat konfiguratzen du.\n"
+"Mandriva Linux makinarako suebaki pertsonal bat konfiguratzen du.\n"
 "Suebaki-soluzio ahaltsua eskuratu ahal izateko, kontsultatu\n"
 "MandrakeSecurity suebaki banaketa espezializatua."
 
@@ -14128,11 +14135,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 ""
-"Exekutatu Scandrake (Hardwarea/Eskanerra Mandrivalinux-en Aginte Gunean) "
+"Exekutatu Scandrake (Hardwarea/Eskanerra Mandriva Linux-en Aginte Gunean) "
 "zure eskanerra sarean partekatzeko\n"
 "\n"
 
@@ -16085,33 +16092,33 @@ msgstr "Gelditu"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Zer da Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Zer da Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Ongi etorri <b>Mandrivalinux</b>-era!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Ongi etorri <b>Mandriva Linux</b>-era!"
 
 #: 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>Linux banaketa</b> bat da sistemaren bihotza duena, "
+"Mandriva Linux <b>Linux banaketa</b> bat da sistemaren bihotza duena, "
 "<b>sistema eragilea</b> deitua (Linux nukleoan oinarritua) <b>aplikazio pila "
 "batekin</b> batera, izan ditzakezun behar guztiak hasetuko dituena."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"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 gaur egun Linux banaketa <b>lagunkoiena</b> da. Gainera "
+"Mandriva Linux gaur egun Linux banaketa <b>lagunkoiena</b> da. Gainera "
 "munduan zehar <b>gehien erabilitakonux</b> banaketen an artean dago!"
 
 #: share/advertising/02.pl:13
@@ -16127,14 +16134,14 @@ msgstr "Ongi etorri <b>Iturburu Irekiaren mundura</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 iturburu irekiko ereduari herabat atsekitzen zaio. Honek esan "
+"Mandriva Linux iturburu irekiko ereduari herabat atsekitzen zaio. Honek esan "
 "nahi du bertsio berri hau <b>Mandriva-eko garatzaile taldearen</b> eta "
-"Mandrivalinux-en <b>mundu zabaleko</b> komunitatearen arteko "
+"Mandriva Linux-en <b>mundu zabaleko</b> komunitatearen arteko "
 "<b>lankidetzaren</b> emaitza dela."
 
 #: share/advertising/02.pl:19
@@ -16154,11 +16161,11 @@ msgstr "<b>GPLa</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 ""
-"Banaketa honetan sartutako software gehiena eta Mandrivalinux tresna guztiak "
-"<b>Lizentzia Publiko Orokorra</b>ren babesean lizentziatuta daude."
+"Banaketa honetan sartutako software gehiena eta Mandriva Linux tresna "
+"guztiak <b>Lizentzia Publiko Orokorra</b>ren babesean lizentziatuta daude."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16183,30 +16190,30 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Elkartu Mandrivalinux komunitatera</b>"
+msgstr "<b>Elkartu Mandriva Linux komunitatera</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-ek erabitzaile eta garatzaile <b>komunitate handienetako</b> "
+"Mandriva Linux-ek erabitzaile eta garatzaile <b>komunitate handienetako</b> "
 "bat dauka. Horrelako komunitate baten eginkizuna oso zabala da, akatsak "
 "jakinaraztetik aplikazio berrien garapenera. Komunitateak <b>funtsezko "
-"eginkizuna</b> betetzen du Mandrivalinux munduan."
+"eginkizuna</b> betetzen du Mandriva Linux munduan."
 
 #: 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 ""
 "Gure komunitate dinamikoari buruz <b>gehiago jakiteko</b>, mesedez bisitatu "
-"<b>www.mandrakelinux.com</b> edo zuzenean <b>www.mandrakelinux.com/en/"
+"<b>www.mandrivalinux.com</b> edo zuzenean <b>www.mandrivalinux.com/en/"
 "cookerdevel.php3</b> garapenean <b>nahastu</b> nahi bazenu."
 
 #: share/advertising/05.pl:15
@@ -16217,10 +16224,10 @@ msgstr "<b>Deskargatzeko bertsioa</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 ""
-"Orain <b>Mandrivalinux Download</b> instalatzen ari zara. Hau Mandrivaek "
+"Orain <b>Mandriva Linux Download</b> instalatzen ari zara. Hau Mandrivaek "
 "<b>guztientzako eskuragarri</b> mantendu nahi duen doako bertsioa da."
 
 #: share/advertising/05.pl:19
@@ -16264,8 +16271,8 @@ msgstr "<b>Discovery, Zure Lehenengo Linux Idaztegia</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Orain <b>Mandrivalinux Discovery</b> instalatzen ari zara."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Orain <b>Mandriva Linux Discovery</b> instalatzen ari zara."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16287,8 +16294,8 @@ msgstr "<b>PowerPack, Linux Idaztegia Gorena</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "<b>Mandrivalinux PowerPack</b> instalatzen ari zara."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "<b>Mandriva Linux PowerPack</b> instalatzen ari zara."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16308,8 +16315,8 @@ msgstr "<b>PowerPack+, Idaztegi eta Zerbitzarietarako Linux Soluzioa</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "<b>Mandrivalinux PowerPack+</b> instalatzen ari zara."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "<b>Mandriva Linux PowerPack+</b> instalatzen ari zara."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16331,13 +16338,14 @@ msgstr "<b>Mandriva Produktuak</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>ek <b>Mandrivalinux</b> produktu eremu zabala garatudu."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
+msgstr ""
+"<b>Mandriva</b>ek <b>Mandriva Linux</b> produktu eremu zabala garatudu."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux produktuak dira:"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux produktuak dira:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16357,11 +16365,11 @@ msgstr "\t* <b>PowerPack+</b>, Idaztegi eta Zerbitzarietarako Linux Soluzioa."
 #: 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 x86-64-rako</b>, zure 64-biteko prozesatzaileari onena "
-"ateratzeko Mandrivalinux soluzioa."
+"\t* <b>Mandriva Linux x86-64-rako</b>, zure 64-biteko prozesatzaileari onena "
+"ateratzeko Mandriva Linux soluzioa."
 
 #: share/advertising/10.pl:15
 #, c-format
@@ -16371,29 +16379,29 @@ msgstr "<b>Mandriva Produktuak (Nomada Produktuak)</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-ek bi produktu garatu ditu Mandrivalinux <b>edozein "
+"Mandriva-ek bi produktu garatu ditu Mandriva Linux <b>edozein "
 "konputagailutan</b> erabili ahal izateko berau instalatu beharrik gabe:"
 
 #: 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>, osorik CD-ROM abiarazle batetik exekutatzen den "
-"Mandrivalinux banaketa bat."
+"\t* <b>Move</b>, osorik CD-ROM abiarazle batetik exekutatzen den Mandriva "
+"Linux banaketa bat."
 
 #: 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>, “LaCie Mobile Hard Drive” ultra-konpaktoan aurre-"
-"instalatutako Mandrivalinux banaketa bat."
+"instalatutako Mandriva Linux banaketa bat."
 
 #: share/advertising/11.pl:13
 #, c-format
@@ -16411,18 +16419,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>, Enpresentzako Mandrivalinux Idaztegia."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Enpresentzako Mandriva Linux Idaztegia."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Mandrivalinux Zerbitzari Soluzioa."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandriva Linux Zerbitzari Soluzioa."
 
 #: 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 Segurtasun Soluzioa."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, Mandriva Linux Segurtasun Soluzioa."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16624,10 +16634,10 @@ msgstr "<b>Gozatu ezazu Aplikazio Eremu Zabala</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 ""
-"Mandrivalinux menuan zure eginbehar guztientzako aplikazio erabilerrazak "
+"Mandriva Linux menuan zure eginbehar guztientzako aplikazio erabilerrazak "
 "aurkituko dituzu:"
 
 #: share/advertising/18.pl:16
@@ -16897,18 +16907,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux kontrol-zentroa</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux kontrol-zentroa</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 Aginte Gunea</b> zure konputagailuaren konfigurazioa "
-"errazteko diseinatutako Mandrivalinux-en ezinbesteko utilitate espezifikoen "
+"<b>Mandriva Linux Aginte Gunea</b> zure konputagailuaren konfigurazioa "
+"errazteko diseinatutako Mandriva Linux-en ezinbesteko utilitate espezifikoen "
 "bilduma bat da."
 
 #: share/advertising/25.pl:17
@@ -16933,15 +16943,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 ""
 "Konputagailu programaketa guztiak bezala, iturburu irekiko softwareak "
 "<b>denbora eta jendea</b> behar du garapenerako. Iturburu irekiko filosofia "
 "errespetatzeko asmoz, Mandriva-ek balio erantsidun produktu eta zerbitzuak "
-"saltzen ditu <b>Mandrivalinux hobetzen jarraitzeko</b>. <b>Iturburu irekiko "
-"filosofiari</b> eta Mandrivalinux-en garapenari laguntza eman nahi badiezu, "
+"saltzen ditu <b>Mandriva Linux hobetzen jarraitzeko</b>. <b>Iturburu irekiko "
+"filosofiari</b> eta Mandriva Linux-en garapenari laguntza eman nahi badiezu, "
 "<b>mesedez</b> gogoan hartu gure produktu edo zerbitzuetako baten erosketa!"
 
 #: share/advertising/27.pl:13
@@ -16976,8 +16986,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Joan gaur bertan <b>store.mandrakesoft.com</b> gunera"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Joan gaur bertan <b>store.mandriva.com</b> gunera"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16987,10 +16997,10 @@ 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> zure Mandrivalinux produktuen <b>lagunperfektua</b> "
+"<b>Mandriva Club</b> zure Mandriva Linux produktuen <b>lagunperfektua</b> "
 "da..."
 
 #: share/advertising/28.pl:19
@@ -17004,7 +17014,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 ""
 "\t* <b>Deskontu bereziak</b> gure lerroko dendaren, <b>store.mandrakesoft."
 "com</b>, produktu eta zerbitzuetan."
@@ -17020,17 +17030,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Parte-hartzea Mandrivalinux <b>erabiltzaile foruetan</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Parte-hartzea Mandriva Linux <b>erabiltzaile foruetan</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* Askapen publikoaren aurretik <b>sarbide goiztiar eta pribilegiatua</b>, "
-"Mandrivalinux <b>ISO irudietara</b>."
+"Mandriva Linux <b>ISO irudietara</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -17050,10 +17060,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-k zerbitzu baliogarrien aukera zabala eskaintzen du zure "
-"Mandrivalinux sistema <b>erraz eguneratzeko</b>:"
+"Mandriva Linux sistema <b>erraz eguneratzeko</b>:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17079,9 +17089,9 @@ msgstr "\t* Eguneraketa <b>programazio</b> malgua."
 #: 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* Zure <b>Mandrivalinux sistema guztien</b> kudeaketa kontu bakarrarekin."
+"\t* Zure <b>Mandriva Linux sistema guztien</b> kudeaketa kontu bakarrarekin."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -17092,27 +17102,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 ""
 "<b>Laguntza</b> behar duzu? Mandriva-en aditu teknikoak aurkituko dituzu www."
-"mandrakeexpert.com <b>gure euskarri teknikoaren plataforman</b>."
+"mandrivaexpert.com <b>gure euskarri teknikoaren plataforman</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>Mandrivalinux aditu gaituen</b> laguntzari esker, denbora asko aurreztuko "
-"duzu."
+"<b>Mandriva Linux aditu gaituen</b> laguntzari esker, denbora asko "
+"aurreztuko duzu."
 
 #: 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 ""
-"Mandrivalinux-ekin zerikusia duten galderak erantzuteko, <b>store."
+"Mandriva Linux-ekin zerikusia duten galderak erantzuteko, <b>store."
 "mandrakesoft.com</b>-en euskarri gertakariak erosteko aukera daukazu."
 
 #: share/compssUsers.pl:25
@@ -17502,8 +17512,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 ""
 "[AUKERAK] [PROGRAMA_IZENA]\n"
 "\n"
@@ -17566,7 +17576,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"
@@ -20442,13 +20452,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux-en programa-erroreen berri emateko tresna"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux-en programa-erroreen berri emateko tresna"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux-en kontrol-zentroa"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux-en kontrol-zentroa"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20941,20 +20951,20 @@ msgstr "Abioan abiaraztekoa"
 #, 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 ""
 "Interfaze hau ez da oraindik konfiguratu.\n"
-"Exekutatu Mandrivalinux kontrol-zentroko \"Gehitu interfaze bat\" "
+"Exekutatu Mandriva Linux kontrol-zentroko \"Gehitu interfaze bat\" "
 "laguntzailea"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Ez daukazu konfiguratutako Internet loturarik.\n"
-"Exekutatu Mandrivalinux Aginte Guneko \"%s\" morroia"
+"Exekutatu Mandriva Linux Aginte Guneko \"%s\" morroia"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21004,8 +21014,8 @@ msgstr "KDM (KDE konexioen kudeatzailea)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Mandrivalinux konexioen kudeatzailea)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Mandriva Linux konexioen kudeatzailea)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21309,18 +21319,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 Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (jatorrizko bertsioa)\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
@@ -21893,8 +21903,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux Laguntza Gunea"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux Laguntza Gunea"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22558,7 +22568,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 ""
 "Soinu-txartelik ez da detektatu zure makinan. Egiazta ezazu Linux-ek "
 "onartutako soinu-txartela behar bezala sartuta dagoela.\n"
@@ -22567,7 +22577,7 @@ msgstr ""
 "Gure hardwarearen datu-basea bisita dezakezu:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24584,7 +24594,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 ""
 "Telebista-txartelik ez da detektatu zure makinan. Egiazta ezazu Linux-ek "
 "onartutako bideo/telebista-txartela behar bezala sartuta dagoela.\n"
@@ -24593,7 +24603,7 @@ msgstr ""
 "Gure hardwarearen datu-basea bisita dezakezu:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25310,13 +25320,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 ""
 "Hau HardDrake da, %s hardwarea konfiguratzeko tresna.\n"
 "<span foreground=\"royalblue3\">Bertsioa:</span> %s\n"
 "<span foreground=\"royalblue3\">Egilea:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25426,8 +25436,8 @@ msgstr "Aldaketa egin da, baina, eragina izan dezan, saioa amaitu behar duzu"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinux Tresnen Erregistroak"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linux Tresnen Erregistroak"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25940,7 +25950,7 @@ msgstr "Konexioa osatu da."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Konexioak huts egin du.\n"
 "Egiaztatu zure konfigurazioa Mandrake-ren kontrol-zentroan."
diff --git a/perl-install/share/po/fa.po b/perl-install/share/po/fa.po
index 4a5fabcfc..af566fb38 100644
--- a/perl-install/share/po/fa.po
+++ b/perl-install/share/po/fa.po
@@ -1308,7 +1308,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 ""
@@ -3730,7 +3730,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 ""
@@ -3915,7 +3915,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"
@@ -3931,11 +3931,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"
@@ -4100,10 +4101,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default 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"
@@ -4291,7 +4292,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"
@@ -4466,12 +4467,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"
@@ -4498,7 +4499,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"
@@ -4507,7 +4508,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"
@@ -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."
@@ -4765,7 +4767,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"
@@ -4806,7 +4808,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 "مدیر امنیت"
 #, 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"
@@ -4992,7 +4994,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"
@@ -5071,7 +5073,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"
@@ -5080,13 +5082,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"
@@ -5161,7 +5164,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"
@@ -5446,7 +5450,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"
@@ -5467,7 +5471,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 ""
 "اکنون زمان آن رسیده است که سیستم چاپ را بر روی رایانه خود انتخاب کنید. "
@@ -5620,7 +5624,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"
@@ -5637,7 +5642,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"
@@ -5767,7 +5772,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"
@@ -6122,7 +6127,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 ""
 "قسمت‌بندی ویندوز شما خیلی درهم ریخته است. لطفا رایانه‌ی خود را با ویندوز "
@@ -6243,13 +6248,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"
@@ -6303,7 +6308,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"
@@ -6340,7 +6345,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"
@@ -6436,8 +6441,8 @@ msgstr ""
 "شرکت Mandriva S.A.حقوق امتیازی خود را برای تغییر یا وفق دادن محصولات "
 "نرم‌افزاری \n"
 "بطور کامل یا قسمت‌هایی از آنها، در هر صورت و برای هر منظور محفوظ می‌دارد. \n"
-"\"Mandriva\", \"Mandrivalinux\" و علائم مربوطه آرم‌های بازرگانی Mandriva S.A. "
-"می باشند.\n"
+"\"Mandriva\", \"Mandriva Linux\" و علائم مربوطه آرم‌های بازرگانی Mandriva S."
+"A. می باشند.\n"
 "\n"
 "\n"
 "۵. اجرای قوانین \n"
@@ -6535,8 +6540,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"
@@ -6544,7 +6549,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"
@@ -6563,8 +6568,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
@@ -6593,7 +6598,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 ""
@@ -7137,7 +7142,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 ""
 "در حال تماس گرفتن با وب‌گاه لینوکس ماندرایک برای دریافت لیست پایگاه‌های "
 "آینه‌های موجود..."
@@ -7362,7 +7367,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
@@ -9949,7 +9954,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 ""
@@ -13981,8 +13986,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 (سخت افزار/ "
@@ -15900,18 +15905,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."
@@ -15923,7 +15928,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> پخش لینوکس امروز است.  لینوکس "
@@ -15942,9 +15947,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 ""
 "لینوکس ماندرایک به مدل منبع باز متعهد است. این بدین معنی است که این توزیع "
@@ -15967,8 +15972,8 @@ msgstr "<b>The 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>General Public License</b> هستند."
@@ -16001,10 +16006,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> کاربران و توسعه دهندگان است. "
 "نقش چنین جامعه‌ای بسیار پهناور، از گزارش اشکال تا توسعه برنامه های جدید است. "
@@ -16014,11 +16019,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."
+"com</b> بازدید کنید یا مستقبما به <b>www.mandrivalinux.com/ en/cookerdevel."
 "php3</b> مراجعه کنید اگر میخواهید در توسعه </b>مشارکت<b>داشته باشید."
 
 #: share/advertising/05.pl:15
@@ -16029,7 +16034,7 @@ 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>لینوکس ماندرایک نسخه بارگیری</b> هستید. این نسخه "
@@ -16076,7 +16081,7 @@ msgstr "<b>اکتشاف, اولین رومیزی لینوکس خود</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> هستید."
 
 #: share/advertising/06.pl:17
@@ -16098,7 +16103,7 @@ msgstr "<b>بسته قدرتی، رومیزی لینوکس نهایی</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>"
 
 #: share/advertising/07.pl:17
@@ -16118,7 +16123,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> هستید."
 
 #: share/advertising/08.pl:17
@@ -16141,14 +16146,14 @@ 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
@@ -16169,7 +16174,7 @@ 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</b>, راه حل لینوکس ماندرایک برای پردازه ۶۴-بیت."
@@ -16182,7 +16187,7 @@ msgstr "<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 ""
 "نرم افزار ماندرایک دو محصول را که به شما اجازه میدهد تا از لینوکس ماندرایک "
@@ -16192,7 +16197,7 @@ 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>انتقال</b>, پخش لینوکس ماندرایک که کاملا از یک سی دی قابل آغازگری "
@@ -16201,7 +16206,7 @@ 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 ""
 "\t* <b>GlobeTrotter</b>, پخش لینوکس ماندرایکی که بر دیسک همراه بسیار کوچک "
@@ -16223,17 +16228,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
@@ -16430,7 +16437,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> "
@@ -16686,14 +16693,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> مجموعه اساسی از وسایل مخصوص لینوکس ماندرایک "
@@ -16721,8 +16728,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> به زمان و مردم </b> "
@@ -16761,8 +16768,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
@@ -16772,7 +16779,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> برای محصول لینوکس ماندرایک است.."
@@ -16789,7 +16796,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 ""
 "\t* <b>تخفیفهای مخصوص</b> در محصولات و خدمات فروشگاه اینترنتی ما در <b>store."
 "mandrakesoft.com</b>."
@@ -16804,14 +16811,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> "
 "لینوکس ماندرایک."
@@ -16834,7 +16841,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> سیستمهای لینوکس ماندرایکتان عرضه میدارد:"
@@ -16861,7 +16868,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
@@ -16873,15 +16880,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>پایگاه پشتیبانی فنی ما</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>، زمان زیادی را ذخیره خواهید "
@@ -16890,11 +16897,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
@@ -17275,8 +17282,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"
@@ -17337,7 +17344,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"
@@ -20185,12 +20192,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
@@ -20682,7 +20689,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"
 "دستیار \"افزودن واسطی\" را از مرکز کنترل ماندرایک اجرا کنید"
@@ -20691,7 +20698,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\" را از مرکز کنترل لینوکس ماندرایک اجرا کنید"
@@ -20744,7 +20751,7 @@ msgstr "KDM (مدیر نمایش کدئی)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr "MdkKDM (مدیر نمایش لینوکس ماندرایک)"
 
 #: standalone/drakedm:37
@@ -21049,18 +21056,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
@@ -21632,7 +21639,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "مرکز راهنمای لینوکس ماندرایک"
 
 #: standalone/drakhelp:36
@@ -22294,7 +22301,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"
@@ -22303,7 +22310,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
@@ -24318,7 +24325,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"
@@ -24327,7 +24334,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
@@ -25036,13 +25043,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 ""
 "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"
 
 #: standalone/harddrake2:243
@@ -25150,7 +25157,7 @@ msgstr "تغییر انجام شده است، ولی برای مؤثر واقع
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "ثبتهای ابزارهای لینوکس ماندرایک"
 
 #: standalone/logdrake:51
@@ -25666,7 +25673,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"
 "پیکربندی خود را در مرکز کنترل ماندرایک تصدیق کنید."
diff --git a/perl-install/share/po/fi.po b/perl-install/share/po/fi.po
index d034e524d..2a7331c1c 100644
--- a/perl-install/share/po/fi.po
+++ b/perl-install/share/po/fi.po
@@ -106,7 +106,7 @@ msgstr ""
 "\n"
 "\n"
 "Voit myös jatkaa ilman USB-avainta - voit silti käyttää\n"
-"Mandriva Move -järjestelmää normaalin Mandrivalinux\n"
+"Mandriva Move -järjestelmää normaalin Mandriva Linux\n"
 "-käyttöjärjestelmän tapaan."
 
 #: ../move/move.pm:483
@@ -133,7 +133,7 @@ msgstr ""
 "\n"
 "\n"
 "Voit myös jatkaa ilman USB-avainta - voit silti käyttää\n"
-"Mandriva Move -järjestelmää normaalin Mandrivalinux\n"
+"Mandriva Move -järjestelmää normaalin Mandriva Linux\n"
 "-käyttöjärjestelmän tapaan."
 
 #: ../move/move.pm:494
@@ -1314,11 +1314,11 @@ msgstr "Kielivalinta"
 #: 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 tukee useita kieliä. Valitse kielet jotka\n"
+"Mandriva Linux tukee useita kieliä. Valitse kielet jotka\n"
 "haluat asentaa. Ne ovat käytettävissä asennuksen jälkeen\n"
 "kun olet käynnistänyt koneesi uudelleen."
 
@@ -3741,12 +3741,12 @@ msgstr "ota radio-tuki käyttöön"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
 "Ennen jatkamista sinun pitäisi lukea huolellisesti lisenssin ehdot.\n"
-"Lisenssi kattaa koko Mandrivalinux jakelun. Jos hyväksyt kaikki\n"
+"Lisenssi kattaa koko Mandriva Linux jakelun. Jos hyväksyt kaikki\n"
 "ehdot, valitse \"%s\" valinta. Jos et hyväksy ehtoja, painamalla \n"
 "\"%s\" painiketta tietokoneesi käynnistyy uudestaan."
 
@@ -3922,13 +3922,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The 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 ""
-"Mandrivalinuxin asennus koostuu useasta CD-ROM-levystä. DrakX tietää,\n"
+"Mandriva Linuxin asennus koostuu useasta CD-ROM-levystä. DrakX tietää,\n"
 "onko valittu paketti toisella CD:llä ja osaa syöttää nykyisen levyn ulos\n"
 "ja pyytää sinua asettamaan oikean levyn tarvittaessa. Jos sinulla ei ole\n"
 "kyseistä CD-levyä käytettävissä, klikkaa vain \"%s\", ja kyseiset paketit\n"
@@ -3938,11 +3938,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"
@@ -3994,12 +3995,12 @@ msgid ""
 "megabytes."
 msgstr ""
 "Nyt on aika valita mitä ohjelmia haluat asentaa järjestelmääsi. Tarjolla\n"
-"on tuhansia paketteja Mandrivalinux jakelussa, ja pakettien\n"
+"on tuhansia paketteja Mandriva Linux jakelussa, ja pakettien\n"
 "hallinnan helpottamiseksi ne on koottu samanlaisten ohjelmistojen\n"
 "ryhmiin.\n"
 "\n"
 "Paketit on ryhmitelty ryhmiin koneesi käyttötarkoituksen mukaisesti.\n"
-"Mandrivalinux sisältää neljä eri ennakkoon määriteltyä asennustapaa.\n"
+"Mandriva Linux sisältää neljä eri ennakkoon määriteltyä asennustapaa.\n"
 "Voit verrata asennustapoja pakettiryhmiin. Voit tietysti asentaa paketteja\n"
 "eri ryhmistä niin halutessasi, joten ``Työasema''-asennus voi sisältää\n"
 "ohjelmia esimerkiksi ``Kehitysympäristö''-ryhmästä.\n"
@@ -4108,10 +4109,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"
@@ -4141,7 +4142,7 @@ msgstr ""
 "\n"
 "!! Jos palvelinpaketti on valittu, joko tarkoituksella tai koska se kuului\n"
 "johonkin valitsemaasi ryhmään, sinulta pyydetään vahvistusta,\n"
-"haluatko varmasti asentaa palvelimen. Oletuksena Mandrivalinux\n"
+"haluatko varmasti asentaa palvelimen. Oletuksena Mandriva Linux\n"
 "käynnistää jokaisen asennetun palvelin koneen käynnistyksen\n"
 "yhteydessä. Vaikka ne ovat turvallisia eikä niillä ole tunnettuja\n"
 "ongelmia jakelun julkaisuajankohtana, niistä voi löytyä turvallisuus-\n"
@@ -4295,7 +4296,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"
@@ -4351,7 +4352,7 @@ msgid ""
 msgstr ""
 "X (eli X Ikkunointijärjestelmä) on GNU/Linuxin graafisen käyttöliittymän\n"
 "sydän jota kaikki graafiset ympäristöt (KDE, Gnome, AfterStep,\n"
-"WindowMaker jne.), jotka seuraavat Mandrivalinuxin mukana,\n"
+"WindowMaker jne.), jotka seuraavat Mandriva Linuxin mukana,\n"
 "käyttävät alustanaan.\n"
 "\n"
 "Sinulle näytetään lista eri parametreista joita voit asettaa saadaksesi\n"
@@ -4462,12 +4463,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"
@@ -4494,7 +4495,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"
@@ -4503,7 +4504,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,11 +4525,11 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Nyt sinun pitää valita miten haluat asentaa Mandrivalinux käyttö-\n"
+"Nyt sinun pitää valita miten haluat asentaa Mandriva Linux käyttö-\n"
 "järjestelmän kiintolevyllesi. Jos kiintolevysi on tyhjä, tai nykyinen\n"
 "käyttöjärjestelmäsi käyttää siltä kaiken vapaan tilan, sinun pitää osioida\n"
 "se. Käytännössä osiointi tarkoittaa kiintolevyn loogista jakamista\n"
-"osiin tehdäksesi tilaa Mandrivalinux-järjestelmän asennukselle.\n"
+"osiin tehdäksesi tilaa Mandriva Linux-järjestelmän asennukselle.\n"
 "\n"
 "Koska osiointiprosessin muutoksia ei yleensä voi peruuttaa, ja se voi\n"
 "johtaa tietojen häviämiseen jos toinen käyttöjärjestelmä on jo asennettuna,\n"
@@ -4553,7 +4555,7 @@ msgstr ""
 "koon muuttaminen voidaan tehdä ilman tietojen hävittämistä, kunhan olet\n"
 "eheyttänyt sen ja se käyttää FAT-tiedostojärjestelmää. Tietojen varmistus\n"
 "on kuitenkin suotavaa. Tämä vaihtoehto on suositeltu jos haluat käyttää\n"
-"Mandrivalinuxia ja Microsoft Windowsia samassa koneessa.\n"
+"Mandriva Linuxia ja Microsoft Windowsia samassa koneessa.\n"
 "\n"
 "   Ennen kuin valitset tämän vaihtoehdon, sinun pitää ymmärtää että tämän\n"
 "toimenpiteen jälkeen Windows-osiosi on pienempi kuin tällä hetkellä.\n"
@@ -4561,7 +4563,7 @@ msgstr ""
 "tallentaa tietojasi tai asentaa uusia ohjelmia.\n"
 "\n"
 " * \"%s\": valitse tämä jos haluat poistaa kaikki tiedot\n"
-"ja osiot ja asentaa Mandrivalinux -järjestelmäsi niiden tilalle. Ole\n"
+"ja osiot ja asentaa Mandriva Linux -järjestelmäsi niiden tilalle. Ole\n"
 "varovainen tämän valinnan kanssa, koska et pysty peruuttamaan\n"
 "valintaasi kun olet hyväksynyt tämän toimenpiteen.\n"
 "\n"
@@ -4723,7 +4725,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"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."
@@ -4745,7 +4747,7 @@ msgstr ""
 "\n"
 "Valitse \"%s\" kun olet valmis alustamaan osiot.\n"
 "\n"
-"Valitse \"%s\", jos haluat valita toisen osion Mandrivalinuxin\n"
+"Valitse \"%s\", jos haluat valita toisen osion Mandriva Linuxin\n"
 "asentamiseen.\n"
 "\n"
 "Valitse \"%s\", jos haluat valita osiot, jotka tarkistetaan\n"
@@ -4763,7 +4765,7 @@ msgstr "Edellinen"
 #: 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"
@@ -4775,7 +4777,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Tässä vaiheessa, kun asennat Mandrivalinuxia, on todennäköistä että\n"
+"Tässä vaiheessa, kun asennat Mandriva Linuxia, on todennäköistä että\n"
 "jotkut paketit on päivitetty alkujulkaisun jälkeen. Joitakin virheitä voi "
 "olla\n"
 "korjattu ja turvallisuusaukkoja paikattu. Hyödyntääksesi näitä päivityksiä,\n"
@@ -4804,7 +4806,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of 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"
@@ -4833,7 +4835,7 @@ msgstr "Tietoturvan ylläpitäjä:"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4903,7 +4905,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Tässä vaiheessa sinun pitää määrittää mitkä osiot käytetään Mandrivalinux\n"
+"Tässä vaiheessa sinun pitää määrittää mitkä osiot käytetään Mandriva Linux\n"
 "-järjestelmäsi asennuksessa. Jos osioita on jo määritelty, joko\n"
 "edellisestä GNU/Linux-asennuksesta tai jonkun toisen osiointityökalun\n"
 "tekeminä, niin voit käyttää olemassa olevia osioita. Muussa tapauksissa\n"
@@ -4990,7 +4992,7 @@ msgstr "Vaihda vakio-/asiantuntijatilan välillä"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5020,7 +5022,7 @@ msgid ""
 msgstr ""
 "Useampi kuin yksi Microsoft-osio on löydetty kiintolevyltäsi. Ole hyvä\n"
 "ja valitse osio jonka kokoa haluat muuttaa asentaaksesi uuden\n"
-"Mandrivalinux -käyttöjärjestelmäsi.\n"
+"Mandriva Linux -käyttöjärjestelmäsi.\n"
 "\n"
 "Jokainen osio on lueteltu seuraavasti: \"Linux nimi\", Windows nimi\", \"Koko"
 "\".\n"
@@ -5069,7 +5071,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing 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"
@@ -5078,19 +5080,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 ""
 "Tämä vaihe asennuksesta näytetään ainoastaan jos vanha GNU/Linux-\n"
 "osio on löydetty koneestasi.\n"
 "\n"
 "DrakX haluaa nyt tietää, haluatko suorittaa uuden asennuksen vai vanhan\n"
-"Mandrivalinux -järjestelmän päivityksen:\n"
+"Mandriva Linux -järjestelmän päivityksen:\n"
 "\n"
 " * \"%s\": oletuksena tämä tapa poistaa vanhan asennuksen. Jos haluat\n"
 "muuttaa miten kiintolevysi on osioitu tai vaihtaa tiedostojärjestelmää, "
@@ -5099,11 +5102,11 @@ msgstr ""
 "ehkä valita niin ettei kaikkia tietojasi hävitetä.\n"
 "\n"
 " * \"%s\": tämä vaihtoehto sallii sinun päivittää paketteja\n"
-"nykyisessä Mandrivalinux -järjestelmässäsi. Nykyistä osiointiasi\n"
+"nykyisessä Mandriva Linux -järjestelmässäsi. Nykyistä osiointiasi\n"
 "eikä käyttäjien tietoja muuteta. Suurin osa muista asennuksen\n"
 "vaiheista on käytössäsi niin kuin ne ovat vakioasennuksessa.\n"
 "\n"
-"``Päivitä''-ominaisuuden pitäisi toimia Mandrivalinux\n"
+"``Päivitä''-ominaisuuden pitäisi toimia Mandriva Linux\n"
 "-järjestelmän versiosta \"8.1\" eteenpäin. Vanhemman version\n"
 "kuin \"8.1\" päivittämistä ei suositella."
 
@@ -5164,7 +5167,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"
@@ -5206,7 +5210,7 @@ msgstr ""
 "Tietoja UTF-8 (unicode) tuesta: Unicode on uusi kirjasinten \n"
 "määrittelytapa joka on määrä kattaa kaikki olemassa olevat kielet.\n"
 "Huomaa etttä täysi tuki GNU/Linuxissa on viellä työn alla. Tästä syystä\n"
-"Mandrivalinuxin UTF-8 käyttö riippuu käyttäjän valinnasta:\n"
+"Mandriva Linuxin UTF-8 käyttö riippuu käyttäjän valinnasta:\n"
 "\n"
 " * Jos valitset kielen jossa on vahva \"vanhanaikainen\" kirjasinmäärittely\n"
 "(latin1 kielet, Venäjä, Japani, Kiina, Korea, Thai, Kreikka, Turkki, suurin "
@@ -5438,7 +5442,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"
@@ -5459,12 +5463,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 ""
 "Nyt on aika valita tulostusjärjestelmä tietokoneellesi. Muut "
 "käyttöjärjestelmät\n"
-"saattavat tarjota sinulle yhden järjestelmän, mutta Mandrivalinux tarjoaa\n"
+"saattavat tarjota sinulle yhden järjestelmän, mutta Mandriva Linux tarjoaa\n"
 "kaksi. Kukin tulostusjärjestelmä sopii parhaiten tietyille asetuksille.\n"
 "\n"
 " *  \"%s\" -- joka tarkoittaa ``tulosta, älä jonota'' (print, do not "
@@ -5607,7 +5611,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"
@@ -5624,7 +5629,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"
@@ -5671,7 +5676,7 @@ msgstr ""
 "Jos tämä ei sovi sinulle, paina \"%s\" muuttaaksesi asetuksia.\n"
 "\n"
 " * \"%s\": jos haluat asettaa Internet- tai paikallisverkkoasetuksesi,\n"
-"voit tehdä sen nyt. Katso ohjekirjasta, tai käytä Mandrivalinux\n"
+"voit tehdä sen nyt. Katso ohjekirjasta, tai käytä Mandriva Linux\n"
 "Ohjauskeskus asennuksen jälkeen hyödyntääksesi sisäiset ohjeet.\n"
 "\n"
 " * \"%s\": sallii sinua asettamaan HTTP ja FTP välityspalvelimia jos\n"
@@ -5747,10 +5752,10 @@ msgstr "Palvelut"
 #, 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 ""
-"Valitse kiintolevy, jonka haluat tyhjentää uudelle Mandrivalinux\n"
+"Valitse kiintolevy, jonka haluat tyhjentää uudelle Mandriva Linux\n"
 "-asennusosiolle. Ole varovainen, koska kaikki asemalla oleva tieto\n"
 "tuhoutuu eikä ole enää palautettavissa!"
 
@@ -6104,12 +6109,12 @@ msgstr "Lasken Windows-osion kokoa"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Windows-osiosi on liian pirstoutunut, käynnistä koneesi uudelleen, mene "
-"Windowsiin ja aja \"Levyn eheytys\" ensin, ja aloita Mandrivalinuxin asennus "
-"uudestaan sen jälkeen."
+"Windowsiin ja aja \"Levyn eheytys\" ensin, ja aloita Mandriva Linuxin "
+"asennus uudestaan sen jälkeen."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6227,13 +6232,13 @@ msgstr "Ajetaan alas verkkoa"
 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"
@@ -6262,8 +6267,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 "
@@ -6277,8 +6282,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 "
@@ -6287,7 +6292,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"
@@ -6321,10 +6326,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"
@@ -6346,14 +6351,14 @@ msgstr ""
 "Johdanto\n"
 "\n"
 "\n"
-"HUOM!! Tämä on vapaasti suomennettu teksti Mandrivalinux -jakelun\n"
+"HUOM!! Tämä on vapaasti suomennettu teksti Mandriva Linux -jakelun\n"
 "lisenssiehdoista. Alkuperäinen teksti löytyy tämän sivun lopusta.\n"
 "\n"
-"Käyttöjärjestelmään ja muihin Mandrivalinux jakelun eri osiin viitataan\n"
+"Käyttöjärjestelmään ja muihin Mandriva Linux jakelun eri osiin viitataan\n"
 "tästä eteenpäin nimellä \"Ohjelmisto\". Ohjelmisto sisältää, mutta ei "
 "rajoitu\n"
 "ainoastaan niihin, pakettien yhdistelmät, menetelmät, säännöt ja\n"
-"dokumentaation jotka kuuluvat käyttöjärjestelmään sekä Mandrivalinux\n"
+"dokumentaation jotka kuuluvat käyttöjärjestelmään sekä Mandriva Linux\n"
 "-jakeluun kuuluvat komponentit.\n"
 "\n"
 "\n"
@@ -6408,8 +6413,8 @@ msgstr ""
 "tuomioistuimen päätöksestä, tai minkä tahansa muun merkittävän tappion "
 "takia)\n"
 "jotka johtuvat ohjelmistokomponenttien hallussapidosta tai käytöstä tai\n"
-"jotka johtuvat ohjelmistokomponenttien lataamisesta joltakin "
-"Mandrivalinuxin\n"
+"jotka johtuvat ohjelmistokomponenttien lataamisesta joltakin Mandriva "
+"Linuxin\n"
 "sivustolta, jotka ovat kiellettyjä tai rajoitettuja joissakin maissa\n"
 "paikallisen lain voimalla.\n"
 "\n"
@@ -6446,7 +6451,7 @@ msgstr ""
 "jotka koskevat ohjelmistoja. Mandriva S.A. pidättää oikeuden muokata\n"
 "tai sovittaa Ohjelmistoa, joko kokonaan tai osittain, kaikilla tavoilla\n"
 "jokaiseen tarpeeseen.\n"
-"\"Mandriva\", \"Mandrivalinux\" ja kaikki niihin liittyvät logot ovat\n"
+"\"Mandriva\", \"Mandriva Linux\" ja kaikki niihin liittyvät logot ovat\n"
 "Mandriva S.A.:n rekisteröityjä tavaramerkkejä.\n"
 "\n"
 "\n"
@@ -6483,7 +6488,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. License Agreement\n"
@@ -6512,8 +6517,8 @@ msgstr ""
 "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 "
@@ -6527,8 +6532,8 @@ msgstr ""
 "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 "
@@ -6537,7 +6542,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"
@@ -6571,10 +6576,10 @@ msgstr ""
 "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"
@@ -6692,8 +6697,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"
@@ -6701,27 +6706,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 ""
 "Onnittelut, asennus on valmis.\n"
 "Poista käynnistyslevyke ja paina Enter käynnistääksesi koneesi uudelleen.\n"
 "\n"
 "\n"
-"Löydät tähän Mandrivalinuxin versioon saatavilla olevat korjaukset ja\n"
+"Löydät tähän Mandriva Linuxin versioon saatavilla olevat korjaukset ja\n"
 "korjattujen virheiden listan osoitteesta:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"Järjestelmän asettamisesta saat tietoja virallisen Mandrivalinuxin\n"
+"Järjestelmän asettamisesta saat tietoja virallisen Mandriva Linuxin\n"
 "käyttäjäoppaan jälkiasennuskappaleesta."
 
 #. -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
@@ -6749,11 +6754,12 @@ msgstr "Siirryn vaiheeseen `%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 ""
-"Järjestelmäsi resurssit ovat lopussa. Voit kohdata ongelmia Mandrivalinuxia\n"
+"Järjestelmäsi resurssit ovat lopussa. Voit kohdata ongelmia Mandriva "
+"Linuxia\n"
 "asentaessasi. Jos näin tapahtuu, voit kokeilla tekstipohjaista asennusta.\n"
 "Tehdäksesi niin paina `F1' kun käynnistät asennusohjelmaa CD-ROM:lta.\n"
 "Tämän jälkeen kirjoita `text'."
@@ -7301,9 +7307,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 ""
-"Otetaan yhteys Mandrivalinuxin sivustolle peilipalvelinlistan saamiseksi..."
+"Otetaan yhteys Mandriva Linuxin sivustolle peilipalvelinlistan saamiseksi..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7528,8 +7534,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux asennus %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux asennus %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10116,13 +10122,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 asetustyökalu\n"
 "\n"
-"Tämä asettaa henkilökohtaisen palomuurin tähän Mandrivalinux koneeseen.\n"
+"Tämä asettaa henkilökohtaisen palomuurin tähän Mandriva Linux koneeseen.\n"
 "Jos haluat vahvan omistetun palomuuriratkaisun, tutustu räätälöityyn\n"
 "MandrakeSecurity Firewall -jakeluun."
 
@@ -14174,11 +14180,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 ""
-"Suorita Scannerdrake (Laitteisto/Kuvanlukija Mandrivalinux "
+"Suorita Scannerdrake (Laitteisto/Kuvanlukija Mandriva Linux "
 "ohjauskeskuksessa) jaaksesi kuvalnukijasi verkkoon.\n"
 "\n"
 
@@ -16123,23 +16129,23 @@ msgstr "Pysäytä"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Mitä Mandrivalinux on?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Mitä Mandriva Linux on?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Tervetuloa <b>Mandrivalinux</b>iin!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Tervetuloa <b>Mandriva Linux</b>iin!"
 
 #: 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 on <b>Linuxjakelu</b> joka yhdistää järjestelmän ydintä, niin "
+"Mandriva Linux on <b>Linuxjakelu</b> joka yhdistää järjestelmän ydintä, niin "
 "kutsuttu <b>käyttöjärjestelmä</b> (perustuu Linux ytimeen), ja <b>suuren "
 "sovellusmäärään</b> kokonaisuuteen joka kattaa kaikki tarpeet joita tulee "
 "mieleen."
@@ -16147,11 +16153,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 on <b>käyttäjäystävällisin</b> Linux-jakelu tänään. Se on myös "
-"<b>eräs käytetyimmistä</b> Linux-jakeluista ympäri maailman!"
+"Mandriva Linux on <b>käyttäjäystävällisin</b> Linux-jakelu tänään. Se on "
+"myös <b>eräs käytetyimmistä</b> Linux-jakeluista ympäri maailman!"
 
 #: share/advertising/02.pl:13
 #, c-format
@@ -16166,15 +16172,15 @@ msgstr "Tervetuloa <b>Avoimen Lähdekoodin maailmaan</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 on sitoutunut Open Source (vapaa lähdekoodi) -malliin. Tämä "
-"tarkoittaa että tämä uusi julkaisu on tulosta <b>Mandrivain "
-"kehittäjätiimin</b> ja <b>maailmanlaajuisen vapaaehtoisten avustajien "
-"yhteisön</b> välisestä <b>yhteistyöstä</b>."
+"Mandriva Linux on sitoutunut Open Source (vapaa lähdekoodi) -malliin. Tämä "
+"tarkoittaa että tämä uusi julkaisu on tulosta <b>Mandrivain kehittäjätiimin</"
+"b> ja <b>maailmanlaajuisen vapaaehtoisten avustajien yhteisön</b> välisestä "
+"<b>yhteistyöstä</b>."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16193,10 +16199,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 ""
-"Suurin osa jakelussa olevista ohjelmista ja kaikki Mandrivalinux työkalut "
+"Suurin osa jakelussa olevista ohjelmista ja kaikki Mandriva Linux työkalut "
 "ovat julkistettu <b>GPL</b> lisenssin ehtojen mukaisesti."
 
 #: share/advertising/03.pl:17
@@ -16222,30 +16228,30 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Liity Mandrivalinux yhteisöön!</b>"
+msgstr "<b>Liity Mandriva Linux yhteisöön!</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 ""
-"Mandrivalinuxilla on yksi <b>suurimmista yhteisöstä</b> käyttäjiä ja "
+"Mandriva Linuxilla on yksi <b>suurimmista yhteisöstä</b> käyttäjiä ja "
 "kehittäjiä. Tämän yhteisön rooli on erittäin laaja, virheiden etsijöistä "
-"uusiin ohjemien kehittäjiin. Yhteisö  on <b>avainasemassa</b> Mandrivalinux "
+"uusiin ohjemien kehittäjiin. Yhteisö  on <b>avainasemassa</b> Mandriva Linux "
 "maailmassa."
 
 #: 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>Oppiaaksesi enemmän</b> dynaamisesta yhteisöstämme, vieraile osoitteessa "
-"<b>www.mandrakelinux.com</b> tai suoraan <b>www.mandrakelinux.com/en/"
+"<b>www.mandrivalinux.com</b> tai suoraan <b>www.mandrivalinux.com/en/"
 "cookerdevel.php3</b> jos haluat <b>osallistua</b> kehitykseen."
 
 #: share/advertising/05.pl:15
@@ -16256,10 +16262,10 @@ msgstr "<b>Download Versio</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 ""
-"Olet nyt asentamassa <b>Mandrivalinux Download</b>. Tämä on ilmainen versio "
+"Olet nyt asentamassa <b>Mandriva Linux Download</b>. Tämä on ilmainen versio "
 "joka Mandriva haluaa pitää <b>kaikkien käytettävissä</b>."
 
 #: share/advertising/05.pl:19
@@ -16302,8 +16308,8 @@ msgstr "<b>Discovery, Ensimmäinen Linux työpöytäsi</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Olet nyt asentamassa <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Olet nyt asentamassa <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16325,8 +16331,8 @@ msgstr "<b>PowerPack, Tehokäyttäjän Linux työpöytä</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Olet nyt asentamassa <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Olet nyt asentamassa <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16335,9 +16341,9 @@ msgid ""
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack on Mandrivain <b>hienoin työpöytä-Linux</b>. Sen lisäksi että "
-"se on helppokäyttöisin ja käyttäjäystävällisin Linux-jakelu, PowerPack "
-"sisältää <b>tuhansia sovelluksia</b> - kaikkea suosituimmista teknisimpiin "
+"PowerPack on Mandrivain <b>hienoin työpöytä-Linux</b>. Sen lisäksi että se "
+"on helppokäyttöisin ja käyttäjäystävällisin Linux-jakelu, PowerPack sisältää "
+"<b>tuhansia sovelluksia</b> - kaikkea suosituimmista teknisimpiin "
 "sovelluksiin."
 
 #: share/advertising/08.pl:13
@@ -16347,8 +16353,8 @@ msgstr "<b>PowerPack+, Linux Ratkaisu Työpöydälle ja Palvelimille</b>."
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Olet nyt asentamassa <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Olet nyt asentamassa <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16370,16 +16376,14 @@ msgstr "<b>Mandriva tuotteita</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> on luonut laajan valkoiman <b>Mandrivalinux</b> "
-"tuotteita."
+"<b>Mandriva</b> on luonut laajan valkoiman <b>Mandriva Linux</b> tuotteita."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux tuotteet ovat:"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux tuotteet ovat:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16399,10 +16403,10 @@ msgstr "\t* <b>PowerPack+</b>, Linux Ratkaisu Työpöydälle ja Palvelimille."
 #: 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 x86-64</b>, Mandrivalinuxin ratkaisu 64 bittisen "
+"\t* <b>Mandriva Linux x86-64</b>, Mandriva Linuxin ratkaisu 64 bittisen "
 "prosessorin hyödyntämiselle."
 
 #: share/advertising/10.pl:15
@@ -16413,28 +16417,28 @@ msgstr "<b>Mandriva tuotteita (Nomad tuotteita)</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 on luonut kaksi tuotetta joka salli sinua käyttämään "
-"Mandrivalinux <b>missä koneessa tahansa</b> ilman tarvetta asentaa sitä:"
+"Mandriva on luonut kaksi tuotetta joka salli sinua käyttämään Mandriva Linux "
+"<b>missä koneessa tahansa</b> ilman tarvetta asentaa sitä:"
 
 #: 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 jakelu joka toimii suoraan käynnistettävästä "
+"\t* <b>Move</b>, Mandriva Linux jakelu joka toimii suoraan käynnistettävästä "
 "CD-levystä."
 
 #: 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 jakelu joka on esiasennettu ultra-"
+"\t* <b>GlobeTrotter</b>, Mandriva Linux jakelu joka on esiasennettu ultra-"
 "kompaktiin “LaCie Mobile Hard Drive” levylle."
 
 #: share/advertising/11.pl:13
@@ -16445,26 +16449,29 @@ msgstr "<b>Mandriva tuotteita (Ammattimaiset ratkaisut)</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 ""
 "Alla on Mandriva tuotteita suunniteltu vastaamaan <b>ammattillisin "
 "tarpeisiin</b>:"
 
 #: 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 työpöytä yrityksille."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Mandriva Linux työpöytä yrityksille."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Mandrivalinux Palvelinratkaisu."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandriva Linux Palvelinratkaisu."
 
 #: 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 turvallisuusratkaisu."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr ""
+"\t* <b>Multi-Network Firewall</b>, Mandriva Linux turvallisuusratkaisu."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16661,10 +16668,10 @@ msgstr "<b>Nauti laajasta ohjelmien valikoimasta</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 ""
-"Mandrivalinux valikosta löydät <b>helppokäyttöiset</b> sovellukset "
+"Mandriva Linux valikosta löydät <b>helppokäyttöiset</b> sovellukset "
 "<b>kaikkiin tehtäviin</b>:"
 
 #: share/advertising/18.pl:16
@@ -16930,17 +16937,17 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux Ohjauskeskus</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux Ohjauskeskus</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 Ohjauskeskus</b> on oleellinen kokoelma Mandrivalinux-"
+"<b>Mandriva Linux Ohjauskeskus</b> on oleellinen kokoelma Mandriva Linux-"
 "sidonnaisia työkaluja helpottamaan tietokoneesi asetusten muokkaamista."
 
 #: share/advertising/25.pl:17
@@ -16966,15 +16973,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 ""
 "Kuten kaikki ohjelmointityöt. avoimen lädekoodin ohjelmat <b>vaatii aikaa ja "
 "ihmisiä</b> kehitykseen. Kunnioittaakseen avoimen lädekoodin filosofiaa, "
-"Mandriva myy lisäarvotuotteita ja palveluja jotta <b>Mandrivalinuxin "
+"Mandriva myy lisäarvotuotteita ja palveluja jotta <b>Mandriva Linuxin "
 "kehitys voi jatkua</b>. Jos haluat <b>tukea avoimen lädekoodin filosofiaa</"
-"b>, ja Mandrivalinuxin tuotteiden kehitystä, <b>ole hyvä</b> ja mieti jos "
+"b>, ja Mandriva Linuxin tuotteiden kehitystä, <b>ole hyvä</b> ja mieti jos "
 "haluat ostaa jonkun meidän tuotteista tai palveluista!"
 
 #: share/advertising/27.pl:13
@@ -16985,8 +16992,8 @@ msgstr "<b>Online kauppa</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 ""
 "Tutustuaaksesi kaikkiin Mandrivain tuotteisiin ja palveluihin, voit "
 "vierailla meidän <b>e-commerce alustassa</b>."
@@ -17009,7 +17016,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 "Käy jo tänään osoitteessa <b>www.mandrakestore.com</b>!"
 
 #: share/advertising/28.pl:15
@@ -17020,10 +17027,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> on <b>täydellinen kumppani</b> Mandrivalinux tuotellesi."
+"<b>Mandriva Club</b> on <b>täydellinen kumppani</b> Mandriva Linux "
+"tuotellesi."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -17036,10 +17044,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>Erikoistarjouksia</b> tuotteista ja palveluista onlinekaupassamme "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -17051,17 +17059,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Osallistu Mandrivalinux <b>käyttäjien keskusteluihin</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Osallistu Mandriva Linux <b>käyttäjien keskusteluihin</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"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>Aikainen ja etuoikeutettu pääsy</b>, ennen julkinen levitys, "
-"Mandrivalinux <b>ISO tiedostoille</b>.."
+"\t* <b>Aikainen ja etuoikeutettu pääsy</b>, ennen julkinen levitys, Mandriva "
+"Linux <b>ISO tiedostoille</b>.."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -17074,17 +17082,17 @@ msgid ""
 "<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandriva Online</b> on uusi erikoispalvelu joka Mandriva ylpeänä "
-"esittää asiakkailleen!"
+"<b>Mandriva Online</b> on uusi erikoispalvelu joka Mandriva ylpeänä esittää "
+"asiakkailleen!"
 
 #: 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 tarjoaa laajan valikoiman hyödyllisiä palveluja Mandrivalinux "
-"järjestelmiäsi <b>helposti päivittämiseen</b>."
+"Mandriva Online tarjoaa laajan valikoiman hyödyllisiä palveluja Mandriva "
+"Linux järjestelmiäsi <b>helposti päivittämiseen</b>."
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17108,9 +17116,9 @@ msgstr "\t* Joustavaa <b>ajastettu</b> päivitys."
 #: 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>Kaikki Mandrivalinux järjestelmiäsi</b> hallinta yhdellä tilillä."
+"\t* <b>Kaikki Mandriva Linux järjestelmiäsi</b> hallinta yhdellä tilillä."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -17121,27 +17129,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 ""
-"Tarvitetko <b>apua?</b> Tapaa Mandrivain tekniset asiantuntijat "
-"<b>meidän teknisessä tukialustassa</b> www.mandrakeexpert.com."
+"Tarvitetko <b>apua?</b> Tapaa Mandrivain tekniset asiantuntijat <b>meidän "
+"teknisessä tukialustassa</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 ""
-"Kiitos <b>pätevistä Mandrivalinux asiantuntijoista</b>, säästät paljon aikaa."
+"Kiitos <b>pätevistä Mandriva Linux asiantuntijoista</b>, säästät paljon "
+"aikaa."
 
 #: 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 ""
-"Mille Mandrivalinuxia koskevia kysymyksille tahansa voit ostaa aputapahtuman "
-"osoitteessa <b>store.mandrakesoft.com</b>."
+"Mille Mandriva Linuxia koskevia kysymyksille tahansa voit ostaa "
+"aputapahtuman osoitteessa <b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17531,16 +17540,16 @@ 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 ""
 "[OPTIOT] [OHJELMAN_NIMI]\n"
 "\n"
 "OPTIOT:\n"
 "  --help            - tulosta tämä viesti.\n"
-"  --report          - ohjelman pitäisi olla yksi Mandrivalinuxin "
+"  --report          - ohjelman pitäisi olla yksi Mandriva Linuxin "
 "työkaluista\n"
-"  --incident        - ohjelman pitäisi olla yksi Mandrivalinuxin työkaluista"
+"  --incident        - ohjelman pitäisi olla yksi Mandriva Linuxin työkaluista"
 
 #: standalone.pm:63
 #, c-format
@@ -17594,7 +17603,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"
@@ -17608,7 +17617,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIOT]...\n"
-"Mandrivalinux Terminal Server asetustyökalu\n"
+"Mandriva Linux Terminal Server asetustyökalu\n"
 "--enable      : ota MTS käyttöön.\n"
 "--disable     : poista MTS käytöstä.\n"
 "--start       : käynnistä MTS\n"
@@ -17662,8 +17671,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"
@@ -20474,13 +20483,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux virheenraportointityökalu"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux virheenraportointityökalu"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux Ohjauskeskus"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux Ohjauskeskus"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20973,19 +20982,19 @@ msgstr "Käynnistetty koneen käynnistämisen yhteydessä"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Tätä liitäntää ei ole vielä asetettu.\n"
-"Suorita Mandrivalinux Ohjauskeskuksesta \"Lisää liitäntä\"."
+"Suorita Mandriva Linux Ohjauskeskuksesta \"Lisää liitäntä\"."
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Tätä liitäntää ei ole vielä asetettu.\n"
-"Suorita Mandrivalinux Ohjauskeskuksesta \"%s\"."
+"Suorita Mandriva Linux Ohjauskeskuksesta \"%s\"."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21035,8 +21044,8 @@ msgstr "KDM (KDE Näytönhallinta)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDDM (Mandrivalinux Näytönhallinta)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDDM (Mandriva Linux Näytönhallinta)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21343,18 +21352,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 (alkuperäinen versio)\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
@@ -21932,8 +21941,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux Apukeskus"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux Apukeskus"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22592,7 +22601,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 ""
 "Yhtäkään äänikorttia ei löydetty koneestasi. Varmista, että Linux-tuettu "
 "äänikortti on kytketty oikein.\n"
@@ -22601,7 +22610,7 @@ msgstr ""
 "Voit katsoa meidän laitteistotietokantaa osoitteesta:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24610,7 +24619,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 ""
 "Yhtäkään TV-korttia ei löydetty koneestasi. Varmista, että Linux-tuettu "
 "Video/TV-kortti on kytketty oikein.\n"
@@ -24619,7 +24628,7 @@ msgstr ""
 "Voit katsoa laitteistotietokantaamme osoitteesta:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25330,13 +25339,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 ""
 "Tämä on HardDrake, %s laitteistonasetustyökalu.\n"
 "<span foreground=\"royalblue3\">Versio:</span> %s\n"
 "<span foreground=\"royalblue3\">Tekijä:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25446,8 +25455,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinux työkalujen lokit"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linux työkalujen lokit"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25961,10 +25970,10 @@ msgstr "Yhteys valmis."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Yhteys epäonnistui.\n"
-"Tarkista asetukset Mandrivalinux Ohjauskeskuksessa."
+"Tarkista asetukset Mandriva Linux Ohjauskeskuksessa."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26869,7 +26878,6 @@ msgstr "Asennus epäonnistui"
 #~ msgid "Save and close"
 #~ msgstr "Tallenna ja Sulje"
 
-
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Ei selainta käytettävissä! Ole hyvä ja asenna jokin"
 
@@ -27011,16 +27019,16 @@ msgstr "Asennus epäonnistui"
 #~ msgstr "Virhe avattaessa %s kirjoitusta varten: %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 ""
-#~ "Tämä on HardDrake, Mandrivalinuxin laitteistonasetustyökalu.\n"
+#~ "Tämä on HardDrake, Mandriva Linuxin laitteistonasetustyökalu.\n"
 #~ "<span foreground=\"royalblue3\">Versio:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Tekijä:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 
 #~ msgid "Use Anonymous Bind"
@@ -27343,7 +27351,8 @@ msgstr "Asennus epäonnistui"
 #~ "You will now set up your Internet/network connection. If you wish to\n"
 #~ "connect your computer to the Internet or to a local network, click \"%s"
 #~ "\".\n"
-#~ "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"
@@ -27364,7 +27373,7 @@ msgstr "Asennus epäonnistui"
 #~ "modems\n"
 #~ "that require additional software to work compared to Normal modems. Some "
 #~ "of\n"
-#~ "those modems actually work under 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"
@@ -27374,7 +27383,7 @@ msgstr "Asennus epäonnistui"
 #~ msgstr ""
 #~ "Sinulla on nyt mahdollisuus asettaa Internet-/verkkoyhteytesi. Jos\n"
 #~ "haluat yhdistää tietokoneesi Internetiin tai lähiverkkoon, valitse\n"
-#~ "\"%s\". Mandrivalinux yrittää tunnistaa verkkolaitteet ja\n"
+#~ "\"%s\". Mandriva Linux yrittää tunnistaa verkkolaitteet ja\n"
 #~ "modeemit automaattisesti. Jos tämä tunnistus epäonnistuu, poista\n"
 #~ "valinta kohdasta \"%s\" seuraavalla kerralla.\n"
 #~ "Voit myös jättää verkon asettamisen tekemättä, tai tehdä sen\n"
@@ -27394,7 +27403,7 @@ msgstr "Asennus epäonnistui"
 #~ "Winmodeemiyhteyksistä: Winmodeemit ovat erityisiä integroituja\n"
 #~ "halpamallimodeemeja (tai softamodeemeja) jotka vaativat lisäohjelmia\n"
 #~ "toimiakseen verrattuna tavallisiin modeemeihin. Jotkin softamodeemit\n"
-#~ "todellakin toimivat Mandrivalinuxin kanssa, toiset eivät. Voit\n"
+#~ "todellakin toimivat Mandriva Linuxin kanssa, toiset eivät. Voit\n"
 #~ "tarkistaa tuetut modeemit LinModems-sivustolta\n"
 #~ "\n"
 #~ "Voit katsoa ``Starter Guidesta'' Internetyhteyksiä koskevia tietoja\n"
@@ -27435,7 +27444,7 @@ msgstr "Asennus epäonnistui"
 #~ "checking this box.\n"
 #~ "\n"
 #~ "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-#~ "\"%s\"), you must ensure that you have a way to boot your 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"
@@ -27472,7 +27481,7 @@ msgstr "Asennus epäonnistui"
 #~ "\n"
 #~ "!! Huom! Jos jätät käynnistyslataajan asentamatta (valitsemalla\n"
 #~ "\"%s\"), sinun pitää varmistaa, että sinulla on keino käynnistää\n"
-#~ "Mandrivalinux -järjestelmäsi! Varmista myös, että tiedät mitä olet\n"
+#~ "Mandriva Linux -järjestelmäsi! Varmista myös, että tiedät mitä olet\n"
 #~ "tekemässä ennen kuin muutat näitä asetuksia !!\n"
 #~ "\n"
 #~ "\"%s\"-painike tässä valikossa mahdollistaa useat\n"
@@ -27786,16 +27795,16 @@ msgstr "Asennus epäonnistui"
 #~ "Tulostimen \"%s\" poistaminen Star Office/OpenOffice.org/GIMP käytöstä "
 #~ "epäonnistui."
 
-#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
-#~ msgstr "<b>Onnittelut Mandrivalinuxin valinnasta!</b>"
+#~ msgid "<b>Congratulations for choosing Mandriva Linux!</b>"
+#~ msgstr "<b>Onnittelut Mandriva Linuxin valinnasta!</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 ""
-#~ "Mandrivalinux käyttöjärjestelmäsi ja sen monet sovellukset ovat tulosta "
-#~ "yhteistyöstä Mandrivain kehittäjien sekä Mandrivalinuxin kehityksessä "
+#~ "Mandriva Linux käyttöjärjestelmäsi ja sen monet sovellukset ovat tulosta "
+#~ "yhteistyöstä Mandrivain kehittäjien sekä Mandriva Linuxin kehityksessä "
 #~ "avustaneiden välillä ympäri maailman."
 
 #~ msgid ""
@@ -27882,9 +27891,10 @@ msgstr "Asennus epäonnistui"
 #~ "\t- Special download mirror list exclusively for Mandriva Club Members"
 #~ msgstr "\t- Erityinen Mandriva Clubin jäsenille tarkoitettu palvelinlista"
 
-#~ msgid "\t- Voting for software to put in Mandrivalinux"
+#~ msgid "\t- Voting for software to put in Mandriva Linux"
 #~ msgstr ""
-#~ "\t- Äänestysmahdollisuus Mandrivalinuxin mukana toimitettavista ohjelmista"
+#~ "\t- Äänestysmahdollisuus Mandriva Linuxin mukana toimitettavista "
+#~ "ohjelmista"
 
 #~ msgid "\t- Plus much more"
 #~ msgstr "\t- Ja paljon muuta"
@@ -27900,10 +27910,10 @@ msgstr "Asennus epäonnistui"
 
 #~ msgid ""
 #~ "If you have Linux questions, subscribe to MandrakeExpert at <b>www."
-#~ "mandrakeexpert.com</b>"
+#~ "mandrivaexpert.com</b>"
 #~ msgstr ""
 #~ "Mikäli sinulla on Linuxiin liittyviä kysymyksiä, tilaa MandrakeExpert "
-#~ "osoitteessa <b>www.mandrakeexpert.com</b>"
+#~ "osoitteessa <b>www.mandrivaexpert.com</b>"
 
 #~ msgid ""
 #~ "If you would like to get involved, please subscribe to the \"Cooker\" "
@@ -27920,23 +27930,24 @@ msgstr "Asennus epäonnistui"
 #~ "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 ""
-#~ "Mandrivalinuxin mukana tulee kuuluisat työpöytäympäristöt KDE ja GNOME "
+#~ "Mandriva Linuxin mukana tulee kuuluisat työpöytäympäristöt KDE ja GNOME "
 #~ "sekä uusimmat versiot suosituimmista Avoimen Lähdekoodin sovelluksista."
 
 #~ 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 tunnetaan laajalti käyttäjäystävällisimpänä ja "
+#~ "Mandriva Linux tunnetaan laajalti käyttäjäystävällisimpänä ja "
 #~ "helppokäyttöisimpänä Linux-jakeluna."
 
-#~ 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- Tutustu <b>Mandrakemove</b>-jakeluun, CD:ltä toimivaan "
-#~ "Mandrivalinuxiin"
+#~ "\t- Tutustu <b>Mandrakemove</b>-jakeluun, CD:ltä toimivaan Mandriva "
+#~ "Linuxiin"
 
 #~ msgid ""
 #~ "\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
@@ -27982,12 +27993,11 @@ msgstr "Asennus epäonnistui"
 
 #~ msgid ""
 #~ "<b>MandrakeClustering</b>: the power and speed of a Linux cluster "
-#~ "combined with the stability and easy-of-use of the world-famous "
-#~ "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>: Linux-clusterin tehokkuus ja nopeus "
-#~ "yhdistettynä maailmankuuluun Mandrivalinux-jakelun vakauteen ja "
+#~ "yhdistettynä maailmankuuluun Mandriva Linux-jakelun vakauteen ja "
 #~ "helppokäyttöisyyteen. Ainutlaatuinen yhdistelmä verratonta HPC tehoa."
 
 #~ msgid ""
@@ -28015,29 +28025,31 @@ msgstr "Asennus epäonnistui"
 #~ "näytönohjainkorttien (kuten ATI® ja NVIDIA®) kanssa."
 
 #~ 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 ""
-#~ "Uusi Mandrivalinux-jakelusi ja sen mukana tulevat sovellukset ovat "
-#~ "Mandrivain kehittäjien ja ympäri maailman Mandrivalinuxin "
-#~ "kehityksessä avustaneiden välisen yhteistyön tulosta."
+#~ "Uusi Mandriva Linux-jakelusi ja sen mukana tulevat sovellukset ovat "
+#~ "Mandrivain kehittäjien ja ympäri maailman Mandriva Linuxin kehityksessä "
+#~ "avustaneiden välisen yhteistyön tulosta."
 
 #~ msgid "<b>PowerPack+</b>"
 #~ msgstr "<b>PowerPack+</b>"
 
 #~ 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 ""
-#~ "Se on ainoa Mandrivalinux tuote johon sisältyy ryhmätyöohjelmistoratkaisu."
+#~ "Se on ainoa Mandriva Linux tuote johon sisältyy "
+#~ "ryhmätyöohjelmistoratkaisu."
 
 #~ 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 ""
-#~ "Kun kirjaudut sisään Mandrivalinux-järjestelmääsi ensimmäistä kertaa voit "
-#~ "valita graafisen työpöytäympäristön jota haluat käyttää useista "
+#~ "Kun kirjaudut sisään Mandriva Linux-järjestelmääsi ensimmäistä kertaa "
+#~ "voit valita graafisen työpöytäympäristön jota haluat käyttää useista "
 #~ "suosituista vaihtoehdoista: KDE, GNOME, WindowMaker, IceWM jne."
 
 #~ msgid ""
@@ -28093,13 +28105,12 @@ msgstr "Asennus epäonnistui"
 #~ msgstr "\t- Ja monia muita"
 
 #~ 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 ""
-#~ "Uusi Mandrivalinux-jakelusi on Mandrivain kehittäjien ja ympäri "
-#~ "maailman Mandrivalinuxin kehityksessä avustaneiden välisen yhteistyön "
-#~ "tulosta."
+#~ "Uusi Mandriva Linux-jakelusi on Mandrivain kehittäjien ja ympäri maailman "
+#~ "Mandriva Linuxin kehityksessä avustaneiden välisen yhteistyön tulosta."
 
 #~ msgid ""
 #~ "We would like to thank everyone who participated in the development of "
@@ -28150,8 +28161,8 @@ msgstr "Asennus epäonnistui"
 #~ "työkaluja helpottamaan tietokoneesi konfigurointia."
 
 #~ 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 ""
 #~ "Tutustu kaikkiin Mandrivain tuotteisiin ja palveluihin "
 #~ "<b>MandrakeStoressa</b> -- täyden palvelun sähköisessä kaupassa."
@@ -28176,26 +28187,27 @@ msgstr "Asennus epäonnistui"
 #~ "\t- Erikoistarjouksia tuotteista ja palveluista jotka on tarjolla "
 #~ "MandrakeStoressa"
 
-#~ 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- Tutustu <b>Mandriva Move</b> jakeluun, CD:ltä toimivaan "
-#~ "Mandrivalinuxiin"
+#~ "\t- Tutustu <b>Mandriva Move</b> jakeluun, CD:ltä toimivaan Mandriva "
+#~ "Linuxiin"
 
 #~ 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 ""
-#~ "Tutustu kaikkiin Mandrivain tuotteisiin <b>MandrakeStoressa</b> - "
-#~ "täyden palvelun sähköisessä kaupassa."
+#~ "Tutustu kaikkiin Mandrivain tuotteisiin <b>MandrakeStoressa</b> - täyden "
+#~ "palvelun sähköisessä kaupassa."
 
 #~ msgid "<b>Become a MandrakeClub member!</b>"
 #~ msgstr "<b>Tule MandrakeClubin jäseneksi!</b>"
 
 #~ msgid ""
-#~ "In the 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 ""
-#~ "Mandrivalinux valikoista löydät helppokäyttöiset sovellukset kaikkiin "
+#~ "Mandriva Linux valikoista löydät helppokäyttöiset sovellukset kaikkiin "
 #~ "tehtäviin:"
 
 #~ msgid ""
@@ -28236,9 +28248,6 @@ msgstr "Asennus epäonnistui"
 #~ msgid "Mandrake Control Center"
 #~ msgstr "Mandraken Ohjauskeskus"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid ""
 #~ "This interface has not been configured yet.\n"
 #~ "Run the \"Add an interface\" assistant from the Mandrake Control Center"
diff --git a/perl-install/share/po/fr.po b/perl-install/share/po/fr.po
index 1d02c8154..0833a6f5c 100644
--- a/perl-install/share/po/fr.po
+++ b/perl-install/share/po/fr.po
@@ -1,6 +1,6 @@
 # translation of DrakX-fr.po to Français
 # translation of DrakX-fr.po to french
-# Translation file of Mandrivalinux graphic install
+# Translation file of Mandriva Linux graphic install
 # Copyright (C) 1999 Mandriva
 #
 # Veuillez ne pas mettre à jour ce fichier à moins d'être
@@ -53,12 +53,12 @@
 #    préférable de le remplacer par le mot "programme".
 #
 # Nous vous remercions de votre compréhension.
-# David BAUDENS <baudens@mandrakesoft.com>, 1999-2004.
-# David ODIN <odin@mandrakesoft.com>, 2000.
-# Pablo Saratxaga <pablo@mandrakesoft.com>, 2001, 2005.
+# David BAUDENS <baudens@mandriva.com>, 1999-2004.
+# David ODIN <odin@mandriva.com>, 2000.
+# Pablo Saratxaga <pablo@mandriva.com>, 2001, 2005.
 # KAtiOS <katios@nolabel.net>, 2001.
-# Guillaume Cottenceau <gc@mandrakesoft.com>, 2001-2002.
-# Thierry Vignaud <tvignaud@mandrakesoft.com>, 2001-2004.
+# Guillaume Cottenceau <gc@mandriva.com>, 2001-2002.
+# Thierry Vignaud <tvignaud@mandriva.com>, 2001-2004.
 # Christophe Combelles <ccomb@free.fr>, 2002,2003.
 # Adrien REZER <monsieurdidi@free.fr>, 2003.
 # RICHARD Nicolas <richardnicolas22@yahoo.fr>, 2004.
@@ -75,7 +75,7 @@ msgstr ""
 "POT-Creation-Date: 2005-04-21 14:27+0200\n"
 "PO-Revision-Date: 2005-04-21 14:38+0200\n"
 "Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
-"Language-Team: Français <cooker-i18n@linux-mandrake.com>\n"
+"Language-Team: Français <cooker-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -175,7 +175,7 @@ msgstr ""
 "\n"
 "Vous pouvez aussi continuer sans clé USB - vous pourrez\n"
 "toujours utiliser Mandriva Move comme un système\n"
-"d'exploitation Mandrivalinux sur CD-ROM."
+"d'exploitation Mandriva Linux sur CD-ROM."
 
 #: ../move/move.pm:483
 #, c-format
@@ -204,7 +204,7 @@ msgstr ""
 "\n"
 "Vous pouvez aussi continuer sans clé USB - vous pourrez\n"
 "toujours utiliser Mandriva Move comme un système\n"
-"d'exploitation Mandrivalinux sur CD-ROM."
+"d'exploitation Mandriva Linux sur CD-ROM."
 
 #: ../move/move.pm:494
 #, c-format
@@ -1400,7 +1400,7 @@ msgstr "Choix de la langue"
 #: 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 ""
@@ -3852,18 +3852,18 @@ msgid "enable radio support"
 msgstr "activer le support de la radio"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:11
 #, 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 ""
 "Avant d'aller plus loin, il est fortement recommandé de lire attentivement\n"
 "les termes et conditions d'utilisation de la licence. Celle-ci régit\n"
-"l'ensemble de la distribution Mandrivalinux. Si vous en acceptez tous les\n"
+"l'ensemble de la distribution Mandriva Linux. Si vous en acceptez tous les\n"
 "termes, cochez la case « %s », sinon, cliquez sur le bouton « %s » pour\n"
 "redémarrer votre ordinateur."
 
@@ -3970,7 +3970,7 @@ msgid "Advanced"
 msgstr "Avancé"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:54
 #, c-format
 msgid ""
@@ -4042,17 +4042,18 @@ msgstr ""
 "« deuxième plus petit ID », etc."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/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 ""
-"Les paquetages requis à l'installation de Mandrivalinux sont distribués sur\n"
+"Les paquetages requis à l'installation de Mandriva Linux sont distribués "
+"sur\n"
 "plusieurs CD-ROM. Si un paquetage requis se trouve sur un autre CD-ROM,\n"
 "DrakX éjectera celui présent dans le lecteur et vous demandera d'insérer le\n"
 "CD-ROM approprié. Si vous ne possédez pas le CD demandé, cliquez tout\n"
@@ -4060,16 +4061,17 @@ msgstr ""
 "installés."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/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"
@@ -4121,11 +4123,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "C'est maintenant le moment de choisir les paquetages qui seront installés\n"
-"sur votre système. Sachez que Mandrivalinux contient plusieurs milliers de\n"
+"sur votre système. Sachez que Mandriva Linux contient plusieurs milliers de\n"
 "paquetages à installer, et ces paquetages ont été rangés par groupes chacun\n"
 "correspondant à un usage particulier de l'ordinateur.\n"
 "\n"
-"Mandrivalinux range ces groupes en quatre catégories. Vous pouvez mélanger\n"
+"Mandriva Linux range ces groupes en quatre catégories. Vous pouvez mélanger\n"
 "des groupes de plusieurs catégories de sorte qu'« une station de travail »\n"
 "peut toujours proposer des applications pour la catégorie « Serveur ».\n"
 "\n"
@@ -4232,10 +4234,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"
@@ -4265,7 +4267,7 @@ msgstr ""
 "apparaît à droite.\n"
 "\n"
 "!! Si un paquetage serveur a été sélectionné, vous devrez confirmer que\n"
-"vous voulez vraiment que celui-ci soit installé. Sous Mandrivalinux , par\n"
+"vous voulez vraiment que celui-ci soit installé. Sous Mandriva Linux , par\n"
 "défaut, tous les services installés sont lancés au démarrage. Malgré tous\n"
 "les efforts investis pour vous livrer une distribution Linux sécurisée, il\n"
 "est possible que certaines failles de sécurité affectent les serveurs\n"
@@ -4292,7 +4294,7 @@ msgid "Automatic dependencies"
 msgstr "Dépendances automatiques"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:183
 #, c-format
 msgid ""
@@ -4352,7 +4354,7 @@ msgstr ""
 "besoin. !!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:206
 #, c-format
 msgid ""
@@ -4395,7 +4397,7 @@ msgid "Automatic time synchronization"
 msgstr "Synchronisation automatique de l'horloge"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:220
 #, c-format
 msgid ""
@@ -4420,13 +4422,13 @@ msgstr ""
 "le serveur qui vous conviendra le mieux."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/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"
@@ -4482,7 +4484,7 @@ msgid ""
 msgstr ""
 "X (pour le système X Window) est le coeur de votre interface graphique sous\n"
 "GNU/Linux. Tous les environnements graphiques (KDE, GNOME, WindowMaker\n"
-"etc.) présents sur Mandrivalinux dépendent de X.\n"
+"etc.) présents sur Mandriva Linux dépendent de X.\n"
 "\n"
 "Il vous sera présenté une liste de divers paramètres à changer pour obtenir\n"
 "un affichage optimal :\n"
@@ -4539,7 +4541,7 @@ msgstr ""
 "l'écran correctement."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:288
 #, c-format
 msgid ""
@@ -4557,7 +4559,7 @@ msgstr ""
 "effectivement."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:295
 #, c-format
 msgid ""
@@ -4577,7 +4579,7 @@ msgstr ""
 "le dessin du moniteur."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:303
 #, c-format
 msgid ""
@@ -4590,7 +4592,7 @@ msgstr ""
 "serveur qui vous conviendra le mieux."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:308
 #, c-format
 msgid ""
@@ -4611,12 +4613,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"
@@ -4643,7 +4645,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"
@@ -4652,7 +4654,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"
@@ -4673,7 +4676,7 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Cette étape vous permet de déterminer précisément l'emplacement de votre\n"
-"installation de Mandrivalinux. Si votre disque est vide ou utilisé par un\n"
+"installation de Mandriva Linux. Si votre disque est vide ou utilisé par un\n"
 "autre système d'exploitation, vous devrez repartitionner votre disque.\n"
 "Partitionner un disque désigne l'opération consistant à le diviser\n"
 "précisément afin de créer un espace pour votre installation.\n"
@@ -4704,7 +4707,7 @@ msgstr ""
 "Le redimensionnement peut être effectué sans pertes de données, à condition\n"
 "que vous ayez préalablement défragmenté la partition Windows. Une\n"
 "sauvegarde de vos données ne fera pas de mal non plus. Cette solution est\n"
-"recommandée pour faire cohabiter Mandrivalinux et Microsoft Windows sur le\n"
+"recommandée pour faire cohabiter Mandriva Linux et Microsoft Windows sur le\n"
 "même ordinateur.\n"
 "\n"
 "   Avant de choisir cette option, il faut comprendre qu'après cette\n"
@@ -4714,7 +4717,7 @@ msgstr ""
 "\n"
 " * « %s » : si vous voulez effacer toutes les données et les applications\n"
 "installées sur votre système et les remplacer par votre nouveau système\n"
-"Mandrivalinux, choisissez cette option. Soyez prudent, car ce choix est\n"
+"Mandriva Linux, choisissez cette option. Soyez prudent, car ce choix est\n"
 "irréversible et permanent. Il vous sera impossible de retrouver vos données\n"
 "effacées.\n"
 "\n"
@@ -4804,7 +4807,7 @@ msgid ""
 "\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n"
 "/dev/fd0\"."
 msgstr ""
-"Votre installation de Mandrivalinux est maintenant terminée et votre\n"
+"Votre installation de Mandriva Linux est maintenant terminée et votre\n"
 "système est prêt à être utilisé. Cliquez sur « %s » pour le redémarrer.\n"
 "N'oubliez pas de retirer la source d'installation(CD-ROM ou disquette).\n"
 "La première chose que vous verrez alors, après que l'ordinateur ait \n"
@@ -4878,7 +4881,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."
@@ -4898,7 +4901,7 @@ msgstr ""
 "Cliquez sur « %s » lorsque vous êtes prêt à formater les partitions.\n"
 "\n"
 "Cliquez sur « %s » pour choisir une autre partition où installer votre\n"
-"nouveau système d'exploitation Mandrivalinux.\n"
+"nouveau système d'exploitation Mandriva Linux.\n"
 "\n"
 "Cliquez sur « %s » si vous désirez sélectionner des partitions pour une\n"
 "vérification des secteurs défectueux (« Bad Blocks »)."
@@ -4913,11 +4916,11 @@ msgid "Previous"
 msgstr "Précédent"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/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"
@@ -4929,7 +4932,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Au moment où vous installez Mandrivalinux, il est possible que certains\n"
+"Au moment où vous installez Mandriva Linux, il est possible que certains\n"
 "paquetages aient été mis à jour depuis la sortie du produit. Des bogues ont\n"
 "pu être corrigés, et des problèmes de sécurité résolus. Pour vous permettre\n"
 "de bénéficier de ces mises à jour, il vous est maintenant proposé de les\n"
@@ -4958,7 +4961,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"
@@ -4973,7 +4976,7 @@ msgstr ""
 "\n"
 "Si vous ne savez pas quel niveau choisir, gardez la sélection par défaut.\n"
 "Vous pourrez le modifier ultérieurement avec l'outil draksec, qui se trouve\n"
-"dans le Centre de Contrôle Mandrivalinux\n"
+"dans le Centre de Contrôle Mandriva Linux\n"
 "\n"
 "Remplissez le champ « %s » avec l'adresse électronique de l'utilisateur qui\n"
 "sera responsable de la sécurité. Les messages de sécurité lui seront\n"
@@ -4988,7 +4991,7 @@ msgstr "Administrateur sécurité"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -5059,7 +5062,8 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "À cette étape, vous devez sélectionner quelle partition sera utilisée pour\n"
-"votre système Mandrivalinux. Si votre disque est déjà partitionné, soit par\n"
+"votre système Mandriva Linux. Si votre disque est déjà partitionné, soit "
+"par\n"
 "une autre installation GNU/Linux ou par un autre outil de partitionnement,\n"
 "vous pourrez les utiliser. Sinon, les partitions devront être créées.\n"
 "\n"
@@ -5145,13 +5149,13 @@ msgid "Toggle between normal/expert mode"
 msgstr "Basculer entre les modes expert et normal"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/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"
@@ -5181,7 +5185,7 @@ msgid ""
 msgstr ""
 "Plus d'une partition Windows a été détectée sur votre disque dur. Veuillez\n"
 "choisir celle que vous choisissez pour votre nouvelle installation de\n"
-"Mandrivalinux.\n"
+"Mandriva Linux.\n"
 "\n"
 "Chaque partition est identifiée comme suit : « Nom Linux », « Nom "
 "Windows »,\n"
@@ -5226,7 +5230,7 @@ msgstr ""
 "liste complète."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:569
 #, c-format
 msgid ""
@@ -5234,7 +5238,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"
@@ -5243,20 +5247,21 @@ 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 ""
 "Cette étape ne s'affichera que si une partition GNU/Linux a été détectée\n"
 "sur votre disque dur.\n"
 "\n"
 "DrakX doit maintenant savoir si vous désirez lancer une « Installation » ou "
 "une\n"
-"« Mise à jour » d'un système Mandrivalinux déjà installé :\n"
+"« Mise à jour » d'un système Mandriva Linux déjà installé :\n"
 "\n"
 " * « %s » : remplace l'ancien système. Cependant, selon votre table de\n"
 "partition, vous pourrez éviter l'effacement de vos données existantes\n"
@@ -5265,13 +5270,13 @@ msgstr ""
 "vous devriez utiliser cette option.\n"
 "\n"
 " * « %s » : cette classe d'installation vous permet de mettre à jour\n"
-"seulement les paquetages qui composent votre système Mandrivalinux. Elle\n"
+"seulement les paquetages qui composent votre système Mandriva Linux. Elle\n"
 "conserve les partitions existantes, ainsi que la configuration des\n"
 "utilisateurs. La plupart des autres étapes d'une installation classique\n"
 "sont accessibles.\n"
 "\n"
 "La mise à jour devrait fonctionner correctement pour les systèmes\n"
-"Mandrivalinux à partir de la version « 8.1 ». Essayer de lancer une mise à\n"
+"Mandriva Linux à partir de la version « 8.1 ». Essayer de lancer une mise à\n"
 "jour sur les versions antérieures à « 8.1 » n'est pas recommandé."
 
 #: help.pm:591
@@ -5313,7 +5318,7 @@ msgstr ""
 "ceux-ci au prochain écran."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:609
 #, c-format
 msgid ""
@@ -5331,7 +5336,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"
@@ -5374,7 +5380,7 @@ msgstr ""
 "À propos de l'encodage UTF-8 (unicode) : Unicode est un nouveau système\n"
 "d'encodage des caractères censé couvrir tous les langues existantes.\n"
 "Cependant son intégration dans GNU/Linux est encore imparfaite. Pour cette\n"
-"raison, Mandrivalinux l'utilisera ou non selon les critères suivants :\n"
+"raison, Mandriva Linux l'utilisera ou non selon les critères suivants :\n"
 "\n"
 " * Si vous choisissez une langue avec un encodage ayant une longue histoire\n"
 "(langues associées à « latin1 », Russe, Japonais, Chinois, Coréen, Thaï,\n"
@@ -5406,7 +5412,7 @@ msgid "Espanol"
 msgstr "Espagnol"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:650
 #, c-format
 msgid ""
@@ -5486,7 +5492,7 @@ msgid "Universal | Any PS/2 & USB mice"
 msgstr "Universelle | N'importe quelle souris PS/2 ou USB"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:684
 #, c-format
 msgid ""
@@ -5497,7 +5503,7 @@ msgstr ""
 "Windows, se nomme « ttyS0 » sous GNU/Linux."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:688
 #, c-format
 msgid ""
@@ -5618,12 +5624,12 @@ msgstr ""
 "démarrage ne sera installé. À vos risques et périls."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/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"
@@ -5644,12 +5650,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 ""
 "Maintenant, il faut choisir un système d'impression pour votre ordinateur. "
 "D'autres\n"
-"systèmes d'exploitation en offrent un, mais Mandrivalinux en propose deux. "
+"systèmes d'exploitation en offrent un, mais Mandriva Linux en propose deux. "
 "Chaque système\n"
 "d'impression convient le mieux à un type différent de configuration.\n"
 "\n"
@@ -5677,7 +5683,7 @@ msgstr ""
 "Si vous choisissez votre système d'impression maintenant et que par la suite "
 "vous n'en êtes pas content, vous pourrez le changer\n"
 "ultérieurement en lançant PrinterDrake depuis le Centre de contrôle\n"
-"Mandrivalinux en cliquant sur le bouton « %s »."
+"Mandriva Linux en cliquant sur le bouton « %s »."
 
 #: help.pm:765
 #, c-format
@@ -5695,7 +5701,7 @@ msgid "Expert"
 msgstr "Expert"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:768
 #, c-format
 msgid ""
@@ -5753,7 +5759,7 @@ msgid "Sound card"
 msgstr "Carte son"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:791
 #, c-format
 msgid ""
@@ -5800,7 +5806,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"
@@ -5817,7 +5824,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"
@@ -5868,7 +5875,7 @@ msgstr ""
 "\n"
 " * « %s » : si vous souhaitez configurer votre accès Internet ou réseau\n"
 "local dès maintenant. Lisez la documentation fournie ou exécutez\n"
-"le Centre de Contrôle Mandrivalinux après l'installation pour avoir droit à "
+"le Centre de Contrôle Mandriva Linux après l'installation pour avoir droit à "
 "une\n"
 "aide complète en ligne.\n"
 "\n"
@@ -5886,7 +5893,7 @@ msgstr ""
 " * « %s » : si vous souhaitez changer la configuration par défaut de votre\n"
 "chargeur de démarrage. À réserver aux utilisateurs expérimentés. Lisez la\n"
 "documentation fournie ou l'aide en ligne sur la configuration de chargeur\n"
-"de démarrage présente dans le Centre de Contrôle Mandrivalinux.\n"
+"de démarrage présente dans le Centre de Contrôle Mandriva Linux.\n"
 "\n"
 " * « %s » : vous pourrez ici contrôler finement les services disponibles\n"
 "sur votre machine. Si vous envisagez de monter un serveur, c'est une bonne\n"
@@ -5944,12 +5951,12 @@ msgid "Services"
 msgstr "Services"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/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 ""
 "Choisissez le disque dur à effacer pour installer votre partition\n"
@@ -5957,7 +5964,7 @@ msgstr ""
 "détruite."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:863
 #, c-format
 msgid ""
@@ -6312,12 +6319,12 @@ msgstr "Calcul de l'espace libre sur la partition Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Votre partition FAT est trop fragmentée. Redémarrez sous Windows\n"
 "et lancez le programme de défragmentation « defrag »,\n"
-"puis relancez l'installation de Mandrivalinux."
+"puis relancez l'installation de Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6439,13 +6446,13 @@ msgstr "Arrêt de l'interface réseau..."
 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"
@@ -6499,7 +6506,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"
@@ -6536,7 +6543,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"
@@ -6558,11 +6565,11 @@ msgstr ""
 "Introduction\n"
 "\n"
 "Le système d'exploitation et les divers composants disponibles dans la \n"
-"distribution Mandrivalinux sont ci-après dénommés les « Logiciels ».\n"
+"distribution Mandriva Linux sont ci-après dénommés les « Logiciels ».\n"
 "Les Logiciels comprennent notamment, mais de façon non limitative,\n"
 "l'ensemble des programmes, procédés, règles et documentations \n"
 "relatifs au système d'exploitation et aux divers composants de la \n"
-"distribution Mandrivalinux.\n"
+"distribution Mandriva Linux.\n"
 "\n"
 "\n"
 "1. Licence\n"
@@ -6584,7 +6591,7 @@ msgstr ""
 "et \n"
 "toute copie de tous programmes et de toutes documentations qui constituent \n"
 "le système d'exploitation et les divers composants disponibles dans la \n"
-"distribution Mandrivalinux.\n"
+"distribution Mandriva Linux.\n"
 "\n"
 "\n"
 "2. Garantie et limitations de garantie\n"
@@ -6613,7 +6620,7 @@ msgstr ""
 "des éventuelles condamnations et indemnités devant être versées par suite \n"
 "d'une décision de justice) qui ferait suite à l'utilisation, la détention \n"
 "ou au simple téléchargement depuis l'un des sites de téléchargement de \n"
-"Mandrivalinux de logiciels prohibés par la législation à laquelle vous \n"
+"Mandriva Linux de logiciels prohibés par la législation à laquelle vous \n"
 "êtes soumis. Cet avertissement concerne notamment certains logiciels de \n"
 "cryptographie fournis avec les Logiciels.\n"
 "\n"
@@ -6642,7 +6649,7 @@ msgstr ""
 "propriété exclusive de leurs auteurs respectifs et sont protégés au titre \n"
 "des droits de propriété intellectuelle et de copyright applicables aux "
 "Logiciels.\n"
-"Les marques « Mandriva » et « Mandrivalinux » ainsi que les \n"
+"Les marques « Mandriva » et « Mandriva Linux » ainsi que les \n"
 "logotypes associés sont déposés par Mandriva S.A. \n"
 "\n"
 "\n"
@@ -6752,8 +6759,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"
@@ -6761,27 +6768,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 ""
 "Félicitations, l'installation est terminée.\n"
 "Enlevez la disquette ou le CD-ROM d'amorçage et appuyez sur « Entrée ».\n"
 "\n"
 "\n"
 "Pour toutes informations sur les corrections disponibles pour cette version "
-"de Mandrivalinux, consultez les Errata disponibles depuis :\n"
+"de Mandriva Linux, consultez les Errata disponibles depuis :\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Des informations sur la configuration de votre système sont \n"
-"disponibles dans le Guide de l'Utilisateur de Mandrivalinux."
+"disponibles dans le Guide de l'Utilisateur de 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
@@ -6811,12 +6818,12 @@ msgstr "Démarrage de l'étape « %s »\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"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 ""
 "Votre ordinateur possède peu de mémoire. Vous aurez peut-être quelques\n"
-"problèmes pour installer Mandrivalinux. Si cela se produit, vous pouvez\n"
+"problèmes pour installer Mandriva Linux. Si cela se produit, vous pouvez\n"
 "essayer de procéder à une installation en mode texte. Pour cela, appuyez\n"
 "sur la touche « F1 » après l'amorçage sur CD-ROM puis entrez « text »."
 
@@ -7368,9 +7375,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 ""
-"Connexion au site Web de Mandrivalinux pour obtenir la liste des serveurs "
+"Connexion au site Web de Mandriva Linux pour obtenir la liste des serveurs "
 "miroirs disponibles..."
 
 #: install_steps_interactive.pm:840
@@ -7599,8 +7606,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Installation de Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Installation de Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10192,14 +10199,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 ""
 "Configuration de drakfirewall\n"
 "\n"
-"Ceci configure un Pare-Feu (firewall) personnel pour votre machine "
-"Mandrivalinux.\n"
+"Ceci configure un Pare-Feu (firewall) personnel pour votre machine Mandriva "
+"Linux.\n"
 "Si vous souhaitez un Pare-Feu dédié plus puissant, tournez-vous plutôt vers\n"
 "la distribution spécialisée « MandrakeSecurity »."
 
@@ -11564,8 +11571,8 @@ msgid ""
 "work, you might want to relaunch the configuration."
 msgstr ""
 "Des problèmes sont apparus pendant la configuration.\n"
-"Testez votre connexion avec le « Centre de Contrôle Mandrivalinux » (dans la "
-"section « réseau ») ou la commande « net_monitor ». Si votre connexion ne "
+"Testez votre connexion avec le « Centre de Contrôle Mandriva Linux » (dans "
+"la section « réseau ») ou la commande « net_monitor ». Si votre connexion ne "
 "fonctionne pas, vous pouvez essayer de relancer la configuration."
 
 #: network/netconnect.pm:1537
@@ -14326,12 +14333,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 ""
-"Lancez Sannerdrake (Matériel->Scanner dans le Centre de Contrôle "
-"Mandrivalinux) pour partager sur le réseau votre scanner.\n"
+"Lancez Sannerdrake (Matériel->Scanner dans le Centre de Contrôle Mandriva "
+"Linux) pour partager sur le réseau votre scanner.\n"
 "\n"
 
 #: printer/printerdrake.pm:3933
@@ -14644,7 +14651,7 @@ msgid ""
 msgstr ""
 "L'accès réseau n'a pas pu être démarré. Veuillez vérifier la configuration "
 "de votre matériel et de votre accès réseau grâce au « Centre de Contrôle "
-"Mandrivalinux » puis essayez à nouveau de configurer l'imprimante distante."
+"Mandriva Linux » puis essayez à nouveau de configurer l'imprimante distante."
 
 #: printer/printerdrake.pm:4206
 #, c-format
@@ -15914,7 +15921,7 @@ msgstr ""
 "Anacron exécute des tâches périodiques avec une précision exprimée en jours. "
 "Les tâches sont exécutées automatiquement au redémarrage de la machine si "
 "elles ont expiré leur délai. Quelques tâches de maintenances quotidienne et "
-"hebdomadaire sont préconfigurées pour le système Mandrivalinux. (Plus "
+"hebdomadaire sont préconfigurées pour le système Mandriva Linux. (Plus "
 "d'informations dans « man anacron »)"
 
 #: services.pm:21
@@ -16102,8 +16109,8 @@ msgstr ""
 "Gestion groupée de toutes les connexions réseau que vous avez configurées et "
 "que vous avez choisi d'activer dès le démarrage du système. (par ex. vos "
 "connexions pour le réseau local et l'ADSL ou le Câble). Vous pouvez accéder "
-"séparément à vos interfaces réseau grâce au « Centre de Contrôle "
-"Mandrivalinux » dans la section « Internet et réseau »."
+"séparément à vos interfaces réseau grâce au « Centre de Contrôle Mandriva "
+"Linux » dans la section « Internet et réseau »."
 
 #: services.pm:59
 #, c-format
@@ -16346,34 +16353,34 @@ msgstr "Arrêter"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Qu'est-ce que Mandrivalinux ?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Qu'est-ce que Mandriva Linux ?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "<b>Mandrivalinux</b> vous souhaite la bienvenue !"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "<b>Mandriva Linux</b> vous souhaite la bienvenue !"
 
 #: 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 est une <b>distribution Linux</b>, qui regroupe un <b>système "
+"Mandriva Linux est une <b>distribution Linux</b>, qui regroupe un <b>système "
 "d'exploitation</b> (ie : le coeur du système, basé sur le noyau Linux) et "
 "<b>un très grand nombre d'applications</b> qui répondront à tous vos besoins."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"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 est la distribution Linux la plus <b>conviviale</b> de toutes. "
-"C'est aussi l'une des <b>plus utilisées</b> au monde !"
+"Mandriva Linux est la distribution Linux la plus <b>conviviale</b> de "
+"toutes. C'est aussi l'une des <b>plus utilisées</b> au monde !"
 
 #: share/advertising/02.pl:13
 #, c-format
@@ -16388,15 +16395,15 @@ msgstr "Bienvenue dans le <b>monde du logiciel libre</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 adhère au modèle du logiciel libre. Cela signifie que cette "
+"Mandriva Linux adhère au modèle du logiciel libre. Cela signifie que cette "
 "dernière version est le résultat d'une <b>collaboration</b> entre "
 "<b>l'équipe des développeurs de Mandriva</b> et la <b>communauté mondiale</"
-"b> des contributeurs à Mandrivalinux."
+"b> des contributeurs à Mandriva Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16415,11 +16422,11 @@ 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 plupart des logiciels inclus dans la distribution et l'intégralité des "
-"outils Mandrivalinux respectent la <b>Licence Publique Générale</b> (en "
+"outils Mandriva Linux respectent la <b>Licence Publique Générale</b> (en "
 "anglais General Public License ou GPL)."
 
 #: share/advertising/03.pl:17
@@ -16450,25 +16457,25 @@ msgstr "<b>Rejoignez la communauté</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 possède l'une des <b>plus importantes</b> communautés "
+"Mandriva Linux possède l'une des <b>plus importantes</b> communautés "
 "d'utilisateurs et de développeurs. Le rôle de cette communauté est multiple, "
 "des rapports de bugs aux développements de nouvelles applications. La "
-"communauté est une <b>part très importante</b> du monde Mandrivalinux."
+"communauté est une <b>part très importante</b> du monde 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 ""
 "Pour en savoir plus sur notre communauté dynamique, allez sur <b>www."
-"mandrakelinux.com</b> ou directement sur <b>www.mandrakelinux.com/en/"
+"mandrivalinux.com</b> ou directement sur <b>www.mandrivalinux.com/en/"
 "cookerdevel.php3</b> si vous souhaitez vous impliquer dans le développement."
 
 #: share/advertising/05.pl:15
@@ -16479,10 +16486,10 @@ msgstr "<b>Version Download</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 ""
-"Vous êtes en train d'installer <b>Mandrivalinux Download</b>. C'est la "
+"Vous êtes en train d'installer <b>Mandriva Linux Download</b>. C'est la "
 "version gratuite que Mandriva tient à garder <b>disponible pour tous</b>."
 
 #: share/advertising/05.pl:19
@@ -16527,8 +16534,8 @@ msgstr "<b>Discovery, Votre premier poste de travail sous Linux</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Vous êtes en train d'installer <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Vous êtes en train d'installer <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16550,8 +16557,8 @@ msgstr "<b>PowerPack, Le poste de travail de référence sous Linux</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Vous êtes en train d'installer <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Vous êtes en train d'installer <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16572,8 +16579,8 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Vous êtes en train d'installer <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Vous êtes en train d'installer <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16595,14 +16602,15 @@ msgstr "<b>Les produits 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> a développé une large gamme de produits <b>Mandrivalinux</b>."
+"<b>Mandriva</b> a développé une large gamme de produits <b>Mandriva Linux</"
+"b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Les produits Mandrivalinux sont :"
+msgid "The Mandriva Linux products are:"
+msgstr "Les produits Mandriva Linux sont :"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16623,10 +16631,10 @@ 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 pour x86-64</b>, La solution Mandrivalinux pour tirer "
+"\t* <b>Mandriva Linux pour x86-64</b>, La solution Mandriva Linux pour tirer "
 "le meilleur parti de votre processeur 64 bits."
 
 #: share/advertising/10.pl:15
@@ -16637,28 +16645,28 @@ msgstr "<b>Les produits Mandriva (produits nomades)</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 a développé deux produits qui permettent d'utiliser Mandrivalinux "
+"Mandriva a développé deux produits qui permettent d'utiliser Mandriva Linux "
 "<b>sur n'importe quel ordinateur</b> et sans installation :"
 
 #: 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>, une distribution Mandrivalinux qui fonctionne entièrement "
+"\t* <b>Move</b>, une distribution Mandriva Linux qui fonctionne entièrement "
 "depuis un CD-ROM amorçable."
 
 #: 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>, une distribution Mandrivalinux préinstallée sur le "
+"\t* <b>GlobeTrotter</b>, une distribution Mandriva Linux préinstallée sur le "
 "disque dur ultra compact “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
@@ -16677,20 +16685,23 @@ 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>Corporate Desktop</b>, Le poste de travail Mandrivalinux à "
+"\t* <b>Corporate Desktop</b>, Le poste de travail Mandriva Linux à "
 "destination des entreprises."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, La solution serveur Mandrivalinux."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, La solution serveur 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>, La solution sécurité Mandrivalinux."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr ""
+"\t* <b>Multi-Network Firewall</b>, La solution sécurité Mandriva Linux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16895,10 +16906,10 @@ msgstr "<b>Profiter de la large gamme d'applications</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 ""
-"Dans le menu Mandrivalinux, vous trouverez des applications <b>faciles "
+"Dans le menu Mandriva Linux, vous trouverez des applications <b>faciles "
 "d'utilisation</b> pour <b>toutes vos tâches</b> :"
 
 #: share/advertising/18.pl:16
@@ -17169,18 +17180,19 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Centre de Contrôle Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Centre de Contrôle 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 ""
-"Le <b>Centre de Contrôle Mandrivalinux</b> est un ensemble cohérent d'outils "
-"créés par Mandrivalinux pour simplifier la configuration de votre ordinateur."
+"Le <b>Centre de Contrôle Mandriva Linux</b> est un ensemble cohérent "
+"d'outils créés par Mandriva Linux pour simplifier la configuration de votre "
+"ordinateur."
 
 #: share/advertising/25.pl:17
 #, c-format
@@ -17205,17 +17217,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 ""
 "Comme toute autre activité informatique, le logiciel libre requiert du "
 "<b>temps et des effectifs</b> pour mener à bien les développements. Pour "
 "respecter la philosophie du logiciel libre, Mandriva vend des produits et "
-"des services à valeur ajoutée pour <b>continuer d'améliorer Mandrivalinux</"
+"des services à valeur ajoutée pour <b>continuer d'améliorer Mandriva Linux</"
 "b>. Si vous souhaitez <b>soutenir la philosophie du logiciel libre</b> et le "
-"développement de Mandrivalinux, <b>merci</b> d'envisager l'achat d'un de nos "
-"produits ou services !"
+"développement de Mandriva Linux, <b>merci</b> d'envisager l'achat d'un de "
+"nos produits ou services !"
 
 #: share/advertising/27.pl:13
 #, c-format
@@ -17248,8 +17260,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Arrêtez-vous aujourd'hui sur <b>store.mandrakesoft.com</b> !"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Arrêtez-vous aujourd'hui sur <b>store.mandriva.com</b> !"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -17259,11 +17271,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> est le <b>partenaire parfait</b> de votre produit "
-"Mandrivalinux."
+"Mandriva Linux."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -17276,10 +17288,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>Des réductions spéciales</b> sur des produits et des services de "
-"notre boutique en ligne <b>store.mandrakesoft.com</b>."
+"notre boutique en ligne <b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -17292,17 +17304,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Participation aux <b>forums d'utilisateurs</b> Mandrivalinux."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Participation aux <b>forums d'utilisateurs</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* Accès privilégié, et avant les sorties publiques, aux images ISO de "
-"Mandrivalinux."
+"Mandriva Linux."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -17322,10 +17334,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 fournit une large gamme de services à valeur ajoutée pour "
-"<b>mettre à jour facilement</b> votre système Mandrivalinux :"
+"<b>mettre à jour facilement</b> votre système Mandriva Linux :"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17351,9 +17363,9 @@ msgstr "\t* <b>Planification</b> flexible des mises à jour."
 #: 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* Gestion de <b>tous vos systèmes Mandrivalinux</b> avec un seul compte."
+"\t* Gestion de <b>tous vos systèmes Mandriva Linux</b> avec un seul compte."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -17364,29 +17376,29 @@ 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 ""
 "Vous avez besoin d'<b>assistance</b> ? Rencontrez les experts techniques de "
 "Mandriva sur notre <b>plate-forme de support technique</b> 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 ""
-"Grâce aux <b>experts Mandrivalinux qualifiés</b>, vous gagnerez beaucoup de "
+"Grâce aux <b>experts Mandriva Linux qualifiés</b>, vous gagnerez beaucoup de "
 "temps."
 
 #: 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 ""
-"Pour toute question relative à Mandrivalinux, vous pouvez acheter du support "
-"d'incidents sur <b>store.mandrakesoft.com</b>."
+"Pour toute question relative à Mandriva Linux, vous pouvez acheter du "
+"support d'incidents sur <b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17778,15 +17790,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 ""
 "[OPTIONS] [NOM_PROGRAMME]\n"
 "\n"
 "OPTIONS :\n"
 "  --help            - affiche ce message.\n"
-"  --report          - le programme doit être un outil Mandrivalinux\n"
-"  --incident        - le programme doit être un outil Mandrivalinux"
+"  --report          - le programme doit être un outil Mandriva Linux\n"
+"  --incident        - le programme doit être un outil Mandriva Linux"
 
 #: standalone.pm:63
 #, c-format
@@ -17841,7 +17853,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"
@@ -17855,7 +17867,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Configurateur pour Mandrivalinux Terminal Server\n"
+"Configurateur pour Mandriva Linux Terminal Server\n"
 "--enable         : active MTS\n"
 "--disable        : désactive MTS\n"
 "--start          : démarre MTS\n"
@@ -20708,13 +20720,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Outil de signalement de bogue Mandrivalinux"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Outil de signalement de bogue Mandriva Linux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Centre de Contrôle Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Centre de Contrôle Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -21207,20 +21219,20 @@ msgstr "Lancer au démarrage"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Cette interface n'a pas encore été configurée.\n"
 "Lancez l'assistant « Ajouter une interface » depuis le Centre de Contrôle "
-"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 ""
 "Vous n'avez aucune connexion internet configurée.\n"
-"Lancez l'assistant « %s » depuis le Centre de Contrôle Mandrivalinux"
+"Lancez l'assistant « %s » depuis le Centre de Contrôle Mandriva Linux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21270,8 +21282,8 @@ msgstr "KDM (Gestionnaire de connexion de KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkDM (Gestionnaire de connexion de Mandrivalinux)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkDM (Gestionnaire de connexion de Mandriva Linux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21580,17 +21592,17 @@ 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 par Mandriva\n"
 "\n"
 "     DUPONT Sébastien (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
@@ -22173,8 +22185,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Le centre d'aide de Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Le centre d'aide de Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22839,7 +22851,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 ""
 "Aucune carte son n'a été détectée sur votre ordinateur. Veuillez vérifier "
 "qu'une carte son supportée par Linux est correctement branchée.\n"
@@ -22848,7 +22860,7 @@ msgstr ""
 "Vous pouvez visiter notre base de données de support matériel à :\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24913,7 +24925,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 ""
 "Aucune carte TV n'a été détectée sur votre ordinateur. Veuillez vérifier "
 "qu'une carte TV/Vidéo supportée par Linux est correctement branchée.\n"
@@ -24922,7 +24934,7 @@ msgstr ""
 "Vous pouvez visiter notre base de données de support matériel à :\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25639,13 +25651,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 est l'outil de configuration %s du matériel.\n"
 "<span foreground=\"royalblue3\">Version :</span> %s\n"
 "<span foreground=\"royalblue3\">Auteur :</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 
 #: standalone/harddrake2:243
 #, c-format
@@ -25756,8 +25768,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Actions des Outils Mandrivalinux"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Actions des Outils Mandriva Linux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -26277,10 +26289,10 @@ msgstr "Connexion effectuée."
 #, 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 connexion a échoué.\n"
-"Vérifiez votre configuration dans le Centre de Contrôle Mandrivalinux."
+"Vérifiez votre configuration dans le Centre de Contrôle Mandriva Linux."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/fur.po b/perl-install/share/po/fur.po
index 99d5ffd2d..ca5103aff 100644
--- a/perl-install/share/po/fur.po
+++ b/perl-install/share/po/fur.po
@@ -1216,7 +1216,7 @@ msgstr "Lenghis"
 #: 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 ""
@@ -3468,7 +3468,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 ""
@@ -3578,7 +3578,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"
@@ -3589,11 +3589,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"
@@ -3700,10 +3701,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"
@@ -3812,7 +3813,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"
@@ -3910,12 +3911,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"
@@ -3942,7 +3943,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"
@@ -3951,7 +3952,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"
@@ -4080,7 +4082,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."
@@ -4098,7 +4100,7 @@ msgstr "Precedent"
 #: 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"
@@ -4127,7 +4129,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"
@@ -4143,7 +4145,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"
@@ -4229,7 +4231,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"
@@ -4274,7 +4276,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"
@@ -4283,13 +4285,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
@@ -4330,7 +4333,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"
@@ -4487,7 +4491,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"
@@ -4508,7 +4512,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 ""
 
@@ -4608,7 +4612,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"
@@ -4625,7 +4630,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"
@@ -4687,7 +4692,7 @@ msgstr "Servizis"
 #, 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 ""
 
@@ -4995,7 +5000,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 ""
 
@@ -5098,13 +5103,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"
@@ -5158,7 +5163,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"
@@ -5195,7 +5200,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"
@@ -5268,8 +5273,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"
@@ -5277,13 +5282,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
@@ -5309,7 +5314,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 ""
@@ -5811,7 +5816,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
@@ -6016,7 +6021,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
@@ -8574,7 +8579,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 ""
@@ -12129,8 +12134,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 ""
 
@@ -13793,18 +13798,18 @@ msgstr "Ferme"
 
 #: 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 "Benvignût in <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Benvignût in <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."
@@ -13813,7 +13818,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 ""
 
@@ -13830,9 +13835,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 ""
 
@@ -13851,8 +13856,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
@@ -13878,17 +13883,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 ""
 
@@ -13900,7 +13905,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 ""
 
@@ -13938,7 +13943,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
@@ -13957,7 +13962,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
@@ -13975,7 +13980,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
@@ -13995,13 +14000,13 @@ msgstr "<b>Mandriva Expert</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 "Applet Atualizazions Mandrivalinux"
+msgid "The Mandriva Linux products are:"
+msgstr "Applet Atualizazions Mandriva Linux"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -14021,7 +14026,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 ""
 
@@ -14033,21 +14038,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 ""
 
@@ -14065,17 +14070,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
@@ -14251,7 +14258,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 ""
 
@@ -14486,14 +14493,14 @@ 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 "
+"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 ""
 
@@ -14516,8 +14523,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 ""
 
@@ -14547,7 +14554,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
@@ -14558,7 +14565,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 ""
 
@@ -14572,7 +14579,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
@@ -14584,14 +14591,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
@@ -14610,7 +14617,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
@@ -14633,7 +14640,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
@@ -14645,21 +14652,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
@@ -15008,8 +15015,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
@@ -15045,7 +15052,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"
@@ -17545,13 +17552,13 @@ 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"
-msgstr "Centri di Control Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Centri di Control Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18020,14 +18027,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
@@ -18078,7 +18085,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18368,9 +18375,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
@@ -18848,8 +18855,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Centri jutoris Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Centri jutoris Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -19429,7 +19436,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
@@ -21027,7 +21034,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
@@ -21713,7 +21720,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 ""
 
@@ -21822,7 +21829,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr ""
 
 #: standalone/logdrake:51
@@ -22326,7 +22333,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/ga.po b/perl-install/share/po/ga.po
index 907a3f58d..ee9ba5c06 100644
--- a/perl-install/share/po/ga.po
+++ b/perl-install/share/po/ga.po
@@ -1207,7 +1207,7 @@ msgstr "Rogha teanga"
 #: 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 ""
@@ -3462,7 +3462,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 ""
@@ -3572,7 +3572,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"
@@ -3583,11 +3583,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"
@@ -3694,10 +3695,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"
@@ -3806,7 +3807,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"
@@ -3904,12 +3905,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"
@@ -3936,7 +3937,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"
@@ -3945,7 +3946,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"
@@ -4074,7 +4076,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."
@@ -4092,7 +4094,7 @@ msgstr "feist"
 #: 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"
@@ -4121,7 +4123,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"
@@ -4137,7 +4139,7 @@ msgstr "Riarthóir Slándála"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4223,7 +4225,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"
@@ -4268,7 +4270,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"
@@ -4277,13 +4279,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
@@ -4324,7 +4327,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"
@@ -4481,7 +4485,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"
@@ -4502,7 +4506,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 ""
 
@@ -4602,7 +4606,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"
@@ -4619,7 +4624,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"
@@ -4681,7 +4686,7 @@ msgstr "Seirbishí"
 #, 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 ""
 
@@ -4995,7 +5000,7 @@ msgstr "Cruthaigh rann nua"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 
@@ -5098,13 +5103,13 @@ msgstr "Ag dúnadh síos an ghreasán"
 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"
@@ -5158,7 +5163,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"
@@ -5195,7 +5200,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"
@@ -5268,8 +5273,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"
@@ -5277,14 +5282,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
@@ -5309,7 +5314,7 @@ msgstr "Ag tosnú ar céim `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"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 ""
@@ -5813,7 +5818,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
@@ -6018,8 +6023,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Suiteáil Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Suiteáil Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8614,7 +8619,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 ""
@@ -12169,8 +12174,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 ""
 
@@ -13833,18 +13838,18 @@ msgstr "Stad"
 
 #: 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 "Fáilte go dtí <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Fáilte go dtí <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."
@@ -13853,7 +13858,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 ""
 
@@ -13870,9 +13875,9 @@ msgstr "Trialaigh an cumraíocht"
 #: 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 ""
 
@@ -13891,8 +13896,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
@@ -13918,17 +13923,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 ""
 
@@ -13940,7 +13945,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 ""
 
@@ -13978,7 +13983,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
@@ -13997,7 +14002,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
@@ -14015,7 +14020,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
@@ -14035,12 +14040,12 @@ msgstr "Bainteach le hIdirlíon"
 #: 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
@@ -14061,7 +14066,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 ""
 
@@ -14073,21 +14078,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 ""
 
@@ -14105,17 +14110,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
@@ -14291,7 +14298,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 ""
 
@@ -14526,14 +14533,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Ionad Rialaithe Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Ionad Rialaithe 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 ""
 
@@ -14556,8 +14563,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 ""
 
@@ -14587,7 +14594,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
@@ -14598,7 +14605,7 @@ msgstr "Bainteach le hIdirlíon"
 #: 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 ""
 
@@ -14612,7 +14619,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
@@ -14624,14 +14631,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
@@ -14650,7 +14657,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
@@ -14673,7 +14680,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
@@ -14685,21 +14692,21 @@ msgstr "Bainteach le hIdirlíon"
 #, 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
@@ -15049,8 +15056,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
@@ -15086,7 +15093,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"
@@ -17584,13 +17591,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
 msgstr "Bainteach le hIdirlíon"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Ionad Rialaithe Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Ionad Rialaithe Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -17611,7 +17618,7 @@ msgstr "HardDrake"
 #: standalone/drakbug:51
 #, fuzzy, c-format
 msgid "Mandriva Online"
-msgstr "Ionad Rialaithe Mandrivalinux"
+msgstr "Ionad Rialaithe Mandriva Linux"
 
 #: standalone/drakbug:52
 #, fuzzy, c-format
@@ -18060,14 +18067,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
@@ -18118,7 +18125,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18408,9 +18415,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
@@ -18888,7 +18895,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "Bainteach le hIdirlíon"
 
 #: standalone/drakhelp:36
@@ -19469,7 +19476,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
@@ -21068,7 +21075,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
@@ -21754,7 +21761,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 ""
 
@@ -21863,7 +21870,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "Bainteach le hIdirlíon"
 
 #: standalone/logdrake:51
@@ -22367,7 +22374,7 @@ msgstr "Athraigh cineál ranna"
 #, 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/gl.po b/perl-install/share/po/gl.po
index 829275ea0..de68525e8 100644
--- a/perl-install/share/po/gl.po
+++ b/perl-install/share/po/gl.po
@@ -1278,11 +1278,11 @@ msgstr "Selección da Lingua"
 #: 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 pode soportar múltiples linguas. Seleccione\n"
+"Mandriva Linux pode soportar múltiples linguas. Seleccione\n"
 "as linguas que desexa instalar. Esta linguas estarán dispoñibles\n"
 "cando a instalación estea completa e reinicie o seu sistema."
 
@@ -3649,12 +3649,12 @@ msgstr "activar o soporte de radio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
 "Antes de continuar, debe ler con coidado os termos da licenza. Esta\n"
-"licenza cobre toda a distribución Mandrivalinux. Se está de acordo\n"
+"licenza cobre toda a distribución Mandriva Linux. Se está de acordo\n"
 "con tódolos termos que contén, marque o cadro \"%s\". Se non o está,\n"
 "prema no botón \"%s\" e reiniciarase o seu ordenador."
 
@@ -3832,13 +3832,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The 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 ""
-"A instalación de Mandrivalinux distribúese en varios CDs. Se un\n"
+"A instalación de Mandriva Linux distribúese en varios CDs. Se un\n"
 "paquete dos seleccionados está noutro CD, o DrakX expulsará o CD\n"
 "actual e diralle que insira o CD requirido. Se non ten o CD requirido a "
 "man,\n"
@@ -3848,11 +3848,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"
@@ -3959,10 +3960,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"
@@ -4101,7 +4102,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"
@@ -4220,12 +4221,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"
@@ -4252,7 +4253,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"
@@ -4261,7 +4262,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"
@@ -4282,11 +4284,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Agora ten que decidir onde quere instalar o sistema operativo\n"
-"Mandrivalinux no disco duro. Se o seu disco duro está baleiro, ou se\n"
+"Mandriva Linux no disco duro. Se o seu disco duro está baleiro, ou se\n"
 "outro sistema operativo está usando todo o espacio dispoñible, terá que\n"
 "particionalo. Básicamente, particionar un disco duro consiste en dividilo\n"
 "lóxicamente para crear o espacio necesario para instalar o seu novo\n"
-"sistema Mandrivalinux.\n"
+"sistema Mandriva Linux.\n"
 "\n"
 "Debido a que o proceso de particionamento é normalmente irreversible\n"
 "e pode provocar perdas de datos, o particionamento pode intimidar e\n"
@@ -4316,7 +4318,7 @@ msgstr ""
 "pode levarse a cabo sen a perda de ningún dato, con tal que\n"
 "desfragmente previamente a partición Windows. É moi recomendable\n"
 "que faga unha copia de seguridade dos seus datos. Recoméndase\n"
-"usar esta opción se desexa usar Mandrivalinux e Microsoft\n"
+"usar esta opción se desexa usar Mandriva Linux e Microsoft\n"
 "Windows no mesmo ordenador.\n"
 "\n"
 "   Antes de escoller esta opción, debe comprender que despois deste\n"
@@ -4325,7 +4327,7 @@ msgstr ""
 "para almacenar os seus datos ou para instalar novo software.\n"
 "\n"
 " * \"%s\". Se desexa eliminar tódolos datos e as particións presentes no\n"
-"seu disco duro e remprazalas polo seu novo sistema Mandrivalinux, elixa\n"
+"seu disco duro e remprazalas polo seu novo sistema Mandriva Linux, elixa\n"
 "esta opción. Teña coidado, porque non poderá desfacer esta operación\n"
 "despois de que confirme.\n"
 "\n"
@@ -4453,7 +4455,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."
@@ -4471,7 +4473,7 @@ msgstr "Anterior"
 #: 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"
@@ -4500,7 +4502,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"
@@ -4516,7 +4518,7 @@ msgstr "Administrador de Seguridade"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4602,7 +4604,7 @@ msgstr "Cambiar entre modo normal/experto"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4650,7 +4652,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"
@@ -4659,13 +4661,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
@@ -4706,7 +4709,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"
@@ -4880,7 +4884,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but 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"
@@ -4901,7 +4905,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -5004,7 +5008,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"
@@ -5021,7 +5026,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"
@@ -5083,11 +5088,11 @@ msgstr "Servicios"
 #, 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 ""
 "Elixa o disco duro que desexa borrar para poder crear a súa nova partición\n"
-"Mandrivalinux. Teña tino, porque se perderán tódolos datos da unidade e\n"
+"Mandriva Linux. Teña tino, porque se perderán tódolos datos da unidade e\n"
 "non se poderán volver recuperar!"
 
 #: help.pm:863
@@ -5435,12 +5440,12 @@ msgstr "Calculando o tamaño da partición de Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "A partición de Windows está demasiado fragmentada. Por favor reinicie o seu "
 "sistema con Windows, execute a utilidade ``defrag'', e despois reinicie a "
-"instalación de Mandrivalinux."
+"instalación de Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -5555,13 +5560,13 @@ msgstr "Desactivando a rede"
 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"
@@ -5615,7 +5620,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"
@@ -5652,7 +5657,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"
@@ -5725,8 +5730,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"
@@ -5734,27 +5739,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 ""
 "Noraboa, rematou a instalación.\n"
 "Quite o disco de arrinque da unidade e prema Intro para reiniciar.\n"
 "\n"
 "\n"
 "Para información sobre parches dispoñibles para esta versión\n"
-"de Mandrivalinux, consulte as erratas dispoñibles en:\n"
+"de Mandriva Linux, consulte as erratas dispoñibles en:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Para información sobre a configuración do seu sistema, despois\n"
-"da instalación, hai un capítulo na Guía de Usuario Oficial de Mandrivalinux."
+"da instalación, hai un capítulo na Guía de Usuario Oficial de 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
@@ -5783,12 +5788,12 @@ msgstr "Entrando na etapa '%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 ""
 "O seu sistema ten poucos recursos. Pode que teña algún problema\n"
-"ó instala-lo Mandrivalinux. Se iso acontece, pode intenta-la instalación\n"
+"ó instala-lo Mandriva Linux. Se iso acontece, pode intenta-la instalación\n"
 "en modo texto.  Para iso, prema 'F1' cando arrinque o CDROM, e escriba\n"
 "'text'."
 
@@ -6322,9 +6327,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 ""
-"Contactando co sitio web de Mandrivalinux para obte-la lista de espellos "
+"Contactando co sitio web de Mandriva Linux para obte-la lista de espellos "
 "dispoñibles..."
 
 #: install_steps_interactive.pm:840
@@ -6545,8 +6550,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Instalación de Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Instalación de Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9126,13 +9131,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 ""
 "Configurador de drakfirewall\n"
 "\n"
-"Isto configura un cortalumes persoal para esta máquina Mandrivalinux.\n"
+"Isto configura un cortalumes persoal para esta máquina Mandriva Linux.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 
@@ -12995,12 +13000,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 ""
-"Execute Scannerdrake (Hardware/Escáner no Centro de Control de "
-"Mandrivalinux) para compartir o seu escáner na rede.\n"
+"Execute Scannerdrake (Hardware/Escáner no Centro de Control de Mandriva "
+"Linux) para compartir o seu escáner na rede.\n"
 "\n"
 
 #: printer/printerdrake.pm:3933
@@ -14823,23 +14828,23 @@ msgstr "Parar"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>¿Que é Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>¿Que é Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "¡Benvid@ a <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "¡Benvid@ a <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 é unha <b>distribución de Linux</b> que consta do núcleo do "
+"Mandriva Linux é unha <b>distribución de Linux</b> que consta do núcleo do "
 "sistema, chamado <b>sistema operativo</b> (baseado no kernel Linux) xunto "
 "cunha <b>chea de aplicacións</b> satisfan tódalas necesidades en que poida "
 "pensar."
@@ -14847,10 +14852,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 é a distribución de Linux máis <b>amigable</b> hoxe en día. "
+"Mandriva Linux é a distribución de Linux máis <b>amigable</b> hoxe en día. "
 "Tamén é unha das distribucións de Linux <b>máis usadas</b> en todo o mundo!"
 
 #: share/advertising/02.pl:13
@@ -14866,15 +14871,15 @@ msgstr "¡Benvid@ ó <b>mundo do Código Aberto</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 comprométese co Modelo de Código Aberto. Isto significa que "
+"Mandriva Linux comprométese co Modelo de Código Aberto. Isto significa que "
 "esta nova versión é o resultado da <b>colaboración</b> entre o <b>equipo de "
 "desenvolvedores de Mandriva</b> e a <b>comunidade mundial</b> de "
-"contribuíntes de Mandrivalinux."
+"contribuíntes de Mandriva Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -14893,11 +14898,11 @@ msgstr "<b>A 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 ""
 "A maioría do software incluido nesta distribución e tódalas ferramentas de "
-"Mandrivalinux usan a <b>General Public License</b>."
+"Mandriva Linux usan a <b>General Public License</b>."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -14928,25 +14933,25 @@ msgstr "<b>¡Únase á comunidade!</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 ten unha das <b>maiores comunidades</b> de usuarios e "
+"Mandriva Linux ten unha das <b>maiores comunidades</b> de usuarios e "
 "desenvolvedores. O rol desta comunidade é moi amplo, dende o informe de "
 "erros ata o desenvolvemento de novas aplicacións. A comunidade xoga un "
-"<b>rol clave</b> no mundo de Mandrivalinux."
+"<b>rol clave</b> no mundo de 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 ""
 "Para <b>saber máis</b> sobre a nosa dinámica comunidade, visite <b>www."
-"mandrakelinux.com</b> ou directamente <b>www.mandrakelinux.com/en/"
+"mandrivalinux.com</b> ou directamente <b>www.mandrivalinux.com/en/"
 "cookerdevel.php3</b> se desexa <b>participar</b> no desenvolvemento."
 
 #: share/advertising/05.pl:15
@@ -14957,10 +14962,10 @@ msgstr "<b>Versión de Descarga</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 ""
-"Vostede está instalando <b>Mandrivalinux Download</b>. Esta é a versión "
+"Vostede está instalando <b>Mandriva Linux Download</b>. Esta é a versión "
 "gratuita que Mandriva quere ter <b>dispoñible para tod@s</b>."
 
 #: share/advertising/05.pl:19
@@ -15004,8 +15009,8 @@ msgstr "<b>Discovery, O Seu Primeiro Escritorio Linux</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Está instalando <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Está instalando <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -15027,8 +15032,8 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Está instalando <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Está instalando <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -15048,8 +15053,8 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Está instalando <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Está instalando <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -15068,15 +15073,15 @@ msgstr "<b>Productos 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> desenvolveu unha gran cantidade de productos "
-"<b>Mandrivalinux</b>."
+"<b>Mandriva</b> desenvolveu unha gran cantidade de productos <b>Mandriva "
+"Linux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Os productos Mandrivalinux son:"
+msgid "The Mandriva Linux products are:"
+msgstr "Os productos Mandriva Linux son:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -15096,7 +15101,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 ""
 
@@ -15108,29 +15113,29 @@ msgstr "<b>Productos de Mandriva (Productos para Nómadas)</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 desenvolveu dous productos que lle permiten usar Mandrivalinux "
+"Mandriva desenvolveu dous productos que lle permiten usar Mandriva Linux "
 "<b>en calquera ordenador</b> e sen necesidade de instalalo nel:"
 
 #: 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>, unha distribución de Mandrivalinux que se executa "
+"\t* <b>Move</b>, unha distribución de Mandriva Linux que se executa "
 "totalmente dende un CD-ROM arrincable."
 
 #: 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>, unha distribución de Mandrivalinux pre-instalada no "
-"ultracompacto “LaCie Mobile Hard Drive”."
+"\t* <b>GlobeTrotter</b>, unha distribución de Mandriva Linux pre-instalada "
+"no ultracompacto “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
 #, c-format
@@ -15148,17 +15153,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
@@ -15350,10 +15357,10 @@ 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 ""
-"No menú de Mandrivalinux atopará aplicacións <b>fáciles de usar</b> para "
+"No menú de Mandriva Linux atopará aplicacións <b>fáciles de usar</b> para "
 "<b>tódalas tarefas</b>:"
 
 #: share/advertising/18.pl:16
@@ -15610,18 +15617,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Centro de Control de Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Centro de Control de 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 ""
-"O <b>Centro de Control de Mandrivalinux</b> é unha colección esencial de "
-"utilidades específicas de Mandrivalinux para facilita-la configuración do "
+"O <b>Centro de Control de Mandriva Linux</b> é unha colección esencial de "
+"utilidades específicas de Mandriva Linux para facilita-la configuración do "
 "ordenador."
 
 #: share/advertising/25.pl:17
@@ -15647,8 +15654,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 ""
 
@@ -15682,8 +15689,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Parar hoxe en <b>store.mandrakesoft.com</b>"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Parar hoxe en <b>store.mandriva.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -15693,11 +15700,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> é o <b>compañeiro perfecto</b> para o seu producto "
-"Mandrivalinux."
+"Mandriva Linux."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -15710,10 +15717,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>Descontos especiais</b> en productos e servicios da nosa tenda en "
-"liña <b>store.mandrakesoft.com</b>."
+"liña <b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -15726,17 +15733,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Participación nos <b>foros de usuarios</b> de Mandrivalinux."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Participación nos <b>foros de usuarios</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 ""
 "\t* <b>Acceso privilexiado e anticipado</b>, antes da liberación pública, ás "
-"<b>imaxes ISO</b> de Mandrivalinux."
+"<b>imaxes ISO</b> de Mandriva Linux."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -15754,10 +15761,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 fornece unha gran cantidade de valiosos servicios para "
-"<b>actualizar fácilmente</b> os seus sistemas Mandrivalinux:"
+"<b>actualizar fácilmente</b> os seus sistemas Mandriva Linux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -15781,9 +15788,10 @@ 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 ""
-"\t* Administración de <b>tódolos seus sistemas Mandrivalinux</b> cunha conta."
+"\t* Administración de <b>tódolos seus sistemas Mandriva Linux</b> cunha "
+"conta."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -15794,23 +15802,23 @@ 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 ""
-"Gracias á axuda dos <b>cualificados expertos de Mandrivalinux</b>, aforrará "
+"Gracias á axuda dos <b>cualificados expertos de Mandriva Linux</b>, aforrará "
 "unha chea de tempo."
 
 #: 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
@@ -16170,8 +16178,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
@@ -16213,7 +16221,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"
@@ -18805,13 +18813,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Ferramenta de Informe de Erros de Mandrivalinux"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Ferramenta de Informe de Erros de Mandriva Linux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Centro de Control de Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Centro de Control de Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19303,21 +19311,21 @@ msgstr "Iniciado ó arrincar"
 #, 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 ""
 "Esta interface ainda non foi configurada.\n"
 "Execute o asistente \"Engadir unha interface\" dende o\n"
-"Centro de Control de Mandrivalinux"
+"Centro de Control de 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 ""
 "Non ten configurada ningunha conexión á Internet.\n"
 "Execute o asistente \"%s\" dende o\n"
-"Centro de Control de Mandrivalinux"
+"Centro 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
@@ -19367,8 +19375,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
@@ -19664,18 +19672,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 de Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versión orixinal)\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
@@ -20198,7 +20206,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "Centro de Axuda de Linux Mandrake"
 
 #: standalone/drakhelp:36
@@ -20799,7 +20807,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 ""
 "Non se detectou ningunha Tarxeta de Son na máquina. Verifique que hai "
 "unhaTarxeta de Son soportada por Linux conectada correctamente.\n"
@@ -20808,7 +20816,7 @@ msgstr ""
 "Pode visita-la nosa base de datos de hardware en:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -22527,7 +22535,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 ""
 "Non se detectou ningunha Tarxeta de TV na súa máquina. Verifique que hai "
 "unha Tarxeta de Video/TV soportada por Linux conectada correctamente.\n"
@@ -22536,7 +22544,7 @@ msgstr ""
 "Pode visita-la nosa base de datos de hardware en:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -23229,13 +23237,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 ""
 "Isto é o HardDrake, unha ferramenta de configuración de hardware de %s.\n"
 "<span foreground=\"royalblue3\">Versión:</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
@@ -23345,8 +23353,8 @@ msgstr "Xa se fixo o cambio, pero para que sexa efectivo debe saír do sistema"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Ferramentas de Logs de Mandrivalinux"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Ferramentas de Logs de Mandriva Linux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -23859,10 +23867,10 @@ msgstr "Conexión establecida."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Fallo ó conectarse.\n"
-"Verifique a configuración no Centro de Control de Mandrivalinux."
+"Verifique a configuración no Centro de Control de Mandriva Linux."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -24727,8 +24735,8 @@ msgstr "Fallo ó instalar"
 #~ msgid "You've not selected any font"
 #~ msgstr "Non seleccionou ningunha fonte"
 
-#~ 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:"
-#~ msgstr "Os productos Mandrivalinux 10.1 son:"
+#~ msgid "The Mandriva Linux 10.1 products are:"
+#~ msgstr "Os productos Mandriva Linux 10.1 son:"
diff --git a/perl-install/share/po/he.po b/perl-install/share/po/he.po
index c43710740..8e93bb058 100644
--- a/perl-install/share/po/he.po
+++ b/perl-install/share/po/he.po
@@ -1256,7 +1256,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 ""
@@ -3591,7 +3591,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 ""
@@ -3705,7 +3705,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"
@@ -3720,11 +3720,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"
@@ -3885,10 +3886,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"
@@ -4029,7 +4030,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"
@@ -4133,12 +4134,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"
@@ -4165,7 +4166,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"
@@ -4174,7 +4175,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"
@@ -4398,7 +4400,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."
@@ -4416,7 +4418,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"
@@ -4445,7 +4447,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"
@@ -4474,7 +4476,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"
@@ -4629,7 +4631,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"
@@ -4678,7 +4680,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"
@@ -4687,13 +4689,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"
@@ -4770,7 +4773,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"
@@ -4930,7 +4934,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"
@@ -4951,7 +4955,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"
@@ -5096,7 +5100,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"
@@ -5113,7 +5118,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"
@@ -5175,7 +5180,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"
@@ -5528,7 +5533,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 ""
 "מחיצת החלונות אינה מאוחה. עליך להפעיל מחדש את המחשב ולהיכנס לחלונות, ושם "
@@ -5644,13 +5649,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"
@@ -5704,7 +5709,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"
@@ -5741,7 +5746,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"
@@ -5929,8 +5934,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"
@@ -5938,7 +5943,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"
@@ -5956,8 +5961,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
@@ -5985,7 +5990,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 ""
@@ -6525,7 +6530,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
@@ -6742,7 +6747,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
@@ -9319,7 +9324,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 ""
@@ -13187,8 +13192,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 ""
 
@@ -14946,18 +14951,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>!"
+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 "
+"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."
@@ -14969,7 +14974,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 ""
 "מנדריבה לינוקס היא הפצת הלינוקס הידידותית ביותר כיום. מנדריבה לינוקס היא גם "
@@ -14988,9 +14993,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 ""
 "מנדריבה לינוקס מחוייבת למודל הקוד הפתוח. משמעות הדבר היא שגרסת הפצה חדשה זו "
@@ -15012,8 +15017,8 @@ msgstr "רשיון ה-GPL"
 #: 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 ""
 "רוב התוכנות הכלולות בהפצה וכל הכלים של מנדריבה לינוקס כפופים לרישיון הציבורי "
 "הכללי של גנו (GPL)."
@@ -15046,10 +15051,10 @@ 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 ""
 "למנדריבה לינוקס יש את אחת מקהילות המפתחים והמשתמשים הגדולות ביותר. התפקידים "
 "של קהילה זו הם מגוונים, החל מדיווח אודות בעיות ועד פיתוח של  תוכנות חדשות. "
@@ -15059,11 +15064,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 ""
 "אם ברצונך ללמוד עוד על הקהילה התוססת שלנו, עליך לבקר באתר www.mandrakelinux."
-"com או לבקר באתר www.mandrakelinux.com/en/cookerdevel.php3 אם ברצונך להשתתף "
+"com או לבקר באתר www.mandrivalinux.com/en/cookerdevel.php3 אם ברצונך להשתתף "
 "בקהילת הפיתוח."
 
 #: share/advertising/05.pl:15
@@ -15074,7 +15079,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 ""
 "הגרסה שתותקן במחשבך היא גרסת ההורדה של מנדריבה לינוקס. זו גרסה חופשית "
@@ -15120,7 +15125,7 @@ msgstr "Discovery - גרסת הלינוקס השולחנית למשתמשים ח
 
 #: 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 "מנדריבה לינוקס Discovery מותקנת כעת."
 
 #: share/advertising/06.pl:17
@@ -15142,7 +15147,7 @@ msgstr "PowerPack, שולחן העבודה האולטימטיבי למשתמשי
 
 #: 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 "מנדריבה לינוקס PowerPack מותקנת כעת."
 
 #: share/advertising/07.pl:17
@@ -15162,7 +15167,7 @@ msgstr "PowerPack+, פתרון לינוקס לשולחנות עבודה ושרת
 
 #: 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 "כעת מותקנת מנדריבה לינוקס PowerPack+"
 
 #: share/advertising/08.pl:17
@@ -15182,12 +15187,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
@@ -15208,7 +15213,7 @@ msgstr "\t* PowerPack+, פתרון הלינוקס המתאים הן לשולחן
 #: 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* מנדריבה לינוקס עבור x86-64</b>, מערכת מנדריבה לינוקס המיועדת לניצול "
@@ -15222,7 +15227,7 @@ msgstr "מוצרי מנדריבה (מסדרת Nomad)"
 #: 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 ""
 "מנדריבה פיתחה שני מוצרים המאפשרים לך להשתמש במנדריבה לינוקס על כל מחשב ללא "
@@ -15231,14 +15236,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* Move, הפצת מנדריבה לינוקס שניתנת להפעלה מתקליטור ללא התקנה."
 
 #: 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* GlobeTrotter, הפצת מנדריבה לינוקס המגיעה מותקנת בתוך כונן קומפקטי ונייד "
@@ -15258,17 +15263,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* Corporate Desktop, הפצת מנדריבה לינוקס השולחנית המיועדת לעסקים."
 
 #: 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* Corporate Server, פתרון השרת מבוסס מנדריבה לינוקס לעסקים."
 
 #: 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* Multi-Network Firewall, פתרון אבטחה מבוסס מנדריבה לינוקס."
 
 #: share/advertising/12.pl:13
@@ -15450,7 +15457,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 "בתפריט של מנדריבה לינוקס נמצאים יישומים קלים לשימוש לכל צרכיך: "
 
@@ -15689,14 +15696,14 @@ 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 "
+"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 ""
 "מרכז הבקרה של מנדריבה לינוקס כולל מגוון כלי עזר ייחודיים למנדריבה שיקלו את "
@@ -15724,8 +15731,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 ""
 
@@ -15755,8 +15762,8 @@ msgstr "המערכת שודרגה ועוצבה מחדש כדי לשפר את ה�
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "אנו מזמינים אותך לבקר כבר היום בכתובת store.mandrakesoft.com!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "אנו מזמינים אותך לבקר כבר היום בכתובת store.mandriva.com!"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -15766,7 +15773,7 @@ msgstr "Mandriva Club"
 #: 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 "מועדון מנדריבה הוא השרות המושלם למוצר מנדריבה לינוקס שברשותך."
 
@@ -15781,7 +15788,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 ""
 "\t* הנחות בלעדיות על מוצרים ושרותים בחנות המקוונת שלנו store.mandrakesoft."
 "com."
@@ -15797,14 +15804,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* השתתפות בפורומי המשתמשים של מנדריבה לינוקס"
 
 #: 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* גישה ראשונית ומועדפת לתמונות תקליטור של גרסאות ציבוריות של מנדריבה "
 "לינוקס, לפני הציבור הרחב."
@@ -15825,7 +15832,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 ""
 "מנדריבה אונליין מספק מגוון רחב של שרותים רבי ערך לעדכון קל של מערכות "
 "מנדריבהלינוקס שברשותך:"
@@ -15852,7 +15859,7 @@ msgstr "\t* עדכונים גמישים במועדים מתוכננים מראש
 #: 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* ניהול כל מערכות מנדריבה לינוקס שברשותך בעזרת חשבון אחד."
 
 #: share/advertising/30.pl:13
@@ -15864,26 +15871,26 @@ msgstr "Mandriva Expert"
 #, 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 ""
 "האם דרושה לך עזרה? המומחים המקצועניים של מנדריבה מחכים לך במערכת התמיכה שלנו "
-"באתר www.mandrakeexpert.com."
+"באתר 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 "הודות לעזרה של מומחי מנדריבה לינוקס מוסמכים, ייחסך לך זמן רב."
 
 #: 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 ""
 "אם יש לך שאלות הנוגעות למנדריבה לינוקס, יש באפשרותך לרכוש יחידות תמיכה בחנות "
-"שלנו store.mandrakesoft.com"
+"שלנו store.mandriva.com"
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -16259,8 +16266,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"
@@ -16315,7 +16322,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"
@@ -16329,7 +16336,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : MTS אפשור\n"
 "--disable        : MTS ביטול\n"
 "--start          : MTS התחלת\n"
@@ -18944,12 +18951,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
@@ -19438,7 +19445,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"
 "עליך להפעיל את האשף \"הוספת ממשק\" ממרכז הבקרה של מנדריבה לינוקס"
@@ -19447,7 +19454,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\" ממרכז הבקרה של מנדריבה לינוקס"
@@ -19500,7 +19507,7 @@ msgstr "מנהל ההפעלה של פרוייקט KDE"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr "מנהל ההפעלה של מנדריבה לינוקס MdkKDM"
 
 #: standalone/drakedm:37
@@ -19801,9 +19808,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
@@ -20332,7 +20339,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "מרכז הבקרה של מנדריבה לינוקס"
 
 #: standalone/drakhelp:36
@@ -20923,14 +20930,14 @@ 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 ""
 "לא זוהה כרטיס קול במערכת שלך. נא לוודא שכרטיס קול תואם Linux נמצא במערכת "
 "ומוכנס באופן נכון. \n"
 "\n"
 "אתה יכול לבקר ברשימת החומרה שלנו באתר: \n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -22545,7 +22552,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"
@@ -22554,7 +22561,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
@@ -23249,13 +23256,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
@@ -23363,7 +23370,7 @@ msgstr "השינוי הסתיים, אך כדי שיהיה בעל משמעות ע
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "כלי רישום של מנדריבה לינוקס"
 
 #: standalone/logdrake:51
@@ -23876,7 +23883,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"
 "נא לבדוק את ההגדרות במרכז ההגדרות של Mandrake."
diff --git a/perl-install/share/po/hi.po b/perl-install/share/po/hi.po
index a66285030..64ef7c98a 100644
--- a/perl-install/share/po/hi.po
+++ b/perl-install/share/po/hi.po
@@ -1295,7 +1295,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 ""
@@ -3705,7 +3705,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 ""
@@ -3896,7 +3896,7 @@ 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"
@@ -3910,11 +3910,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"
@@ -4069,10 +4070,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"
@@ -4262,7 +4263,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"
@@ -4436,12 +4437,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"
@@ -4468,7 +4469,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"
@@ -4477,7 +4478,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"
@@ -4606,7 +4608,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."
@@ -4624,7 +4626,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"
@@ -4653,7 +4655,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"
@@ -4669,7 +4671,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"
@@ -4755,7 +4757,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"
@@ -4833,7 +4835,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"
@@ -4842,13 +4844,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
@@ -4889,7 +4892,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"
@@ -5064,7 +5068,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"
@@ -5085,7 +5089,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 ""
 
@@ -5191,7 +5195,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"
@@ -5208,7 +5213,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"
@@ -5270,7 +5275,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"
@@ -5625,7 +5630,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 ""
 "आपका विण्डो विभाजन अति खंडित है । कृपया अपने कम्प्यूटर को विण्डो के अन्तर्गत पुनः आरम्भ "
@@ -5742,13 +5747,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"
@@ -5802,7 +5807,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"
@@ -5839,7 +5844,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"
@@ -5866,7 +5871,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"
 "१. अधिकार-पत्र करारनामा\n"
@@ -5920,7 +5925,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"
@@ -5957,7 +5962,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"
@@ -6035,8 +6040,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"
@@ -6044,7 +6049,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"
@@ -6063,8 +6068,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
@@ -6093,7 +6098,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 ""
@@ -6631,7 +6636,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 ""
 "उपलब्ध मिररों की सूची को प्राप्त करने के लिए मैनड्रैक लिनक्स वेब-स्थल से सम्पर्क किया जा रहा "
 "है..."
@@ -6853,7 +6858,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
@@ -9440,7 +9445,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 ""
@@ -13446,8 +13451,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 ""
 
@@ -15222,18 +15227,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
 #, fuzzy, 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 "
+"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."
@@ -15242,7 +15247,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 ""
 
@@ -15259,9 +15264,9 @@ msgstr "मुक्त स्रोत जगत में स्वागत !
 #: 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 ""
 "आपका नवीन मैनड्रैक लिनक्स संचालन-तंत्र और इसके अनेकों कार्यक्रम,मैनड्रैकसॉफ़्ट विकासकर्ताओं व "
@@ -15285,8 +15290,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 ""
 
 #: share/advertising/03.pl:17
@@ -15312,17 +15317,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 ""
 
@@ -15334,7 +15339,7 @@ msgstr "यह मैनड्रैक लिनक्स का <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 ""
 
@@ -15372,7 +15377,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
@@ -15394,7 +15399,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
@@ -15412,7 +15417,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
@@ -15432,12 +15437,12 @@ 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 ""
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrivalinux products are:"
+msgid "The Mandriva Linux products are:"
 msgstr "मैनड्रैक अपडेटो का एपलेट"
 
 #: share/advertising/09.pl:18
@@ -15458,7 +15463,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 ""
 
@@ -15470,21 +15475,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 ""
 
@@ -15502,17 +15507,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
@@ -15688,7 +15695,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 ""
 
@@ -15923,14 +15930,14 @@ msgstr ""
 
 #: 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 ""
 
@@ -15953,8 +15960,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 ""
 
@@ -15984,7 +15991,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
@@ -15995,7 +16002,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 ""
 
@@ -16009,7 +16016,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
@@ -16021,14 +16028,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
@@ -16047,7 +16054,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
@@ -16070,7 +16077,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
@@ -16082,21 +16089,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
@@ -16452,8 +16459,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"
@@ -16495,7 +16502,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"
@@ -19145,12 +19152,12 @@ 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"
+msgid "Mandriva Linux Control Center"
 msgstr "मैनड्रैक नियंत्रण केन्द्र"
 
 #: standalone/drakbug:48
@@ -19641,7 +19648,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"
 "मैनड्रैक नियंत्रण केन्द्र से \"एक इन्टरफ़ेस को जोड़े\" सहायक को चलायें"
@@ -19650,7 +19657,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 ""
 "इस इन्टरफ़ेस को अभी तक संरचित नहीं किया गया है ।\n"
 "मैनड्रैक नियंत्रण केन्द्र से \"%s\" सहायक को चलायें"
@@ -19703,7 +19710,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20001,18 +20008,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"
 "       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
@@ -20527,7 +20534,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "मैनड्रैक नियंत्रण केन्द्र"
 
 #: standalone/drakhelp:36
@@ -21128,7 +21135,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"
@@ -21137,7 +21144,7 @@ msgstr ""
 "आप हमारे हार्डवेयर डाटाबेस के अवलोकन हेतु निम्न वेब कड़ी पर जा सकते है:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/hi/hardware.php3"
+"http://www.mandrivalinux.com/hi/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -22866,7 +22873,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"
@@ -22875,7 +22882,7 @@ msgstr ""
 "आप हमारे हार्डवेयर डाटाबेस को निम्नलिखित वेब-कड़ी पर देख सकते है:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/hi/hardware.php3"
+"http://www.mandrivalinux.com/hi/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -23583,13 +23590,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 ""
 "यह है हार्डड्रैक, एक मैनड्रैक हार्डवेयर संरचना औज़ार ।\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
@@ -23699,7 +23706,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "मैनड्रैक टूल्स लॉग्स"
 
 #: standalone/logdrake:51
@@ -24212,7 +24219,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"
 "मैनड्रैक नियंत्रण केन्द्र में अपनी संरचना को सत्यापित करें ।"
@@ -25212,16 +25219,16 @@ 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 ""
 #~ "यह है हार्डड्रैक, एक मैनड्रैक हार्डवेयर संरचना औज़ार ।\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"
 
 #~ msgid "OK"
@@ -25621,7 +25628,7 @@ msgstr "संसाधन असफ़ल"
 #~ "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
 #~ msgstr "स्टार ऑफ़िस/ओपनऑफ़िस.ओआरजी/जीआईएमपी से \"%s\" प्रिंटर को हटाने में असफ़ल ।"
 
-#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
+#~ msgid "<b>Congratulations for choosing Mandriva Linux!</b>"
 #~ msgstr "<b>मैनड्रैक लिनक्स का चयन करने के लिए धन्यवाद!</b>"
 
 #~ msgid ""
@@ -25649,7 +25656,7 @@ msgstr "संसाधन असफ़ल"
 #~ msgid "\t* Full access to commercial applications"
 #~ msgstr "\t* वाणिज्य कार्यक्रमों तक पूर्ण पहुँच"
 
-#~ msgid "\t* Voting for software to put in Mandrivalinux"
+#~ msgid "\t* Voting for software to put in Mandriva Linux"
 #~ msgstr "\t* मैनड्रैक लिनक्स में सॉफ़्टवेयर डालने के लिए मतदान"
 
 #~ msgid "Do you require assistance?"
@@ -25661,13 +25668,13 @@ msgstr "संसाधन असफ़ल"
 #~ msgid "<b>Do you require assistance?</b>"
 #~ msgstr "<b>क्या आप को सहायता की आवश्यकता है?</b>"
 
-#~ msgid "This is the Mandrivalinux <b>Download version</b>."
+#~ msgid "This is the Mandriva Linux <b>Download version</b>."
 #~ msgstr "यह मैनड्रैक लिनक्स का <b>डॉउनलोड संस्मरण</b> है ।"
 
 #~ 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 ""
 #~ "आपका नवीन मैनड्रैक लिनक्स संचालन-तंत्र और इसके अनेकों कार्यक्रम,मैनड्रैकसॉफ़्ट विकासकर्ताओं "
 #~ "व विश्वव्यापी मैनड्रैक लिनक्स योगदानकर्ताओं केमध्य किये हुए मिले-जुले प्रयासों का मिला-जुला "
@@ -25723,7 +25730,7 @@ msgstr "संसाधन असफ़ल"
 #~ 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."
@@ -25842,7 +25849,7 @@ msgstr "संसाधन असफ़ल"
 #~ "यदि आप इस सुविधा के इच्छुक नहीं है, तो \"%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."
@@ -25853,14 +25860,16 @@ msgstr "संसाधन असफ़ल"
 
 #~ msgid ""
 #~ "It is now time to specify which programs you wish to install on your\n"
-#~ "system. There are thousands of packages available for 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"
@@ -25979,11 +25988,11 @@ msgstr "संसाधन असफ़ल"
 #~ "chose the individual package or because it was part of a group of "
 #~ "packages,\n"
 #~ "you will be asked to confirm that you really want those servers to be\n"
-#~ "installed. By default 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"
@@ -26052,7 +26061,8 @@ msgstr "संसाधन असफ़ल"
 #~ "You will now set up your Internet/network connection. If you wish to\n"
 #~ "connect your computer to the Internet or to a local network, click \"%s"
 #~ "\".\n"
-#~ "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"
@@ -26073,7 +26083,7 @@ msgstr "संसाधन असफ़ल"
 #~ "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"
@@ -26229,7 +26239,7 @@ msgstr "संसाधन असफ़ल"
 #~ "X (for X Window System) is the heart of the GNU/Linux graphical "
 #~ "interface\n"
 #~ "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-#~ "WindowMaker, etc.) bundled with 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"
diff --git a/perl-install/share/po/hr.po b/perl-install/share/po/hr.po
index 599973ae5..e64e14f89 100644
--- a/perl-install/share/po/hr.po
+++ b/perl-install/share/po/hr.po
@@ -1275,7 +1275,7 @@ msgstr "Myanmar"
 #: 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 "Možete izabrati druge jezike koji će biti dostupni nakon instalacije"
@@ -3604,12 +3604,12 @@ msgstr "omogući podršku za radio"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 nastavka trebate pažljivo pročitati stavke licence. Ona\n"
-"pokriva cijelu Mandrivalinux distribuciju, i ako se ne slažete u svim\n"
+"pokriva cijelu Mandriva Linux distribuciju, i ako se ne slažete u svim\n"
 "stavkama sadržanih u njoj, kliknite na \"Odbij\" gumb koji će automatski\n"
 "završiti instalaciju. Za nastavak instalacije, kliknite na\n"
 "\"Prihvati\" gumb."
@@ -3791,13 +3791,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The 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 je proširena na nekoliko CDROMova. DrakX\n"
+"Mandriva Linux instalacija je proširena na nekoliko CDROMova. DrakX\n"
 "zna ukoliko se odabrani paket nalazi na drugom CDROMu i izbaciti će\n"
 "trenutni CD i pitati vas da ubacite drugi koji je potreban."
 
@@ -3805,11 +3805,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"
@@ -3977,10 +3978,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"
@@ -4020,13 +4021,13 @@ msgstr ""
 "grupi,\n"
 "bit ćete upitani da potvrdite da li želite stvarno instalirati te "
 "poslužitelje.\n"
-"Kod Mandrivalinuxa, svi instalirani poslužitelji se pokreću prilikom "
+"Kod Mandriva Linuxa, svi instalirani poslužitelji se pokreću prilikom "
 "podizanja\n"
 "sustava. Čak iako su sigurni, bez poznatih problema u vrijeme izlaska "
 "distribucije,\n"
 "može se dogoditi da se otkriju sigurnosne rupe nakon zgotovljenja ove "
 "inačice\n"
-"Mandrivalinuxa. Ako ne znate što bi pojedini servis trebao raditi ili "
+"Mandriva Linuxa. Ako ne znate što bi pojedini servis trebao raditi ili "
 "zašto \n"
 "se instalira, pritisnite \"Ne\". Pritiskanjem na \"Da\"instalirat će se "
 "navedeni\n"
@@ -4178,7 +4179,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with 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"
@@ -4283,12 +4284,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"
@@ -4315,7 +4316,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"
@@ -4324,7 +4325,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"
@@ -4345,12 +4347,12 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "U ovom trenutku, trebate izabrati gdje ćete instalirati vaš\n"
-"Mandrivalinux operativni sustav na vašem tvrdom disku. Ukoliko je prazan "
+"Mandriva Linux operativni sustav na vašem tvrdom disku. Ukoliko je prazan "
 "ili \n"
 "ako postojeći operativni sustav koristi čitav prostor na disku, trebate ga\n"
 "particionirati. Jednostavno, particioniranje hard diska sastoji se od\n"
 "logičkog dijeljenja kako bi napravili prostor za instalaciju vašeg novog\n"
-"Mandrivalinux sustava.\n"
+"Mandriva Linux sustava.\n"
 "\n"
 "Zato što su posljedice procesa particioniranja obično nepovratne,\n"
 "particioniranje može biti strašno i stresno ukoliko ste korisnik bez "
@@ -4359,7 +4361,7 @@ msgstr ""
 "upute i uzmite vremena koliko vam je potrebno.\n"
 "\n"
 "Ako ste pokrenuli instalaciju u modu za stručnjake, ući ćete u DiskDrake,\n"
-"Mandrivalinuxov alat za particioniranje, s kojim možete fino podešavati\n"
+"Mandriva Linuxov alat za particioniranje, s kojim možete fino podešavati\n"
 "particije. Pogledajte DiskDrake odjeljak u ``User Guide''.\n"
 "Iz sučelja instalacije možete koristiti čarobnjake koji su ovdje opisani\n"
 "pritiskom na \"Čarobnjak\" dugme.\n"
@@ -4382,7 +4384,7 @@ msgstr ""
 " * \"Obriši cijeli disk\": ukoliko želite obrisati sve podatke i sve "
 "particije\n"
 "koje postoje na vašem hard disku i zamjeniti ih sa\n"
-"vašim novim Mandrivalinux sustavom, možete izabrati ovu opciju. Budite\n"
+"vašim novim Mandriva Linux sustavom, možete izabrati ovu opciju. Budite\n"
 "pažljivi sa ovim rješenjem, nećete moći\n"
 "povratiti vaš izbor nakon potvrde.\n"
 "\n"
@@ -4397,7 +4399,7 @@ msgstr ""
 "Microsoft Windows particije. Mijenjanje veličine može se obaviti bez\n"
 "gubitka bilo kakvih podataka, ako prethodno defragmentirate Windows "
 "particiju.\n"
-"Ovo rješenje je preporučeno ukoliko želite koristiti zajedno Mandrivalinux\n"
+"Ovo rješenje je preporučeno ukoliko želite koristiti zajedno Mandriva Linux\n"
 "i Microsoft Windows-e na istom računalu.\n"
 "\n"
 "  Prije izabiranja ovog rješenja, molimo shvatite da će veličina vaše "
@@ -4562,7 +4564,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."
@@ -4588,7 +4590,7 @@ msgstr ""
 "Pritisnite na \"U redu\" kada ste spremni za formatiranje particije.\n"
 "\n"
 "Pritisnite na \"Odustani\" kada želite izabrati druge particije za\n"
-"instalaciju vašeg novog Mandrivalinux operativnog sustava.\n"
+"instalaciju vašeg novog Mandriva Linux operativnog sustava.\n"
 "\n"
 "Pritisnite na \"Napredno\" ako želite izabrati particije koje će biti\n"
 "provjeravane radi loših blokova (bad blocks)."
@@ -4605,7 +4607,7 @@ msgstr "Prethodni"
 #: 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"
@@ -4617,7 +4619,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Dok instalirate Mandrivalinux, moguće je da su neki paketi već nadograđeni\n"
+"Dok instalirate Mandriva Linux, moguće je da su neki paketi već nadograđeni\n"
 "od prvotne inačice. Neki bugovi su možda uklonjeni, i sigurnost poboljšana.\n"
 "Da bi iskoristili prednosti tih nadogradnji, predloženo vam je da ih\n"
 "skinete s Interneta. Izaberite \"Da\" ako ste povezani s Internetom, ili \"Ne"
@@ -4646,7 +4648,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"
@@ -4672,7 +4674,7 @@ msgstr "Udaljeno administriranje"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4744,7 +4746,7 @@ msgid ""
 msgstr ""
 "U ovoj točki instalacije, trebate izabrati koje partiticije ćete koristiti "
 "za\n"
-"instalaciju vašeg novog Mandrivalinux sustava. Ukoliko su\n"
+"instalaciju vašeg novog Mandriva Linux sustava. Ukoliko su\n"
 "particije već definirane (iz prethodne instalacije GNU/Linux-a ili iz\n"
 "drugih particijskih alata), možete koristiti postojeće particije. Inače,\n"
 "moraju biti definirane.\n"
@@ -4826,7 +4828,7 @@ msgstr "Prebaci u normalni mod"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4857,7 +4859,7 @@ msgstr ""
 "Više od jedne Microsoft Windows particije su pronađene\n"
 "na vašem hard disku. Molimo izaberite jednu kojoj želite promjeniti "
 "veličinu\n"
-"kako bi instalirali vaš novi Mandrivalinux operativni sustav.\n"
+"kako bi instalirali vaš novi Mandriva Linux operativni sustav.\n"
 "\n"
 "Svaka je particija popisana kako slijedi; \"Linux ime\", \"Windows ime\"\n"
 "\"Kapacitet\".\n"
@@ -4902,7 +4904,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"
@@ -4911,13 +4913,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
@@ -4968,7 +4971,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"
@@ -5202,7 +5206,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"
@@ -5223,12 +5227,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 ""
 "Ovdje biramo sustav za ispis za vaše računalo. Drugi OSovi možda nude "
 "jedan,\n"
-"ali Mandrivalinux nudi tri.\n"
+"ali Mandriva Linux nudi tri.\n"
 "\n"
 " * \"pdq\", što znači ``print, do not queue'' (ispiši, bez stavljanja u "
 "red), je\n"
@@ -5385,7 +5389,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"
@@ -5402,7 +5407,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"
@@ -5464,11 +5469,11 @@ msgstr "Servisi"
 #, 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 ""
 "Izaberite hard disk kojeg želite obrisati kako bi instalirali vašu\n"
-"novu Mandrivalinux particiju. Budite pažljivi, svi postojeći podaci\n"
+"novu Mandriva Linux particiju. Budite pažljivi, svi postojeći podaci\n"
 "biti će izgubljen i neće se moći povratiti!"
 
 #: help.pm:863
@@ -5815,7 +5820,7 @@ msgstr "Iskoristi slobodan prostor na Windows particiji"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Vaša Windows particija je prefragmentirana, molim pokrenite ``defrag'' prvo."
@@ -5932,13 +5937,13 @@ msgstr "Onemogućujem 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"
@@ -5967,8 +5972,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 "
@@ -5982,8 +5987,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 "
@@ -5992,7 +5997,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"
@@ -6026,10 +6031,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"
@@ -6056,7 +6061,7 @@ msgstr ""
 "Produkti  uključuju, ali nisu \n"
 "ograničeni na, skup programa, metoda, zakona i dokumentacija vezanih uz "
 "operativni\n"
-"sustav i različite komponente Mandrivalinux distribucije.\n"
+"sustav i različite komponente Mandriva Linux distribucije.\n"
 "\n"
 "\n"
 "1. Licencni Dogovor\n"
@@ -6098,8 +6103,8 @@ msgstr ""
 "OGRANIČENA ODGOVORNOST POVEZANA SA POSJEDOVANJEM ILI KORIŠTENJEM ZABRANJENOG "
 "SOFTWARE-A U NEKIM ZEMLJAMA\n"
 "\n"
-"Do granice dozvoljene zakonom, Mandriva S.A. ili njegovi distributori "
-"neće, u bilo kakvim slučajevima, biti \n"
+"Do granice dozvoljene zakonom, Mandriva S.A. ili njegovi distributori neće, "
+"u bilo kakvim slučajevima, biti \n"
 "odgovaran za bilo kakvu specijalnu, nesretnu, direktnu ili indirektnu štetu "
 "bilo kako (uključujući \n"
 "ograničene štete zbog gubitka posla, prekida posla, financijskog gubitka, "
@@ -6108,7 +6113,7 @@ msgstr ""
 "posljedicagubitka) što je posljedica \n"
 "posjedovanja ili korištenja software-skih komponenti ili kao posljedica "
 "skidanja (download-a) software-skih komponenti \n"
-"sa jednog od Mandrivalinux site-ova koja su zabranjena ili ograničena u "
+"sa jednog od Mandriva Linux site-ova koja su zabranjena ili ograničena u "
 "nekim zemljama po lokalnim zakonima.\n"
 "Ova ograničena odgovornost se primjenjuje na, ali nije ograničena, jake "
 "kriptografske komponente \n"
@@ -6130,8 +6135,8 @@ msgstr ""
 "Mandriva-u.\n"
 "Programe razvijeni od strane Mandriva S.A. su pokriveni GPL licencom. "
 "Dokumentacija napisana \n"
-"od strane Mandriva S.A. je pokrivena specifičnom licencom. Molimo "
-"pogledajte dokumentaciju za \n"
+"od strane Mandriva S.A. je pokrivena specifičnom licencom. Molimo pogledajte "
+"dokumentaciju za \n"
 "više detalja.\n"
 "\n"
 "\n"
@@ -6141,10 +6146,10 @@ msgstr ""
 "autorima i \n"
 "zaštićeni su intelektualnim vlasništvom i autorskim zakonima primjenjivim na "
 "software-ske programe.\n"
-"Mandriva S.A. zadržava svoje pravo za izmjenu ili prilagođavanje "
-"Software-skog Produkta, kao cijelinu ili u\n"
+"Mandriva S.A. zadržava svoje pravo za izmjenu ili prilagođavanje Software-"
+"skog Produkta, kao cijelinu ili u\n"
 "dijelovima, u svim slučajevima za sve namjene.\n"
-"\"Mandriva\", \"Mandrivalinux\" i pripadajući logoi su zaštićeni prodajni "
+"\"Mandriva\", \"Mandriva Linux\" i pripadajući logoi su zaštićeni prodajni "
 "znaci Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6244,8 +6249,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"
@@ -6253,7 +6258,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 ""
 "Čestitam, instalacija je kompletna.\n"
 "Uklonite boot medij i pritisnite return za ponovno podizanje.\n"
@@ -6268,13 +6273,13 @@ msgstr ""
 "\n"
 "\n"
 "Informacije o konfiguriranju vašeg sustava je raspoloživo u poslije\n"
-"instalacijskom poglavlju od Official Mandrivalinux User's Guide."
+"instalacijskom poglavlju od 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
@@ -6303,12 +6308,12 @@ msgstr "Pokrećem 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š sustav je slab na resursima. Možete imati nekih problem prilikom\n"
-"instalacije Mandrivalinux-a. Ukoliko se to desi, možete probati tekstualnu\n"
+"instalacije Mandriva Linux-a. Ukoliko se to desi, možete probati tekstualnu\n"
 "instalaciju. Za to, pritisnite `F1' kada podižete CDROM, i unesite `text'."
 
 #: install_steps_gtk.pm:228 install_steps_interactive.pm:624
@@ -6842,9 +6847,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 site za dobivanje popisa raspoloživih mirrora"
+"Kontaktiram Mandriva Linux web site za dobivanje popisa raspoloživih mirrora"
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7065,8 +7070,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
@@ -9651,13 +9656,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 ""
 "tinyfirewall podešavanje\n"
 "\n"
-"Ovo podešava osobni vatrozid za ovo Mandrivalinux računalo.\n"
+"Ovo podešava osobni vatrozid za ovo Mandriva Linux računalo.\n"
 "Za snažno primjenjena vatrozidna rješenja, molimo pogledajte\n"
 "specijaliziranu MandrakeSecurity Firewall distribuciju."
 
@@ -13467,8 +13472,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 ""
 
@@ -15327,18 +15332,18 @@ msgstr "Zaustavi"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Što je Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Što je Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Dobro dosli u <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Dobro dosli 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."
@@ -15347,7 +15352,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 ""
 
@@ -15364,9 +15369,9 @@ msgstr "Dobrodošli u Open Source svijet"
 #: 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 ""
 
@@ -15385,8 +15390,8 @@ msgstr "<b>GPL licenca</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
@@ -15412,17 +15417,17 @@ msgstr "<b>Pridružite se zajednici</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 ""
 
@@ -15434,7 +15439,7 @@ msgstr "<B>Download inačica</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 ""
 
@@ -15472,7 +15477,7 @@ msgstr "<b>Discovery, vaš prvi Linux dekstop</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 ""
 
 #: share/advertising/06.pl:17
@@ -15491,7 +15496,7 @@ msgstr "<b>PowerPack, vrhunski Linux desktop</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 ""
 
 #: share/advertising/07.pl:17
@@ -15509,7 +15514,7 @@ msgstr "<b>PowerPack+, Linux rješenje za desktope i poslužitelje</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15524,18 +15529,17 @@ msgstr ""
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
 msgid "<b>Mandriva Products</b>"
-msgstr "Mandrivalinux Kontrolni Centar"
+msgstr "Mandriva Linux Kontrolni Centar"
 
 #: 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
@@ -15556,7 +15560,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 ""
 
@@ -15568,21 +15572,21 @@ msgstr "<b>Mandriva proizvod (Nomad 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 ""
 
 #: 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 ""
 
@@ -15594,23 +15598,25 @@ msgstr "<b>Mandriva proizvodi (Profesionalna rješenja)</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 ""
 
 #: 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
@@ -15787,7 +15793,7 @@ msgstr "<b>Uživajte u velikom izboru aplikacija</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 ""
 
@@ -16023,14 +16029,14 @@ msgstr ""
 
 #: 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 ""
 
@@ -16053,21 +16059,21 @@ 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 Kontrolni Centar"
+msgstr "Mandriva Linux Kontrolni Centar"
 
 #: 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 ""
 
 #: share/advertising/27.pl:17
@@ -16084,18 +16090,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
 #, fuzzy, c-format
 msgid "<b>Mandriva Club</b>"
-msgstr "Mandrivalinux Kontrolni Centar"
+msgstr "Mandriva Linux Kontrolni Centar"
 
 #: 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 ""
 
@@ -16109,7 +16115,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
@@ -16121,14 +16127,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
@@ -16147,7 +16153,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
@@ -16170,33 +16176,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
 #, fuzzy, c-format
 msgid "<b>Mandriva Expert</b>"
-msgstr "Mandrivalinux Kontrolni Centar"
+msgstr "Mandriva Linux Kontrolni Centar"
 
 #: 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
@@ -16496,7 +16502,7 @@ msgstr ""
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
-msgstr "Mandrivalinux Kontrolni Centar"
+msgstr "Mandriva Linux Kontrolni Centar"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -16572,8 +16578,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
@@ -16615,7 +16621,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"
@@ -16662,8 +16668,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"
@@ -19226,13 +19232,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux Kontrolni Centar"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux Kontrolni Centar"
 
 #: 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
@@ -19712,7 +19718,7 @@ msgstr "Pokrenuto pri podizanju"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Ovo sučelje još nije podešeno.\n"
 "Pokrenite čarobnjak za postavu u glavnom prozoru"
@@ -19721,7 +19727,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 ""
 "Ovo sučelje još nije podešeno.\n"
 "Pokrenite čarobnjak za postavu u glavnom prozoru"
@@ -19774,7 +19780,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20074,9 +20080,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
@@ -20615,7 +20621,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "Mandrake Kontrolni Centar"
 
 #: standalone/drakhelp:36
@@ -21205,7 +21211,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 ""
 "TV kartica nije prepoznata na vašem računalu. Provjerite da li je Linux-"
 "podržana Video/TV kartica ispravno uključena.\n"
@@ -21214,7 +21220,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
@@ -22831,7 +22837,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 ""
 "TV kartica nije prepoznata na vašem računalu. Provjerite da li je Linux-"
 "podržana Video/TV kartica ispravno uključena.\n"
@@ -22840,7 +22846,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
 #, fuzzy, c-format
@@ -23528,7 +23534,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 ""
 
@@ -23639,7 +23645,7 @@ msgstr "Promjena je izvršena, ali da bi imala učinak, morate se odlogirati"
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "Objašnjenja Mandrake alata"
 
 #: standalone/logdrake:51
@@ -24146,10 +24152,10 @@ msgstr "Veza uspostavljena."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Spajanje nije uspjelo.\n"
-"Provjerite konfiguraciju u Mandrivalinux kontrolnom centru."
+"Provjerite konfiguraciju u Mandriva Linux kontrolnom centru."
 
 #: standalone/net_monitor:341
 #, fuzzy, c-format
@@ -24985,7 +24991,6 @@ msgstr "Instalacija nije uspjela"
 #~ msgid "No network card"
 #~ msgstr "ne mogu pronaći niti jednu mrežnu karticu"
 
-
 #~ msgid ""
 #~ "No browser is installed on your system, Please install one if you want to "
 #~ "browse the help system"
diff --git a/perl-install/share/po/hu.po b/perl-install/share/po/hu.po
index 540bfafa1..a651dd03f 100644
--- a/perl-install/share/po/hu.po
+++ b/perl-install/share/po/hu.po
@@ -1319,11 +1319,11 @@ msgstr "Nyelvválasztás"
 #: 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 ""
-"A Mandrivalinux több nyelvvel is telepíthető. Jelölje ki,\n"
+"A Mandriva Linux több nyelvvel is telepíthető. Jelölje ki,\n"
 "mely nyelveket szeretné telepíteni. Ezek a telepítés befejeződése\n"
 "utáni újraindítást követően lesznek elérhetők."
 
@@ -3761,12 +3761,12 @@ msgstr "Rádiótámogatás bekapcsolása"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
 "Mielőtt továbblépne, olvassa át alaposan a licencegyezményt, amely az\n"
-"egész Mandrivalinux disztribúcióra érvényes. Ha elfogadja az abban\n"
+"egész Mandriva Linux disztribúcióra érvényes. Ha elfogadja az abban\n"
 "szereplő feltételeket, akkor jelölje be a(z) \"%s\" opciót.\n"
 "Ha nem fogadja el valamelyik feltételt, akkor kattintson a(z)\n"
 "\"%s\" gombra - ezzel újraindítja a számítógépet."
@@ -3947,13 +3947,14 @@ 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 ""
-"A Mandrivalinux telepítőanyag több CD-n helyezkedik el. Ha egy kiválasztott\n"
+"A Mandriva Linux telepítőanyag több CD-n helyezkedik el. Ha egy "
+"kiválasztott\n"
 "csomag egy másik CD-n található, akkor a telepítő kiadja az\n"
 "aktuális CD-t, és megkéri Önt, hogy helyezze be a megfelelőt.\n"
 "Ha a szóban forgó lemez nincs kéznél, akkor kattintson a(z) \"%s\" gombra,\n"
@@ -3963,11 +3964,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"
@@ -4019,10 +4021,10 @@ msgid ""
 "megabytes."
 msgstr ""
 "Most meg kell adnia, mely programokat kívánja telepíteni a rendszerére.\n"
-"Több ezer program létezik Mandrivalinuxhoz; a kezelésük megkönnyítése\n"
+"Több ezer program létezik Mandriva Linuxhoz; a kezelésük megkönnyítése\n"
 "érdekében a programok (hasonlóság alapján) csoportokba lettek sorolva.\n"
 "\n"
-"A Mandrivalinux rendszerben négy előredefiniált csomagkategória van\n"
+"A Mandriva Linux rendszerben négy előredefiniált csomagkategória van\n"
 "meghatározva. A különböző kategóriákban levő csomagok keverhetők is,\n"
 "tehát egy \"Munkaállomás\" típusú telepítés tartalmazhat olyan\n"
 "alkalmazásokat is, amelyek csak a \"Kiszolgáló\" kategóriában vannak\n"
@@ -4128,10 +4130,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"
@@ -4162,7 +4164,7 @@ msgstr ""
 "Ha kiszolgálócsomagok is ki lettek választva - akár közvetlenül, akár\n"
 "bizonyos csoportok tagjaként -, a telepítő megerősítést kér Öntől arra\n"
 "vonatkozóan, hogy valóban telepíteni kívánja-e azon kiszolgálószoftvereket.\n"
-"A Mandrivalinux rendszerben alapértelmezésben az összes feltelepített\n"
+"A Mandriva Linux rendszerben alapértelmezésben az összes feltelepített\n"
 "szolgáltatás elindításra kerül a rendszer indulásakor. Még ha azok\n"
 "biztonságosak is illetve nem rendelkeznek ismert problémákkal, akkor is\n"
 "előfordulhat, hogy utóbb biztonsági problémák merülnek fel velük\n"
@@ -4317,7 +4319,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,7 +4374,7 @@ msgid ""
 "not successful in getting the display configured."
 msgstr ""
 "Az X (teljes néven: X Window System) a Linux grafikus felületét nyújtó\n"
-"rendszer. A Mandrivalinuxban levő grafikus környezetek (KDE, GNOME,\n"
+"rendszer. A Mandriva Linuxban levő grafikus környezetek (KDE, GNOME,\n"
 "AfterStep, WindowMaker, ...) ezen grafikus rendszert használják.\n"
 "\n"
 "Egy listát fog látni az elérhető paraméterekről, amelyekkel optimalizálható\n"
@@ -4493,12 +4495,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"
@@ -4525,7 +4527,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"
@@ -4534,7 +4536,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"
@@ -4554,11 +4557,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 ""
-"Ebben a lépésben kell megadni, hogy a Mandrivalinux telepítése a merevlemez\n"
+"Ebben a lépésben kell megadni, hogy a Mandriva Linux telepítése a "
+"merevlemez\n"
 "melyik részére történjen. Ha a lemez még teljesen üres, vagy a korábban\n"
 "telepített operációs rendszer(ek) miatt nincs elég szabad hely, akkor újra\n"
 "kell partícionálni a lemezt. A partícionálás a lemezterület logikai\n"
-"újrafelosztását jelenti - erre a Mandrivalinux telepítéséhez szükséges\n"
+"újrafelosztását jelenti - erre a Mandriva Linux telepítéséhez szükséges\n"
 "hely létrehozása érdekében van szükség.\n"
 "\n"
 "A partícionálás veszélyes művelet. Hiba esetén adatvesztéssel járhat\n"
@@ -4590,7 +4594,7 @@ msgstr ""
 "Az átméretezés végrehajtható a lemezen levő adatok\n"
 "elvesztése nélkül - feltéve, hogy azt megelőzően töredezettségmentesítve\n"
 "lett a kérdéses partíció. Javasolt továbbá az adatok mentése is.\n"
-"Ezen módszer a javasolt abban az esetben, ha a Mandrivalinuxt és a\n"
+"Ezen módszer a javasolt abban az esetben, ha a Mandriva Linuxt és a\n"
 "Windowst ugyanazon a gépen szeretné használni.\n"
 "\n"
 "Ha ezt a lehetőséget választja, ne feledkezzen meg arról, hogy ennek\n"
@@ -4710,7 +4714,7 @@ msgstr ""
 "\n"
 "Ez a lehetőség jól használható akkor, amikor nagyobb számú azonos gépre\n"
 "kell a rendszert feltelepíteni. Az automatikus telepítéssel\n"
-"kapcsolatban a Mandrivalinux honlapján találhatók további információk.\n"
+"kapcsolatban a Mandriva Linux honlapján találhatók további információk.\n"
 "\n"
 "  - \"%s\"(*): elmenti a telepítés során\n"
 "kiválasztott csomagok listáját. Ha egy újabb telepítés alkalmával fel\n"
@@ -4765,7 +4769,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."
@@ -4787,7 +4791,7 @@ msgstr ""
 "Kattintson a(z) \"%s\" gombra a formázások megkezdéséhez.\n"
 "\n"
 "Kattintson a(z) \"%s\" gombra, ha más partícióra szeretné telepíteni a\n"
-"Mandrivalinux operációs rendszert.\n"
+"Mandriva Linux operációs rendszert.\n"
 "\n"
 "Kattintson a(z) \"%s\" gombra, ha bizonyos partíciókat ellenőriztetni\n"
 "kíván (hibás blokkok keresése)."
@@ -4804,7 +4808,7 @@ msgstr "Előző"
 #: 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"
@@ -4816,7 +4820,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Lehetséges, hogy amikor Ön a Mandrivalinux rendszert telepíti, már\n"
+"Lehetséges, hogy amikor Ön a Mandriva Linux rendszert telepíti, már\n"
 "frissítésre kerültek bizonyos csomagok a rendszer kiadása óta.\n"
 "Elképzelhető, hogy bizonyos hibák ki lettek javítva, illetve\n"
 "hogy meg lettek oldva bizonyos felmerült biztonsági problémák. Ezeket\n"
@@ -4848,7 +4852,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"
@@ -4861,7 +4865,7 @@ msgstr ""
 "\n"
 "Ha nem biztos benne, hogy mit volna érdemes választani, akkor válassza\n"
 "az alapértelmezés szerinti lehetőséget. A biztonsági szint később is\n"
-"módosítható a Mandrivalinux Vezérlőközpontban elérhető \"draksec\"\n"
+"módosítható a Mandriva Linux Vezérlőközpontban elérhető \"draksec\"\n"
 "eszközzel.\n"
 "\n"
 "A(z) \"%s\" mezőben megadandó a biztonságért felelős személy email-címe.\n"
@@ -4876,7 +4880,7 @@ msgstr "Biztonsági adminisztrátor"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4946,7 +4950,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Ebben a lépésben kell kiválasztani a Mandrivalinux rendszer telepítéséhez\n"
+"Ebben a lépésben kell kiválasztani a Mandriva Linux rendszer telepítéséhez\n"
 "használni kívánt partíciókat. Ha a kívánt partíciók már létre lettek hozva\n"
 "(egy korábbi Linux-telepítés vagy valamilyen partícionálási segédprogram\n"
 "által), akkor felhasználhatók a már létező partíciók. Ha viszont még nem\n"
@@ -5039,7 +5043,7 @@ msgstr "Váltás a normál és a szakértői módok közt"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5069,7 +5073,7 @@ msgid ""
 msgstr ""
 "Egynél több microsoftos partíció van a lemezen.\n"
 "Válassza ki azt, amelyiket át szeretné méretezni, hogy a\n"
-"Mandrivalinux feltelepíthető legyen.\n"
+"Mandriva Linux feltelepíthető legyen.\n"
 "\n"
 "A partíciólista a következő mezőket tartalmazza: \"linuxos név\",\n"
 "\"windowsos név\", \"kapacitás\".\n"
@@ -5119,7 +5123,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"
@@ -5128,18 +5132,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 ""
 "Erre a lépésre csak akkor kerül sor, ha a gépen már van linuxos partíció.\n"
 "\n"
 "Most közölnie kell a telepítővel, hogy új telepítést szeretne-e végezni\n"
-"vagy pedig egy meglevő Mandrivalinux-rendszert kíván frissíteni:\n"
+"vagy pedig egy meglevő Mandriva Linux-rendszert kíván frissíteni:\n"
 "\n"
 "  - \"%s\": a korábbi rendszer felülírásra kerül. Attól függően, hogy\n"
 "milyen partíciók találhatók a gépen, bizonyos partíciók (például a\n"
@@ -5147,13 +5152,13 @@ msgstr ""
 "megőrizhetők. Ha szeretné módosítani a merevlemezek partícionálását\n"
 "vagy a fájlrendszereket, akkor ezt a lehetőséget használja.\n"
 "\n"
-"  - \"%s\": lehetővé teszi egy korábbi Mandrivalinux-telepítés\n"
+"  - \"%s\": lehetővé teszi egy korábbi Mandriva Linux-telepítés\n"
 "csomagjainak frissítését. A merevlemezek partícionálása változatlanul\n"
 "marad, a felhasználók adatai sem módosulnak. A többi beállítási lépés közül\n"
 "a legtöbb elérhető lesz - a folyamat hasonló a normál telepítéshez.\n"
 "\n"
 "Frissítés használata akkor javasolt, ha a számítógépen\n"
-"Mandrivalinux 8.1 vagy újabb kiadás van."
+"Mandriva Linux 8.1 vagy újabb kiadás van."
 
 #: help.pm:591
 #, c-format
@@ -5211,7 +5216,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"
@@ -5254,7 +5260,7 @@ msgstr ""
 "Az UTF-8 (Unicode) szabvány támogatásáról: A Unicode egy új\n"
 "karakterkódolási szabvány az összes létező nyelv lefedésére.\n"
 "A Linux alatti teljes támogatása még fejlesztés alatt áll.\n"
-"A Mandrivalinux UTF-8-használatát befolyásolják a felhasználó\n"
+"A Mandriva Linux UTF-8-használatát befolyásolják a felhasználó\n"
 "által végzett beállítások:\n"
 "\n"
 "  - ha olyan nyelvet választ, amelyhez erősen kapcsolódik egy\n"
@@ -5508,7 +5514,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"
@@ -5529,11 +5535,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 ""
 "Itt lehet nyomtatórendszert választani a gép számára. Más operációs\n"
-"rendszerekben általában csak egy van, a Mandrivalinuxban viszont kettő is.\n"
+"rendszerekben általában csak egy van, a Mandriva Linuxban viszont kettő is.\n"
 "Mindkettőnek megvannak a maga előnyei bizonyos környezetben használva.\n"
 "\n"
 "  - \"%s\": \"print, do not queue\", azaz sorba tevés nélkül történő\n"
@@ -5558,7 +5564,7 @@ msgstr ""
 "\n"
 "Telepítés után lehetősége lesz a nyomtatórendszer lecserélésére (ha mégsem\n"
 "felel meg az itt kiválasztott) - ehhez a PrinterDrake programot kell\n"
-"elindítani a Mandrivalinux Vezérlőközpontban, majd rá kell kattintani a(z)\n"
+"elindítani a Mandriva Linux Vezérlőközpontban, majd rá kell kattintani a(z)\n"
 "\"%s\" gombra."
 
 #: help.pm:765
@@ -5675,7 +5681,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"
@@ -5692,7 +5699,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"
@@ -5743,7 +5750,7 @@ msgstr ""
 "\n"
 "  - \"%s\": ha be szeretné állítani az internet vagy a helyi hálózat\n"
 "elérését most, akkor kattintson a gombra. Információkat a nyomtatott\n"
-"dokumentációból szerezhet, vagy telepítés után a Mandrivalinux\n"
+"dokumentációból szerezhet, vagy telepítés után a Mandriva Linux\n"
 "Vezérlőközpontban.\n"
 "\n"
 "  - \"%s\": lehetővé teszi a HTTP- és FTP-proxyk beállítását arra az\n"
@@ -5760,7 +5767,7 @@ msgstr ""
 "beállításait, kattintson a megfelelő gombra. Elsősorban a komolyabb\n"
 "ismeretekkel rendelkező felhasználóknak javasolt. Információkat a\n"
 "nyomtatott dokumentációból szerezhet, vagy telepítés után a\n"
-"Mandrivalinux Vezérlőközpontban a rendszerindítónál.\n"
+"Mandriva Linux Vezérlőközpontban a rendszerindítónál.\n"
 "\n"
 "  - \"%s\": itt részletesen beállítható, hogy mely\n"
 "szolgáltatások legyenek működtetve a gépen. Ha kiszolgálóként szeretné\n"
@@ -5821,11 +5828,11 @@ msgstr "Szolgáltatások"
 #, 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álassza ki azt a lemezt, amelyet törölni szeretne a\n"
-"Mandrivalinux-partíció létrehozásához. Figyelem: a lemezen\n"
+"Mandriva Linux-partíció létrehozásához. Figyelem: a lemezen\n"
 "található adatok elvesznek, és később nem nyerhetők vissza!"
 
 #: help.pm:863
@@ -6175,12 +6182,12 @@ msgstr "A windowsos partíció méretének meghatározása"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "A windowsos partíció túlzottan töredezett. Indítsa újra a gépet Windowsszal, "
 "majd futtassa a \"defrag\" programot. Ennek végeztével indítsa el újra a "
-"Mandrivalinux telepítését."
+"Mandriva Linux telepítését."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6295,13 +6302,13 @@ msgstr "A hálózatkezelés leállítása"
 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"
@@ -6330,8 +6337,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 "
@@ -6345,8 +6352,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 "
@@ -6355,7 +6362,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"
@@ -6389,10 +6396,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"
@@ -6413,11 +6420,11 @@ msgid ""
 msgstr ""
 "Bevezetés\n"
 "\n"
-"A továbbiakban az operációs rendszerre és a Mandrivalinux disztribúcióban "
+"A továbbiakban az operációs rendszerre és a Mandriva Linux disztribúcióban "
 "elérhető\n"
 "különféle komponensekre \"Szoftvertermékek\" néven hivatkozunk. A "
 "Szoftvertermékek körébe - nem\n"
-"kizárólagosan - beletartoznak az operációs rendszerhez és a Mandrivalinux "
+"kizárólagosan - beletartoznak az operációs rendszerhez és a Mandriva Linux "
 "disztribúció\n"
 "különféle komponenseihez kapcsolódó programok, módszerek, szabályok és "
 "dokumentáció.\n"
@@ -6483,7 +6490,7 @@ msgstr ""
 "károk a\n"
 "szoftverkomponensek birtoklásából vagy használatából illetve a helyi "
 "törvények által\n"
-"tiltott vagy korlátozott szoftverkomponenseknek egy Mandrivalinux-címről "
+"tiltott vagy korlátozott szoftverkomponenseknek egy Mandriva Linux-címről "
 "való\n"
 "letöltéséből származnak.\n"
 "Ezen korlátozott felelősség vonatkozik többek közt a Szoftvertermékekben "
@@ -6520,12 +6527,12 @@ msgstr ""
 "és a szoftverekre vonatkozó szellemi tulajdoni illetve szerzői jogi "
 "(copyright) törvények\n"
 "védelme alatt áll.\n"
-"A Mandriva S.A. fenntartja a jogot arra, hogy módosítsa illetve "
-"átalakítsa a\n"
+"A Mandriva S.A. fenntartja a jogot arra, hogy módosítsa illetve átalakítsa "
+"a\n"
 "Szoftvertermékeket - teljes egészében vagy részben, bármilyen módon illetve "
 "bármilyen célra.\n"
-"A \"Mandriva\", a \"Mandrivalinux\" és az azokhoz tartozó logók a "
-"Mandriva S.A. védjegyei.\n"
+"A \"Mandriva\", a \"Mandriva Linux\" és az azokhoz tartozó logók a Mandriva "
+"S.A. védjegyei.\n"
 "\n"
 "\n"
 "5. Vonatkozó törvények\n"
@@ -6637,8 +6644,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"
@@ -6646,28 +6653,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 ""
 "Gratulálunk; a telepítés befejeződött. Vegye ki a rendszerindítási\n"
 "adathordozókat, majd nyomja le az Enter billentyűt a rendszer\n"
 "újraindításához.\n"
 "\n"
 "\n"
-"Az ehhez a Mandrivalinux-verzióhoz elérhető javításokról a következő\n"
+"Az ehhez a Mandriva Linux-verzióhoz elérhető javításokról a következő\n"
 "helyen olvashat:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"A rendszer beállításával kapcsolatban a Mandrivalinux hivatalos\n"
+"A rendszer beállításával kapcsolatban a Mandriva Linux hivatalos\n"
 "felhasználói kézikönyvében talál további információkat."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: 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
@@ -6697,12 +6704,12 @@ msgstr "A következő lépés: \"%s\"\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"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 ""
 "A rendszer gyenge erőforrásokkal rendelkezik. Előfordulhat, hogy problémái\n"
-"lesznek a Mandrivalinux telepítésével. Ha így történik, próbálkozzon\n"
+"lesznek a Mandriva Linux telepítésével. Ha így történik, próbálkozzon\n"
 "szöveges módú telepítéssel: CD-ről való rendszerindítást követően nyomjon\n"
 "\"F1\"-et, majd írja be azt, hogy \"text\"."
 
@@ -7259,10 +7266,10 @@ 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 ""
-"Kapcsolódás a Mandrivalinux webkiszolgálójához; az elérhető tükörkiszolgálók "
-"listájának lekérdezése..."
+"Kapcsolódás a Mandriva Linux webkiszolgálójához; az elérhető "
+"tükörkiszolgálók listájának lekérdezése..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7490,8 +7497,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux-telepítés %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux-telepítés %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10080,14 +10087,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 ""
 "A DrakFirewall beállítása\n"
 "\n"
 "Ezzel egy személyes felhasználásra szánt tűzfalat lehet beállítani ehhez\n"
-"a Mandrivalinuxt használó géphez. Ha egy komolyabb tűzfalmegoldást\n"
+"a Mandriva Linuxt használó géphez. Ha egy komolyabb tűzfalmegoldást\n"
 "szeretne, szerezze be a speciális MandrakeSecurity Firewall disztribúciót."
 
 #: network/drakfirewall.pm:164
@@ -14175,12 +14182,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 ""
 "Ha szeretné megosztani a lapolvasót a hálózaton, akkor használja a "
-"Scannerdrake programot (Hardver/Lapolvasók a Mandrivalinux "
+"Scannerdrake programot (Hardver/Lapolvasók a Mandriva Linux "
 "Vezérlőközpontban).\n"
 "\n"
 
@@ -16186,33 +16193,33 @@ msgstr "Leállítás"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Mi a Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Mi a Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Üdvözli a <b>Mandrivalinux</b>"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Üdvözli a <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 ""
-"A Mandrivalinux egy <b>Linux-disztribúció</b>, amely az alaprendszeren - a "
+"A Mandriva Linux egy <b>Linux-disztribúció</b>, amely az alaprendszeren - a "
 "Linux kernelen alapuló <b>operációs rendszeren</b> - kívül tartalmaz "
 "<b>számos alkalmazást</b> is, megfelelve ezzel minden igénynek."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"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 ""
-"A Mandrivalinux a leginkább <b>felhasználóbarát</b> Linux-disztribúció, "
+"A Mandriva Linux a leginkább <b>felhasználóbarát</b> Linux-disztribúció, "
 "továbbá az egyik <b>legelterjedtebb</b> is."
 
 #: share/advertising/02.pl:13
@@ -16228,13 +16235,13 @@ msgstr "Üdvözöljük a <b>nyílt forráskód világában</b>"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"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 ""
-"A Mandrivalinux a nyílt forrás-modellt alkalmazza. Ez azt jelenti, hogy ez a "
-"verzió a <b>Mandriva fejlesztőcsapata</b> és a Mandrivalinux "
+"A Mandriva Linux a nyílt forrás-modellt alkalmazza. Ez azt jelenti, hogy ez "
+"a verzió a <b>Mandriva fejlesztőcsapata</b> és a Mandriva Linux "
 "fejlesztésében közreműködők <b>világméretű közössége</b> közti "
 "<b>együttműködés</b> eredménye."
 
@@ -16255,10 +16262,10 @@ msgstr "<b>A 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 ""
-"A disztribúcióban levő legtöbb szoftver, valamint az összes Mandrivalinux-"
+"A disztribúcióban levő legtöbb szoftver, valamint az összes Mandriva Linux-"
 "eszköz a <b>General Public License</b> nevű licencet használja."
 
 #: share/advertising/03.pl:17
@@ -16290,26 +16297,26 @@ msgstr "<b>Csatlakozzon a közösséghez</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 ""
-"A Mandrivalinux rendelkezik az egyik <b>legnagyobb</b> felhasználói és "
+"A Mandriva Linux rendelkezik az egyik <b>legnagyobb</b> felhasználói és "
 "fejlesztői <b>közösséggel</b>. A közösség széles körű tevékenységet végez a "
 "hibakereséstől kezdve az alkalmazásfejlesztésig. A közösség "
-"<b>kulcsszerepet</b> játszik a Mandrivalinux világában."
+"<b>kulcsszerepet</b> játszik a Mandriva Linux világában."
 
 #: 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 ""
 "Ha szeretne <b>többet tudni</b> a dinamikus közösségünkről, akkor látogasson "
-"el a <b>www.mandrakelinux.com</b> weblapra. Ha szeretne <b>részt venni</b> a "
-"fejlesztésben, akkor a <b>www.mandrakelinux.com/en/cookerdevel.php3</b> "
+"el a <b>www.mandrivalinux.com</b> weblapra. Ha szeretne <b>részt venni</b> a "
+"fejlesztésben, akkor a <b>www.mandrivalinux.com/en/cookerdevel.php3</b> "
 "weblapot ajánljuk."
 
 #: share/advertising/05.pl:15
@@ -16320,10 +16327,10 @@ msgstr "<b>Letölthető verzió</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 ""
-"Jelenleg a <b>Mandrivalinux letölthető verziójának</b> telepítése folyik. "
+"Jelenleg a <b>Mandriva Linux letölthető verziójának</b> telepítése folyik. "
 "Ezt az ingyenes verziót a Mandriva <b>mindenki számára elérhetően</b> "
 "terjeszti."
 
@@ -16366,8 +16373,8 @@ msgstr "<b>Discovery - az Ön első Linux-munkaasztala</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Ön most a <b>Mandrivalinux Discovery</b> terméket telepíti."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Ön most a <b>Mandriva Linux Discovery</b> terméket telepíti."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16389,8 +16396,8 @@ msgstr "<b>PowerPack - a legerősebb Linux-munkaasztal</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Ön most a <b>Mandrivalinux PowerPack</b> terméket telepíti."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Ön most a <b>Mandriva Linux PowerPack</b> terméket telepíti."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16410,8 +16417,8 @@ msgstr "<b>PowerPack+ - Linux-megoldás munkaasztalra és kiszolgálóra</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Ön most a <b>Mandrivalinux PowerPack+</b> terméket telepíti."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Ön most a <b>Mandriva Linux PowerPack+</b> terméket telepíti."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16434,16 +16441,15 @@ msgstr "<b>Mandriva-termékek</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 ""
-"A <b>Mandriva</b> széles skálával rendelkezik <b>Mandrivalinux</b>-"
+"A <b>Mandriva</b> széles skálával rendelkezik <b>Mandriva Linux</b>-"
 "termékekből."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "A Mandrivalinux-termékek a következők:"
+msgid "The Mandriva Linux products are:"
+msgstr "A Mandriva Linux-termékek a következők:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16463,10 +16469,10 @@ msgstr "\t- <b>PowerPack+</b> - Linux-megoldás munkaasztalra és kiszolgálóra
 #: 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 az x86-64 architektúrához</b> - a Mandrivalinux-"
+"\t- <b>Mandriva Linux az x86-64 architektúrához</b> - a Mandriva Linux-"
 "megoldás, amellyel a legtöbbet hozhatja ki 64 bites processzorából"
 
 #: share/advertising/10.pl:15
@@ -16477,29 +16483,29 @@ msgstr "<b>Mandriva-termékek (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 ""
 "A Mandriva rendelkezik kettő olyan termékkel, amelyek lehetővé teszik a "
-"Mandrivalinux <b>bármely számítógépen</b> való, telepítés nélküli "
+"Mandriva Linux <b>bármely számítógépen</b> való, telepítés nélküli "
 "használatát:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a 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-rendszer, amely teljes mértékben egy "
+"\t- <b>Move</b> - Mandriva Linux-rendszer, amely teljes mértékben egy "
 "indítható CD-ről fut"
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a 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-rendszer előre telepítve a tömör "
+"\t- <b>GlobeTrotter</b> - Mandriva Linux-rendszer előre telepítve a tömör "
 "felépítésű LaCie Mobile Hard Drive lemezegységre"
 
 #: share/advertising/11.pl:13
@@ -16510,29 +16516,30 @@ msgstr "<b>Mandriva-termékek (professzionális megoldások)</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 ""
-"A <b>professzionális igények</b> kielégítésére tervezett Mandriva-"
-"termékek:"
+"A <b>professzionális igények</b> kielégítésére tervezett Mandriva-termékek:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
-"\t- <b>Corporate Desktop</b> - az üzleti célra szánt Mandrivalinux-"
+"\t- <b>Corporate Desktop</b> - az üzleti célra szánt Mandriva Linux-"
 "munkaasztal"
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t- <b>Corporate Server</b> - Mandrivalinux-kiszolgálói megoldás"
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t- <b>Corporate Server</b> - Mandriva Linux-kiszolgálói megoldás"
 
 #: 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> - biztonsági megoldás Mandrivalinuxszal"
+"\t- <b>Multi-Network Firewall</b> - biztonsági megoldás Mandriva Linuxszal"
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16578,8 +16585,8 @@ msgid ""
 "environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "A PowerPack rendszerben lehetősége van <b>grafikus asztali környezetet</b> "
-"választani. A Mandriva alapértelmezésként a <b>KDE</b> környezetet "
-"jelölte ki."
+"választani. A Mandriva alapértelmezésként a <b>KDE</b> környezetet jelölte "
+"ki."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16606,8 +16613,8 @@ msgid ""
 "environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "A PowerPack+ rendszerben lehetősége van <b>grafikus asztali környezetet</b> "
-"választani. A Mandriva alapértelmezésként a <b>KDE</b> környezetet "
-"jelölte ki."
+"választani. A Mandriva alapértelmezésként a <b>KDE</b> környezetet jelölte "
+"ki."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16734,10 +16741,10 @@ msgstr "<b>Alkalmazások széles skálája</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 ""
-"A Mandrivalinux menüjében <b>minden feladathoz</b> talál <b>egyszerűen "
+"A Mandriva Linux menüjében <b>minden feladathoz</b> talál <b>egyszerűen "
 "használható</b> alkalmazásokat:"
 
 #: share/advertising/18.pl:16
@@ -17008,17 +17015,17 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux Vezérlőközpont</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux Vezérlőközpont</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 ""
-"A <b>Mandrivalinux Vezérlőközpont</b> a Mandrivalinux-beli számítógép-"
+"A <b>Mandriva Linux Vezérlőközpont</b> a Mandriva Linux-beli számítógép-"
 "beállítási szoftvereszközök nélkülözhetetlen gyűjteménye."
 
 #: share/advertising/25.pl:17
@@ -17044,16 +17051,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 ""
 "Mint mindenféle számítógép-programozás, a nyílt forráskódú szoftver "
 "fejlesztése is <b>igényel időt és embereket</b>. A nyílt forráskód "
-"filozófiájának tiszteletben tartásával a Mandriva értéknövelt termékeket "
-"és szolgáltatásokat kínál a <b>Mandrivalinux fejlesztésének fenntartása</b> "
+"filozófiájának tiszteletben tartásával a Mandriva értéknövelt termékeket és "
+"szolgáltatásokat kínál a <b>Mandriva Linux fejlesztésének fenntartása</b> "
 "érdekében. Ha szeretné <b>támogatni a nyílt forráskód filozófiáját</b> és a "
-"Mandrivalinux fejlesztését, akkor <b>fontolja meg</b> valamely termékünk "
+"Mandriva Linux fejlesztését, akkor <b>fontolja meg</b> valamely termékünk "
 "vagy szolgáltatásunk megvásárlását."
 
 #: share/advertising/27.pl:13
@@ -17064,11 +17071,11 @@ msgstr "<b>Webes áruház</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 ""
-"Ha információt szeretne a Mandriva termékeiről és szolgáltatásairól, "
-"akkor látogassa meg <b>webes áruházunkat</b>."
+"Ha információt szeretne a Mandriva termékeiről és szolgáltatásairól, akkor "
+"látogassa meg <b>webes áruházunkat</b>."
 
 #: share/advertising/27.pl:17
 #, c-format
@@ -17088,8 +17095,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Látogassa meg a <b>store.mandrakesoft.com</b> weboldalt"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Látogassa meg a <b>store.mandriva.com</b> weboldalt"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -17099,10 +17106,10 @@ 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 ""
-"A <b>Mandriva Club</b> a <b>tökéletes kiegészítő</b> az Ön Mandrivalinux-"
+"A <b>Mandriva Club</b> a <b>tökéletes kiegészítő</b> az Ön Mandriva Linux-"
 "rendszeréhez."
 
 #: share/advertising/28.pl:19
@@ -17116,9 +17123,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>kedvezmények</b> webes áruházunk - <b>store.mandrakesoft.com</b> - "
+"\t- <b>kedvezmények</b> webes áruházunk - <b>store.mandriva.com</b> - "
 "termékeire és szolgáltatásaira"
 
 #: share/advertising/28.pl:21
@@ -17132,17 +17139,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t- a Mandrivalinux <b>felhasználói fórumainak</b> használata"
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t- a Mandriva Linux <b>felhasználói fórumainak</b> használata"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"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>korábbi és elsőbbségi hozzáférés</b> - a nyilvános kiadás előtt - a "
-"Mandrivalinux <b>ISO-fájljaihoz</b>"
+"Mandriva Linux <b>ISO-fájljaihoz</b>"
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -17162,10 +17169,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 ""
-"A Mandriva Online széles körű szolgáltatásokat nyújt Mandrivalinux-rendszerek "
-"<b>egyszerűen végezhető frissítésére</b>:"
+"A Mandriva Online széles körű szolgáltatásokat nyújt Mandriva Linux-"
+"rendszerek <b>egyszerűen végezhető frissítésére</b>:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17190,9 +17197,9 @@ msgstr "\t- rugalmas, <b>ütemezett</b> frissítések"
 #: 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- az <b>összes Mandrivalinux-rendszer</b> kezelése egyetlen azonosítóval"
+"\t- az <b>összes Mandriva Linux-rendszer</b> kezelése egyetlen azonosítóval"
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -17203,7 +17210,7 @@ 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>Segítségre</b> van szüksége? A Mandriva technikai szakértőit "
 "megtalálhatja a <b>technikai támogatási oldalunkon</b>: www.mandrakeexpert."
@@ -17212,20 +17219,20 @@ 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 ""
-"A <b>képzett Mandrivalinux-szakértők</b> segítségének köszönhetően időt "
+"A <b>képzett Mandriva Linux-szakértők</b> segítségének köszönhetően időt "
 "takaríthat meg."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to 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ármilyen, a Mandrivalinuxszal kapcsolatos kérdés esetén lehetősége van "
-"támogatási egységek vásárlására a <b>store.mandrakesoft.com</b> helyen."
+"Bármilyen, a Mandriva Linuxszal kapcsolatos kérdés esetén lehetősége van "
+"támogatási egységek vásárlására a <b>store.mandriva.com</b> helyen."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17610,15 +17617,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 ""
 "[OPCIÓK] [PROGRAMNÉV]\n"
 "\n"
 "OPCIÓK:\n"
 "  --help            - jelen segítség megjelenítése\n"
-"  --report          - programnév (a Mandrivalinux-eszközök egyike)\n"
-"  --incident        - programnév (a Mandrivalinux-eszközök egyike)"
+"  --report          - programnév (a Mandriva Linux-eszközök egyike)\n"
+"  --incident        - programnév (a Mandriva Linux-eszközök egyike)"
 
 #: standalone.pm:63
 #, c-format
@@ -17673,7 +17680,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"
@@ -17687,7 +17694,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPCIÓK]...\n"
-"A Mandrivalinux terminálkiszolgáló (MTS) beállítása\n"
+"A Mandriva Linux terminálkiszolgáló (MTS) beállítása\n"
 "--enable         : az MTS bekapcsolása\n"
 "--disable        : az MTS kikapcsolása\n"
 "--start          : az MTS elindítása\n"
@@ -17743,8 +17750,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"
@@ -20542,13 +20549,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux hibabejelentő program"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux hibabejelentő program"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux Vezérlőközpont"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux Vezérlőközpont"
 
 #: standalone/drakbug:48
 #, c-format
@@ -21044,19 +21051,20 @@ msgstr "Automatikus indítá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 ""
 "Ez a csatoló még nem lett beállítva.\n"
-"Használja a \"Csatoló felvétele\" funkciót a Mandrivalinux Vezérlőközpontban."
+"Használja a \"Csatoló felvétele\" funkciót a Mandriva Linux "
+"Vezérlőközpontban."
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Internetkapcsolat még nem lett beállítva.\n"
-"Használja a \"%s\" funkciót a Mandrivalinux Vezérlőközpontban."
+"Használja a \"%s\" funkciót a Mandriva Linux Vezérlőközpontban."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21106,8 +21114,8 @@ msgstr "KDM (KDE bejelentkezéskezelő)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Mandrivalinux bejelentkezéskezelő)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Mandriva Linux bejelentkezéskezelő)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21411,18 +21419,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, Mandriva.\n"
 "\n"
 "\n"
 "       DUPONT Sebastien (eredeti verzió)\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
@@ -22006,8 +22014,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux segítségrendszer"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux segítségrendszer"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22674,17 +22682,17 @@ 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 ""
 "Hangkártya nem található a gépben. Ellenőrizze, hogy valóban van-e a gépben "
 "Linux által támogatott hangkártya, és hogy megfelelően van-e beszerelve a "
 "gépbe.\n"
 "\n"
 "\n"
-"A Mandrivalinux hardver-adatbázisa a következő helyen található:\n"
+"A Mandriva Linux hardver-adatbázisa a következő helyen található:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24718,17 +24726,17 @@ 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 ""
 "Tévékártya nem található a gépben. Ellenőrizze, hogy valóban van-e a gépben "
 "Linux által támogatott tévékártya, és hogy megfelelően van-e beszerelve a "
 "gépbe.\n"
 "\n"
 "\n"
-"A Mandrivalinux hardver-adatbázisa a következő helyen található:\n"
+"A Mandriva Linux hardver-adatbázisa a következő helyen található:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25440,13 +25448,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 hardverbeállítási program.\n"
 "<span foreground=\"royalblue3\">Verzió:</span> %s\n"
 "<span foreground=\"royalblue3\">Szerző:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25559,8 +25567,8 @@ msgstr "A módosítás megtörtént, de az érvénybe lépéséhez ki kell jelen
 # what it did by writing to /var/log/explanations
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinux-eszközök naplói"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linux-eszközök naplói"
 
 #: standalone/logdrake:51
 #, c-format
@@ -26079,10 +26087,10 @@ msgstr "A kapcsolat létrejött."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "A kapcsolódás nem sikerült.\n"
-"Ellenőrizze a beállításokat a Mandrivalinux Vezérlőközpontban."
+"Ellenőrizze a beállításokat a Mandriva Linux Vezérlőközpontban."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -27115,16 +27123,16 @@ msgstr "A telepítés hibával ért véget."
 #~ msgstr "Hiba történt %s írásra való megnyitásánál: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a 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 hardverbeállítási program.\n"
+#~ "HardDrake - Mandriva Linux hardverbeállítási program.\n"
 #~ "<span foreground=\"royalblue3\">Verzió:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Szerző:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 
 #~ msgid "Use Anonymous Bind"
@@ -27451,7 +27459,7 @@ msgstr "A telepítés hibával ért véget."
 #~ msgstr ""
 #~ "Nincs beállítva egyetlen internetkapcsolat sem.\n"
 #~ "Kapcsolat létrehozásához használja az \"Internet-hozzáférés\"\n"
-#~ "funkciót a Mandrivalinux Vezérlőközpontban."
+#~ "funkciót a Mandriva Linux Vezérlőközpontban."
 
 #~ msgid ""
 #~ "Welcome to the UPS configuration utility.\n"
@@ -27559,9 +27567,9 @@ msgstr "A telepítés hibával ért véget."
 #~ "A(z) \"%s\" nyomtatót nem sikerült eltávolítani a StarOffice/OpenOffice."
 #~ "org/GIMP programból."
 
-#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
+#~ msgid "<b>Congratulations for choosing Mandriva Linux!</b>"
 #~ msgstr ""
-#~ "<b>Gratulálunk ahhoz, hogy a Mandrivalinux rendszert választotta</b>"
+#~ "<b>Gratulálunk ahhoz, hogy a Mandriva Linux rendszert választotta</b>"
 
 #~ msgid ""
 #~ "We would like to thank everyone who participated in the development of "
@@ -27672,8 +27680,8 @@ msgstr "A telepítés hibával ért véget."
 #~ msgstr ""
 #~ "\t* letöltési tükörkiszolgálók kizárólagosan a Mandriva Club-tagok számára"
 
-#~ msgid "\t* Voting for software to put in Mandrivalinux"
-#~ msgstr "\t* szavazás a Mandrivalinux rendszerbe felveendő alkalmazásokról"
+#~ msgid "\t* Voting for software to put in Mandriva Linux"
+#~ msgstr "\t* szavazás a Mandriva Linux rendszerbe felveendő alkalmazásokról"
 
 #~ msgid "\t* Plus much more"
 #~ msgstr "\t* ..."
@@ -27690,10 +27698,10 @@ msgstr "A telepítés hibával ért véget."
 
 #~ msgid ""
 #~ "If you have Linux questions, subscribe to Mandriva Expert at <b>www."
-#~ "mandrakeexpert.com</b>"
+#~ "mandrivaexpert.com</b>"
 #~ msgstr ""
 #~ "Ha Linuxszal kapcsolatos kérdései vannak, iratkozzon fel a "
-#~ "MandrakeExpertre a <b>www.mandrakeexpert.com</b> weboldalon."
+#~ "MandrakeExpertre a <b>www.mandrivaexpert.com</b> weboldalon."
 
 #~ msgid "Installation of %s failed. The following error occurred:"
 #~ msgstr "A(z) %s telepítése nem sikerült a következő hiba miatt:"
@@ -27742,24 +27750,24 @@ msgstr "A telepítés hibával ért véget."
 #~ msgid ""
 #~ "Before continuing, you should carefully read the terms of the license. "
 #~ "It\n"
-#~ "covers the entire 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 ""
 #~ "Mielőtt továbblépne, olvassa át alaposan a licencegyezményt, amely az\n"
-#~ "egész Mandrivalinux disztribúcióra érvényes. Ha elfogadja az abban\n"
+#~ "egész Mandriva Linux disztribúcióra érvényes. Ha elfogadja az abban\n"
 #~ "szereplő feltételeket, akkor jelölje be a(z) \"%s\" opciót.\n"
 #~ "Ha nem fogadja el valamelyik feltételt, akkor kattintson a(z)\n"
 #~ "\"%s\" gombra - ezzel újraindítja a számítógépet."
 
 #~ msgid ""
-#~ "The 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 ""
-#~ "A Mandrivalinux telepítőanyag több CD-n helyezkedik el. Ha egy "
+#~ "A Mandriva Linux telepítőanyag több CD-n helyezkedik el. Ha egy "
 #~ "kiválasztott\n"
 #~ "csomag egy másik CD-n található, akkor a telepítő kiadja az\n"
 #~ "aktuális CD-t, és megkéri Önt, hogy helyezze be a megfelelőt."
@@ -27902,7 +27910,7 @@ msgstr "A telepítés hibával ért véget."
 #~ "választani."
 
 #~ 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"
@@ -27917,7 +27925,7 @@ msgstr "A telepítés hibával ért véget."
 #~ "the\n"
 #~ "selected package(s), or \"%s\" to abort."
 #~ msgstr ""
-#~ "Lehetséges, hogy amikor Ön a Mandrivalinux rendszert telepíti, már\n"
+#~ "Lehetséges, hogy amikor Ön a Mandriva Linux rendszert telepíti, már\n"
 #~ "frissítésre kerültek bizonyos csomagok a rendszer kiadása óta.\n"
 #~ "Elképzelhető, hogy bizonyos hibák ki lettek javítva, illetve\n"
 #~ "hogy meg lettek oldva bizonyos felmerült biztonsági problémák. Ezeket\n"
@@ -28205,8 +28213,8 @@ msgstr "A telepítés hibával ért véget."
 #~ "alkalmazásokat tartalmaz."
 
 #~ 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 ""
 #~ "Az összes Mandriva-terméket és -szolgáltatást megtalálhatja a "
 #~ "<b>MandrakeStore</b> webáruházban."
@@ -28244,7 +28252,6 @@ msgstr "A telepítés hibával ért véget."
 #~ "  --report          - paraméter: programnév (a Mandrake-eszközök egyike)\n"
 #~ "  --incident        - paraméter: programnév (a Mandrake-eszközök egyike)"
 
-
 #~ msgid ""
 #~ "This interface has not been configured yet.\n"
 #~ "Run the \"Add an interface\" assistant from the Mandrake Control Center"
diff --git a/perl-install/share/po/id.po b/perl-install/share/po/id.po
index b8343fd27..ec0a7c364 100644
--- a/perl-install/share/po/id.po
+++ b/perl-install/share/po/id.po
@@ -1316,11 +1316,11 @@ msgstr "Pilihan bahasa"
 #: 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 mendukung beberapa bahasa. Pilihlah\n"
+"Mandriva Linux mendukung beberapa bahasa. Pilihlah\n"
 "bahasa yang akan diinstall. Bahasa pilihan akan ditampilkan\n"
 "setelah proses installasi selesai dan Anda merestart sistem Anda."
 
@@ -3732,12 +3732,12 @@ msgstr "aktifkan dukungan radio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
 "Bacalah lisensi sebelum melanjutkan. Lisensi mencakup seluruh distribusi\n"
-"Mandrivalinux. Jika Anda setuju dengan semua pasal di dalamnya, klik\n"
+"Mandriva Linux. Jika Anda setuju dengan semua pasal di dalamnya, klik\n"
 "kotak \"%s\". Jika tidak, klik pada tombol \"%s\" akan mereboot komputer "
 "Anda."
 
@@ -3918,13 +3918,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The 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 ""
-"Installasi Mandrivalinux didistribusikan pada beberapa CDROM. DrakX tahu "
+"Installasi Mandriva Linux didistribusikan pada beberapa CDROM. DrakX tahu "
 "jika paket\n"
 "terpilih berada di CDROM lain dan akan mengeluarkan CD yang ada untuk "
 "kemudian\n"
@@ -3936,11 +3936,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"
@@ -3993,11 +3994,11 @@ msgid ""
 msgstr ""
 "Sekarang waktunya untuk menentukan program yang akan diinstal. Terdapat "
 "ribuan \n"
-"pada Mandrivalinux, dan untuk mempermudah, mereka telah diletakkan pada "
+"pada Mandriva Linux, dan untuk mempermudah, mereka telah diletakkan pada "
 "grup \n"
 "aplikasi yang sejenis.\n"
 "\n"
-"Mandrivalinux mengurutkan paket dalam empat kategori. Anda bisa "
+"Mandriva Linux mengurutkan paket dalam empat kategori. Anda bisa "
 "menggabungkan \n"
 "menyesuaikan aplikasi dari berbagai kategori, sehingga installasi "
 "``Workstation''\n"
@@ -4106,10 +4107,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"
@@ -4141,9 +4142,10 @@ msgstr ""
 "!! Jika paket server terpilih dengan sengaja atau karena merupakan bagian "
 "suatu\n"
 "grup besar, akan ada pertanyaan konfirmasi installasi paket tersebut. Pada\n"
-"Mandrivalinux, secara default semua server terinstal dijalankan saat boot.\n"
+"Mandriva Linux, secara default semua server terinstal dijalankan saat boot.\n"
 "Meski aman saat distribusi diluncurkan, ada kemungkinan lubang keamanan\n"
-"ditemukan setelah versi Mandrivalinux ini selesai. Jika Anda tidak tahu apa\n"
+"ditemukan setelah versi Mandriva Linux ini selesai. Jika Anda tidak tahu "
+"apa\n"
 "yang dilakukan oleh suatu layanan atau mengapa ia diinstal, klik \"%s\".\n"
 "Jika Anda menekan \"%s\" layanan terdaftar akan diinstal dan akan "
 "dijalankan\n"
@@ -4308,7 +4310,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"
@@ -4364,7 +4366,7 @@ msgid ""
 msgstr ""
 "X (untuk X Window System) adalah jantung dari interface grafis GNU/Linux\n"
 "yang diperlukan oleh semua lingkungan grafis (KDE, GNOME, AfterStep,\n"
-"WindowMaker, dll.) yang dibundel pada Mandrivalinux.\n"
+"WindowMaker, dll.) yang dibundel pada Mandriva Linux.\n"
 "\n"
 "Anda akan melihat daftar parameter yang berbeda untuk merubah untuk "
 "mendapatkan\n"
@@ -4494,12 +4496,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"
@@ -4526,7 +4528,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both 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"
@@ -4535,7 +4537,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"
@@ -4557,11 +4560,11 @@ msgid ""
 msgstr ""
 "Sekarang Anda harus menentukan dimana Anda hendak menginstall sistem "
 "operasi\n"
-"Mandrivalinux pada harddisk Anda. Jika harddisk Anda kosong atau jika "
+"Mandriva Linux pada harddisk Anda. Jika harddisk Anda kosong atau jika "
 "sebuah\n"
 "sistem operasi menggunakan semua tempat, Anda harus mempartisi drive.\n"
 "Pada dasarnya, mempartisi harddisk berarti membaginya secara logical\n"
-"untuk membuat ruang yang diperlukan sistem Mandrivalinux baru Anda.\n"
+"untuk membuat ruang yang diperlukan sistem Mandriva Linux baru Anda.\n"
 "\n"
 "Karena proses partisi harddisk biasanya tidak bisa dikembalikan dan bisa \n"
 "mengacu pada kehilangan data, partisi bisa menegangkan dan membuat stress\n"
@@ -4598,7 +4601,7 @@ msgstr ""
 "dengan sebelumnya Anda sudah mendefrag partisi Windows.\n"
 "Membackup data sangat disarankan. Penggunaan opsi ini sangat "
 "direkomendasikan jika Anda\n"
-"ingin menggunakan Mandrivalinux dan Microsoft Windows pada komputer yang "
+"ingin menggunakan Mandriva Linux dan Microsoft Windows pada komputer yang "
 "sama.\n"
 "\n"
 "   Sebelum memilih opsi ini, harap dipahami bahwa setelah prosedur ini, "
@@ -4611,8 +4614,8 @@ msgstr ""
 "\n"
 " * \"%s\". Jika Anda hendak menghapus seluruh data dan semua partisi yang "
 "ada pada harddisk\n"
-"Anda dan menggantinya dengan sistem Mandrivalinux yang baru, pilih opsi ini. "
-"Hati-hati, karena\n"
+"Anda dan menggantinya dengan sistem Mandriva Linux yang baru, pilih opsi "
+"ini. Hati-hati, karena\n"
 "Anda tidak bisa membatalkan opsi ini setelah Anda mengkonfirmasikan.\n"
 "\n"
 "   !! Jika Anda memilih opsi ini, semua data pada harddisk Anda akan "
@@ -4780,7 +4783,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"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."
@@ -4802,7 +4805,7 @@ msgstr ""
 "Klik pada \"%s\" ketika Anda siap memformat partisi.\n"
 "\n"
 "Klik pada \"%s\" jika Anda hendak memilih partisi lain untuk \n"
-"installasi sistem operasi Mandrivalinux baru Anda.\n"
+"installasi sistem operasi Mandriva Linux baru Anda.\n"
 "\n"
 "Klik pada \"%s\" jika Anda hendak memilih partisi yang hendak \n"
 "diperiksa untuk block rusak pada disk."
@@ -4819,7 +4822,7 @@ msgstr "Sebelumnya"
 #: 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"
@@ -4831,7 +4834,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Saat Mandrivalinux diinstal, mungkin beberapa paket telah diupdate sejak\n"
+"Saat Mandriva Linux diinstal, mungkin beberapa paket telah diupdate sejak\n"
 "rilis awal. Beberapa kesalahan mungkin telah diperbaiki / masalah keamanan\n"
 "dipecahkan. Untuk memanfaatkan update ini Anda dapat men-download-nya dari\n"
 "Internet. Pilih \"%s\" jika Anda memiliki koneksi Internet, atau \"%s\" "
@@ -4859,7 +4862,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"
@@ -4872,7 +4875,7 @@ msgstr ""
 "\n"
 "Jika Anda tidak tahu apa yang akan dipilih, gunakan opsi default. Anda\n"
 "mampu mengubahnya menggunakan perkakas draksec, yang merupakan bagian\n"
-"dari dari Pusat Kontrol Mandrivalinux.\n"
+"dari dari Pusat Kontrol Mandriva Linux.\n"
 "\n"
 "Isi bagian \"%s\" dengan alamat email dari orang yang bertanggung jawab\n"
 "atas keaman. Pesan keamanan akan dikirimkan pada alamat tersebut."
@@ -4886,7 +4889,7 @@ msgstr "Administrator Keamanan"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4957,7 +4960,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Saat ini, Anda harus memilih partisi yang akan digunakan untuk installasi\n"
-"sistem Mandrivalinux Anda. Jika partisi telah didefinisikan, baik dari\n"
+"sistem Mandriva Linux Anda. Jika partisi telah didefinisikan, baik dari\n"
 "installasi GNU/Linux sebelumnya atau melalui perkakas partisi lainnya,\n"
 "Anda bisa menggunakan partisi yang ada. Jika tidak, partisi harddisk \n"
 "harus didefinisikan.\n"
@@ -5041,7 +5044,7 @@ msgstr "Ubah ke modus normal/ahli"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5118,7 +5121,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"
@@ -5127,18 +5130,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 ""
 "Tahap ini hanya aktif jika partisi GNU/Linux lama ditemukan.\n"
 "\n"
 "DrakX perlu tahu Anda ingin melakukan installasi baru atau upgrade sistem\n"
-"Mandrivalinux yang sudah ada:\n"
+"Mandriva Linux yang sudah ada:\n"
 "\n"
 "* \"%s\": Untuk sebagian besar bagian, opsi ini menghapus sistem lama.\n"
 "Namun, bergantung pada skema partisi Anda, Anda bisa mencegah data Anda\n"
@@ -5147,11 +5151,11 @@ msgstr ""
 "harus menggunakan opsi ini.\n"
 "\n"
 "* \"%s\": Kelas installasi ini akan mengupdate paket yang terinstall\n"
-"pada sistem Mandrivalinux Anda. Skema partisi dan data pengguna Anda\n"
+"pada sistem Mandriva Linux Anda. Skema partisi dan data pengguna Anda\n"
 "tidak akan diubah. Sebagian besar langkah konfigurasi yang tersisa\n"
 "serupa pada installasi standar.\n"
 "\n"
-"Menggunakan opsi ``Upgrade'' seharusnya berjalan pada Mandrivalinux\n"
+"Menggunakan opsi ``Upgrade'' seharusnya berjalan pada Mandriva Linux\n"
 "versi \"8.1\" keatas. Melakukan upgrade pada versi sebelum \"8.1\"\n"
 "tidak dianjurkan."
 
@@ -5210,7 +5214,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"
@@ -5251,7 +5256,7 @@ msgstr ""
 "Tentang dukungan UTF-8 (unicode): Unicode adalah enkoding karakter yang\n"
 "baru yang ditujukan untuk mencakup seluruh bahasa yang ada. Namun \n"
 "dukungan penuh pada GNU/Linux sedang dalam pengembangan. Untuk alasan\n"
-"tersebut, penggunaan UTF-8 pada Mandrivalinux bergantung pada pilihan\n"
+"tersebut, penggunaan UTF-8 pada Mandriva Linux bergantung pada pilihan\n"
 "pengguna:\n"
 "\n"
 " * Jika Anda memilih menggunakan bahasa dengan enkoding yang kuat (bahasa\n"
@@ -5485,7 +5490,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"
@@ -5506,11 +5511,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 ""
 "Sekarang, waktunya memilih sistem pencetakan untuk komputer Anda. Sistem\n"
-"operasi lain mungkin menawarkan satu, tetapi Mandrivalinux menawarkan dua.\n"
+"operasi lain mungkin menawarkan satu, tetapi Mandriva Linux menawarkan dua.\n"
 "Setiap sistem pencetakan sesuai untuk jenis konfigurasi tertentu.\n"
 "\n"
 " * \"%s\" - yang merupakan akronim untuk ``print, tidak ada antrian'',\n"
@@ -5648,7 +5653,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"
@@ -5665,7 +5671,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"
@@ -5716,7 +5722,7 @@ msgstr ""
 "\n"
 " * \"%s\": jika Anda hendak mengkonfigurasi akses jaringan Internet\n"
 "atau lokal Anda, Anda bisa melakukannya sekarang. Lihat dokumentasi\n"
-"cetak atau gunakan Pusat Kontrol Mandrivalinux setelah installasi\n"
+"cetak atau gunakan Pusat Kontrol Mandriva Linux setelah installasi\n"
 "selesai untuk mengambil keuntungan dari bantuannya.\n"
 "\n"
 " * \"%s\": mengijinkan Anda mengkonfigurasi alamat proxy HTTP dan\n"
@@ -5733,7 +5739,7 @@ msgstr ""
 " * \"%s\": jika Anda hendak merubah konfigurasi bootloader Anda, klik\n"
 "tombol ini. Opsi ini ditujukan untuk pengguna tingkat lanjut. Lihat\n"
 "dokumentasi cetak atau bantuan tentang konfigurasi bootloader pada \n"
-"Pusat Kontrol Mandrivalinux.\n"
+"Pusat Kontrol Mandriva Linux.\n"
 "\n"
 " * \"%s\": melalui daftar ini Anda bisa menentukan layanan apa yang\n"
 "akan dijalankan pada komputer Anda. Jika Anda berencana untuk memakai\n"
@@ -5795,10 +5801,10 @@ msgstr "Layanan"
 #, 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 ""
-"Pilih harddrive yang akan dihapus untuk menginstall partisi Mandrivalinux\n"
+"Pilih harddrive yang akan dihapus untuk menginstall partisi Mandriva Linux\n"
 "baru Anda. Hati-hati, semua data pada drive ini akan hilang dan\n"
 "tidak dapat dikembalikan seperti semula!"
 
@@ -6150,11 +6156,11 @@ msgstr "Menghitung ukuran partisi Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Partisi Windows Anda terlalu terfragmen. Harap reboot komputer Anda pada "
-"Windows, jalankan utilitas ``defrag'', lalu ulangi installasi Mandrivalinux."
+"Windows, jalankan utilitas ``defrag'', lalu ulangi installasi Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6271,13 +6277,13 @@ msgstr "Menonaktifkan jaringan"
 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"
@@ -6331,7 +6337,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"
@@ -6368,7 +6374,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"
@@ -6592,8 +6598,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"
@@ -6601,13 +6607,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 ""
 "Selamat, installasi selesai.\n"
 "Ambil media boot dan tekan Return/Enter untuk reboot.\n"
 "\n"
 "\n"
-"Untuk informasi perbaikan yang tersedia untuk rilis Mandrivalinux\n"
+"Untuk informasi perbaikan yang tersedia untuk rilis Mandriva Linux\n"
 "ini, silakan lihat Errata yang tersedia pada:\n"
 "\n"
 "\n"
@@ -6615,13 +6621,13 @@ msgstr ""
 "\n"
 "\n"
 "Informasi tentang konfigurasi sistem tersedia pada bab Pasca\n"
-"Installasi di Panduan Pengguna Resmi Linux Mandrivalinux."
+"Installasi di Panduan Pengguna Resmi Linux 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
@@ -6650,12 +6656,12 @@ msgstr "Memasuki langkah `%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 ""
 "Sumber daya sistem Anda rendah. Anda akan mengalami kesulitan\n"
-"menginstall Mandrivalinux. Jika terjadi, Anda bisa mencoba\n"
+"menginstall Mandriva Linux. Jika terjadi, Anda bisa mencoba\n"
 "installasi berbasis teks. Untuk melakukannya, tekan `F1' saat\n"
 "booting pada CDROM, lalu ketikkan `text'."
 
@@ -7192,8 +7198,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
-msgstr "Menghubungi situs Mandrivalinux untuk mengambil daftar mirror..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr "Menghubungi situs Mandriva Linux untuk mengambil daftar mirror..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7416,8 +7422,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Installasi Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Installasi Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10225,13 +10231,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 ""
 "konfigurator drakfirewall\n"
 "\n"
-"Program ini mengkonfigurasi firewall pribadi untuk Mandrivalinux.\n"
+"Program ini mengkonfigurasi firewall pribadi untuk Mandriva Linux.\n"
 "Untuk membuat solusi firewall yang lebih baik, cobalah\n"
 "distribusi khusus MandrakeSecurity Firewall"
 
@@ -14272,12 +14278,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 ""
-"Jalankan Scannerdrake (Perangkat Lunak/Scanner pada Pusat Kontrol "
-"Mandrivalinux) untuk berbagi scanner pada jaringan.\n"
+"Jalankan Scannerdrake (Perangkat Lunak/Scanner pada Pusat Kontrol Mandriva "
+"Linux) untuk berbagi scanner pada jaringan.\n"
 
 #: printer/printerdrake.pm:3933
 #, c-format
@@ -16190,33 +16196,33 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Apa itu Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Apa itu Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Selamat Datang di <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Selamat Datang di <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 adalah sebuah <b>distribusi Linux</b> yang menggabungkan inti "
+"Mandriva Linux adalah sebuah <b>distribusi Linux</b> yang menggabungkan inti "
 "sistem, yang disebut <b>sistem operasi</b> (berbasiskan kernel Linux) dengan "
 "<b>banyak aplikasi</b> yang sesuai kebutuhan Anda."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"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 juga merupakan distribusi Linux paling <b>ramah pengguna</b>. "
+"Mandriva Linux juga merupakan distribusi Linux paling <b>ramah pengguna</b>. "
 "Ia juga merupakan distribusi Linux yang <b>paling banyak digunakan</b>!"
 
 #: share/advertising/02.pl:13
@@ -16232,14 +16238,14 @@ msgstr "Selamat datang di <b>dunia 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 berkomitmen dengan model open source. Hal ini berarti rilis "
+"Mandriva Linux berkomitmen dengan model open source. Hal ini berarti rilis "
 "baru adalah hasil <b>kolaborasi</b> antara <b>tim pengembang Mandriva</b> "
-"dengan <b>komunitas</b> kontributor Mandrivalinux."
+"dengan <b>komunitas</b> kontributor Mandriva Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16258,11 +16264,11 @@ 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 ""
 "Sebagian besar perangkat lunak yang disertakan pada distribusi ini dan semua "
-"perkakas Mandrivalinux berada dibawah lisensi <b>General Public License</b>."
+"perkakas Mandriva Linux berada dibawah lisensi <b>General Public License</b>."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16292,25 +16298,25 @@ msgstr "<b>Bergabung dengan Komunitas</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 memiliki salah satu <b>komunitas terbesar</b> dari pengguna "
+"Mandriva Linux memiliki salah satu <b>komunitas terbesar</b> dari pengguna "
 "dan pengembang. Fungsi dari komunitas sangatlah luas, mulai dari pelaporan "
 "kesalahan hingga pengembangan aplikasi baru. Komunitas memainkan <b>peran</"
-"b> dalam dunia Mandrivalinux."
+"b> dalam dunia 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 ""
 "Untuk <b>mempelajari lebih lanjut</b> tentang komunitas dinamis kami, "
-"silahkan kunjungi <b>www.mandrakelinux.com</b> atau <b>www.mandrakelinux.com/"
+"silahkan kunjungi <b>www.mandrivalinux.com</b> atau <b>www.mandrivalinux.com/"
 "en/cookerdevel.php3</b> jika Anda ingin <b>terlibat</b> pada pengembangan."
 
 #: share/advertising/05.pl:15
@@ -16321,10 +16327,10 @@ msgstr "<b>Versi Download</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 ""
-"Saat ini Anda akan menginstall <b>Mandrivalinux Versi Download</b>. Ini "
+"Saat ini Anda akan menginstall <b>Mandriva Linux Versi Download</b>. Ini "
 "merupakan versi gratis yang <b>tersedia untuk semua</b>."
 
 #: share/advertising/05.pl:19
@@ -16368,8 +16374,8 @@ msgstr "<b>Discovery, Desktop Linux Pertama Anda</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Anda sekarang akan menginstall <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Anda sekarang akan menginstall <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16391,8 +16397,8 @@ msgstr "<b>PowerPack, Desktop Linux Handal</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Anda akan menginstall <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Anda akan menginstall <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16412,8 +16418,8 @@ msgstr "<b>PowerPack+, Solusi Linux untuk Desktop dan Server</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Anda akan menginstall <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Anda akan menginstall <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16435,14 +16441,14 @@ msgstr "<b>Produk 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> telah mengembangkan produk <b>Mandrivalinux</b> yang luas."
+"<b>Mandriva</b> telah mengembangkan produk <b>Mandriva Linux</b> yang luas."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Produk Mandrivalinux adalah:"
+msgid "The Mandriva Linux products are:"
+msgstr "Produk Mandriva Linux adalah:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16462,10 +16468,10 @@ msgstr "\t* <b>PowerPack+</b>, Solusi Linux untuk Desktop dan 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 untuk x86-64</b>, Solusi Mandrivalinux untuk "
+"\t* <b>Mandriva Linux untuk x86-64</b>, Solusi Mandriva Linux untuk "
 "memaksimalkan prosesor 64-bit Anda."
 
 #: share/advertising/10.pl:15
@@ -16476,29 +16482,29 @@ msgstr "<b>Produk Mandriva (Produk 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 telah mengembangan dua produk yang mengijinkan Anda menggunakan "
-"Mandrivalinux <b>pada sembarang komputer</b> dan tanpa harus menginstallnya:"
+"Mandriva Linux <b>pada sembarang komputer</b> dan tanpa harus menginstallnya:"
 
 #: 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>, distribusi Mandrivalinux yang berjalan sepenuhnya melalui "
+"\t* <b>Move</b>, distribusi Mandriva Linux yang berjalan sepenuhnya melalui "
 "CD-ROM bootable."
 
 #: 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>, distribusi Mandrivalinux yang terinstall pada ultra-"
-"compact “LaCie Mobile Hard Drive”."
+"\t* <b>GlobeTrotter</b>, distribusi Mandriva Linux yang terinstall pada "
+"ultra-compact “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
 #, c-format
@@ -16516,18 +16522,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 untuk Bisnis."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Desktop Mandriva Linux untuk Bisnis."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Solusi Server Mandrivalinux."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Solusi Server 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>, Solusi Keamanan Mandrivalinux."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, Solusi Keamanan Mandriva Linux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16726,10 +16734,10 @@ msgstr "<b>Menikmati Aplikasi yang Luas</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 ""
-"Pada menu Mandrivalinux Anda akan menemukan aplikasi <b>mudah digunakan</b> "
+"Pada menu Mandriva Linux Anda akan menemukan aplikasi <b>mudah digunakan</b> "
 "untuk <b>semua tugas Anda</b>:"
 
 #: share/advertising/18.pl:16
@@ -16995,18 +17003,18 @@ msgstr "\t* <b>Postfix</b> dan <b>Sendmail</b>: server mail paling populer."
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Pusat Kontrol Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Pusat Kontrol 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>Pusat Kontrol Mandrivalinux</b> adalah kumpulan koleksi penting dari "
-"utilitas khusus Mandrivalinux yang didesain untuk mempermudah konfigurasi "
+"<b>Pusat Kontrol Mandriva Linux</b> adalah kumpulan koleksi penting dari "
+"utilitas khusus Mandriva Linux yang didesain untuk mempermudah konfigurasi "
 "komputer Anda."
 
 #: share/advertising/25.pl:17
@@ -17031,15 +17039,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 ""
 "Seperti semua pemrograman komputer, perangkat lunak open source "
 "<b>membutuhkan waktu dan orang</b> untuk pengembangan. Untuk menghargai "
 "filosofi open source, Mandriva menjual produk dan layanan yang bernilai "
-"lebih untuk <b>meningkatkan Mandrivalinux</b>. Jika Anda ingin <b>mendukung "
-"filosofi open source</b> dan pengembangan dari Mandrivalinux, <b>silahkan</"
+"lebih untuk <b>meningkatkan Mandriva Linux</b>. Jika Anda ingin <b>mendukung "
+"filosofi open source</b> dan pengembangan dari Mandriva Linux, <b>silahkan</"
 "b> mempertimbangkan untuk membeli salah satu produk atau layanan kami!"
 
 #: share/advertising/27.pl:13
@@ -17074,8 +17082,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Berkunjunglah sekarang pada <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Berkunjunglah sekarang pada <b>store.mandriva.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -17085,11 +17093,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> adalah <b>pelengkap sempurna</b> untuk produk "
-"Mandrivalinux Anda..."
+"<b>Mandriva Club</b> adalah <b>pelengkap sempurna</b> untuk produk Mandriva "
+"Linux Anda..."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -17103,10 +17111,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>Potongan khusus</b> untuk produk dan layanan pada toko online "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -17118,17 +17126,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Partisipasi pada <b>forum pengguna</b> Mandrivalinux."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Partisipasi pada <b>forum pengguna</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>Akses cepat dan khusus</b>, sebelum rilis publik, untuk <b>citra ISO</"
-"b> Mandrivalinux."
+"b> Mandriva Linux."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -17148,10 +17156,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 menawarkan layanan yang luas untuk <b>kemudahan update</b> "
-"dari sistem Mandrivalinux Anda:"
+"dari sistem Mandriva Linux Anda:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17175,9 +17183,9 @@ msgstr "\t* Update <b>terjadwal</b> yang fleksibel."
 #: 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* Pengelolaan <b>semua sistem Mandrivalinux Anda</b> dengan satu account."
+"\t* Pengelolaan <b>semua sistem Mandriva Linux Anda</b> dengan satu account."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -17188,27 +17196,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 ""
 "Apakah Anda membutuhkan <b>asisten?</b> Temukan teknisi ahli Mandriva pada "
-"<b>platform dukungan teknis kami</b> www.mandrakeexpert.com."
+"<b>platform dukungan teknis kami</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 ""
-"Terima kasih kepada bantuan dari <b>ahli berkualitas Mandrivalinux</b>, Anda "
-"akan menghemat banyak waktu."
+"Terima kasih kepada bantuan dari <b>ahli berkualitas Mandriva Linux</b>, "
+"Anda akan menghemat banyak waktu."
 
 #: 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 ""
-"Untuk sembarang pertanyaan yang berhubungan dengan Mandrivalinux, Anda "
+"Untuk sembarang pertanyaan yang berhubungan dengan Mandriva Linux, Anda "
 "memiliki kesempatan untuk membeli dukungan insiden pada <b>store."
 "mandrakesoft.com</b>."
 
@@ -17596,8 +17604,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 ""
 "[OPSI] [NAMA_PROGRAM]\n"
 "\n"
@@ -17658,7 +17666,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"
@@ -20500,13 +20508,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Perkakas Pelapor Kesalahan Mandrivalinux"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Perkakas Pelapor Kesalahan Mandriva Linux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Pusat Kontrol Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Pusat Kontrol Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20997,19 +21005,19 @@ msgstr "Dijalankan saat boot"
 #, 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 ""
 "Antarmuka ini belum terkonfigurasi.\n"
-"Jalankan asisten \"Tambahkan antarmuka\" dari Pusat Kontrol Mandrivalinux"
+"Jalankan asisten \"Tambahkan antarmuka\" dari Pusat Kontrol 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 ""
 "Anda tidak memiliki koneksi Internet yang terkonfigurasi.\n"
-"Jalankan asisten \"%s\" dari Pusat Kontrol Mandrivalinux"
+"Jalankan asisten \"%s\" dari Pusat Kontrol Mandriva Linux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21059,8 +21067,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 +21371,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 ""
 "Hak Cipta (C) 2001-2002 oleh Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versi orisinal)\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
@@ -21948,8 +21956,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Pusat Bantuan Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Pusat Bantuan Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22615,7 +22623,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 ""
 "Tidak ada Kartu Suara yang terdeteksi. Pastikan Kartu Suara yang didukung "
 "Linux terhubung dengan benar.\n"
@@ -22624,7 +22632,7 @@ msgstr ""
 "Anda bisa mengunjungi database perangkat keras kami pada:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24648,7 +24656,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 ""
 "Tidak ada Kartu TV yang terdeteksi. Pastikan Kartu Video/TV yang didukung "
 "Linux terhubung dengan benar.\n"
@@ -24657,7 +24665,7 @@ msgstr ""
 "Kunjungi database perangkat keras kami di:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25366,13 +25374,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 ""
 "Ini adalah HardDrake, perkakas konfigurasi perangkat keras %s.\n"
 "<span foreground=\"royalblue3\">Versi:</span> %s\n"
 "<span foreground=\"royalblue3\">Penulis:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25480,8 +25488,8 @@ msgstr "Perubahan selesai, tetapi agar efektif, Anda harus logout"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Log Perkakas Mandrivalinux"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Log Perkakas Mandriva Linux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -26004,10 +26012,10 @@ msgstr "Koneksi selesai."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Koneksi gagal.\n"
-"Periksa konfigurasi Anda pada Pusat Kontrol Mandrivalinux."
+"Periksa konfigurasi Anda pada Pusat Kontrol Mandriva Linux."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/is.po b/perl-install/share/po/is.po
index 13ed89029..c5f1fbf01 100644
--- a/perl-install/share/po/is.po
+++ b/perl-install/share/po/is.po
@@ -1298,11 +1298,11 @@ msgstr "Tungumálaval"
 #: 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 getur stutt mörg tungumál.  Veldu tungumál\n"
+"Mandriva Linux getur stutt mörg tungumál.  Veldu tungumál\n"
 "sem þú vilt setja upp stuðning fyrir.  Þau verða tiltæk þegar\n"
 "uppsetningu er lokið. og þú endurræsir kerfið."
 
@@ -3712,12 +3712,12 @@ msgstr "virkja útvarps stuðning"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
 "Áður en þú heldur áfram, ættir þú að lesa vandlega leyfisskilmálana. Þeir\n"
-"taka yfir alla Mandrivalinux dreifinguna. Ef þú er samþykk(ur) öllum þeim\n"
+"taka yfir alla Mandriva Linux dreifinguna. Ef þú er samþykk(ur) öllum þeim\n"
 "skilmáum sem þar standa, krossaðu þá við í \"%s\" reitinn, ef ekki\n"
 "smelltu þá á \"%s\" hnappinn sem mun endurræsa tölvuna þína."
 
@@ -3897,13 +3897,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The 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 uppsetningunni er dreift á nokkra geisladiska. Ef valinn\n"
+"Mandriva Linux uppsetningunni er dreift á nokkra geisladiska. Ef valinn\n"
 "pakki er á öðrum geisladiski, þá mun DrakX spýta út núverandi diski\n"
 "og biðja þig um að setja inn rétta diskinn. Ef þú hefur ekki rétta diskinn "
 "við\n"
@@ -3914,11 +3914,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"
@@ -3971,10 +3972,10 @@ msgid ""
 msgstr ""
 "Nú er tími til að skilgreina hvaða forrit þú vilt að séu sett upp á kerfinu "
 "þínu.\n"
-"Það eru þúsundir pakka til fyrir Mandrivalinux, og til að einfalda\n"
+"Það eru þúsundir pakka til fyrir Mandriva Linux, og til að einfalda\n"
 "umsjón pakkanna hafa þeir verið flokkaðir í hópa af svipuðum forritum.\n"
 "\n"
-"Mandrivalinux skiptir pökkunum í fjóra flokka. Þú getur blandað saman\n"
+"Mandriva Linux skiptir pökkunum í fjóra flokka. Þú getur blandað saman\n"
 "pökkum úr mismunandi flokkkum svo að ``Vinnustöðvar'' uppsetning\n"
 "getur innihaldið forrit úr ``Miðlara'' flokknum.\n"
 "\n"
@@ -4080,10 +4081,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"
@@ -4114,7 +4115,7 @@ msgstr ""
 "!! Ef miðlara-pakki hefur verið valinn, annað hvort af því að þú valdir "
 "stakan\n"
 "pakka eða hann var hluti af hóp, verður þú beðinn um að staðfesta að\n"
-"þú viljir fá þessa miðlara uppsetta. Sjálfgefið mun Mandrivalinux ræsa "
+"þú viljir fá þessa miðlara uppsetta. Sjálfgefið mun Mandriva Linux ræsa "
 "allar\n"
 "uppsettar þjónustur og miðlara við kerfisræsingu. Jafnvel þó að þeir séu\n"
 "öruggir og engar þekktar villur þegar kerfinu var dreift þá er möguleiki að\n"
@@ -4276,7 +4277,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"
@@ -4390,12 +4391,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"
@@ -4422,7 +4423,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"
@@ -4431,7 +4432,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"
@@ -4560,7 +4562,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"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."
@@ -4578,7 +4580,7 @@ msgstr "Fyrra"
 #: 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"
@@ -4607,7 +4609,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"
@@ -4623,7 +4625,7 @@ msgstr "Öryggisfulltrúi"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4710,7 +4712,7 @@ msgstr "Víxla milli venjulegs/sérfræðings-hams"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4741,7 +4743,7 @@ msgstr ""
 "Fleiri en ein Microsoft disksneið hefur fundist á harða disknum.\n"
 "Vinsamlega veldu hverja þeirra þú vilt breyta stærðinni á til að geta sett "
 "upp\n"
-"nýja Mandrivalinux stýrikerfið.\n"
+"nýja Mandriva Linux stýrikerfið.\n"
 "\n"
 "Hver sneið á listanum inniheldur \"Linux nafn\", \"Windows nafn\" \"Diskrýmd"
 "\".\n"
@@ -4787,7 +4789,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"
@@ -4796,13 +4798,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
@@ -4843,7 +4846,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"
@@ -5002,7 +5006,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"
@@ -5023,7 +5027,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 ""
 
@@ -5146,7 +5150,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"
@@ -5163,7 +5168,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"
@@ -5285,11 +5290,11 @@ msgstr "Þjónustur"
 #, 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 ""
 "Veldu harða diskinn sem þú vilt hreinsa allt af til að setja upp nýja\n"
-"Mandrivalinux disksneið.  Varúð, öllum gögnum á disknum verður\n"
+"Mandriva Linux disksneið.  Varúð, öllum gögnum á disknum verður\n"
 "eytt, og það er ekki hægt að sækja þau aftur!"
 
 #: help.pm:863
@@ -5632,7 +5637,7 @@ msgstr "Reikna stærð Windows disksneiðar"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 
@@ -5750,13 +5755,13 @@ msgstr "Keyri niður netið"
 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"
@@ -5785,8 +5790,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 "
@@ -5800,8 +5805,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 "
@@ -5810,7 +5815,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"
@@ -5844,10 +5849,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"
@@ -5920,8 +5925,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"
@@ -5929,27 +5934,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 ""
 "Til hamingju! Innsetningu er lokið.\n"
 "Taktu disklinginn eða geisladiskinn úr drifinu og sláðu á ENTER.\n"
 "\n"
 "\n"
 "viðbætur og/eða lagfæringar á göllum sem gætu verið til\n"
-"staðar í þessari útgáfu af Mandrivalinux má finna á \n"
+"staðar í þessari útgáfu af Mandriva Linux má finna á \n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Frekari upplýsingar um hvernig á að stilla vélina eftir innsetninguna er að\n"
-"finna í viðeigandi kafla í Official Mandrivalinux User's Guide bókinni."
+"finna í viðeigandi kafla í Official Mandriva Linux User's Guide bókinni."
 
 #. -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
@@ -5978,7 +5983,7 @@ msgstr "Hef skref `%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 ""
@@ -6516,9 +6521,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 ""
-"Hef samband við Mandrivalinux vefinn til að sækja lista yfir fáanlega "
+"Hef samband við Mandriva Linux vefinn til að sækja lista yfir fáanlega "
 "spegla..."
 
 #: install_steps_interactive.pm:840
@@ -6738,8 +6743,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux innsetning %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux innsetning %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9321,13 +9326,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 stillingar\n"
 "\n"
-"Þessi eining stillir prívat eldvegg fyrir þessa Mandrivalinux vél\n"
+"Þessi eining stillir prívat eldvegg fyrir þessa Mandriva Linux vél\n"
 "Fyrir öruggan og aflmikinn eldvegg líttu á hina sértæku\n"
 "Mandrake eldveggs útgáfu."
 
@@ -13015,8 +13020,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 ""
 
@@ -14763,18 +14768,18 @@ msgstr "Stöðva"
 
 #: 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 "Velkomin(n) í <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Velkomin(n) í <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."
@@ -14783,7 +14788,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 ""
 
@@ -14800,9 +14805,9 @@ msgstr "Velkomin í <b>heim opins hugbúnaðar</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 ""
 
@@ -14821,8 +14826,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
@@ -14848,17 +14853,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 ""
 
@@ -14870,7 +14875,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 ""
 
@@ -14908,7 +14913,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
@@ -14927,7 +14932,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
@@ -14945,7 +14950,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
@@ -14965,13 +14970,12 @@ msgstr "<b>Mandriva vörur</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
@@ -14992,7 +14996,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 ""
 
@@ -15004,21 +15008,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 ""
 
@@ -15030,23 +15034,25 @@ msgstr ""
 #: 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 ""
 
 #: 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
@@ -15222,7 +15228,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 ""
 
@@ -15457,14 +15463,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux Stjórnborð</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux Stjórnborð</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 ""
 
@@ -15487,8 +15493,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 ""
 
@@ -15500,8 +15506,8 @@ msgstr "<b>Vefverslun</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 ""
 
 #: share/advertising/27.pl:17
@@ -15518,7 +15524,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
@@ -15529,7 +15535,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 ""
 
@@ -15543,7 +15549,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
@@ -15555,14 +15561,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
@@ -15581,7 +15587,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
@@ -15604,7 +15610,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
@@ -15616,21 +15622,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
@@ -15985,8 +15991,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
@@ -16022,7 +16028,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"
@@ -16069,16 +16075,16 @@ 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"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPTION]...\n"
-"  --no-confirmation      Ekki biðja um staðfestingu í upphafi "
-"Mandriva Update\n"
+"  --no-confirmation      Ekki biðja um staðfestingu í upphafi Mandriva "
+"Update\n"
 "  --no-verify-rpm        Ekki staðfesta undiskriftir pakka\n"
 "  --changelog-first      Birta breytingalista á undan skráarlista í "
 "lýsingaglugga\n"
@@ -18553,13 +18559,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux villutilkynningar-tól"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux villutilkynningar-tól"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux Stjórnborð"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux Stjórnborð"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19041,19 +19047,19 @@ msgstr "Virkjað við ræsingu"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Þetta nettengi hefur ekki verið stillt enn.\n"
-"Keyrið \"Bæta við tengingu\" aðstoðarálfinn frá Mandrivalinux stjórnborðinu"
+"Keyrið \"Bæta við tengingu\" aðstoðarálfinn frá Mandriva Linux stjórnborðinu"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Þú hefur ekki skilgreint neina internettengingu.\n"
-"Keyrið \"%s\" aðstoðarálfinn frá Mandrivalinux stjórnborðinu"
+"Keyrið \"%s\" aðstoðarálfinn frá Mandriva Linux stjórnborðinu"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -19103,8 +19109,8 @@ msgstr "KDM (KDE gluggastjóri)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Mandrivalinux gluggastjóri)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Mandriva Linux gluggastjóri)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -19410,18 +19416,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 ""
 "Höfundaréttur (C) 2001-2002 hjá Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (upprunaleg útgáfa)\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
@@ -19949,8 +19955,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux hjálp"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux hjálp"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -20565,7 +20571,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 ""
 "Ekkert hljóðkort hefur fundist á tölvunni þinni. Vinssamlega athugaðu hvort "
 "hljóðkort sem stutt er af Linux sé rétt sett tengt. \n"
@@ -20573,7 +20579,7 @@ msgstr ""
 "Þú getur leitað í vélbúnaðargagnagrunni á:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -22394,7 +22400,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 ""
 "Ekkert sjónvrpskort hefur fundist á vélinni þinni.  Vinsamlega athugið hvort "
 "sjónvarpskort sem stutt er af Linux sé rétt tengt og uppsett.\n"
@@ -22403,7 +22409,7 @@ msgstr ""
 "Þú getur leitað í vélbúnaðargagnagrunni á:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -23110,13 +23116,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 ""
 "Þetta er HardDrake, vélbúnaðarstillitól %s.\n"
 "<span foreground=\"royalblue3\">Útgáfa:</span> %s\n"
 "<span foreground=\"royalblue3\">Höfundur:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -23226,8 +23232,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinux tólaannálar"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linux tólaannálar"
 
 #: standalone/logdrake:51
 #, c-format
@@ -23737,10 +23743,10 @@ msgstr "Tenging uppsett."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Tenging mistókst\n"
-"Athugaðu uppsetninguna í Mandrivalinux stjórnborði."
+"Athugaðu uppsetninguna í Mandriva Linux stjórnborði."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -24605,7 +24611,6 @@ msgstr "Innsetning mistókst"
 #~ msgid "You've not selected any font"
 #~ msgstr "Þú hefur ekki valið neitt letur"
 
-
 #~ msgid ""
 #~ "No browser is installed on your system, Please install one if you want to "
 #~ "browse the help system"
@@ -24701,16 +24706,16 @@ msgstr "Innsetning mistókst"
 #~ msgstr "Villa við að opna %s til skriftar: %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 ""
-#~ "Þetta er HardDrake, vélbúnaðarstillitól Mandrivalinux.\n"
+#~ "Þetta er HardDrake, vélbúnaðarstillitól Mandriva Linux.\n"
 #~ "<span foreground=\"royalblue3\">Útgáfa:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Höfundur:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 
 #~ msgid "OK"
@@ -25092,7 +25097,6 @@ msgstr "Innsetning mistókst"
 #~ msgid "mkraid failed"
 #~ msgstr "mkraid mistókst"
 
-
 #~ msgid ""
 #~ "Connection failed.\n"
 #~ "Verify your configuration in the Mandrake Control Center."
diff --git a/perl-install/share/po/it.po b/perl-install/share/po/it.po
index 201c50900..d7ac462c0 100644
--- a/perl-install/share/po/it.po
+++ b/perl-install/share/po/it.po
@@ -1322,11 +1322,11 @@ msgstr "Scelta della lingua"
 #: 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 può gestire più di una lingua.\n"
+"Mandriva Linux può gestire più di una lingua.\n"
 "Seleziona le lingue da installare. Esse saranno disponibili\n"
 "quando riavvierai il sistema alla fine dell'installazione."
 
@@ -3757,12 +3757,12 @@ msgstr "abilita il supporto radio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
 "Prima di proseguire dovresti leggere con attenzione le condizioni d'uso che\n"
-"riguardano l'intera distribuzione Mandrivalinux. Se sei d'accordo con\n"
+"riguardano l'intera distribuzione Mandriva Linux. Se sei d'accordo con\n"
 "tutti i termini della licenza clicca sul pulsante \"%s\". In caso contrario\n"
 "ti basterà un clic sul pulsante \"%s\" per riavviare il computer."
 
@@ -3874,7 +3874,7 @@ msgid "Advanced"
 msgstr "Avanzato"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:54
 #, c-format
 msgid ""
@@ -3943,17 +3943,17 @@ msgstr ""
 "etc."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/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 ""
-"La distribuzione Mandrivalinux è suddivisa su più CD-ROM. Se uno dei\n"
+"La distribuzione Mandriva Linux è suddivisa su più CD-ROM. Se uno dei\n"
 "pacchetti selezionati si trova su un CD-ROM diverso da quello attualmente\n"
 "inserito nel lettore, DrakX provvederà a espellerlo e a chiedervi di\n"
 "inserire quello corretto. Se non avete a portata di mano il CD richiesto,\n"
@@ -3961,16 +3961,17 @@ msgstr ""
 "installati."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/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"
@@ -4023,7 +4024,7 @@ msgid ""
 msgstr ""
 "Adesso è il momento di indicare i programmi che volete siano installati sul\n"
 "vostro sistema. Ci sono migliaia di pacchetti disponibili per\n"
-"Mandrivalinux, e sono stati suddivisi in gruppi in base al loro campo di\n"
+"Mandriva Linux, e sono stati suddivisi in gruppi in base al loro campo di\n"
 "utilizzo, in modo da facilitarne la gestione.\n"
 "\n"
 "I gruppi sono a loro volta suddivisi in quattro categorie. Potete\n"
@@ -4123,7 +4124,7 @@ msgid "Truly minimal install"
 msgstr "Installazione veramente minimale"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:149
 #, c-format
 msgid ""
@@ -4138,10 +4139,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default 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 ""
 "!! Se avete selezionato un pacchetto che offre un servizio come server\n"
 "(intenzionalmente, oppure perché faceva parte di un gruppo), vi verrà\n"
 "chiesta conferma per la sua effettiva installazione. Come opzione\n"
-"predefinita, in Mandrivalinux tutti i servizi installati vengono attivati\n"
+"predefinita, in Mandriva Linux tutti i servizi installati vengono attivati\n"
 "automaticamente all'avvio. Sebbene si tratti di servizi sicuri ed esenti da\n"
 "problemi noti al momento del rilascio della distribuzione, non è escluso\n"
 "che possano essere scoperte falle di sicurezza al loro interno dopo la\n"
-"pubblicazione di questa versione di Mandrivalinux. Quindi, se non avete\n"
+"pubblicazione di questa versione di Mandriva Linux. Quindi, se non avete\n"
 "idea di cosa faccia un particolare servizio o del perché debba essere\n"
 "installato, cliccate su \"%s\". Scegliendo \"%s\", invece, i servizi\n"
 "elencati saranno installati e attivati in automatico all'avvio del sistema.\n"
@@ -4206,7 +4207,7 @@ msgid "Automatic dependencies"
 msgstr "Dipendenze automatiche"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:183
 #, c-format
 msgid ""
@@ -4229,7 +4230,7 @@ msgid "Configure"
 msgstr "Configura"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:189
 #, c-format
 msgid ""
@@ -4269,7 +4270,7 @@ msgstr ""
 "veramente bisogno. !!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:206
 #, c-format
 msgid ""
@@ -4313,7 +4314,7 @@ msgid "Automatic time synchronization"
 msgstr "Sincronizzazione automatica dell'orario"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:220
 #, c-format
 msgid ""
@@ -4339,13 +4340,13 @@ msgstr ""
 "adatta alle vostre necessità."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/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"
@@ -4401,7 +4402,7 @@ msgid ""
 msgstr ""
 "X (abbreviazione per \"X Window System\") è il cuore dell'interfaccia\n"
 "grafica di GNU/Linux, sul quale sono basati tutti gli ambienti grafici\n"
-"inclusi in Mandrivalinux (KDE, GNOME, AfterStep, WindowMaker, etc.).\n"
+"inclusi in Mandriva Linux (KDE, GNOME, AfterStep, WindowMaker, etc.).\n"
 "\n"
 "Vi verrà mostrata una lista dei parametri da configurare in modo da avere\n"
 "la miglior visualizzazione possibile:\n"
@@ -4493,7 +4494,7 @@ msgstr ""
 "anteprima della configurazione selezionata."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:303
 #, c-format
 msgid ""
@@ -4506,7 +4507,7 @@ msgstr ""
 "adatta alle vostre necessità."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:308
 #, c-format
 msgid ""
@@ -4525,16 +4526,16 @@ msgstr ""
 "riusciti a configurare correttamente il server grafico."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/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"
@@ -4561,7 +4562,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"
@@ -4570,7 +4571,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"
@@ -4591,12 +4593,12 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "A questo punto dovete scegliere in quali punti del vostro disco rigido\n"
-"installare il sistema operativo Mandrivalinux. Se il disco è vuoto, o se\n"
+"installare il sistema operativo Mandriva Linux. Se il disco è vuoto, o se\n"
 "tutto lo spazio disponibile è occupato da un altro sistema operativo già\n"
 "installato, allora dovrete creare o modificare le partizioni. In breve,\n"
 "partizionare un disco rigido consiste nel suddividerlo logicamente in più\n"
 "zone in maniera da creare lo spazio necessario all'installazione di\n"
-"Mandrivalinux.\n"
+"Mandriva Linux.\n"
 "\n"
 "Dato che gli effetti del partizionamento sono di solito irreversibili, e\n"
 "possono causare la perdita di dati, questa operazione può intimidire e\n"
@@ -4627,7 +4629,7 @@ msgstr ""
 "dati, a patto che prima di procedere la partizione Windows sia stata\n"
 "deframmentata. Vi consigliamo caldamente di fare comunque una copia di\n"
 "sicurezza dei vostri dati. Questa è la soluzione consigliata se desiderate\n"
-"usare sia Mandrivalinux che Microsoft Windows sullo stesso computer.\n"
+"usare sia Mandriva Linux che Microsoft Windows sullo stesso computer.\n"
 "\n"
 "   Prima di scegliere questa opzione, tenete presente che le dimensioni\n"
 "della partizione su cui risiede Windows saranno ridotte rispetto a quelle\n"
@@ -4636,7 +4638,7 @@ msgstr ""
 "\n"
 " * \"%s\": se desiderate cancellare tutti i dati e tutte le partizioni\n"
 "presenti sul vostro disco rigido e rimpiazzarli con il vostro nuovo sistema\n"
-"Mandrivalinux, potete selezionare questa opzione. Fate molta attenzione,\n"
+"Mandriva Linux, potete selezionare questa opzione. Fate molta attenzione,\n"
 "perché dopo aver dato conferma non potrete più tornare indietro.\n"
 "\n"
 "   !! Se scegliete questa opzione tutti i dati sul vostro disco saranno\n"
@@ -4689,7 +4691,7 @@ msgid "Custom disk partitioning"
 msgstr "Partizionamento personalizzato"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:377
 #, c-format
 msgid ""
@@ -4788,7 +4790,7 @@ msgid "Save packages selection"
 msgstr "Salva scelta pacchetti"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:412
 #, c-format
 msgid ""
@@ -4809,7 +4811,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."
@@ -4831,7 +4833,7 @@ msgstr ""
 "Cliccate su \"%s\" quando siete pronti ad avviare la formattazione.\n"
 "\n"
 "Cliccate su \"%s\" se desiderate installare il vostro nuovo sistema\n"
-"operativo Mandrivalinux su partizioni diverse da quelle selezionate.\n"
+"operativo Mandriva Linux su partizioni diverse da quelle selezionate.\n"
 "\n"
 "Cliccate su \"%s\" se desiderate selezionare alcune delle partizioni\n"
 "affinché venga controllata la presenza di eventuali blocchi danneggiati su\n"
@@ -4847,11 +4849,11 @@ msgid "Previous"
 msgstr "Indietro"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/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"
@@ -4863,7 +4865,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"È molto probabile che, al momento in cui installate Mandrivalinux, alcuni\n"
+"È molto probabile che, al momento in cui installate Mandriva Linux, alcuni\n"
 "pacchetti siano stati aggiornati rispetto alla versione iniziale;\n"
 "potrebbero essere stati corretti degli errori, o risolti eventuali problemi\n"
 "relativi alla sicurezza. Per permettervi di beneficiare di questi\n"
@@ -4886,7 +4888,7 @@ msgid "Install"
 msgstr "Installa"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:447
 #, c-format
 msgid ""
@@ -4897,7 +4899,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"
@@ -4912,7 +4914,7 @@ msgstr ""
 "\n"
 "Se non sapete quale scelta fare, utilizzate l'impostazione predefinita.\n"
 "Potrete comunque cambiare in seguito il livello di sicurezza usando\n"
-"draksec, uno strumento del Mandrivalinux Control Center.\n"
+"draksec, uno strumento del Mandriva Linux Control Center.\n"
 "\n"
 "Nel campo \"%s\" inserite l'indirizzo email dell'utente che sarà\n"
 "responsabile per la sicurezza: tutti i messaggi relativi alla sicurezza\n"
@@ -4924,12 +4926,12 @@ msgid "Security Administrator"
 msgstr "Amministratore per la sicurezza"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/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"
@@ -5000,7 +5002,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "A questo punto, dovete decidere quali partizioni devono essere usate per\n"
-"l'installazione del vostro sistema Mandrivalinux. Se sono già state\n"
+"l'installazione del vostro sistema Mandriva Linux. Se sono già state\n"
 "definite delle partizioni, grazie a una precedente installazione di\n"
 "GNU/Linux o usando un altro programma di partizionamento, potete utilizzare\n"
 "quelle. In caso contrario, sarà necessario creare o modificare le\n"
@@ -5090,13 +5092,13 @@ msgid "Toggle between normal/expert mode"
 msgstr "Scambio tra modo normale e esperto"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/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"
@@ -5126,7 +5128,7 @@ msgid ""
 msgstr ""
 "Sul vostro disco rigido è stata individuata più di una partizione\n"
 "Microsoft. Scegliete quella che deve essere ridimensionata in modo da poter\n"
-"installare il vostro nuovo sistema operativo Mandrivalinux.\n"
+"installare il vostro nuovo sistema operativo Mandriva Linux.\n"
 "\n"
 "Ogni partizione è elencata in questo modo: \"nome Linux\", \"nome Windows\"\n"
 "\"Dimensione\".\n"
@@ -5155,7 +5157,7 @@ msgstr ""
 "rigido su Windows (il primo disco o partizione è denominato \"C:\")."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:564
 #, c-format
 msgid ""
@@ -5170,7 +5172,7 @@ msgstr ""
 "cliccate su \"%s\" per avere la lista completa."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:569
 #, c-format
 msgid ""
@@ -5178,7 +5180,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing 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"
@@ -5187,19 +5189,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 ""
 "Questo passo viene eseguito soltanto se sulla vostra macchina viene trovata\n"
 "una partizione GNU/Linux preesistente.\n"
 "\n"
 "A questo punto DrakX ha bisogno di sapere se intendete effettuare una nuova\n"
-"installazione o un aggiornamento di un sistema Mandrivalinux esistente:\n"
+"installazione o un aggiornamento di un sistema Mandriva Linux esistente:\n"
 "\n"
 " * \"%s\": nella maggior parte dei casi cancella completamente il vecchio\n"
 "sistema. Tuttavia, in base allo schema di partizionamento usato, potete\n"
@@ -5209,17 +5212,17 @@ msgstr ""
 "\n"
 " * \"%s\": questo tipo di installazione vi permette di effettuare un\n"
 "semplice aggiornamento dei pacchetti già installati sul vostro sistema\n"
-"Mandrivalinux. Tutte le partizioni attuali del disco rigido vengono\n"
+"Mandriva Linux. Tutte le partizioni attuali del disco rigido vengono\n"
 "conservate, come pure le configurazioni e i dati individuali degli utenti.\n"
 "La maggior parte degli altri passi relativi alla configurazione restano\n"
 "disponibili, come per una installazione normale.\n"
 "\n"
 "L'opzione \"Aggiornamento\" non dovrebbe comportare difficoltà per sistemi\n"
-"Mandrivalinux a partire dalla versione \"8.1\", mentre non è consigliabile\n"
-"utilizzarla per aggiornare versioni di Mandrivalinux precedenti la \"8.1\"."
+"Mandriva Linux a partire dalla versione \"8.1\", mentre non è consigliabile\n"
+"utilizzarla per aggiornare versioni di Mandriva Linux precedenti la \"8.1\"."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:591
 #, c-format
 msgid ""
@@ -5261,7 +5264,7 @@ msgstr ""
 "latina a quella non latina e viceversa."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:609
 #, c-format
 msgid ""
@@ -5279,7 +5282,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"
@@ -5323,7 +5327,7 @@ msgstr ""
 "Riguardo al supporto UTF-8 (Unicode): Unicode è un nuovo standard per la\n"
 "codifica dei caratteri, progettato per supportare tutte le lingue\n"
 "esistenti. Il suo supporto su GNU/Linux è ancora in fase di sviluppo, e per\n"
-"questo motivo la sua attivazione su Mandrivalinux dipenderà dalle scelte\n"
+"questo motivo la sua attivazione su Mandriva Linux dipenderà dalle scelte\n"
 "effettuate dall'utente:\n"
 "\n"
 " * se scegliete lingue fortemente legate alle vecchie codifiche (lingue del\n"
@@ -5358,7 +5362,7 @@ msgid "Espanol"
 msgstr "Spagnolo"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:650
 #, c-format
 msgid ""
@@ -5441,7 +5445,7 @@ msgid "Universal | Any PS/2 & USB mice"
 msgstr "Universale | Qualsiasi mouse PS/2 o USB"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:684
 #, c-format
 msgid ""
@@ -5452,7 +5456,7 @@ msgstr ""
 "corriponde alla \"ttyS0\" di GNU/Linux."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:688
 #, c-format
 msgid ""
@@ -5540,7 +5544,7 @@ msgid "authentication"
 msgstr "autenticazione"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:725
 #, c-format
 msgid ""
@@ -5581,12 +5585,12 @@ msgstr ""
 "consapevoli di ciò che essa comporta."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/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"
@@ -5607,11 +5611,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 ""
 "Qui potrete scegliere il sistema di stampa da usare con il vostro computer;\n"
-"altri sistemi operativi ve ne offrono uno, ma Mandrivalinux ve ne offre ben\n"
+"altri sistemi operativi ve ne offrono uno, ma Mandriva Linux ve ne offre "
+"ben\n"
 "due. Ciascuno di essi è adatto a un particolare tipo di configurazione.\n"
 "\n"
 " * \"%s\" -- che sta per \"\"print, do not queue\"\" (\"stampa, non mettere\n"
@@ -5635,7 +5640,7 @@ msgstr ""
 "\n"
 "Se fate una scelta adesso e successivamente cambiate idea, potrete sempre\n"
 "scegliere un diverso sistema di stampa avviando PrinterDrake dal\n"
-"Mandrivalinux Control Center e cliccando sul pulsante \"%s\"."
+"Mandriva Linux Control Center e cliccando sul pulsante \"%s\"."
 
 #: help.pm:765
 #, c-format
@@ -5653,7 +5658,7 @@ msgid "Expert"
 msgstr "Esperto"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:768
 #, c-format
 msgid ""
@@ -5697,7 +5702,7 @@ msgstr ""
 "scheda, dovrai specificarli manualmente."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:786
 #, c-format
 msgid ""
@@ -5717,7 +5722,7 @@ msgid "Sound card"
 msgstr "Scheda audio"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:791
 #, c-format
 msgid ""
@@ -5764,7 +5769,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"
@@ -5781,7 +5787,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"
@@ -5835,7 +5841,7 @@ msgstr ""
 "\n"
 " * \"%s\": se desiderate configurare l'accesso a Internet o a una rete\n"
 "locale potete farlo adesso. Consultate la documentazione stampata, oppure\n"
-"utilizzate il Mandrivalinux Control Center una volta terminata\n"
+"utilizzate il Mandriva Linux Control Center una volta terminata\n"
 "l'installazione per avere a vostra disposizione un aiuto in linea completo.\n"
 "\n"
 " * \"%s\": vi permette di configurare gli indirizzi di proxy HTTP e FTP,\n"
@@ -5853,7 +5859,7 @@ msgstr ""
 " * \"%s\": cliccate su questo pulsante per cambiare la configurazione del\n"
 "bootloader. Questa opzione dovrebbe essere utilizzata solo dagli utenti più\n"
 "esperti. Consultate la documentazione stampata o l'aiuto in linea del\n"
-"Mandrivalinux Control Center riguardo la configurazione del bootloader.\n"
+"Mandriva Linux Control Center riguardo la configurazione del bootloader.\n"
 "\n"
 " * \"%s\": qui potrete stabilire in dettaglio quali servizi saranno\n"
 "attivati sul vostro sistema. Se pensate di utilizzare il computer come\n"
@@ -5911,20 +5917,20 @@ msgid "Services"
 msgstr "Servizi"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/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 ""
 "Scegli il disco rigido che vuoi cancellare per poter preparare le nuove\n"
-"partizioni per Mandrivalinux. Attenzione! tutti i dati sul disco andranno\n"
+"partizioni per Mandriva Linux. Attenzione! tutti i dati sul disco andranno\n"
 "perduti e non saranno più recuperabili!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 #: help.pm:863
 #, c-format
 msgid ""
@@ -6275,12 +6281,12 @@ msgstr "Sto calcolando la dimensione della partizione Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "La partizione Windows è troppo frammentata. Bisogna riavviare il computer "
 "sotto Windows, lanciare \"defrag\" e poi ricominciare l'installazione di "
-"Mandrivalinux."
+"Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6398,13 +6404,13 @@ msgstr "Sto disattivando la rete"
 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"
@@ -6458,7 +6464,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"
@@ -6495,7 +6501,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"
@@ -6518,11 +6524,11 @@ msgstr ""
 "\n"
 "Nel seguito intendiamo con \"Software\" il sistema operativo e le diverse "
 "componenti disponibili\n"
-"nella distribuzione Mandrivalinux. Il Software include, ma non è limitato "
+"nella distribuzione Mandriva Linux. Il Software include, ma non è limitato "
 "all'insieme di\n"
 "programmi, metodi, regole e documentazione relativi al sistema operativo e "
 "alle diverse componenti\n"
-"della distribuzione Mandrivalinux.\n"
+"della distribuzione Mandriva Linux.\n"
 "\n"
 "\n"
 "1. Licenza\n"
@@ -6565,7 +6571,7 @@ msgstr ""
 "commerciale, perdite finanziarie, oneri legali e sanzioni pecuniarie che "
 "derivino da sentenze giudiziarie, o qualsiasi altra perdita conseguente), "
 "dovuto al possesso e all'uso di componenti software, o derivante dall'aver "
-"scaricato componenti software da uno dei siti di Mandrivalinux, che "
+"scaricato componenti software da uno dei siti di Mandriva Linux, che "
 "risultino proibiti o soggetti a limitazioni d'uso in alcune nazioni per "
 "effetto di leggi locali. Questa limitazione di responsabilità si applica, ma "
 "non è limitata, alle componenti di crittografia sicura incluse nel "
@@ -6594,7 +6600,7 @@ msgstr ""
 "rispettivi autori e sono protetti dalle leggi che disciplinano la proprietà "
 "intellettuale e il copyright applicabili ai programmi software. La Mandriva "
 "S.A. si riserva il diritto di modificare o adattare il Software, in parte o "
-"in tutto, con ogni mezzo e per qualsiasi scopo.\"Mandriva\", \"Mandrivalinux"
+"in tutto, con ogni mezzo e per qualsiasi scopo.\"Mandriva\", \"Mandriva Linux"
 "\" e i relativi logo sono proprietà della Mandriva S.A.\n"
 "\n"
 "\n"
@@ -6701,8 +6707,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"
@@ -6710,27 +6716,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 ""
 "Congratulazioni, l'installazione è completa.\n"
 "Rimuovi il disco di avvio e premi Invio per riavviare il sistema.\n"
 "\n"
 "\n"
 "Per informazioni su correzioni disponibili per questa versione di Linux\n"
-"Mandrivalinux, consulta gli \"Errata\" che trovi su\n"
+"Mandriva Linux, consulta gli \"Errata\" che trovi su\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Altre informazioni sulla configurazione del sistema sono nel capitolo\n"
-"sulla post-installazione del \"Manuale dell'Utente\" di Mandrivalinux."
+"sulla post-installazione del \"Manuale dell'Utente\" di 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
@@ -6759,12 +6765,12 @@ msgstr "Avvio della fase \"%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 ""
 "Il sistema ha risorse scarse. Potrebbero verificarsi problemi installando\n"
-"Mandrivalinux. In tal caso, puoi tentare un'installazione testuale. \n"
+"Mandriva Linux. In tal caso, puoi tentare un'installazione testuale. \n"
 "Per farlo, premi \"F1\" all'avvio da CDROM e poi digita \"text\"."
 
 #: install_steps_gtk.pm:228 install_steps_interactive.pm:624
@@ -7306,9 +7312,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 ""
-"Connessione al sito Mandrivalinux per ricevere l'elenco dei mirror "
+"Connessione al sito Mandriva Linux per ricevere l'elenco dei mirror "
 "disponibili..."
 
 #: install_steps_interactive.pm:840
@@ -7534,8 +7540,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Installazione di Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Installazione di Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10122,13 +10128,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 ""
 "Configuratore di drakfirewall\n"
 "\n"
-"Configura un firewall personale per questo sistema Mandrivalinux.\n"
+"Configura un firewall personale per questo sistema Mandriva Linux.\n"
 "Per una soluzione firewall potente e dedicata, affidati alla\n"
 "distribuzione specializzata MandrakeSecurity Firewall."
 
@@ -14209,11 +14215,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 ""
-"Puoi lanciare Scannerdrake (Hardware/Scanner in Mandrivalinux Control "
+"Puoi lanciare Scannerdrake (Hardware/Scanner in Mandriva Linux Control "
 "Center) per condividere in rete questo scanner.\n"
 "\n"
 
@@ -16163,23 +16169,23 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Cos'è Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Cos'è Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Benvenuto in <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Benvenuto in <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 è una <b>distribuzione Linux</b> formata da una parte "
+"Mandriva Linux è una <b>distribuzione Linux</b> formata da una parte "
 "centrale, chiamata <b>sistema operativo</b> (che si basa sul kernel Linux) a "
 "cui sono aggiunte <b>una marea di applicazioni</b> che soddisfano ogni "
 "esigenza tu possa pensare di avere."
@@ -16187,10 +16193,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 è attualmente la distribuzione Linux più <b>facile da usare</"
+"Mandriva Linux è attualmente la distribuzione Linux più <b>facile da usare</"
 "b>. Essa è anche una delle distribuzioni <b>più diffuse</b> a livello "
 "mondiale!"
 
@@ -16207,16 +16213,16 @@ msgstr "Benvenuto nel <b>mondo dell'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 è impegnata nel modello di sviluppo a codice sorgente aperto "
+"Mandriva Linux è impegnata nel modello di sviluppo a codice sorgente aperto "
 "ed applica sempre la General Public License. Questa nuova release è il "
 "risultato della <b>collaborazione</b> tra il <b>team di sviluppo della "
 "Mandriva </b> e la <b>comunità internazionale</b> di chi contribuisce a "
-"Mandrivalinux."
+"Mandriva Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16235,11 +16241,11 @@ 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 ""
 "Gran parte dei software inclusi nella distribuzione e tutti gli strumenti "
-"Mandrivalinux sono rilasciati sotto la <b>General Public License</b>"
+"Mandriva Linux sono rilasciati sotto la <b>General Public License</b>"
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16271,25 +16277,25 @@ msgstr "<b>Unisciti alla Comunità</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 ha una delle <b>più grandi comunità</b> di utenti e "
+"Mandriva Linux ha una delle <b>più grandi comunità</b> di utenti e "
 "sviluppatori. Il ruolo di questa comunità è molto ampio, va dalla "
 "segnalazione di bug allo sviluppo di nuove applicazioni. La comunità svolge "
-"un <b>ruolo chiave</b> nel mondo di Mandrivalinux."
+"un <b>ruolo chiave</b> nel mondo di 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>Per saperne di più</b> sulla nostra attiva comunità puoi visitare <b>www."
-"mandrakelinux.com</b> o andare direttamente su <b>www.mandrakelinux.com/en/"
+"mandrivalinux.com</b> o andare direttamente su <b>www.mandrivalinux.com/en/"
 "cookerdevel.php3</b> se vuoi essere <b>coinvolto</b> nello sviluppo."
 
 #: share/advertising/05.pl:15
@@ -16300,10 +16306,10 @@ msgstr "<b>Versione scaricabile</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 ""
-"Stai per installare <b>Mandrivalinux Download</b>. Questa è la versione "
+"Stai per installare <b>Mandriva Linux Download</b>. Questa è la versione "
 "gratuita che Mandriva vuol mantenere <b>disponibile per tutti</b>."
 
 #: share/advertising/05.pl:19
@@ -16346,8 +16352,8 @@ msgstr "<b>Discovery, il tuo primo desktop Linux</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Stai per installare <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Stai per installare <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16369,8 +16375,8 @@ msgstr "<b>PowerPack, il desktop Linux ideale</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Stai per installare <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Stai per installare <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16390,8 +16396,8 @@ msgstr "<b>PowerPack+, La soluzione Linux per desktop e server</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Stai per installare <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Stai per installare <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16413,15 +16419,15 @@ msgstr "<b>Prodotti 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 sviluppato un'ampia gamma di prodotti <b>Mandrivalinux</"
+"<b>Mandriva</b> ha sviluppato un'ampia gamma di prodotti <b>Mandriva Linux</"
 "b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "I prodotti Mandrivalinux sono:"
+msgid "The Mandriva Linux products are:"
+msgstr "I prodotti Mandriva Linux sono:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16442,10 +16448,10 @@ 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 per x86-64</b> - La soluzione Mandrivalinux per "
+"\t* <b>Mandriva Linux per x86-64</b> - La soluzione Mandriva Linux per "
 "sfruttare al massimo un processore a 64-bit."
 
 #: share/advertising/10.pl:15
@@ -16456,29 +16462,28 @@ msgstr "<b>Prodotti Mandriva per \"nomadi\"</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 ha sviluppato due prodotti che ti permettono di utilizzare "
-"Mandrivalinux <b>su tutti i computer</b> e senza alcun bisogno di "
-"installarlo:"
+"Mandriva ha sviluppato due prodotti che ti permettono di utilizzare Mandriva "
+"Linux <b>su tutti i computer</b> e senza alcun bisogno di installarlo:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a 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> - una distribuzione Mandrivalinux che gira completamente da "
+"\t* <b>Move</b> - una distribuzione Mandriva Linux che gira completamente da "
 "un CD-ROM avviabile."
 
 #: 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> - una distribuzione Mandrivalinux pre-installata su "
+"\t* <b>GlobeTrotter</b> - una distribuzione Mandriva Linux pre-installata su "
 "un “LaCie Mobile Hard Drive” ultra-compatto."
 
 #: share/advertising/11.pl:13
@@ -16497,21 +16502,24 @@ 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>Corporate Desktop</b> - L'ambiente di lavoro aziendale di "
-"Mandrivalinux."
+"\t* <b>Corporate Desktop</b> - L'ambiente di lavoro aziendale di Mandriva "
+"Linux."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b> - La soluzione Mandrivalinux per i server."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr ""
+"\t* <b>Corporate Server</b> - La soluzione Mandriva Linux per i server."
 
 #: 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> - La soluzione Mandrivalinux per la "
+"\t* <b>Multi-Network Firewall</b> - La soluzione Mandriva Linux per la "
 "sicurezza."
 
 #: share/advertising/12.pl:13
@@ -16714,10 +16722,10 @@ msgstr "<b>Sfrutta l'ampia gamma di applicazioni</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 ""
-"Nel menu di Mandrivalinux troverai <b>agevoli</b> strumenti per realizzare "
+"Nel menu di Mandriva Linux troverai <b>agevoli</b> strumenti per realizzare "
 "<b>ogni compito</b>:"
 
 #: share/advertising/18.pl:16
@@ -16984,18 +16992,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Il Centro di Controllo Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Il Centro di Controllo 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 ""
-"Il <b>Centro di Controllo Mandrivalinux</b> è un'importante raccolta di "
-"strumenti specifici di Mandrivalinux studiati per semplificare la "
+"Il <b>Centro di Controllo Mandriva Linux</b> è un'importante raccolta di "
+"strumenti specifici di Mandriva Linux studiati per semplificare la "
 "configurazione del computer."
 
 #: share/advertising/25.pl:17
@@ -17020,15 +17028,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 ""
 "Come tutta la programmazione, anche il software a codice sorgente aperto "
 "<b>richiede tempo e personale</b>. Nel rispetto della filosofia open source, "
 "Mandriva vende prodotti a valore aggiunto e servizi per <b>continuare a "
-"sviluppare Mandrivalinux</b>. Se vuoi <b>supportare la filosofia open "
-"source</b> e lo sviluppo di Mandrivalinux, dovresti prendere in "
+"sviluppare Mandriva Linux</b>. Se vuoi <b>supportare la filosofia open "
+"source</b> e lo sviluppo di Mandriva Linux, dovresti prendere in "
 "considerazione l'idea di acquistare uno dei nostri prodotti o servizi!"
 
 #: share/advertising/27.pl:13
@@ -17063,8 +17071,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Fermati oggi stesso a <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Fermati oggi stesso a <b>store.mandriva.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -17074,11 +17082,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> è il <b>perfetto completamento</b> del tuo "
-"Mandrivalinux."
+"<b>Mandriva Club</b> è il <b>perfetto completamento</b> del tuo Mandriva "
+"Linux."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -17091,10 +17099,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>sconti speciali</b> su prodotti e servizi del nostro negozio online "
-"<b>store.mandrakesoft.com</b>;"
+"<b>store.mandriva.com</b>;"
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -17107,17 +17115,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* participazione ai <b>forum degli utenti</b> Mandrivalinux;"
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* participazione ai <b>forum degli utenti</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>accesso privilegiato e anticipato</b>, prima del rilascio al "
-"pubblico, alle <b>immagini ISO</b> di Mandrivalinux."
+"pubblico, alle <b>immagini ISO</b> di Mandriva Linux."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -17137,10 +17145,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 fornisce un'ampia gamma di preziosi servizi per "
-"<b>aggiornare facilmente</b> i tuoi sistemi Mandrivalinux:"
+"<b>aggiornare facilmente</b> i tuoi sistemi Mandriva Linux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17166,9 +17174,9 @@ msgstr "\t* aggiornamenti flessibili e <b>programmati</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* gestione di <b>tutti i tuoi sistemi Mandrivalinux</b> con un solo "
+"\t* gestione di <b>tutti i tuoi sistemi Mandriva Linux</b> con un solo "
 "account."
 
 #: share/advertising/30.pl:13
@@ -17180,28 +17188,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 ""
 "Ti serve <b>assistenza?</b> Incontra gli esperti tecnici di Mandriva sulla "
-"<b>nostra piattaforma per il supporto tecnico</b> www.mandrakeexpert.com."
+"<b>nostra piattaforma per il supporto tecnico</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 ""
-"Grazie all'aiuto di <b>esperti qualificati su Mandrivalinux</b>, "
+"Grazie all'aiuto di <b>esperti qualificati su Mandriva Linux</b>, "
 "risparmierai moltissimo tempo."
 
 #: 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 ""
-"Per risolvere ogni problema relativo a Mandrivalinux, puoi comprare su "
-"<b>store.mandrakesoft.com</b> degli interventi di supporto."
+"Per risolvere ogni problema relativo a Mandriva Linux, puoi comprare su "
+"<b>store.mandriva.com</b> degli interventi di supporto."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17589,8 +17597,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 ""
 "[OPZIONI] [NOME_PROGRAMMA]\n"
 "\n"
@@ -17653,7 +17661,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"
@@ -17667,7 +17675,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPZIONI]...\n"
-"Configuratore del Mandrivalinux Terminal Server\n"
+"Configuratore del Mandriva Linux Terminal Server\n"
 "--enable         : abilita MTS\n"
 "--disable        : disabilita MTS\n"
 "--start          : avvia MTS\n"
@@ -20519,13 +20527,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Procedura Mandrivalinux per segnalare bug"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Procedura Mandriva Linux per segnalare bug"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Centro di Controllo Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Centro di Controllo Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -21017,20 +21025,20 @@ msgstr "Attivato al boot"
 #, 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 ""
 "Questa interfaccia non è stata ancora configurata.\n"
-"Lancia l'assistente \"Aggiungi un'interfaccia\" dal Mandrivalinux Control "
+"Lancia l'assistente \"Aggiungi un'interfaccia\" dal Mandriva Linux Control "
 "Center"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Non è stata configurata nessuna interfaccia Internet.\n"
-"Lancia l'assistente \"%s\" dal Centro di controllo Mandrivalinux."
+"Lancia l'assistente \"%s\" dal Centro di controllo Mandriva Linux."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21080,8 +21088,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
@@ -21385,18 +21393,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 di Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versione originale)\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 +21981,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Centro di aiuto Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Centro di aiuto Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22641,7 +22649,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 ""
 "Non è stata rilevata nessuna scheda audio sulla tua macchina. Per favore,\n"
 "verifica che ci sia una scheda supportata da Linux correttamente inserita.\n"
@@ -22650,7 +22658,7 @@ msgstr ""
 "Puoi controllare il nostro elenco di hardware supportato a:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24664,7 +24672,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 ""
 "Non è stata rilevata nessuna scheda TV sulla tua macchina. Per favore,\n"
 "verifica che ci sia una scheda supportata da Linux correttamente inserita.\n"
@@ -24673,7 +24681,7 @@ msgstr ""
 "Puoi controllare il nostro elenco di hardware supportato a:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25390,13 +25398,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 ""
 "Questo è HardDrake, uno strumento %s per configurare l'hardware.\n"
 "<span foreground=\"royalblue3\">Versione:</span> %s\n"
 "<span foreground=\"royalblue3\">Autore:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25508,8 +25516,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Log dei programmi Mandrivalinux"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Log dei programmi Mandriva Linux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -26021,10 +26029,10 @@ msgstr "Connessione completata."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Connessione non riuscita.\n"
-"Verifica la configurazione dal Centro di Controllo Mandrivalinux."
+"Verifica la configurazione dal Centro di Controllo Mandriva Linux."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po
index 76bf2a53a..73f7b8a96 100644
--- a/perl-install/share/po/ja.po
+++ b/perl-install/share/po/ja.po
@@ -1304,11 +1304,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"
 "インストール後に再選択することも可能です。"
 
@@ -3706,11 +3706,11 @@ 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 ""
-"先に進む前にライセンスをよく読んでください。これはMandrivalinux\n"
+"先に進む前にライセンスをよく読んでください。これはMandriva Linux\n"
 "全体に適用されます。全ての項目に同意する場合は \"%s\" を押してください。\n"
 "そうでない場合は \"%s\" をクリックしてコンピュータを再起動してください。"
 
@@ -3880,13 +3880,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のインストールは数枚のCD-ROMから行ないます。\n"
+"Mandriva Linuxのインストールは数枚のCD-ROMから行ないます。\n"
 "選択したパッケージが別のCD-ROMの中にあると、DrakXは現在のCDを\n"
 "イジェクトして別のCDを入れるよう促します。\n"
 "指示されたCDをお持ちでない場合は %s をクリックしてください。"
@@ -3895,11 +3895,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"
@@ -3950,11 +3951,11 @@ msgid ""
 "command-line interface. The total size of this installation is about 65\n"
 "megabytes."
 msgstr ""
-"ここではインストールするプログラムを選びます。Mandrivalinuxには数千 \n"
+"ここではインストールするプログラムを選びます。Mandriva Linuxには数千 \n"
 "ものパッケージが用意されています。それらは管理し易いように類似した\n"
 "アプリケーションごとにグループ化されています 。\n"
 "\n"
-"Mandrivalinuxではこのグループをさらに四つのカテゴリーに分類しています。\n"
+"Mandriva Linuxではこのグループをさらに四つのカテゴリーに分類しています。\n"
 "パッケージの選択に際しては、複数のカテゴリーからグループを選ぶことが\n"
 "できます。つまり、「ワークステーション」としてのインストールに「サーバ」\n"
 "カテゴリーのグループを加えることもできます。\n"
@@ -4059,10 +4060,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default 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"
@@ -4092,7 +4093,7 @@ msgstr ""
 "注意!! 選択されたグループにサーバ用のパッケージが含まれていたり、または\n"
 "個別にそれを選択されると、本当にインストールしてよいか確認を促す\n"
 "メッセージが出ます。\n"
-"Mandrivalinuxのデフォルトの設定では、インストールされたサービスはすべて\n"
+"Mandriva Linuxのデフォルトの設定では、インストールされたサービスはすべて\n"
 "起動時に自動的に開始されます。ディストリビューションがリリースされた時点\n"
 "で既知の問題がなく安全だとされていても、リリース後にセキュリティホールが\n"
 "発見される可能性はあります。\n"
@@ -4240,7 +4241,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"
@@ -4295,7 +4296,7 @@ msgid ""
 "not successful in getting the display configured."
 msgstr ""
 "X(X Window System)はGNU/Linuxのグラフィカルインターフェースの中心となる\n"
-"部分でMandrivalinuxに収録されている様々なグラフィカル環境(KDE/GNOME/\n"
+"部分でMandriva Linuxに収録されている様々なグラフィカル環境(KDE/GNOME/\n"
 "AfterStep/WindowMakerなど)は全てこれに依存しています。\n"
 "\n"
 "最適なグラフィック表示を得るために調整可能ないくつかの設定項目が\n"
@@ -4404,12 +4405,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"
@@ -4436,7 +4437,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"
@@ -4445,7 +4446,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"
@@ -4465,10 +4467,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 ""
-"ここではMandrivalinuxをハードドライブのどこにインストールするかを\n"
+"ここではMandriva Linuxをハードドライブのどこにインストールするかを\n"
 "選択します。ハードドライブが空であったり既存のOSが全ての領域を使用して\n"
 "いたりする場合は、パーティションを設定しなければなりません。\n"
-"基本的に、Mandrivalinuxをインストールするには、ハードドライブを\n"
+"基本的に、Mandriva Linuxをインストールするには、ハードドライブを\n"
 "論理分割して領域を確保することが必要です。\n"
 "\n"
 "パーティションの設定は、たいていの場合復元不可能なうえ、データの消失に\n"
@@ -4495,7 +4497,7 @@ msgstr ""
 "Microsoft WindowsのFATまたはNTFSパーティションのサイズを変更します。\n"
 "サイズ変更は、Windowsのパーティションがあらかじめデフラグ(最適化)されて\n"
 "いれば、データを失うことなく実行できます。(必ずデータのバックアップを\n"
-"しておいてください) MandrivalinuxとMicrosoft Windowsを両方使われる場合は\n"
+"しておいてください) Mandriva LinuxとMicrosoft Windowsを両方使われる場合は\n"
 "このオプションを選んでください。(Windowsを消去される場合は次を参照して\n"
 "ください: ディスク全体を消去)\n"
 "\n"
@@ -4505,7 +4507,7 @@ msgstr ""
 "なりますので注意してください。\n"
 "\n"
 " * %s: ハードドライブのすべてのデータとパーティション\n"
-"を削除しMandrivalinuxシステムに入れ替える場合はこのオプションを選んで\n"
+"を削除しMandriva Linuxシステムに入れ替える場合はこのオプションを選んで\n"
 "ください。確認後は取り消しできませんので十分注意してください。\n"
 "\n"
 "   !! このオプションを選ぶとディスク上の全データが消去されます !!\n"
@@ -4661,7 +4663,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."
@@ -4679,7 +4681,7 @@ msgstr ""
 "\n"
 "パーティションをフォーマットする準備ができたら %s をクリックしてください。\n"
 "\n"
-"Mandrivalinuxを別のパーティションに新規にインストールする場合は %s\n"
+"Mandriva Linuxを別のパーティションに新規にインストールする場合は %s\n"
 "をクリックしてください。\n"
 "\n"
 "ディスクの不良ブロックを検証するパーティションを選ぶには %s を\n"
@@ -4697,7 +4699,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"
@@ -4709,7 +4711,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"
@@ -4736,7 +4738,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"
@@ -4748,7 +4750,7 @@ msgstr ""
 "しかしセキュリティレベルを高くすると一般的には使い勝手が悪くなります。\n"
 "\n"
 "何を選択してよいか分からない場合はデフォルトのままにしておいてください。\n"
-"設定は後で変更できます。Mandrivalinuxコントロールセンタには draksec\n"
+"設定は後で変更できます。Mandriva Linuxコントロールセンタには draksec\n"
 "というそのためのツールが用意されています。\n"
 "\n"
 "%s にセキュリティ管理者のメールアドレスを入力してください。\n"
@@ -4763,7 +4765,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"
@@ -4833,7 +4835,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"
@@ -4918,7 +4920,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"
@@ -4947,7 +4949,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "ハードドライブにMicrosoftのパーティションがいくつか検出されました。\n"
-"Mandrivalinuxをインストールするためにリサイズするパーティションを\n"
+"Mandriva Linuxをインストールするためにリサイズするパーティションを\n"
 "選んでください。\n"
 "\n"
 "パーティションは次のように表示されます: \"Linux name\", \"Windows name\"\n"
@@ -4995,7 +4997,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"
@@ -5004,18 +5006,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 ""
 "このステップは既存のGNU/Linuxパーティションが検出された時にのみ表示\n"
 "されます。\n"
 "\n"
-"DrakXは既存のMandrivalinuxシステムを更新するかそれとも新規にインストール\n"
+"DrakXは既存のMandriva Linuxシステムを更新するかそれとも新規にインストール\n"
 "するかを尋ねます:\n"
 "\n"
 " * %s: 基本的には古いシステムを完全に消去してしまいます。\n"
@@ -5023,10 +5026,10 @@ msgstr ""
 "\"home\" ディレクトリ)を残すことができます。パーティションの設定やファイル\n"
 "システムを変更される場合はこのオプションをお使いください。\n"
 "\n"
-" * %s: これは既にMandrivalinuxにインストールされている\n"
+" * %s: これは既にMandriva Linuxにインストールされている\n"
 "パッケージをアップデートします。現在のパーティションの設定やユーザデータは\n"
 "変更されません。その他の設定の大部分は標準のインストールと同様に行えます。\n"
-"「アップグレード」はMandrivalinuxのバージョンが\"8.1\"以降であれば問題ない\n"
+"「アップグレード」はMandriva Linuxのバージョンが\"8.1\"以降であれば問題ない\n"
 "はずです。\"8.1\"より古いバージョンにはお勧めできません。"
 
 #: help.pm:591
@@ -5078,7 +5081,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"
@@ -5117,7 +5121,7 @@ msgstr ""
 "\n"
 "ユニコード(UTF-8)サポートについて: ユニコードは世界中のすべての言語を\n"
 "カバーします。しかしながら、GNU/Linux環境でのユニコードサポートはまだ開発\n"
-"途上にあります。そのため、Mandrivalinuxではユーザの選択に応じてその使用を\n"
+"途上にあります。そのため、Mandriva Linuxではユーザの選択に応じてその使用を\n"
 "制限しています:\n"
 "\n"
 " * レガシーなエンコードを使用する言語(latin1/ロシア語/日本語/中国語/\n"
@@ -5345,7 +5349,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"
@@ -5366,11 +5370,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "ここでは、コンピュータの印刷システムを選択します。他のOSには一種類しか\n"
-"ありませんが、Mandrivalinuxには二種類の印刷システムがあります。それぞれ\n"
+"ありませんが、Mandriva Linuxには二種類の印刷システムがあります。それぞれ\n"
 "利点と欠点がありますので、より適したものを選んでください。\n"
 "\n"
 " * %s - 'Print, Do not Queue(印刷する。キューはしない)'の略。\n"
@@ -5388,7 +5392,7 @@ msgstr ""
 "%s には印刷/プリンタオプションの選択/プリンタの管理などのための\n"
 "グラフィカルフロントエンドがあります。\n"
 "\n"
-"選択した印刷システムを後で変更する場合は、Mandrivalinuxコントロールセンタ\n"
+"選択した印刷システムを後で変更する場合は、Mandriva Linuxコントロールセンタ\n"
 "のPrinterDrakeで %s をクリックしてください。"
 
 #: help.pm:765
@@ -5506,7 +5510,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"
@@ -5523,7 +5528,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"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"
@@ -5567,7 +5572,7 @@ msgstr ""
 "%s をクリックして設定し直してください。\n"
 "\n"
 " * %s: インターネットとローカルネットワークの設定。\n"
-"マニュアルを参照するか、もしくはインストール完了後にMandrivalinux\n"
+"マニュアルを参照するか、もしくはインストール完了後にMandriva Linux\n"
 "コントロールセンターのヘルプにしたがって行なってください。\n"
 "\n"
 " * %s: あなたのマシンがプロキシサーバの背後にあれば\n"
@@ -5582,7 +5587,7 @@ msgstr ""
 "\n"
 " * %s: ブートローダの設定を変更する時はこのボタンを\n"
 "押してください。(注意:これは上級者向きです) 印刷されたドキュメントまたは\n"
-"Mandrivalinuxコントロールセンターのブートローダに関するヘルプを参照して\n"
+"Mandriva Linuxコントロールセンターのブートローダに関するヘルプを参照して\n"
 "ください。\n"
 "\n"
 " * %s: ここではどのサービスを有効にするかを細かく設定できます。\n"
@@ -5643,10 +5648,10 @@ 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 ""
-"Mandrivalinuxをインストールするためにフォーマットするハードドライブを\n"
+"Mandriva Linuxをインストールするためにフォーマットするハードドライブを\n"
 "選んでください。注意: このドライブのデータは全て失われ、回復すること\n"
 "はできません。"
 
@@ -5996,11 +6001,11 @@ msgstr "Windowsパーティションのサイズを計算"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Windowsパーティションが断片化しすぎています。再起動してWindowsを立ち上げ、\n"
-"デフラグを実行してください。その後再起動してMandrivalinuxをインストール\n"
+"デフラグを実行してください。その後再起動してMandriva Linuxをインストール\n"
 "してください。"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6113,13 +6118,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"
@@ -6173,7 +6178,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"
@@ -6210,7 +6215,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"
@@ -6231,10 +6236,10 @@ msgid ""
 msgstr ""
 "序文\n"
 "\n"
-"オペレーティング・システムとMandrivalinuxディストリビューションに\n"
+"オペレーティング・システムとMandriva Linuxディストリビューションに\n"
 "含まれる様々なコンポーネントを、以下「ソフトウェア製品」と呼びます。\n"
 "ソフトウェア製品には、オペレーティング・システムに関連するプログラム\n"
-"一式・方法・ルール・ドキュメントとMandrivalinuxディストリビューション\n"
+"一式・方法・ルール・ドキュメントとMandriva Linuxディストリビューション\n"
 "の様々なコンポーネントが含まれます。但し、これらに限定されるものでは\n"
 "ありません。\n"
 "\n"
@@ -6269,7 +6274,7 @@ msgstr ""
 "法律で認められる範囲内で、Mandriva S.A.またはその製品を配布する者\n"
 "は、いかなる状況においてもソフトウェア製品のコンポーネントの所持・使用\n"
 "またはいくつかの国の法律によって禁止・制限されているソフトウェアを\n"
-"Mandrivalinuxのウェブサイトからダウンロードしたことによって生じた特殊・\n"
+"Mandriva Linuxのウェブサイトからダウンロードしたことによって生じた特殊・\n"
 "偶発的・直接的・間接的な損害に対して責任を負いません。これらの損害には\n"
 "取引上の損失・事業の中断・経済的損失・裁判の判決によって発生した訴訟\n"
 "費用ならびに罰金、その他の間接的な損失を無制限に含みます。この限定保証\n"
@@ -6296,7 +6301,7 @@ msgstr ""
 "に属し、ソフトウェア・プログラムに適用される知的財産法・著作権法によって\n"
 "保護されています。Mandriva S.A.は方法・目的の如何にかかわらずソフト\n"
 "ウェア製品を全面的・部分的に改変する権利を留保しています。Mandrakeと\n"
-"Mandrivalinux、ならびに関連するロゴはMandriva S.A.の登録商標です。\n"
+"Mandriva Linux、ならびに関連するロゴはMandriva S.A.の登録商標です。\n"
 "\n"
 "\n"
 "5. 準拠法\n"
@@ -6392,8 +6397,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"
@@ -6401,7 +6406,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"
 "起動用メディアを抜き、[Enter]を押して再起動してください。\n"
@@ -6413,14 +6418,14 @@ msgstr ""
 "%s\n"
 "\n"
 "\n"
-"システム設定に関する詳細については Mandrivalinux User's Guide を\n"
+"システム設定に関する詳細については Mandriva Linux User's Guide を\n"
 "ご覧ください。"
 
 #. -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
@@ -6448,11 +6453,11 @@ 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 ""
-"リソースが足りません。Mandrivalinuxをインストール中に問題が発生する\n"
+"リソースが足りません。Mandriva Linuxをインストール中に問題が発生する\n"
 "可能性があります。\n"
 "別の方法として、テキストモードでインストールすることもできます。\n"
 "その場合は、CD-ROMから起動した時に[F1]を押し、続いて'text'と入力\n"
@@ -6993,8 +6998,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
@@ -7217,8 +7222,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
@@ -9802,7 +9807,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 ""
@@ -13812,13 +13817,13 @@ 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を実行してくださ"
 "い。\n"
-"(Mandrivalinuxコントロールセンターのハードウェア->スキャナを選択)\n"
+"(Mandriva Linuxコントロールセンターのハードウェア->スキャナを選択)\n"
 
 #: printer/printerdrake.pm:3933
 #, c-format
@@ -15705,34 +15710,34 @@ msgstr "停止"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "Mandrivalinux とは？"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "Mandriva Linux とは？"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Mandrivalinux へようこそ"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Mandriva Linux へようこそ"
 
 #: 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 は Linux カーネルを核にしたオペレーティングシステムと、あらゆる"
-"ニーズを満たす多くのアプリケーションからなる Linux ディストリビューションで"
+"Mandriva Linux は Linux カーネルを核にしたオペレーティングシステムと、あらゆ"
+"るニーズを満たす多くのアプリケーションからなる Linux ディストリビューションで"
 "す。"
 
 #: 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はユーザーフレンドリーなLinux ディストリビューションです。世界中"
-"で最も広く使われているディストリビューションのひとつです。"
+"Mandriva LinuxはユーザーフレンドリーなLinux ディストリビューションです。世界"
+"中で最も広く使われているディストリビューションのひとつです。"
 
 #: share/advertising/02.pl:13
 #, c-format
@@ -15747,14 +15752,14 @@ 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 ""
-"Mandrivalinux はオープンソースモデルに力を注いでいます。この新しいリリースは "
-"Mandriva の開発チームと Mandrivalinux のコントリビュータが生み出した世界規模"
-"のコミュニティによるコラボレーションの成果です。"
+"Mandriva Linux はオープンソースモデルに力を注いでいます。この新しいリリース"
+"は Mandriva の開発チームと Mandriva Linux のコントリビュータが生み出した世界"
+"規模のコミュニティによるコラボレーションの成果です。"
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -15771,11 +15776,11 @@ msgstr "GPL"
 #: 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 ""
-"このディストリビューションに含まれるほとんどのソフトウェアと Mandrivalinux の"
-"ツールは、 General Public License でライセンスされています。"
+"このディストリビューションに含まれるほとんどのソフトウェアと Mandriva Linux "
+"のツールは、 General Public License でライセンスされています。"
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -15805,25 +15810,25 @@ 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 ""
-"Mandrivalinux はユーザと開発者から成る世界規模のコミュニティを生み出しまし"
+"Mandriva Linux はユーザと開発者から成る世界規模のコミュニティを生み出しまし"
 "た。このコミュニティは様々な役割を果たしています。新しいアプリケーションの開"
-"発に際してはバグを報告し問題の解決を助けます。コミュニティは Mandrivalinux "
+"発に際してはバグを報告し問題の解決を助けます。コミュニティは Mandriva Linux "
 "World で中心的な役割を担っています。"
 
 #: 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 ""
-"まずは、 www.mandrakelinux.com でこの活気に満ちたコミュニティを覗いてみてくだ"
-"さい。開発への参加に興味のある方は www.mandrakelinux.com/en/cookerdevel.php3 "
+"まずは、 www.mandrivalinux.com でこの活気に満ちたコミュニティを覗いてみてくだ"
+"さい。開発への参加に興味のある方は www.mandrivalinux.com/en/cookerdevel.php3 "
 "へどうぞ。"
 
 #: share/advertising/05.pl:15
@@ -15834,7 +15839,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 ""
 "これは Mandriva が無償で提供するダウンロードバージョンです。 Mandriva は今後"
@@ -15877,8 +15882,8 @@ msgstr "Discovery: 初めての Linux デスクトップ"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Mandrivalinux Discovery をインストールします。"
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Mandriva Linux Discovery をインストールします。"
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -15900,8 +15905,8 @@ msgstr "PowerPack: Linux デスクトップの決定版"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Mandrivalinux PowerPack をインストールします。"
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Mandriva Linux PowerPack をインストールします。"
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -15920,8 +15925,8 @@ msgstr "PowerPack+: デスクトップ/サーバ向け Linux ソリューショ�
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Mandrivalinux PowerPack+ をインストールします。"
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Mandriva Linux PowerPack+ をインストールします。"
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -15943,13 +15948,13 @@ msgstr "Mandriva の製品"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
-msgstr "Mandriva は幅広い Mandrivalinux 製品を開発しています。"
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
+msgstr "Mandriva は幅広い Mandriva Linux 製品を開発しています。"
 
 #: 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
@@ -15969,9 +15974,9 @@ msgstr "\t* PowerPack+: デスクトップ/サーバ向け Linux ソリューシ
 #: 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* Mandrivalinux for x86-64: 64-bitプロセッサのための Mandrivalinux"
+msgstr "\t* Mandriva Linux for x86-64: 64-bitプロセッサのための Mandriva Linux"
 
 #: share/advertising/10.pl:15
 #, c-format
@@ -15981,28 +15986,28 @@ msgstr "Mandriva の製品 - 行動派のあなたに"
 #: 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 は Mandrivalinux をインストールすることなしにどのコンピュータでもお"
+"Mandriva は Mandriva Linux をインストールすることなしにどのコンピュータでもお"
 "使い頂けるよう、ふたつの製品を開発しました。"
 
 #: 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* Move: ブータブルCD一枚で稼動できる Mandrivalinux ディストリビューション"
+"\t* Move: ブータブルCD一枚で稼動できる Mandriva Linux ディストリビューション"
 
 #: 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* GlobeTrotter: 超コンパクトな LaCie Mobile ハードドライブにプリインストー"
-"ルされた Mandrivalinux ディストリビューション"
+"ルされた Mandriva Linux ディストリビューション"
 
 #: share/advertising/11.pl:13
 #, c-format
@@ -16019,18 +16024,21 @@ 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* Corporate Desktop: ビジネス向けデスクトップ"
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* Corporate Server: Mandrivalinux サーバ・ソリューション"
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* Corporate Server: Mandriva Linux サーバ・ソリューション"
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
-msgstr "\t* Multi-Network Firewall: Mandrivalinux セキュリティ・ソリューション"
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr ""
+"\t* Multi-Network Firewall: Mandriva Linux セキュリティ・ソリューション"
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16225,10 +16233,10 @@ 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 ""
-"Mandrivalinux のメニューにはあらゆる用途に合った使い易いアプリケーションが"
+"Mandriva Linux のメニューにはあらゆる用途に合った使い易いアプリケーションが"
 "ぎっしり詰まってます:"
 
 #: share/advertising/18.pl:16
@@ -16473,18 +16481,18 @@ msgstr "\t* Postfix と Sendmail: 強力で人気のあるメールサーバ"
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "Mandrivalinux コントロールセンタ"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "Mandriva Linux コントロールセンタ"
 
 #: 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 ""
-"Mandrivalinux コントロールセンタは、コンピュータの設定を簡単に行えるよう考案"
-"された Mandrivalinux 独自のツール群です。"
+"Mandriva Linux コントロールセンタは、コンピュータの設定を簡単に行えるよう考案"
+"された Mandriva Linux 独自のツール群です。"
 
 #: share/advertising/25.pl:17
 #, c-format
@@ -16508,14 +16516,14 @@ 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 ""
 "オープンソースソフトウェアも他のソフトウェアと同様に開発には時間と人が必要で"
 "す。オープンソースの理念を尊重するために、 Mandriva は付加価値商品やサービス"
-"を販売して Mandrivalinux の改良を続けています。オープンソースの理念と "
-"Mandrivalinux の開発を支援して下さるのであれば、ぜひ当社の製品またはサービス"
+"を販売して Mandriva Linux の改良を続けています。オープンソースの理念と "
+"Mandriva Linux の開発を支援して下さるのであれば、ぜひ当社の製品またはサービス"
 "の購入をご検討ください。"
 
 #: share/advertising/27.pl:13
@@ -16547,8 +16555,8 @@ msgstr "装いを一新し、効率性とユーザビリティーを向上させ
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "store.mandrakesoft.com にぜひお立ち寄りください。"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "store.mandriva.com にぜひお立ち寄りください。"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16558,9 +16566,10 @@ msgstr "Mandriva Club"
 #: 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 "Mandrivalinux 製品に合わせて Mandriva Club へのご入会をお勧めします。 "
+msgstr ""
+"Mandriva Linux 製品に合わせて Mandriva Club へのご入会をお勧めします。 "
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -16572,8 +16581,8 @@ msgstr "Mandriva Club にご入会いただくと次のような特典をお楽�
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
-msgstr "\t* オンラインストア store.mandrakesoft.com での製品とサービスの優待"
+"<b>store.mandriva.com</b>."
+msgstr "\t* オンラインストア store.mandriva.com での製品とサービスの優待"
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -16584,15 +16593,15 @@ msgstr "\t* NVIDIA®/ATI™ をはじめとする商用アプリケーション�
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Mandrivalinux ユーザ・フォーラムへの参加"
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* 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>."
-msgstr "\t* 公式リリースに先立つ Mandrivalinux ISO イメージの早期ダウンロード"
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
+msgstr "\t* 公式リリースに先立つ Mandriva Linux ISO イメージの早期ダウンロード"
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -16612,10 +16621,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 は Mandrivalinux システムを簡単に更新して頂けるよう幅広いサー"
-"ビスをご提供します。"
+"Mandriva Online は Mandriva Linux システムを簡単に更新して頂けるよう幅広い"
+"サービスをご提供します。"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16637,10 +16646,10 @@ msgstr "\t* 更新スケジュールをフレキシブルに設定できます"
 #: 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* ひとつのアカウントでお使いのすべての Mandrivalinux システムを管理して頂け"
-"ます。"
+"\t* ひとつのアカウントでお使いのすべての Mandriva Linux システムを管理して頂"
+"けます。"
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -16651,26 +16660,26 @@ msgstr "Mandriva Expert"
 #, 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 ""
-"お困りのことがあれば当社のテクニカルサポート www.mandrakeexpert.com で "
+"お困りのことがあれば当社のテクニカルサポート www.mandrivaexpert.com で "
 "Mandriva のテクニカルエキスパートに相談してみてください。"
 
 #: 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 ""
-"経験豊富な Mandrivalinux エキスパートに手助けしてもらえば、大切な時間を節約で"
-"きるでしょう。"
+"経験豊富な Mandriva Linux エキスパートに手助けしてもらえば、大切な時間を節約"
+"できるでしょう。"
 
 #: 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>."
-msgstr "store.mandrakesoft.com でサポートチケットをご購入頂くこともできます。"
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
+msgstr "store.mandriva.com でサポートチケットをご購入頂くこともできます。"
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17051,15 +17060,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 ""
 "[オプション] [プログラム名]\n"
 "\n"
 "オプション:\n"
 "  --help            - このヘルプを表示\n"
-"  --report          - プログラムはMandrivalinuxのツールに限ります\n"
-"  --incident        - プログラムはMandrivalinuxのツールに限ります"
+"  --report          - プログラムはMandriva Linuxのツールに限ります\n"
+"  --incident        - プログラムはMandriva Linuxのツールに限ります"
 
 #: standalone.pm:63
 #, c-format
@@ -17113,7 +17122,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"
@@ -17127,7 +17136,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Mandrivalinuxターミナルサーバ設定ツール\n"
+"Mandriva Linuxターミナルサーバ設定ツール\n"
 "--enable         : MTSを有効にする\n"
 "--disable        : MTSを無効にする\n"
 "--start          : MTSを開始する\n"
@@ -19944,13 +19953,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, 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
@@ -20440,20 +20449,20 @@ 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"
-"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 ""
 "インターネットの接続が設定されていません。\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
@@ -20503,8 +20512,8 @@ msgstr "KDM (KDEディスプレイマネージャ)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Mandrivalinuxディスプレイマネージャ)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Mandriva Linuxディスプレイマネージャ)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -20810,18 +20819,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
@@ -21384,8 +21393,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinuxヘルプセンタ"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linuxヘルプセンタ"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22039,7 +22048,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 ""
 "サウンドカードを検出できませんでした。Linuxがサポートしている\n"
 "サウンドカードが正しく差し込まれているか確認してください。\n"
@@ -22048,7 +22057,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
@@ -24055,7 +24064,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 ""
 "TVカードを検出できませんでした。Linuxがサポートしている\n"
 "ビデオ/TVカードが正しく挿入されているか確認してください。\n"
@@ -24063,7 +24072,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
@@ -24768,13 +24777,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\">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
@@ -24882,8 +24891,8 @@ msgstr "設定を変更しました。有効にするにはログアウトして
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinuxツールのログ"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linuxツールのログ"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25395,10 +25404,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
diff --git a/perl-install/share/po/ko.po b/perl-install/share/po/ko.po
index b668b7ac0..3cb2297b0 100644
--- a/perl-install/share/po/ko.po
+++ b/perl-install/share/po/ko.po
@@ -1231,7 +1231,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 "설치후 다른 다른 언어를 선택할수 있습니다."
@@ -3509,12 +3509,12 @@ 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"
-"사용자 계약서는 전체 맨드레이크 리눅스 배포본을 포괄하는 내용이며,\n"
+"사용자 계약서는 전체 맨드리바 리눅스 배포본을 포괄하는 내용이며,\n"
 "만약 동의하지 않으신다면 「거부」버튼을 누르세요. 거부 버튼은 현재 설치를\n"
 "즉각 종료하게 합니다. 설치를 계속하고 싶다면 「동의」버튼을 누르세요."
 
@@ -3657,13 +3657,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 ""
-"맨드레이크 리눅스 설치 시스템은 여러 장의 CD로 구성되어 있습니다.\n"
+"맨드리바 리눅스 설치 시스템은 여러 장의 CD로 구성되어 있습니다.\n"
 "드레이크X는 선택된 각각의 팩키지가 어느 CD에 들어 있는지 이미 알고 있습니"
 "다.\n"
 "필요시 현재 CD를 자동으로 꺼내고 다른 CD의 삽입을 요청할 것입니다."
@@ -3672,11 +3672,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"
@@ -3728,7 +3729,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "이제 시스템상에 설치할 프로그램들을 지정할 차례입니다.\n"
-"맨드레이크 리눅스에는 설치할 수 있는 수천 개의 프로그램들이 있기 때문에\n"
+"맨드리바 리눅스에는 설치할 수 있는 수천 개의 프로그램들이 있기 때문에\n"
 "사용자가 그것들을 모두 다 알지는 못할 것입니다.\n"
 "\n"
 "만약 표준 CD 설치를 수행하고 있는 중이라면, 현재 가지고 있는 CD들에 대해\n"
@@ -3820,10 +3821,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"
@@ -3946,7 +3947,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"
@@ -4050,12 +4051,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"
@@ -4082,7 +4083,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"
@@ -4091,7 +4092,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"
@@ -4111,10 +4113,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 ""
-"이제 하드디스크의 어디에 리눅스 맨드레이크를 설치할지를\n"
+"이제 하드디스크의 어디에 리눅스 맨드리바를 설치할지를\n"
 "선택해야 합니다. 만약 하드디스크가 완전히 비어 있거나 또는\n"
 "다른 운영체제가 하드디스크 전체를 점유하고 있다면, 파티션을\n"
-" 나누어야 합니다. 파티션을 나눈다함은 리눅스 맨드레이크가\n"
+" 나누어야 합니다. 파티션을 나눈다함은 리눅스 맨드리바가\n"
 "설치될 공간을 확보하기 위하여 디스크를 논리적으로 분할한다는 의미입니다.\n"
 "\n"
 "일반적으로 파티션 과정을 거쳐 버리면 기존 데이터의 복구가 불가능해지기\n"
@@ -4122,7 +4124,7 @@ msgstr ""
 "사용하면 이 작업을 쉽게 할 수 있습니다. 시작하기 전에, 충분한 시간을 가지고\n"
 "사용자 설명서를 읽어 보세요.\n"
 "\n"
-"현재 전문가 모드로 설치를 진행 중이라면, 리눅스 맨드레이크의 파티션 분할 도구"
+"현재 전문가 모드로 설치를 진행 중이라면, 리눅스 맨드리바의 파티션 분할 도구"
 "인\n"
 "디스크드레이크를 만나게 될 것입니다. 이 도구는 파티션드르이 세밀한 조정을 가"
 "능하게\n"
@@ -4163,7 +4165,7 @@ msgstr ""
 "것을 유념하세요.\n"
 "\n"
 " ○ 전체 디스크 삭제: 만약 디스크상의 모든 기존 파티션과 데이터를 삭제하고\n"
-"리눅스 맨드레이크를 위한 파티션으로 바꾸고 싶다면, 이것을 선택하세요.\n"
+"리눅스 맨드리바를 위한 파티션으로 바꾸고 싶다면, 이것을 선택하세요.\n"
 "주의하세요: 일단 이렇게 하고나면 다시 되돌릴 수 없습니다.\n"
 "\n"
 "   !! 이 옵션을 선택하게 되면, 디스크상의 모든 데이터가 손실됩니다. !!\n"
@@ -4320,7 +4322,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."
@@ -4343,7 +4345,7 @@ msgstr ""
 "\n"
 "포맷할 준비가 되었으면, 「확인」을 누르세요.\n"
 "\n"
-"맨드레이크 리눅스 설치용 파티션을 다시 선택하고 싶다면,\n"
+"맨드리바 리눅스 설치용 파티션을 다시 선택하고 싶다면,\n"
 "「취소」를 누르세요.\n"
 "\n"
 "디스크상의 손상된 블럭을 체크하며 포맷하고 싶다면,\n"
@@ -4361,7 +4363,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"
@@ -4390,7 +4392,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"
@@ -4417,7 +4419,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"
@@ -4487,7 +4489,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"이제 어느 파티션이 맨드레이크 리눅스의 설치용으로 사용되어야 할지를\n"
+"이제 어느 파티션이 맨드리바 리눅스의 설치용으로 사용되어야 할지를\n"
 "선택해야 합니다. 이전에 다른 GNU/리눅스를 설치한 적이 있거나, 다른 파티션\n"
 "도구를 사용하여 이미 파티션들이 정의되어 있다면, 기존 파티션을 그대로 사용\n"
 "할 수 있습니다. 그렇지 않다면 하드디스크의 파티션들을 지금 만들어야 합니다.\n"
@@ -4561,7 +4563,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"
@@ -4590,7 +4592,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "둘 이상의 MS 윈도우즈 파티션이 디스크상에서 발견되었습니다.\n"
-"맨드레이크 리눅스 운영체제를 설치하기 위해 크기를 조정할\n"
+"맨드리바 리눅스 운영체제를 설치하기 위해 크기를 조정할\n"
 "파티션을 선택하세요.\n"
 "\n"
 "각 파티션은 다음과 같이 열거됩니다: 「리눅스 이름」,「윈도우즈 이름」,\n"
@@ -4635,7 +4637,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"
@@ -4644,13 +4646,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
@@ -4701,7 +4704,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"
@@ -4884,7 +4888,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"
@@ -4905,7 +4909,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 ""
 
@@ -5032,7 +5036,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"
@@ -5049,7 +5054,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"
@@ -5111,10 +5116,10 @@ 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"
+"맨드리바 리눅스 파티션을 만들기 위해서 삭제할 하드디스클르 선택하세요.\n"
 "주의:\n"
 "디스크상의 모든 데이터는 손실되며, 영원히 복구가 불가능해 집니다!"
 
@@ -5456,7 +5461,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 ""
 "윈도우즈 파티션이 심하게 조각나 있습니다. 먼저 ``디스크 조각 모음''을 하세요."
@@ -5572,13 +5577,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"
@@ -5607,8 +5612,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 "
@@ -5622,8 +5627,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 "
@@ -5632,7 +5637,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"
@@ -5666,10 +5671,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"
@@ -5742,8 +5747,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"
@@ -5751,25 +5756,25 @@ 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"
 "\n"
 "\n"
-"이 버전의 맨드레이크 리눅스의 버그수정 정보는\n"
+"이 버전의 맨드리바 리눅스의 버그수정 정보는\n"
 "%s\n"
 "에서 얻으실 수 있습니다.\n"
 "\n"
 "\n"
-"설치후 시스템 설정에 대한 정보는 공식 맨드레이크 리눅스 유저 가이드를\n"
+"설치후 시스템 설정에 대한 정보는 공식 맨드리바 리눅스 유저 가이드를\n"
 "참고하시기 바랍니다."
 
 #. -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
@@ -5798,11 +5803,11 @@ 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"
 "수도 있습니다. 만약 문제가 발생하면, 택스트 모드로 설치를 시도해 보세요.\n"
 "텍스트 모드로 설치하려면, CDROM으로 부팅후 「F1」을 누르고 「text」라고 입력"
@@ -6322,8 +6327,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
-msgstr "유효한 미러 목록을 받기 위해 맨드레이크 리눅스 웹사이트에 접속 중..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr "유효한 미러 목록을 받기 위해 맨드리바 리눅스 웹사이트에 접속 중..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -6539,8 +6544,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "리눅스-맨드레이크 설치 %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "리눅스-맨드리바 설치 %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9111,14 +9116,14 @@ 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"
-"이것은 맨드레이크 리눅스 시스템의 개인 방화벽을 설정합니다.\n"
-"강력한 전문 방화벽을 사용하고 싶다면, 맨드레이크 보안 방화벽\n"
+"이것은 맨드리바 리눅스 시스템의 개인 방화벽을 설정합니다.\n"
+"강력한 전문 방화벽을 사용하고 싶다면, 맨드리바 보안 방화벽\n"
 "배포판을 구하시기 바랍니다."
 
 #: network/drakfirewall.pm:164
@@ -12781,8 +12786,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 ""
 
@@ -13036,8 +13041,8 @@ msgid ""
 "also using the %s Control Center, section \"Hardware\"/\"Printer\""
 msgstr ""
 "설치과정에서 설정한 네트웍을 시작할 수 없습니다. 시스템이 부팅될 때, 네트웍"
-"이 자동 실행되도록 되어 있는지 확인하고, 맨드레이크 제어 센터(「네트웍과 인터"
-"넷」/「연결」)를 이용하여 올바르게 설정하세요.그리고나서 다시 맨드레이크 제"
+"이 자동 실행되도록 되어 있는지 확인하고, 맨드리바 제어 센터(「네트웍과 인터"
+"넷」/「연결」)를 이용하여 올바르게 설정하세요.그리고나서 다시 맨드리바 제"
 "어 센터(「하드웨어」/「프린터」)를 이용하여, 프린터 설정을 다시 해 보세요."
 
 #: printer/printerdrake.pm:4196
@@ -14585,18 +14590,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
 #, fuzzy, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "맨드레이크 온라인에 잘 오셨습니다."
+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 "
+"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."
@@ -14605,7 +14610,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 ""
 
@@ -14622,9 +14627,9 @@ 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 "
+"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 ""
 
@@ -14643,8 +14648,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
@@ -14670,17 +14675,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 ""
 
@@ -14692,7 +14697,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 ""
 
@@ -14730,7 +14735,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
@@ -14749,7 +14754,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
@@ -14767,7 +14772,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
@@ -14782,18 +14787,17 @@ msgstr ""
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
 msgid "<b>Mandriva Products</b>"
-msgstr "맨드레이크 제어 센터"
+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
@@ -14814,7 +14818,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 ""
 
@@ -14826,21 +14830,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 ""
 
@@ -14852,23 +14856,25 @@ msgstr ""
 #: 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 ""
 
 #: 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
@@ -15044,7 +15050,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 ""
 
@@ -15279,14 +15285,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>맨드레이크 제어 센터</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 ""
 
@@ -15309,21 +15315,21 @@ 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 "맨드레이크 제어 센터"
+msgstr "맨드리바 제어 센터"
 
 #: 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 ""
 
 #: share/advertising/27.pl:17
@@ -15340,18 +15346,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
 #, fuzzy, c-format
 msgid "<b>Mandriva Club</b>"
-msgstr "<b>맨드레이크 온라인</b>"
+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 ""
 
@@ -15365,7 +15371,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
@@ -15377,20 +15383,20 @@ 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
 #, c-format
 msgid "<b>Mandriva Online</b>"
-msgstr "<b>맨드레이크 온라인</b>"
+msgstr "<b>맨드리바 온라인</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
@@ -15403,7 +15409,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
@@ -15426,33 +15432,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
 #, fuzzy, c-format
 msgid "<b>Mandriva Expert</b>"
-msgstr "맨드레이크 제어 센터"
+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."
+"<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
@@ -15732,7 +15738,7 @@ msgstr "웹민 서비스"
 #: share/compssUsers.pl:187
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "맨드레이크 터미널 서버 설정"
+msgstr "맨드리바 터미널 서버 설정"
 
 #: share/compssUsers.pl:191
 #, fuzzy, c-format
@@ -15747,7 +15753,7 @@ msgstr ""
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
-msgstr "맨드레이크 제어 센터"
+msgstr "맨드리바 제어 센터"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -15805,8 +15811,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
@@ -15842,7 +15848,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"
@@ -15889,8 +15895,8 @@ msgstr ""
 #, 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"
@@ -15960,7 +15966,7 @@ msgstr ""
 #: standalone/drakTermServ:211 standalone/drakTermServ:214
 #, fuzzy, c-format
 msgid "Terminal Server Configuration"
-msgstr "맨드레이크 터미널 서버 설정"
+msgstr "맨드리바 터미널 서버 설정"
 
 #: standalone/drakTermServ:220
 #, c-format
@@ -16105,7 +16111,7 @@ msgstr ""
 #: standalone/drakTermServ:509
 #, fuzzy, c-format
 msgid "Terminal Server Overview"
-msgstr "맨드레이크 터미널 서버 설정"
+msgstr "맨드리바 터미널 서버 설정"
 
 #: standalone/drakTermServ:510
 #, c-format
@@ -18366,13 +18372,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "맨드레이크 버그 보고 도구"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "맨드리바 버그 보고 도구"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "맨드레이크 제어 센터"
+msgid "Mandriva Linux Control Center"
+msgstr "맨드리바 제어 센터"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18393,7 +18399,7 @@ msgstr "하드 드레이크"
 #: standalone/drakbug:51
 #, c-format
 msgid "Mandriva Online"
-msgstr "맨드레이크 온라인"
+msgstr "맨드리바 온라인"
 
 #: standalone/drakbug:52
 #, c-format
@@ -18847,14 +18853,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 ""
 "인터넷 연결이 없습니다.\n"
 "「설정」을 눌러 먼저 연결을 설정하세요."
@@ -18907,7 +18913,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -19202,9 +19208,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
@@ -19703,8 +19709,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "맨드레이크 제어 센터"
+msgid "Mandriva Linux Help Center"
+msgstr "맨드리바 제어 센터"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -20289,7 +20295,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
@@ -21900,7 +21906,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
@@ -22586,7 +22592,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 ""
 
@@ -22695,8 +22701,8 @@ msgstr "변경이 완료 되었지만, 적용되기 위해서는 재로그인해
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "맨드레이크 도구 설명"
+msgid "Mandriva Linux Tools Logs"
+msgstr "맨드리바 도구 설명"
 
 #: standalone/logdrake:51
 #, fuzzy, c-format
@@ -23202,7 +23208,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
@@ -24025,7 +24031,6 @@ msgstr "설치 실패."
 #~ msgid "No network card"
 #~ msgstr "네트웍 카드 없음"
 
-
 #~ msgid "No browser available! Please install one"
 #~ msgstr "브라우저를 찾을 수 없습니다! 설치해 주세요."
 
@@ -24359,9 +24364,6 @@ msgstr "설치 실패."
 #~ msgid "mkraid failed"
 #~ msgstr "mkraid 실패"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "맨드레이크 온라인"
-
 #~ msgid "The package %s is needed. Install it?"
 #~ msgstr "팩키지 %s가 필요합니다. 설치하겠습니까?"
 
diff --git a/perl-install/share/po/ky.po b/perl-install/share/po/ky.po
index ea3575a13..754b6986c 100644
--- a/perl-install/share/po/ky.po
+++ b/perl-install/share/po/ky.po
@@ -132,7 +132,7 @@ msgstr ""
 "\n"
 "\n"
 "Учурда сиз USB-ачкычы жок эле ишти улантсаңыз болот - мындай\n"
-"учурда сиз Mandriva Move'ду кадимки Mandrake операциондук системасы\n"
+"учурда сиз Mandriva Move'ду кадимки Mandriva операциондук системасы\n"
 "катары колдоно аласыз."
 
 #: ../move/move.pm:494
@@ -1319,11 +1319,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"
 "системаңызды кайра жүктөгөн соң алар колдонууга даяр болот."
 
@@ -3746,12 +3746,12 @@ 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 ""
 "Мындан ары улантуу үчүн сиз лицензия шартын көңүл коюп окууңуз керек.\n"
-"Ал Mandrivalinux'тун бардык дистрибутивдерине таратылат. Эгер сиз анын\n"
+"Ал Mandriva Linux'тун бардык дистрибутивдерине таратылат. Эгер сиз анын\n"
 "ичиндеги бардык шарттарга көнбөсөңүз, \"%s\" рамкасын тандаңыз. Андай\n"
 "болбосо, \"%s\" баскычын бассаңыз сиздин компьютер кайра жүктөлөт."
 
@@ -3931,13 +3931,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 орнотулушу бир нече CD-ROMго бөлүнүп жайгаштырылган. Эгерде\n"
+"Mandriva Linux орнотулушу бир нече CD-ROMго бөлүнүп жайгаштырылган. Эгерде\n"
 "тандалган пакет башка CD-ROMдо жатса, DrakX учурдагы CDни чыгарып\n"
 "керектелип жаткан тийишүү CDни салууңузду сурайт. Эгерде Сизде тийиштүү\n"
 "CD кол алдыңызда жок болсо, жөн гана \"%s\" түймөсүн чертиңиз, бул учурда\n"
@@ -3947,11 +3947,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"
@@ -4003,12 +4004,12 @@ msgid ""
 "megabytes."
 msgstr ""
 "Эми системаңызга кайсы программаларды орнотууну кааларыңызды аныктоого\n"
-"убакыт келип жетти. Mandrivalinux менен кошо миңдеген пакеттер сунуш "
+"убакыт келип жетти. Mandriva Linux менен кошо миңдеген пакеттер сунуш "
 "кылынат,\n"
 "тандоону жеңилдетүү үчүн алар жакындыгынакарата топторго бөлүнгөн.\n"
 "\n"
 "Пакеттер машинаңыздын колдонуу спецификасына дал келе тургандай\n"
-"болуп топторго иреттелген. Mandrivalinux'та пакетер төрт категория\n"
+"болуп топторго иреттелген. Mandriva Linux'та пакетер төрт категория\n"
 "боюнча иреттелет. Сиз ар түрдүү категорияларда жайгашкан тиркемелерди\n"
 "аралаштырып же айкалыштыра аласыз, мисалы ``Иш станциясы'' орнотуу варианты\n"
 "``Иштеп түзүү'' категорясындагы тиркемелерди да камтышы мүмкүн.\n"
@@ -4113,10 +4114,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default 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"
@@ -4146,11 +4147,11 @@ msgstr ""
 "\n"
 "!! Эгерде кандайдыр бир сервердик пакет тандалса, сиз аны атайын\n"
 "тандасаңыз же ал башка пакеттин бөлүгү болсо, сиз аны чынында эле\n"
-"ал серверлерди орнотууну каалагандыгыңызды сурайт. Mandrivalinux\n"
+"ал серверлерди орнотууну каалагандыгыңызды сурайт. Mandriva Linux\n"
 "бардык орнотулган серверлерлерди жүктөө убагында алдынала ишке\n"
 "киргизилет. Дистрибутив чыгарылып жаткан убакта алар коопсуздук\n"
 "боюнча белгилүү проблемалары жок болгону менен, аларда бул\n"
-"Mandrivalinux версиясы чыгарылгандан кийин да, кооптуу болгон\n"
+"Mandriva Linux версиясы чыгарылгандан кийин да, кооптуу болгон\n"
 "жылчыктар табылышы мүмкүн. Эгер сиз берилген кызмат эмне үчүн\n"
 "колдонорун жана эмне иш кыларын билбесеңиз \"%s\" басыңыз.\n"
 "Эгер сиз \"%s\" бассаңыз тизмедеги бардык кызматтар орнотулуп\n"
@@ -4301,7 +4302,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"
@@ -4356,7 +4357,7 @@ msgid ""
 "not successful in getting the display configured."
 msgstr ""
 "X (X Window системасы үчүн) GNU/Linux графикалык интерфейсинин\n"
-"жүрөгү, анын негизинде Mandrivalinux-ка кирген бардык графикалык\n"
+"жүрөгү, анын негизинде Mandriva Linux-ка кирген бардык графикалык\n"
 "чөйрөлөр (KDE, GNOME, AfterStep, WindowMaker, ж.б.д.у.с.) иштейт.\n"
 "\n"
 "Оптималдык графикалык көрүнүштү алуу үчүн, сизге ар түрдүү\n"
@@ -4472,12 +4473,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"
@@ -4504,7 +4505,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"
@@ -4513,7 +4514,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"
@@ -4533,11 +4535,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 ""
-"Бул кадамда, Mandrivalinux аркеттер системасын сиздин катуу дисктин\n"
+"Бул кадамда, Mandriva Linux аркеттер системасын сиздин катуу дисктин\n"
 "кайсы жерине орнотууну чечүүңүзгө туура келет. Эгер сиздин катуу диск бош\n"
 "болсо же орнотулган аракеттери системасы дисктин бардыгын ээлесе, сизге\n"
 "дискиңизди кайра бөлүүгө туура келет. Негизинен дискти бөлүү сиздин\n"
-"жаңы Mandrivalinux системасын орнотуу үчүн дисктен логикалык түрдө\n"
+"жаңы Mandriva Linux системасын орнотуу үчүн дисктен логикалык түрдө\n"
 "орун бөлүүдө турат.\n"
 "\n"
 "Эгерде дискте орнотулган аракеттер системасы болсо, дискти бөлүү кайра\n"
@@ -4563,7 +4565,7 @@ msgstr ""
 "Windows FAT же NTFS бөлүмдөрүнүн өлчөмдөрүн өзгөртсөңүз болот.\n"
 "Өлчөмүн өзгөртүү процессин маалыматтарды жоготпой жасаса да болот, өзгөчө\n"
 "Windows бөлүмү дефрагментация кылынгандан кийин. Маалыматтарыңыздын\n"
-"резервдик копиясын түзүү көптөн-көп сунуш кылынат.Эгер сиз Mandrivalinux\n"
+"резервдик копиясын түзүү көптөн-көп сунуш кылынат.Эгер сиз Mandriva Linux\n"
 "жана Microsoft Windows бир компьютерде колдонгуңуз келсе, бул опцияны\n"
 "тандаңыз.\n"
 "\n"
@@ -4572,7 +4574,7 @@ msgstr ""
 "берилиштерин жана жаңы программаларды орнотуу үчүн бош орун азыраак болот.\n"
 "\n"
 " * \"%s\" эгер сиз катуу дискиңиздеги бардык маалыматтарды жоготуп ордуна\n"
-"Mandrivalinux орнотууну кааласаңыз, бул опцияны тандаңыз. Бул чечимди\n"
+"Mandriva Linux орнотууну кааласаңыз, бул опцияны тандаңыз. Бул чечимди\n"
 "тандоодо этият болуңуз, себеби муну тастыктаган соң бардыгын мурда\n"
 "болгондой кылып калыбына келтире албайсыз.\n"
 "\n"
@@ -4733,7 +4735,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."
@@ -4758,7 +4760,7 @@ msgstr ""
 "\n"
 "Бөлүмдөрдү форматтого даяр болгондон кийин \"%s\" баскычын басыңыз.\n"
 "\n"
-"Эгер сиз Mandrivalinux системасын башка бөлүмгө орноткуңуз келсе \"%s\"\n"
+"Эгер сиз Mandriva Linux системасын башка бөлүмгө орноткуңуз келсе \"%s\"\n"
 "баскычын басыңыз.\n"
 "\n"
 "Эгер сиз начар делген блокторду (bad blocks) текшерүүгө бөлүмдөрдү\n"
@@ -4776,7 +4778,7 @@ msgstr "Мурунку"
 #: 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"
@@ -4788,7 +4790,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"
 "жаңылоолордон пайда алуу үчүн аларды сиз азыр Интернеттен жүктөп\n"
@@ -4817,7 +4819,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"
@@ -4830,7 +4832,7 @@ msgstr ""
 "жогорураак деңгээли жалып учурда колдонуу ыңгайлуулугун чектөө\n"
 "эсебинен жасалат.\n"
 "Эгер кайсынынсын тандоону билбесеңиз, аны ошол боюнча калтырыңыз.\n"
-"Коопсуздук деңгээлин кийин Mandrake Башкаруу Борборунун draksec\n"
+"Коопсуздук деңгээлин кийин Mandriva Башкаруу Борборунун draksec\n"
 "утилитинин жардамы менен өзгөртсөңүз болот.\n"
 "\n"
 "\"%s\" талаасында системанын коопсуздугу үчүн жооп берген колдонуучу\n"
@@ -4845,7 +4847,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"
@@ -4931,7 +4933,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"
@@ -4976,7 +4978,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"
@@ -4985,13 +4987,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
@@ -5032,7 +5035,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"
@@ -5191,7 +5195,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"
@@ -5212,7 +5216,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 ""
 
@@ -5312,7 +5316,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"
@@ -5329,7 +5334,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"
@@ -5391,7 +5396,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 ""
 
@@ -5728,7 +5733,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 ""
 
@@ -5831,13 +5836,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"
@@ -5891,7 +5896,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"
@@ -5928,7 +5933,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"
@@ -6001,8 +6006,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"
@@ -6010,13 +6015,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
@@ -6042,7 +6047,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 ""
@@ -6544,7 +6549,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
@@ -6749,7 +6754,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
@@ -9311,7 +9316,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 ""
@@ -12873,8 +12878,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 ""
 
@@ -14537,18 +14542,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."
@@ -14557,7 +14562,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 ""
 
@@ -14574,9 +14579,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 ""
 
@@ -14595,8 +14600,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
@@ -14622,17 +14627,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 ""
 
@@ -14644,7 +14649,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 ""
 
@@ -14682,7 +14687,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
@@ -14701,7 +14706,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
@@ -14719,7 +14724,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
@@ -14739,13 +14744,13 @@ msgstr "<b>Mandriva Expert</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 апплети"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux Updates апплети"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -14765,7 +14770,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 ""
 
@@ -14777,21 +14782,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 ""
 
@@ -14809,17 +14814,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
@@ -14908,7 +14915,7 @@ msgstr ""
 #: share/advertising/15.pl:13
 #, fuzzy, c-format
 msgid "<b>Kontact</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/15.pl:15
 #, c-format
@@ -14995,7 +15002,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 ""
 
@@ -15230,14 +15237,14 @@ 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 "
+"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 ""
 
@@ -15260,8 +15267,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 ""
 
@@ -15291,7 +15298,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
@@ -15302,7 +15309,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 ""
 
@@ -15316,7 +15323,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
@@ -15328,14 +15335,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
@@ -15354,7 +15361,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
@@ -15377,7 +15384,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
@@ -15389,21 +15396,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
@@ -15768,8 +15775,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
@@ -15805,7 +15812,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"
@@ -18303,13 +18310,13 @@ 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"
-msgstr "Mandrivalinux Башкаруу Борбору"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux Башкаруу Борбору"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18782,14 +18789,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
@@ -18840,7 +18847,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -19130,9 +19137,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
@@ -19610,8 +19617,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
@@ -20191,7 +20198,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
@@ -21895,7 +21902,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 ""
 "Сиздин машинеңизде ТВ-карта табылган жок. Linux-шайкеш Видео/ТВ-"
 "картанынтуура жана бышык орнотулганын текшериңиз.\n"
@@ -21904,7 +21911,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
@@ -22620,13 +22627,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
@@ -22738,8 +22745,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrake куралдарынын журналдары"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva куралдарынын журналдары"
 
 #: standalone/logdrake:51
 #, c-format
@@ -23254,10 +23261,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"
-"Mandrake Башкаруу Борборунан конфигурацияны текшериңиз."
+"Mandriva Башкаруу Борборунан конфигурацияны текшериңиз."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -24134,7 +24141,7 @@ msgstr "Орнотуу ийгиликсиз аяктады"
 #~ "\n"
 #~ "Машинени кайра жүктөтүүчү түймөнү басыңыз, ачкычты чыгарып алыңыз,\n"
 #~ "жазуудан коргонуусун алыңыз дагы, ачкычты кайра салыңыз, андан соң\n"
-#~ "Mandrake Move'ни кайра жүктөңүз."
+#~ "Mandriva Move'ни кайра жүктөңүз."
 
 #~ msgid ""
 #~ "Your USB key does not have any valid Windows (FAT) partitions.\n"
@@ -24156,7 +24163,7 @@ msgstr "Орнотуу ийгиликсиз аяктады"
 #~ "\n"
 #~ "\n"
 #~ "Сиз USB-ачкычы жок эле ишти улантсаңыз боло берет - мындай\n"
-#~ "учурда сиз Mandrake Move'ду кадимки live Mandrake операциондук\n"
+#~ "учурда сиз Mandriva Move'ду кадимки live Mandriva операциондук\n"
 #~ "системасы катары колдоно аласыз."
 
 #~ msgid ""
@@ -24173,7 +24180,7 @@ msgstr "Орнотуу ийгиликсиз аяктады"
 #~ "Operating System."
 #~ msgstr ""
 #~ "Сиздин системада эч бир USB-ачкычы табылган жок. Эгерде\n"
-#~ "сиз USB-ачкычын азыр орнотсоңуз, Mandrake Move ушул же башка\n"
+#~ "сиз USB-ачкычын азыр орнотсоңуз, Mandriva Move ушул же башка\n"
 #~ "компьютерде келечектеги жүктөлүүсүндө пайдалана алгыдай кылып\n"
 #~ "беримдерди өздүк каталогуңузга жана бүтүндөй системанын конфигурациясын\n"
 #~ "так сактап алуу мүмкүнчүлүгүн алат. Эскертүү: эгер ачкычты жаңы\n"
@@ -24181,7 +24188,7 @@ msgstr "Орнотуу ийгиликсиз аяктады"
 #~ "\n"
 #~ "\n"
 #~ "Учурда сиз USB-ачкычы жок эле ишти улантсаңыз болот - мындай\n"
-#~ "учурда сиз Mandrake Move'ду кадимки Mandrake операциондук системасы\n"
+#~ "учурда сиз Mandriva Move'ду кадимки Mandriva операциондук системасы\n"
 #~ "катары колдоно аласыз."
 
 #~ msgid ""
@@ -24208,7 +24215,7 @@ msgstr "Орнотуу ийгиликсиз аяктады"
 #~ "\n"
 #~ "Мунун себеби USB-ачкычынындагы системалык конфигурациялык\n"
 #~ "файлдардын жабырланышында болушу мүмкүн, бул учурда\n"
-#~ "көйгөйдү чечүү үчүн ачкычты сууруп салып Mandrake Move'ни\n"
+#~ "көйгөйдү чечүү үчүн ачкычты сууруп салып Mandriva Move'ни\n"
 #~ "кайра жүктөө жетиштүү. Ал үчүн тиешелүү түймөнү басыңыз.\n"
 #~ "\n"
 #~ "\n"
@@ -24216,700 +24223,3 @@ msgstr "Орнотуу ийгиликсиз аяктады"
 #~ "сууруп алып, анын мазмунун башка OC аркылуу изилдесеңиз\n"
 #~ "же №3 жана №4 консолдору аркылуу\n"
 #~ "лог-файлдардан эмне болгонун көрсөңүз болот."
-
-#~ msgid ""
-#~ "Mandrakelinux can support multiple languages. Select\n"
-#~ "the languages you would like to install. They will be available\n"
-#~ "when your installation is complete and you restart your system."
-#~ msgstr ""
-#~ "Mandrakelinux көп тилдүүлүктү колдойт. Орнотуу үчүн\n"
-#~ "каалаган тилди тандаңыз. Орнотуу процесси бүтүп,\n"
-#~ "системаңызды кайра жүктөгөн соң алар колдонууга даяр болот."
-
-#~ msgid ""
-#~ "Before continuing, you should carefully read the terms of the license. "
-#~ "It\n"
-#~ "covers the entire Mandrakelinux distribution. If you agree with all the\n"
-#~ "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
-#~ "button will reboot your computer."
-#~ msgstr ""
-#~ "Мындан ары улантуу үчүн сиз лицензия шартын көңүл коюп окууңуз керек.\n"
-#~ "Ал Mandrakelinux'тун бардык дистрибутивдерине таратылат. Эгер сиз анын\n"
-#~ "ичиндеги бардык шарттарга көнбөсөңүз, \"%s\" рамкасын тандаңыз. Андай\n"
-#~ "болбосо, \"%s\" баскычын бассаңыз сиздин компьютер кайра жүктөлөт."
-
-#~ msgid ""
-#~ "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
-#~ "selected package is located on another CD-ROM, DrakX will eject the "
-#~ "current\n"
-#~ "CD and ask you to insert the required one. If you do not have the "
-#~ "requested\n"
-#~ "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
-#~ "installed."
-#~ msgstr ""
-#~ "Mandrakelinux орнотулушу бир нече CD-ROMго бөлүнүп жайгаштырылган. "
-#~ "Эгерде\n"
-#~ "тандалган пакет башка CD-ROMдо жатса, DrakX учурдагы CDни чыгарып\n"
-#~ "керектелип жаткан тийишүү CDни салууңузду сурайт. Эгерде Сизде тийиштүү\n"
-#~ "CD кол алдыңызда жок болсо, жөн гана \"%s\" түймөсүн чертиңиз, бул "
-#~ "учурда\n"
-#~ "тиешелүү пакет орнотулбай кала берет."
-
-#~ msgid ""
-#~ "It's now time to specify which programs you wish to install on your "
-#~ "system.\n"
-#~ "There are thousands of packages available for Mandrakelinux, and to make "
-#~ "it\n"
-#~ "simpler to manage, they have been placed into groups of similar\n"
-#~ "applications.\n"
-#~ "\n"
-#~ "Mandrakelinux sorts package groups in four categories. You can mix and\n"
-#~ "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 ""
-#~ "Эми системаңызга кайсы программаларды орнотууну кааларыңызды аныктоого\n"
-#~ "убакыт келип жетти. Mandrakelinux менен кошо миңдеген пакеттер сунуш "
-#~ "кылынат,\n"
-#~ "тандоону жеңилдетүү үчүн алар жакындыгынакарата топторго бөлүнгөн.\n"
-#~ "\n"
-#~ "Пакеттер машинаңыздын колдонуу спецификасына дал келе тургандай\n"
-#~ "болуп топторго иреттелген. Mandrakelinux'та пакетер төрт категория\n"
-#~ "боюнча иреттелет. Сиз ар түрдүү категорияларда жайгашкан тиркемелерди\n"
-#~ "аралаштырып же айкалыштыра аласыз, мисалы ``Иш станциясы'' орнотуу "
-#~ "варианты\n"
-#~ "``Иштеп түзүү'' категорясындагы тиркемелерди да камтышы мүмкүн.\n"
-#~ "\n"
-#~ " * \"%s\": эгер сиз машинаны иш станциясы катары колдонгуңуз келсе,\n"
-#~ "иш станциясы категориясынан бир же бир нече тийиштүү группаны\n"
-#~ "тандаңыз.\n"
-#~ "\n"
-#~ " * \"%s\": эгер сиз програмалоо менен алектенгиңиз келсе,\n"
-#~ "бул категориядагы тийиштүү группаны тандаңыз.\n"
-#~ "\n"
-#~ " * \"%s\": эгер сиздин машина сервер катары иштей турган болсо, ага көп\n"
-#~ "колдонулуучу кызматтардын кайсыларын орнотууну кааласаңыз тандаңыз.\n"
-#~ "\n"
-#~ " * \"%s\": бул жерден сиз жактырган графикалык чөйрөнү тандашыңыз\n"
-#~ " керек. Эгер сиз графикалык чөйрөдө иштөөнү кааласаңыз,\n"
-#~ "жок дегенде алардын бири тандалышы керек.\n"
-#~ "\n"
-#~ "Чычкандын сөөмөйүн группанын атына алып келсеңиз, ал группага\n"
-#~ "тийиштүү түшүндүрмө көрсөтүлөт.\n"
-#~ "\n"
-#~ "Сизге \"%s\" чарчыбелгисин тандоо пайдалуу болот, албетте эгерде сиз\n"
-#~ "сунушталып жаткан пакеттерди жакшы билесиңиз, же орнотулуп жаткандарды\n"
-#~ "толук көзөмөлдөп турууну кааласаңыз.\n"
-#~ "\n"
-#~ "Эгер орнотууну \"%s\" режиминде баштасаңыз, кандайдыр бир жаңы пакеттер\n"
-#~ "орнотулушуна жол бербөө үчүн бардык группаларды тандоо чарчыбелгисин "
-#~ "тазалап\n"
-#~ "таштасаңыз болот. Бул орнотулган системаны калыбына келтирүү же жаңылоо "
-#~ "учурунда пайдалуу.\n"
-#~ "\n"
-#~ "Эгеред кадимкидей орнотуу учурунда бир да группа тандабасаңыз (жаңылоого "
-#~ "тийиштүү\n"
-#~ "эмес), минималдык инсталляция үчүн ар кандай опциялары менен\n"
-#~ "диалог пайда болот:\n"
-#~ "\n"
-#~ " * \"%s\": графикалык иш столунун иштешине керектелинүүчү\n"
-#~ "пакеттердин минималдык тобун орнотуу.\n"
-#~ "\n"
-#~ " * \"%s\": негизги системаны жана базалык утилиталарды документациялары "
-#~ "менен\n"
-#~ "кошо орнотуу. Бул инсталляция сервер катары орнотууга туура келет.\n"
-#~ "\n"
-#~ " * \"%s\": Linux системасынын иштеши үчүн керектүү эң эле минималдык "
-#~ "пакеттер\n"
-#~ "орнотулат. Бул вариантта сиз командалык сап режиминде гана иштей аласыз. "
-#~ "Бул\n"
-#~ "орнотуунун жалпы өлчөмү 65 мегабайтты ээлейт."
-
-#, fuzzy
-#~ 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 Mandrakelinux will automatically start any "
-#~ "installed\n"
-#~ "services at boot time. Even if they are safe and have no known issues at\n"
-#~ "the time the distribution was shipped, it is entirely possible that\n"
-#~ "security holes were discovered after this version of Mandrakelinux was\n"
-#~ "finalized. If you do not know what a particular service is supposed to do "
-#~ "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 ""
-#~ "Эгер сиз инсталляторго пакеттерди өз алдыңызча тандоону билдирсеңиз,\n"
-#~ "анда ал группаларга жана подгруппаларга бөлүнгөн бардык пакеттердин\n"
-#~ "дарагын көрсөтөт. Даракты кароо учурунда сиз группаны толугу менен,\n"
-#~ "подгруппаларды же өз алдынча турган пакеттерди тандасаңыз болот.\n"
-#~ "\n"
-#~ "Дарактан пакетти тандоо учурунда, оң жак тарабына пакеттин максатын\n"
-#~ "баяндоочу жардам чыгарылат.\n"
-#~ "\n"
-#~ "!! Эгерде кандайдыр бир сервердик пакет тандалса, сиз аны атайын\n"
-#~ "тандасаңыз же ал башка пакеттин бөлүгү болсо, сиз аны чынында эле\n"
-#~ "ал серверлерди орнотууну каалагандыгыңызды сурайт. Mandrakelinux\n"
-#~ "бардык орнотулган серверлерлерди жүктөө убагында алдынала ишке\n"
-#~ "киргизилет. Дистрибутив чыгарылып жаткан убакта алар коопсуздук\n"
-#~ "боюнча белгилүү проблемалары жок болгону менен, аларда бул\n"
-#~ "Mandrakelinux версиясы чыгарылгандан кийин да, кооптуу болгон\n"
-#~ "жылчыктар табылышы мүмкүн. Эгер сиз берилген кызмат эмне үчүн\n"
-#~ "колдонорун жана эмне иш кыларын билбесеңиз \"%s\" басыңыз.\n"
-#~ "Эгер сиз \"%s\" бассаңыз тизмедеги бардык кызматтар орнотулуп\n"
-#~ "система жүктөлүү учурунда автоматтык түрө ишке киргизилет!!\n"
-#~ "\n"
-#~ "Инсталлятор менен пакеттерди автоматтык түрдө тандоодо\n"
-#~ "\"%s\" опциясы көз карандылык бардыгын билдирүүчү эскертүү\n"
-#~ "диалогун чыгарууга тыйуу салат. Кээ бир пакеттер бири-бири менен\n"
-#~ "байланышкандыктан инсталляторго кээ бир кошумча программаларды\n"
-#~ "орнотууга туура келет. Инсталлятор орнотуунун ийгиликтүү аякташы\n"
-#~ "максатында, көз карандылыктарды канаатандыруу үчүн кандай\n"
-#~ "пакеттердин керектигин өзү аныктайт.\n"
-#~ "\n"
-#~ "Тизменин төмөн жагындагы флоппинин кичинекей сүрөтбелгиси мындан\n"
-#~ "мурунку инсталляцияда тандалган пакеттердин тизмесин жүктөөгө\n"
-#~ "мүмкүндүк берет. Эгер сиз бул сүрөтбелгини бассаңыз, мындан мурунку\n"
-#~ "инсталляция учурунда даярдалган флоппини салууңузду суранат. Мындай\n"
-#~ "флоппини түзүү үчүн акыркы кадамдагы экинчи кеңешти караңыз."
-
-#, fuzzy
-#~ msgid ""
-#~ "X (for X Window System) is the heart of the GNU/Linux graphical "
-#~ "interface\n"
-#~ "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-#~ "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
-#~ "\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 (X Window системасы үчүн) GNU/Linux графикалык интерфейсинин\n"
-#~ "жүрөгү, анын негизинде Mandrakelinux-ка кирген бардык графикалык\n"
-#~ "чөйрөлөр (KDE, GNOME, AfterStep, WindowMaker, ж.б.д.у.с.) иштейт.\n"
-#~ "\n"
-#~ "Оптималдык графикалык көрүнүштү алуу үчүн, сизге ар түрдүү\n"
-#~ "параметрлердин тизмеси сунушталат: Видеокарта\n"
-#~ "\n"
-#~ "   Инсталлятор демейде сиздин машинаңызда орнотулган видеокартаны\n"
-#~ "автоматтык түрдө таап калыптандырат. Эгер антпесе, сизде орнотулган\n"
-#~ "картаны бул тизмеден тандасаңыз болот.\n"
-#~ "\n"
-#~ "   Эгерде сиздин картаңыз үчүн ар кандай серверлер мүмкүн болсо, 3D\n"
-#~ "тездетүүсү менен же анысы жок, сиздин керектөөңүзгө көбүрөөк туура\n"
-#~ "келген серверди тандап алууңузду сунуштайт.\n"
-#~ "\n"
-#~ "\n"
-#~ "Монитор\n"
-#~ "\n"
-#~ "   Инсталлятор демейде сиздин машинаңызга туташкан мониторду\n"
-#~ "автоматтык түрдө таап калыптандырат. Эгер антпесе, сизге туташкан\n"
-#~ "мониторду тизмеден өз алдынча тандасаңыз болот.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Мүмкүнчүлүк\n"
-#~ "\n"
-#~ "   Бул жерден сиздин техникаңыз колдой алган көрсөтүү мүмкүнчүлүгүн жана\n"
-#~ "түс тереңдигин тандасаңыз болот. Сизге көбүрөөк туура келгенин тандаңыз "
-#~ "(сиз\n"
-#~ "аны инсталляциядан кийин өзгөртө аласыз). Тандалып алынган "
-#~ "конфигурациянын\n"
-#~ "үлгүсү мониторго чыгарылат.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Текшерүү\n"
-#~ "\n"
-#~ "   Сиздин каражатыңызга карата, бул пункт бар же жок болушу мүмкүн.\n"
-#~ "\n"
-#~ "   Система тандалган мүмкүнчүлүктү колдонуп графикалык экранды ачуу\n"
-#~ "аракетин жасайт. Эгер сиз текшерүү учурунда маалыматты көрө алсаңыз\n"
-#~ "жана \"%s\" жообун тандасаңыз анда DrakX кийинки кадамга өтөт.\n"
-#~ "Эгер сиз маалыматты көрө албасаңыз, анда автоматтык түрдө аныкталган\n"
-#~ "конфигурциянын бөлүгү туура эмес аныкталган деп түшүнүлүп, автоматтык\n"
-#~ "түрдө 12 секунд өткөн соң сизди менюга кайра алып келет. Туура "
-#~ "графикалык\n"
-#~ "сүрөттү алмайынча, параметрлерди оңдоп кайталап көрүңүз.\n"
-#~ "\n"
-#~ "\n"
-#~ "Параметрлер\n"
-#~ "\n"
-#~ "   Бул жерден сиз машинаңызды автоматтык түрдө гафикалык интерфейсти\n"
-#~ "жүктөөгө калыптасаңыз болот. Албетте, эгерде сиздин машинаңыз сервер\n"
-#~ "катары иштесе же графикалык режимди калыптандыруу мүмкүн болбосо\n"
-#~ "анда сиз \"%s\" тандооңуз туура."
-
-#, fuzzy
-#~ msgid ""
-#~ "You now need to decide where you want to install the Mandrakelinux\n"
-#~ "operating system on your hard drive. If your hard drive is empty or if "
-#~ "an\n"
-#~ "existing operating system is using all the available space you will have "
-#~ "to\n"
-#~ "partition the drive. Basically, partitioning a hard drive means to\n"
-#~ "logically divide it to create the space needed to install your new\n"
-#~ "Mandrakelinux system.\n"
-#~ "\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 Mandrakelinux 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 Mandrakelinux 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 ""
-#~ "Бул кадамда, Mandrakelinux аркеттер системасын сиздин катуу дисктин\n"
-#~ "кайсы жерине орнотууну чечүүңүзгө туура келет. Эгер сиздин катуу диск "
-#~ "бош\n"
-#~ "болсо же орнотулган аракеттери системасы дисктин бардыгын ээлесе, сизге\n"
-#~ "дискиңизди кайра бөлүүгө туура келет. Негизинен дискти бөлүү сиздин\n"
-#~ "жаңы Mandrakelinux системасын орнотуу үчүн дисктен логикалык түрдө\n"
-#~ "орун бөлүүдө турат.\n"
-#~ "\n"
-#~ "Эгерде дискте орнотулган аракеттер системасы болсо, дискти бөлүү кайра\n"
-#~ "калыбына келбөөчү процесс болгондуктан андагы маалыматтарды жоготууга\n"
-#~ "алып келиши мүмкүн экендигинен, үйрөнчүк колдонуучулар үчүн бир топ\n"
-#~ "кыйыныраак жана коркунучтуу момент. Тилекке жараша DrakXте бул\n"
-#~ "процессти жеңилдетүүчү уста бар. Бул кадамды улантуу алдында колдонмонун\n"
-#~ "тийиштүү бөлүгүн окуп чыгыңыз жана шашпаңыз.\n"
-#~ "\n"
-#~ "Катуу дискиңиздин конфигурациясына жараша бир нече параметрлер мүмкүн:\n"
-#~ "\n"
-#~ " * \"%s\": бул опция бош дискти же дисктерди автоматтык түрдө бөлүүнү\n"
-#~ "түшүндүрөт. Эгер бул опция тандалса, андан ары суроо берилбейт;\n"
-#~ "\n"
-#~ " * \"%s\": уста катуу дискиңиздеги Linux бөлүмдөрүн аныктады. Эгер сиз\n"
-#~ "аларды колдонгуңуз келсе бул опцияны тандаңыз. Ар бир бөлүм үчүн\n"
-#~ "бириктирүү чекиттерин көрсөтүү суралат. Алыднала бириктирүү чекиттери\n"
-#~ "салтка жараша тандалгандыктан аны тийбей койсоңуз да болот.\n"
-#~ " * \"%s\": эгерде сиздин дискте Microsoft Windows орнотулуп аны толук "
-#~ "ээлесе,\n"
-#~ "Linux берилиштерин сактоо үчүн бош орун түзүүңүзгө туура келет. Муну "
-#~ "түзүү\n"
-#~ "үчүн Microsoft Windows бөлүмүн жана берилиштерин жоготсоңуз, же "
-#~ "Microsoft\n"
-#~ "Windows FAT же NTFS бөлүмдөрүнүн өлчөмдөрүн өзгөртсөңүз болот.\n"
-#~ "Өлчөмүн өзгөртүү процессин маалыматтарды жоготпой жасаса да болот, "
-#~ "өзгөчө\n"
-#~ "Windows бөлүмү дефрагментация кылынгандан кийин. Маалыматтарыңыздын\n"
-#~ "резервдик копиясын түзүү көптөн-көп сунуш кылынат.Эгер сиз Mandrakelinux\n"
-#~ "жана Microsoft Windows бир компьютерде колдонгуңуз келсе, бул опцияны\n"
-#~ "тандаңыз.\n"
-#~ "\n"
-#~ "   Бул опцияны тандоо алдында сиздин Microsoft Windows бөлүмүңүздүн "
-#~ "өлчөмү\n"
-#~ "мурдагыдан азыраак болуусун түшүнүүңүз керек. Сизде Microsoft Windows-"
-#~ "тун\n"
-#~ "берилиштерин жана жаңы программаларды орнотуу үчүн бош орун азыраак "
-#~ "болот.\n"
-#~ "\n"
-#~ " * \"%s\" эгер сиз катуу дискиңиздеги бардык маалыматтарды жоготуп "
-#~ "ордуна\n"
-#~ "Mandrakelinux орнотууну кааласаңыз, бул опцияны тандаңыз. Бул чечимди\n"
-#~ "тандоодо этият болуңуз, себеби муну тастыктаган соң бардыгын мурда\n"
-#~ "болгондой кылып калыбына келтире албайсыз.\n"
-#~ "\n"
-#~ "   !! Эгер бул опцияны тандасаңыз, катуу дискиңиздеги бардык маалыматтар\n"
-#~ "жоготулат. !!\n"
-#~ "\n"
-#~ " * \"%s\": бул опция катуу дисктеги бардык маалыматты жоготуп бөлүмдөрдү\n"
-#~ "түзүүнү кайра башынан бош жерден баштоого мүмкүндүк берет. Дискиңиздеги\n"
-#~ "бардык информация жоголот.\n"
-#~ "\n"
-#~ "   !! Эгер бул опцияны тандасаңыз, катуу дискиңиздеги бардык маалыматтар\n"
-#~ "жоготулат. !!\n"
-#~ "\n"
-#~ " * \"%s\": згер сиз дискти өз алдынча бөлгүңүз келсе бул опцияны "
-#~ "тандаңыз.\n"
-#~ "Этият болуңуз - бул кубаттуу жана ошол эле маалда кооптуу мүмкүнчүлүк.\n"
-#~ "Сиз бир заматта болгон мааламаттардын бардыгын жоготуп алышыңыз мүмкүн.\n"
-#~ "Ошондуктан, ушул сыяктуу нерсени мурда жасап, кандайдыр бир тажрыйбаңыз\n"
-#~ "болгон учурда гана бул опцияны тандоо сунуш кылынат. DiskDrake "
-#~ "утилитасын\n"
-#~ "кантип колдонуу керектигин билүү үчүн ``Баштоочунун колдонмосу' "
-#~ "китебинин\n"
-#~ "``Дисктин бөлүмдөрүн башкаруу'' бөлүмүнө кайрылыңыз."
-
-#, fuzzy
-#~ 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"
-#~ "Mandrakelinux 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 ""
-#~ "Кайрадан жыңы түзүлгөн бөлүмдөрдү колдонууга киргизүү үчүн аларды\n"
-#~ "форматтоо талап кылынат (форматтоо файл системасын түзүүнү\n"
-#~ "түшүндүрөт).\n"
-#~ "\n"
-#~ "Бул этапта сизде мурда болүнгөн бөлүмдөрдө сакталган берилиштерди өчүрүү\n"
-#~ "үчүн аларды кайра форматто мүмкүнчүлүгү бар. Эгер бул сизге керек болсо,\n"
-#~ "бул бөлүмдөрдү дагы тандаңыз.\n"
-#~ "\n"
-#~ "Мурда түзүлгөн бөлүмдөрдү кайрадан форматтоо дайыма керек эместигин\n"
-#~ "эске алыңыз. Сиз, аракеттер системасы орнотулган (\"/\", \"/usr\" или \"/"
-#~ "var\")\n"
-#~ "бөлүмдөрүн кайра форматтоңуз керек, бирок сиз сактап калууну каалаган\n"
-#~ "бөлүмдөрдү кайра форматтоо талап кылынбайт (демейде бул \"/home\").\n"
-#~ "\n"
-#~ "Бөлүмдөрдү тандоодо этияттаңыз. Форматталган соң көрсөтүлгөн "
-#~ "бөлүмдөрдөгү\n"
-#~ "бардык берилиштер жоготулат, ошондуктан аларды кайра калыбына келтирүүгө\n"
-#~ "мүмкүн эмес.\n"
-#~ "\n"
-#~ "Бөлүмдөрдү форматтого даяр болгондон кийин \"%s\" баскычын басыңыз.\n"
-#~ "\n"
-#~ "Эгер сиз Mandrakelinux системасын башка бөлүмгө орноткуңуз келсе \"%s\"\n"
-#~ "баскычын басыңыз.\n"
-#~ "\n"
-#~ "Эгер сиз начар делген блокторду (bad blocks) текшерүүгө бөлүмдөрдү\n"
-#~ "тандагыңыз келсе \"%s\" баскычын басыңыз."
-
-#, fuzzy
-#~ msgid ""
-#~ "By the time you install Mandrakelinux, 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 ""
-#~ "Mandrakelinux орнотуу убагында баштапкы релиздин кээ бир пакеттерин\n"
-#~ "жаңы чыкандары менен жаңыласаңыз жакшы болот. Кээ бир багдар\n"
-#~ "оңдолушу жана коопсуздук проблемалары чечилиши мүмкүн. Бул\n"
-#~ "жаңылоолордон пайда алуу үчүн аларды сиз азыр Интернеттен жүктөп\n"
-#~ "алсаңыз болот. Жаңылоо үчүн, эгер сизде иштеп жаткан Интернет байланышы\n"
-#~ "болсо \"%s\" баскычын басыңыз, же \"%s\" басып пакеттерди\n"
-#~ " жаңылоону кийинчээрек жасасаңыз болот.\n"
-#~ "\n"
-#~ "\"%s\" баскычын басканда жаңылоолорду жүктөп алууга мүмкүн болгон\n"
-#~ "орундарды тизеси чыгат. Сизге эң жакын жайгашканын тандаңыз. Андан\n"
-#~ "соң пакттерди тандоо дарагы чыгат: тизмени карап чыгып тандаган соң\n"
-#~ "кабыл алуу жана орнотуу үчүн \"%s\" же орнотпоо үчүн \"%s\" басыңыз."
-
-#, fuzzy
-#~ 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 Mandrakelinux\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 ""
-#~ "Бул этапта DrakX сизге машинаңыз үчүн каалаган коопсуздук деңгээлин\n"
-#~ "тандоого мүмкүндүк берет. Эгерде машинаңызда критикалык маалымат\n"
-#~ "болсо же ал Интернетке түздөн-түз туташкан болсо, эреже катары анда\n"
-#~ "коопсуздук деңгээли жогору болушу керек. Бирок коопсуздуктун\n"
-#~ "жогорураак деңгээли жалып учурда колдонуу ыңгайлуулугун чектөө\n"
-#~ "эсебинен жасалат.\n"
-#~ "Эгер кайсынынсын тандоону билбесеңиз, аны ошол боюнча калтырыңыз.\n"
-#~ "Коопсуздук деңгээлин кийин Mandrake Башкаруу Борборунун draksec\n"
-#~ "утилитинин жардамы менен өзгөртсөңүз болот.\n"
-#~ "\n"
-#~ "\"%s\" талаасында системанын коопсуздугу үчүн жооп берген колдонуучу\n"
-#~ "көрсөтүлөт. Бул адреске коопсуздук боюнча кабарлар жөнөтүлөт."
-
-#~ msgid ""
-#~ "_: keyboard\n"
-#~ "Tifinagh (+latin/arabic)"
-#~ msgstr "Tifinagh (+латын/арабтык)"
-
-#~ msgid "No network card"
-#~ msgstr "Тармактык карта жок"
-
-#, fuzzy
-#~ msgid "Use already installed driver (%s)"
-#~ msgstr "Ssh-идентификатору алдгачан орнотулган"
-
-#~ msgid "Welcome to <b>Mandrakelinux</b>!"
-#~ msgstr "<b>Mandrakelinux</b>'ка кош келиңиз!"
-
-#, fuzzy
-#~ msgid "<b>Mandrakesoft Products</b>"
-#~ msgstr "<b>Mandrakeexpert</b>"
-
-#, fuzzy
-#~ msgid "The Mandrakelinux products are:"
-#~ msgstr "Mandrakelinux Updates апплети"
-
-#~ msgid "<b>Mandrakeclub</b>"
-#~ msgstr "<b>Mandrakeclub</b>"
-
-#, fuzzy
-#~ msgid "<b>Mandrakeonline</b>"
-#~ msgstr "<b>Mandrakeclub</b>"
-
-#~ msgid "<b>Mandrakeexpert</b>"
-#~ msgstr "<b>Mandrakeexpert</b>"
-
-#, fuzzy
-#~ msgid "Mandrakesoft Wizards"
-#~ msgstr "<b>Mandrakeexpert</b>"
-
-#~ msgid "Mandrakelinux Control Center"
-#~ msgstr "Mandrakelinux Башкаруу Борбору"
-
-#~ msgid "Mandrakeonline"
-#~ msgstr "Mandrakeonline"
-
-#, fuzzy
-#~ msgid "Mandrakelinux Help Center"
-#~ msgstr "Mandrakelinux Башкаруу Борбору"
-
-#~ msgid "Mandrakelinux Tools Logs"
-#~ msgstr "Mandrake куралдарынын журналдары"
-
-#~ msgid ""
-#~ "Connection failed.\n"
-#~ "Verify your configuration in the Mandrakelinux Control Center."
-#~ msgstr ""
-#~ "Туташуу ишке ашпады.\n"
-#~ "Mandrake Башкаруу Борборунан конфигурацияны текшериңиз."
diff --git a/perl-install/share/po/lt.po b/perl-install/share/po/lt.po
index efa64b52e..08ee850d9 100644
--- a/perl-install/share/po/lt.po
+++ b/perl-install/share/po/lt.po
@@ -1223,7 +1223,7 @@ msgstr "Vanuatu"
 #: 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 "Tu gali pasirinkti kitas kalbas, kurios bus prieinamos po įdiegimo"
@@ -3505,7 +3505,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
@@ -3655,7 +3655,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"
@@ -3666,11 +3666,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"
@@ -3777,10 +3778,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"
@@ -3902,7 +3903,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"
@@ -4000,12 +4001,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"
@@ -4032,7 +4033,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"
@@ -4041,7 +4042,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"
@@ -4062,10 +4064,10 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Dabar tu turi nuspręsti, kurioje savo kietojo disko vietoje nori įdiegti\n"
-"Mandrivalinux operacijų sistemą. Jei jis yra tuščias arba jau esanti\n"
+"Mandriva Linux operacijų sistemą. Jei jis yra tuščias arba jau esanti\n"
 "operacijų sistema naudoja visą vietą jame, tau reikės sudalinti jį. Kietojo\n"
 "disko sudalinimas į skirsnius tiesiog yra jo logiškas padalinimas taip, kad\n"
-"atsirastų laisvos vietos įdiegti tavo naujajai Mandrivalinux sistemai.\n"
+"atsirastų laisvos vietos įdiegti tavo naujajai Mandriva Linux sistemai.\n"
 "\n"
 "\n"
 "Kadangi sudalinimo skirsniais padariniai dažniausiai yra negrįžtami,\n"
@@ -4096,7 +4098,7 @@ msgstr ""
 "\n"
 "* Išvalyti visą diską: jei tu nori sunaikinti visus duomenis ir skirsnius, "
 "esančius kietajame diske, ir pakeisti juos\n"
-"  nauja Mandrivalinux sistema, gali pasirinkti šį variantą. Būk atsargus su "
+"  nauja Mandriva Linux sistema, gali pasirinkti šį variantą. Būk atsargus su "
 "šiuo sprendimu, nes jei sutiksi,\n"
 "  nebegalėsi apsigalvoti ir sugrįžti.\n"
 "\n"
@@ -4109,7 +4111,7 @@ msgstr ""
 "sprendimus) arba pakeisti Windows skirsnio\n"
 "  dydį. Dydžio pakeitimas gali būti atliktas be duomenų praradimo. Šis "
 "sprendimas yra rekomenduojamas, jei\n"
-"  tu nori naudoti tiek Mandrivalinux, tiek Microsoft Windows tame pačiame "
+"  tu nori naudoti tiek Mandriva Linux, tiek Microsoft Windows tame pačiame "
 "kompiuteryje.\n"
 "\n"
 "\n"
@@ -4235,7 +4237,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."
@@ -4264,7 +4266,7 @@ msgstr ""
 "\n"
 "\n"
 "Spausk \"Atšaukti\", jei nori pasirinkti kitus skirsnius, į kuriuos įdiegti\n"
-"Mandrivalinux sistemą."
+"Mandriva Linux sistemą."
 
 #: help.pm:431 install_steps_gtk.pm:392 interactive.pm:434
 #: interactive/newt.pm:318 printer/printerdrake.pm:3676
@@ -4278,7 +4280,7 @@ msgstr "Ankstesnis"
 #: 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"
@@ -4307,7 +4309,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"
@@ -4323,7 +4325,7 @@ msgstr "Nutolusio lpd spausdintuvo nuostatos"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4480,7 +4482,7 @@ msgstr "Pakeisti į normalų režimą"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4511,7 +4513,7 @@ msgstr ""
 "Tavo kietajame diske buvo aptiktas vienas ar daugiau Microsoft Windows\n"
 "skirsnis. Prašom pasirinkti, kurio iš jų dydį nori pakeisti, kad įdiegtum "
 "savo\n"
-"naująją Mandrivalinux operacijų sistemą.\n"
+"naująją Mandriva Linux operacijų sistemą.\n"
 "\n"
 "\n"
 "Tavo žiniai, kiekvienas skirsnis sąraše užrašomas pavidalu \"Linux "
@@ -4567,7 +4569,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"
@@ -4576,13 +4578,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
@@ -4623,7 +4626,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"
@@ -4782,7 +4786,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"
@@ -4803,7 +4807,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 ""
 
@@ -4929,7 +4933,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"
@@ -4946,7 +4951,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"
@@ -5008,11 +5013,11 @@ msgstr "Paslaugų nustatymai"
 #, 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 ""
 "Pasirink kietąjį diską, kurį nori ištuštinti, kad įdiegtum naują\n"
-"Mandrivalinux sistemą. Būk atsargus, visi duomenys, esantys jame, bus\n"
+"Mandriva Linux sistemą. Būk atsargus, visi duomenys, esantys jame, bus\n"
 "prarasti, ir jų nebebus įmanoma atkurti."
 
 #: help.pm:863
@@ -5347,7 +5352,7 @@ msgstr "Naudoti laisvą vietą Windows skirsnyje"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Tavo Windows skirsnis yra pernelyg fragmentuotas, pirma paleisk „defrag“"
@@ -5465,13 +5470,13 @@ msgstr "Išjungiamas tinklas"
 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"
@@ -5525,7 +5530,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"
@@ -5562,7 +5567,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"
@@ -5664,8 +5669,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"
@@ -5673,13 +5678,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 ""
 "Sveikiname. Įdiegimas baigtas.\n"
 "Ištrauk įdiegimo laikmenas ir spausk Enter, kad perkrautum.\n"
 "\n"
 "\n"
-"Kad sužinotum apie pataisymus, kurie prieinami šiai Mandrivalinux laidai,\n"
+"Kad sužinotum apie pataisymus, kurie prieinami šiai Mandriva Linux laidai,\n"
 "pasižiūrėk į Errata, kuris yra \n"
 "\n"
 "\n"
@@ -5687,13 +5692,13 @@ msgstr ""
 "\n"
 "\n"
 "Informacija apie tavo sistemos konfigūravimą yra oficialioje\n"
-"Mandrivalinux User's Guide knygoje."
+"Mandriva Linux User's Guide knygoje."
 
 #. -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
@@ -5722,12 +5727,12 @@ msgstr "Įeinama į žingsnį „%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 ""
 "Tavo sistemoje mažai resursų. Tu gali susidurti su bėdomis, įdiegdamas\n"
-"Mandrivalinux. Jei taip atsitiktų, gali pabandyti tekstinį diegimo būdą:\n"
+"Mandriva Linux. Jei taip atsitiktų, gali pabandyti tekstinį diegimo būdą:\n"
 "Kai užsikrauna iš CDROM'o, paspausk `F1', o tada įvesk \"text\"."
 
 #: install_steps_gtk.pm:228 install_steps_interactive.pm:624
@@ -6240,7 +6245,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 ""
 "Jungiamasi prie atvaizdžio (mirror), kad gautume prieinamų paketų sąrašą"
 
@@ -6457,8 +6462,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux įdiegimas %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux įdiegimas %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9028,7 +9033,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 ""
@@ -12657,8 +12662,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 ""
 
@@ -14397,18 +14402,18 @@ msgstr "Sustoti"
 
 #: 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 "Sveiki atvykę į <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Sveiki atvykę į <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."
@@ -14417,7 +14422,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 ""
 
@@ -14434,9 +14439,9 @@ msgstr "Nustatymų tikrinimas"
 #: 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 ""
 
@@ -14455,8 +14460,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
@@ -14482,17 +14487,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 ""
 
@@ -14504,7 +14509,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 ""
 
@@ -14542,7 +14547,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
@@ -14561,7 +14566,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
@@ -14579,7 +14584,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
@@ -14599,12 +14604,12 @@ msgstr "Prisijungti prie interneto"
 #: 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
@@ -14625,7 +14630,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 ""
 
@@ -14637,21 +14642,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 ""
 
@@ -14669,17 +14674,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
@@ -14855,7 +14862,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 ""
 
@@ -15090,14 +15097,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
 msgstr "Prisijungti prie interneto"
 
 #: 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 ""
 
@@ -15120,8 +15127,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 ""
 
@@ -15151,7 +15158,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
@@ -15162,7 +15169,7 @@ msgstr "Prisijungti prie interneto"
 #: 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 ""
 
@@ -15176,7 +15183,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
@@ -15188,14 +15195,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
@@ -15214,7 +15221,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
@@ -15237,7 +15244,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
@@ -15249,21 +15256,21 @@ msgstr "Prisijungti prie interneto"
 #, 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
@@ -15623,8 +15630,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
@@ -15660,7 +15667,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"
@@ -18160,12 +18167,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
 msgstr "Prisijungti prie interneto"
 
 #: standalone/drakbug:46
 #, fuzzy, c-format
-msgid "Mandrivalinux Control Center"
+msgid "Mandriva Linux Control Center"
 msgstr "Prisijungti prie interneto"
 
 #: standalone/drakbug:48
@@ -18637,14 +18644,14 @@ msgstr "Startavo įkrovos metu"
 #, 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
@@ -18695,7 +18702,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18985,9 +18992,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
@@ -19490,7 +19497,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "Prisijungti prie interneto"
 
 #: standalone/drakhelp:36
@@ -20080,7 +20087,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
@@ -21687,7 +21694,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
@@ -22375,7 +22382,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 ""
 
@@ -22484,7 +22491,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "Konsolės įrankiai"
 
 #: standalone/logdrake:51
@@ -22988,7 +22995,7 @@ msgstr "Jungties tipas: "
 #, 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/ltg.po b/perl-install/share/po/ltg.po
index 4da0b1a55..8f71c2531 100644
--- a/perl-install/share/po/ltg.po
+++ b/perl-install/share/po/ltg.po
@@ -1273,11 +1273,11 @@ msgstr "Manuali"
 #: 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 var nūdrūšynuot vairuokys volūdys. Izavielejit\n"
+"Mandriva Linux var nūdrūšynuot vairuokys volūdys. Izavielejit\n"
 "volūdys, kaidys gribit uzstuodeit. Tuos byus pīejamys,\n"
 "kod jiusu instaleišona byus gotova i jius puorstarteisit sovu sistemu."
 
@@ -3610,13 +3610,13 @@ msgstr "īslēgt radejis atbolstu"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
 "Pyrms turpynuot, jiusim vajadzātu uzmaneigi izlaseit licencis vīnuošonūs. "
 "Tei nūsadz\n"
-"vysu Mandrivalinux distribuceju. Ja jius napīkreitit vysim tuos "
+"vysu Mandriva Linux distribuceju. Ja jius napīkreitit vysim tuos "
 "nūteikumiem,\n"
 "puorbaudit \"%s\"  kasti, nūspīdit pūgu \"%s\",\n"
 "lai jiusu dators puorstarteitu."
@@ -3756,13 +3756,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The 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 instalācija ir sadalīta pa dažiem CD-ROM diskiem. DrakX\n"
+"Mandriva Linux instalācija ir sadalīta pa dažiem CD-ROM diskiem. DrakX\n"
 "zin, vai izvēlētā pakotne atrodas uz cita CD-ROM diska, izvirzīs pašreizējo\n"
 "kompaktdisku un palūgs ievietot citu pēc nepieciešamības."
 
@@ -3770,11 +3770,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"
@@ -3881,10 +3882,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"
@@ -4005,7 +4006,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"
@@ -4111,12 +4112,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"
@@ -4143,7 +4144,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"
@@ -4152,7 +4153,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"
@@ -4172,11 +4174,11 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Pošlaik jiusim ir juoizavielej, kur iz cītuo diska instalēt Mandrivalinux\n"
+"Pošlaik jiusim ir juoizavielej, kur iz cītuo diska instalēt Mandriva Linux\n"
 "opereituojsistemu. Ja disks ir tukšs voi cyta opereituojsistema aizjam vysu\n"
 "vītu iz diska, jiusim byus juoveic diska sadaleišona. Eisumā, cītuo diska\n"
 "sadaleišona nūzeimej tū sadaleit logiskuos daļuos, lai izveiduotu vītu\n"
-"Mandrivalinux sistemys instaleišonai.\n"
+"Mandriva Linux sistemys instaleišonai.\n"
 "\n"
 "Sakarā ar tū, ka diska sadaleišonys process parasti ir naatgrīzenisks,\n"
 "napīredziejušam lītuotuojam tys var byut napateikams i stresa pylns.\n"
@@ -4205,7 +4207,7 @@ msgstr ""
 "\n"
 "* Izdzēst visu disku: ja vēlaties izdzēst visus uz diska esošos datus un "
 "sadaļas un aizstāt tās ar jaunu\n"
-"  Mandrivalinux sistēmu, varat izvēlēties šo opciju. Esiet uzmanīgi, "
+"  Mandriva Linux sistēmu, varat izvēlēties šo opciju. Esiet uzmanīgi, "
 "izvēloties šo risinājumu, jo pēc\n"
 "  apstiprināšanas jūs vairs nevarēsit atteikties no šīs izvēles.\n"
 "\n"
@@ -4218,7 +4220,7 @@ msgstr ""
 "vai izmainīt Microsoft\n"
 "  Windows sadaļas izmēru. Sadaļas izmēru var izmainīt bez datu zaudēšanas. "
 "Šis risinājums ir ieteicams, ja\n"
-"  jūs savā datorā vēlaties izmantot gan Mandrivalinux, gan Microsoft "
+"  jūs savā datorā vēlaties izmantot gan Mandriva Linux, gan Microsoft "
 "Windows.\n"
 "\n"
 "\n"
@@ -4342,7 +4344,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."
@@ -4366,7 +4368,7 @@ msgstr ""
 "Noklikšķiniet \"Labi\", kad esat gatavi formatēt sadaļas.\n"
 "\n"
 "Noklikšķiniet \"Atcelt\", ja jūs gribat izvēlēties citas sadaļas, kur\n"
-"instalēt jauno Mandrivalinux operētājsistēmu."
+"instalēt jauno Mandriva Linux operētājsistēmu."
 
 #: help.pm:431 install_steps_gtk.pm:392 interactive.pm:434
 #: interactive/newt.pm:318 printer/printerdrake.pm:3676
@@ -4380,7 +4382,7 @@ msgstr "Atpakaļ"
 #: 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"
@@ -4409,7 +4411,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"
@@ -4433,7 +4435,7 @@ msgstr "Drošības administrators:"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4503,7 +4505,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Pašlaik jums ir jāizvēlas, kurā(s) diska sadaļā(s) instalēt Mandrivalinux\n"
+"Pašlaik jums ir jāizvēlas, kurā(s) diska sadaļā(s) instalēt Mandriva Linux\n"
 "operētājsistēmu. Ja sadaļas jau ir izveidotas (agrākas GNU/Linux "
 "instalēšanas\n"
 "laikā vai ar citu diska sadalīšanas rīku), jūs varat izmantot esošās "
@@ -4586,7 +4588,7 @@ msgstr "Pārslēgt normālajā režīmā"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4616,7 +4618,7 @@ msgid ""
 msgstr ""
 "Uz jūsu cietā diska ir atrasta vairāk nekā viena Microsoft Windows sadaļa.\n"
 "Lūdzu izvēlieties to sadaļu, kuras izmēru jūs vēlaties izmainīt, lai\n"
-"instalētu jauno Mandrivalinux operētājsistēmu.\n"
+"instalētu jauno Mandriva Linux operētājsistēmu.\n"
 "\n"
 "\n"
 "Jūsu zināšanai, katra sadaļa ir uzskaitīta šādā veidā: \"Linux nosaukums\",\n"
@@ -4663,7 +4665,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"
@@ -4672,13 +4674,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
@@ -4732,7 +4735,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"
@@ -4891,7 +4895,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"
@@ -4912,7 +4916,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 ""
 
@@ -5033,7 +5037,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"
@@ -5050,7 +5055,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"
@@ -5112,11 +5117,11 @@ msgstr "Servisi"
 #, 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 ""
 "Norādiet cieto disku, ko vēlaties izdzēst, lai izveidotu jaunu\n"
-"Mandrivalinux sadaļu. Esiet uzmanīgi, jo visi diskā esošie dati\n"
+"Mandriva Linux sadaļu. Esiet uzmanīgi, jo visi diskā esošie dati\n"
 "pazudīs un nebūs atjaunojami."
 
 #: help.pm:863
@@ -5465,11 +5470,11 @@ msgstr "Izmantot Windows sadaļas brīvo vietu"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Windows sadaļa ir puoruok fragmenteita. Vyspyrms nu Windows vidis palaidit "
-"``defrag'' i tod atsuocit Mandrivalinux instaleišonu."
+"``defrag'' i tod atsuocit Mandriva Linux instaleišonu."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -5584,13 +5589,13 @@ msgstr "Atslādzu teiklu"
 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"
@@ -5619,8 +5624,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 "
@@ -5634,8 +5639,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 "
@@ -5644,7 +5649,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"
@@ -5678,10 +5683,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"
@@ -5786,8 +5791,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"
@@ -5795,14 +5800,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 ""
 "Apsveicam, instaleišona ir pabeigta.\n"
 "Izjemit suokneišonys datu nesieju i nūspīdit īvodu, lai puorstarteitu "
 "datoru.\n"
 "\n"
 "\n"
-"Lai sajimtu informaceju par lobuojumim, kas ir pīejami itam Mandrivalinux\n"
+"Lai sajimtu informaceju par lobuojumim, kas ir pīejami itam Mandriva Linux\n"
 "izdavumam, skotit Errata failu, kas atrūnams\n"
 "\n"
 "\n"
@@ -5810,14 +5815,14 @@ msgstr ""
 "\n"
 "\n"
 "Informaceja par jiusu sistemys konfigureišonu ir pīejama Oficialajā\n"
-"Mandrivalinux lītuotuoja rūkysgruomotys piecinstaleišonys (post install) "
+"Mandriva Linux lītuotuoja rūkysgruomotys piecinstaleišonys (post install) "
 "nūdaļā."
 
 #. -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
@@ -5846,11 +5851,11 @@ msgstr "Uzsuocu sūli `%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 ""
-"Jiusu sistemai tryukst resursu. Mandrivalinux instaleišonys laikā var\n"
+"Jiusu sistemai tryukst resursu. Mandriva Linux instaleišonys laikā var\n"
 "rastīs problemys. Ja tai nūteik, varit pamieginuot teksta režima "
 "instaleišonu.\n"
 "Lai tū izdareitu, nūspīdit`F1', kod nūteik īluode nu CDROM, tod īvodit\n"
@@ -6388,9 +6393,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 ""
-"Pīsaslādzu Mandrivalinux teimeklim, lai sajimtu pīejamū spūguļserveru "
+"Pīsaslādzu Mandriva Linux teimeklim, lai sajimtu pīejamū spūguļserveru "
 "sarokstu..."
 
 #: install_steps_interactive.pm:840
@@ -6606,8 +6611,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux instaleišona %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux instaleišona %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9201,13 +9206,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 konfigurētājs\n"
 "\n"
-"Šis rīks konfigurē personālo ugunssienu priekš Mandrivalinux\n"
+"Šis rīks konfigurē personālo ugunssienu priekš Mandriva Linux\n"
 "datora. Priekš spēcīga, ugunssienas izveidei veltīta risinājuma,\n"
 "lūdzu apskatiet MandrakeSecurity Firewall XXXXXX."
 
@@ -12943,8 +12948,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 ""
 
@@ -14723,18 +14728,18 @@ msgstr "Apturēt"
 
 #: 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 "Laipni lyudzam <b>Mandrivalinux</b>'ā!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Laipni lyudzam <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."
@@ -14743,7 +14748,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 ""
 
@@ -14760,9 +14765,9 @@ msgstr "Esit sveicynuoti atvartuo koda pasaulē!"
 #: 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 ""
 
@@ -14781,8 +14786,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
@@ -14808,17 +14813,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 ""
 
@@ -14830,7 +14835,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 ""
 
@@ -14868,7 +14873,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
@@ -14887,7 +14892,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
@@ -14905,7 +14910,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
@@ -14925,13 +14930,12 @@ msgstr "<b>Mandrake veikals</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
@@ -14952,7 +14956,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 ""
 
@@ -14964,21 +14968,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 ""
 
@@ -14990,23 +14994,25 @@ msgstr ""
 #: 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 ""
 
 #: 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
@@ -15182,7 +15188,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 ""
 
@@ -15417,14 +15423,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux kontrolis centrs</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux kontrolis centrs</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 ""
 
@@ -15447,8 +15453,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 ""
 
@@ -15460,8 +15466,8 @@ msgstr "<b>Mandrake veikals</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 ""
 
 #: share/advertising/27.pl:17
@@ -15478,7 +15484,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
@@ -15489,7 +15495,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 ""
 
@@ -15503,7 +15509,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
@@ -15515,14 +15521,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
@@ -15541,7 +15547,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
@@ -15564,7 +15570,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
@@ -15576,21 +15582,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
@@ -15949,8 +15955,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
@@ -15986,7 +15992,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"
@@ -16033,8 +16039,8 @@ msgstr ""
 #, 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"
@@ -18563,13 +18569,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
 msgstr "Mandrake kliudys ziņuojumu reiks"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux kontrolis centrs"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux kontrolis centrs"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19047,19 +19053,19 @@ msgstr "Palaists pi īluodis"
 #, 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 ""
 "Itei saskarne vēl nabeja nūkonfigurāta.\n"
-"Palaidit paleigu \"Pīvīnuot saskarni\" nu Mandrivalinux kontrolis centra."
+"Palaidit paleigu \"Pīvīnuot saskarni\" nu Mandriva Linux kontrolis centra."
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Itei saskarne vēl nabeja nūkonfigurāta.\n"
-"Palaidit paleigu \"%s\" nu Mandrivalinux kontrolis centra."
+"Palaidit paleigu \"%s\" nu Mandriva Linux kontrolis centra."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -19109,7 +19115,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -19409,9 +19415,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
@@ -19938,7 +19944,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "Mandrake kontrolis centrs"
 
 #: standalone/drakhelp:36
@@ -20532,7 +20538,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
@@ -22157,7 +22163,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 ""
 "Jiusu datora TV karte natyka nūteikta. Lyudzu puorsalīcynojit, ka Linux "
 "atbolsteituo Video/TV karte ir pareizi īsprausta.\n"
@@ -22166,7 +22172,7 @@ msgstr ""
 "Jius varit aplyukuot myusu aparaturys datubāzi ite:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -22851,13 +22857,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 ""
 "Itys ir HardDrake, Mandrake aparaturys konfigureišonys reiks.\n"
 "<span foreground=\"royalblue3\">Verseja:</span> %s\n"
 "<span foreground=\"royalblue3\">Autors:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -22966,7 +22972,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "Mandrake reiku aproksti"
 
 #: standalone/logdrake:51
@@ -23481,7 +23487,7 @@ msgstr "Savīnuojums izpiļdeits."
 #, 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
@@ -24325,7 +24331,6 @@ msgstr "Instalaceja naizadeve"
 #~ msgid "You've not selected any font"
 #~ msgstr "Jius naizavielēt nivīnu fontu"
 
-
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Puorlyuks nav pīejams. Lyudzu, instalejit kaidu"
 
@@ -24440,16 +24445,16 @@ msgstr "Instalaceja naizadeve"
 #~ msgstr "Kliuda, atverūt %s īraksteišonai: %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 ""
-#~ "Itys ir HardDrake, Mandrivalinux aparaturys konfigureišonys reiks.\n"
+#~ "Itys ir HardDrake, Mandriva Linux aparaturys konfigureišonys reiks.\n"
 #~ "<span foreground=\"royalblue3\">Verseja:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Autors:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 
 #~ msgid "OK"
@@ -24787,8 +24792,8 @@ msgstr "Instalaceja naizadeve"
 #~ msgstr ""
 #~ "Naizadeve printeri \"%s\" nūjimt nu Star Office/OpenOffice.org/GIMP."
 
-#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
-#~ msgstr "<b>Paļdis, ka izavielēt Mandrivalinux!</b>"
+#~ msgid "<b>Congratulations for choosing Mandriva Linux!</b>"
+#~ msgstr "<b>Paļdis, ka izavielēt Mandriva Linux!</b>"
 
 #~ msgid "<b>Discovery</b>"
 #~ msgstr "<b>Atkluošona</b>"
@@ -24802,10 +24807,10 @@ msgstr "Instalaceja naizadeve"
 #~ msgid "\t* Full access to commercial applications"
 #~ msgstr "\t* Pylna pīeja komercialajom aplikacejom"
 
-#~ msgid "\t* Voting for software to put in Mandrivalinux"
+#~ msgid "\t* Voting for software to put in Mandriva Linux"
 #~ msgstr ""
 #~ "\t* Īspieja bolsuot par programmnūdrūšynuojumu, kurs tiks īkļauts "
-#~ "Mandrivalinux\"ā"
+#~ "Mandriva Linux\"ā"
 
 #~ msgid "Do you require assistance?"
 #~ msgstr "Voi jiusim ir vajadzeiga paleidzeiba?"
@@ -24852,14 +24857,14 @@ msgstr "Instalaceja naizadeve"
 #~ 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 ""
 #~ "Pyrms turpynuot, jiusim vajadzātu uzmaneigi izlaseit licencis vīnuošonūs. "
 #~ "Tei nūsadz\n"
-#~ "vysu Mandrivalinux distribuceju. Ja jius napīkreitit vysim tuos "
+#~ "vysu Mandriva Linux distribuceju. Ja jius napīkreitit vysim tuos "
 #~ "nūteikumiem,\n"
 #~ "puorbaudit \"%s\"  kasti, nūspīdit pūgu \"%s\",\n"
 #~ "lai jiusu dators puorstarteitu."
@@ -24953,9 +24958,6 @@ msgstr "Instalaceja naizadeve"
 #~ msgid "<b>Become a MandrakeClub member!</b>"
 #~ msgstr "<b>Kliustit par Mandrake kluba lūcekli!</b>"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid ""
 #~ "This interface has not been configured yet.\n"
 #~ "Run the \"Add an interface\" assistant from the Mandrake Control Center"
diff --git a/perl-install/share/po/lv.po b/perl-install/share/po/lv.po
index 7923411c0..3b917e0c7 100644
--- a/perl-install/share/po/lv.po
+++ b/perl-install/share/po/lv.po
@@ -1237,7 +1237,7 @@ msgstr "Mjanma"
 #: 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 "Jūs varat izvēlēties citas valodas, kas būs pieejamas pēc instalēšanas"
@@ -3570,13 +3570,13 @@ msgstr "ieslēgt radio atbalstu"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
 "Pirms turpināt, Jums vajadzētu uzmanīgi izlasīt licences vienošanos. Tā "
 "nosedz\n"
-"visu Mandrivalinux distribūciju, un ja Jūs nepiekrītat visiem noteikumiem,\n"
+"visu Mandriva Linux distribūciju, un ja Jūs nepiekrītat visiem noteikumiem,\n"
 "nospiediet uz pogas \"Noraidīt\", kas nekavējoties pārtrauks instalāciju. "
 "Lai turpinātu\n"
 "instalācijas procesu, nospiediet pogu \"Pieņemt\"."
@@ -3716,13 +3716,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The 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 instalācija ir sadalīta pa dažiem CD-ROM diskiem. DrakX\n"
+"Mandriva Linux instalācija ir sadalīta pa dažiem CD-ROM diskiem. DrakX\n"
 "zin, vai izvēlētā pakotne atrodas uz cita CD-ROM diska, izvirzīs pašreizējo\n"
 "kompaktdisku un palūgs ievietot citu pēc nepieciešamības."
 
@@ -3730,11 +3730,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"
@@ -3843,10 +3844,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"
@@ -3967,7 +3968,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"
@@ -4070,12 +4071,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"
@@ -4102,7 +4103,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"
@@ -4111,7 +4112,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"
@@ -4131,11 +4133,11 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Pašlaik jums ir jāizvēlas, kur uz cietā diska instalēt Mandrivalinux\n"
+"Pašlaik jums ir jāizvēlas, kur uz cietā diska instalēt Mandriva Linux\n"
 "operētājsistēmu. Ja disks ir tukšs vai cita operētājsistēma aizņem visu\n"
 "vietu uz diska, jums būs jāveic diska sadalīšana. Īsumā, cietā diska\n"
 "sadalīšana nozīmē to sadalīt loģiskās daļās, lai izveidotu vietu\n"
-"Mandrivalinux sistēmas instalēšanai.\n"
+"Mandriva Linux sistēmas instalēšanai.\n"
 "\n"
 "\n"
 "Sakarā ar to, ka diska sadalīšanas process parasti ir neatgriezenisks,\n"
@@ -4164,7 +4166,7 @@ msgstr ""
 "\n"
 "* Izdzēst visu disku: ja vēlaties izdzēst visus uz diska esošos datus un "
 "sadaļas un aizstāt tās ar jaunu\n"
-"  Mandrivalinux sistēmu, varat izvēlēties šo opciju. Esiet uzmanīgi, "
+"  Mandriva Linux sistēmu, varat izvēlēties šo opciju. Esiet uzmanīgi, "
 "izvēloties šo risinājumu, jo pēc\n"
 "  apstiprināšanas jūs vairs nevarēsit atteikties no šīs izvēles.\n"
 "\n"
@@ -4177,7 +4179,7 @@ msgstr ""
 "vai izmainīt Microsoft\n"
 "  Windows sadaļas izmēru. Sadaļas izmēru var izmainīt bez datu zaudēšanas. "
 "Šis risinājums ir ieteicams, ja\n"
-"  jūs savā datorā vēlaties izmantot gan Mandrivalinux, gan Microsoft "
+"  jūs savā datorā vēlaties izmantot gan Mandriva Linux, gan Microsoft "
 "Windows.\n"
 "\n"
 "\n"
@@ -4301,7 +4303,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."
@@ -4325,7 +4327,7 @@ msgstr ""
 "Noklikšķiniet \"Labi\", kad esat gatavi formatēt sadaļas.\n"
 "\n"
 "Noklikšķiniet \"Atcelt\", ja jūs gribat izvēlēties citas sadaļas, kur\n"
-"instalēt jauno Mandrivalinux operētājsistēmu."
+"instalēt jauno Mandriva Linux operētājsistēmu."
 
 #: help.pm:431 install_steps_gtk.pm:392 interactive.pm:434
 #: interactive/newt.pm:318 printer/printerdrake.pm:3676
@@ -4339,7 +4341,7 @@ msgstr "Atpakaļ"
 #: 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"
@@ -4368,7 +4370,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"
@@ -4392,7 +4394,7 @@ msgstr "Drošības administrators:"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4462,7 +4464,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Pašlaik jums ir jāizvēlas, kurā(s) diska sadaļā(s) instalēt Mandrivalinux\n"
+"Pašlaik jums ir jāizvēlas, kurā(s) diska sadaļā(s) instalēt Mandriva Linux\n"
 "operētājsistēmu. Ja sadaļas jau ir izveidotas (agrākas GNU/Linux "
 "instalēšanas\n"
 "laikā vai ar citu diska sadalīšanas rīku), jūs varat izmantot esošās "
@@ -4545,7 +4547,7 @@ msgstr "Pārslēgt normālajā režīmā"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4575,7 +4577,7 @@ msgid ""
 msgstr ""
 "Uz jūsu cietā diska ir atrasta vairāk nekā viena Microsoft Windows sadaļa.\n"
 "Lūdzu izvēlieties to sadaļu, kuras izmēru jūs vēlaties izmainīt, lai\n"
-"instalētu jauno Mandrivalinux operētājsistēmu.\n"
+"instalētu jauno Mandriva Linux operētājsistēmu.\n"
 "\n"
 "\n"
 "Jūsu zināšanai, katra sadaļa ir uzskaitīta šādā veidā: \"Linux nosaukums\",\n"
@@ -4622,7 +4624,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"
@@ -4631,13 +4633,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
@@ -4691,7 +4694,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"
@@ -4850,7 +4854,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"
@@ -4871,7 +4875,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 ""
 
@@ -4992,7 +4996,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"
@@ -5009,7 +5014,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"
@@ -5071,11 +5076,11 @@ msgstr "Servisi"
 #, 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 ""
 "Norādiet cieto disku, ko vēlaties izdzēst, lai izveidotu jaunu\n"
-"Mandrivalinux sadaļu. Esiet uzmanīgi, jo visi diskā esošie dati\n"
+"Mandriva Linux sadaļu. Esiet uzmanīgi, jo visi diskā esošie dati\n"
 "pazudīs un nebūs atjaunojami."
 
 #: help.pm:863
@@ -5424,11 +5429,11 @@ msgstr "Izmantot Windows sadaļas brīvo vietu"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Windows sadaļa ir pārāk fragmentēta. Vispirms no Windows vides palaidiet "
-"``defrag'' un tad atsāciet Mandrivalinux instalēšanu."
+"``defrag'' un tad atsāciet Mandriva Linux instalēšanu."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -5541,13 +5546,13 @@ msgstr "Atslēdzu tīklu"
 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"
@@ -5576,8 +5581,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 "
@@ -5591,8 +5596,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 "
@@ -5601,7 +5606,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"
@@ -5635,10 +5640,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"
@@ -5738,8 +5743,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"
@@ -5747,14 +5752,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 ""
 "Apsveicam, instalēšana ir pabeigta.\n"
 "Izņemiet sāknēšanas datu nesēju un nospiediet ievadu, lai pārstartētu "
 "datoru.\n"
 "\n"
 "\n"
-"Lai saņemtu informāciju par labojumiem, kas ir pieejami šim Mandrivalinux\n"
+"Lai saņemtu informāciju par labojumiem, kas ir pieejami šim Mandriva Linux\n"
 "izdevumam, skatiet Errata failu, kas atrodams\n"
 "\n"
 "\n"
@@ -5762,13 +5767,13 @@ msgstr ""
 "\n"
 "\n"
 "Informācija par jūsu sistēmas konfigurēšanu ir pieejama Oficiālās\n"
-"Mandrivalinux rokasgrāmatas pēcinstalēšanas nodaļā."
+"Mandriva Linux rokasgrāmatas pēcinstalēšanas nodaļā."
 
 #. -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
@@ -5797,11 +5802,11 @@ msgstr "Uzsāku soli `%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 ""
-"Jūsu sistēmai trūkst resursu. Mandrivalinux instalēšanas laikā var\n"
+"Jūsu sistēmai trūkst resursu. Mandriva Linux instalēšanas laikā var\n"
 "rasties problēmas. Ja tā notiek, varat pamēģināt teksta instalēšanu.\n"
 "Lai to izdarītu, nospiediet`F1', ka notiek ielāde no CDROM, tad ievadiet\n"
 "`text'."
@@ -6336,9 +6341,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 ""
-"Pieslēdzos Mandrivalinux tīmeklim, lai saņemtu pieejamo spoguļserveru "
+"Pieslēdzos Mandriva Linux tīmeklim, lai saņemtu pieejamo spoguļserveru "
 "sarakstu sarakstu..."
 
 #: install_steps_interactive.pm:840
@@ -6552,8 +6557,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux instalēšana %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux instalēšana %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9136,13 +9141,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 konfigurētājs\n"
 "\n"
-"Šis rīks konfigurē personālo ugunssienu priekš Mandrivalinux\n"
+"Šis rīks konfigurē personālo ugunssienu priekš Mandriva Linux\n"
 "datora. Priekš spēcīga, ugunssienas izveidei veltīta risinājuma,\n"
 "lūdzu apskatiet MandrakeSecurity Firewall XXXXXX."
 
@@ -12874,8 +12879,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 ""
 
@@ -14652,18 +14657,18 @@ msgstr "Apturēt"
 
 #: 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 "Laipni lūdzam <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Laipni lūdzam <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."
@@ -14672,7 +14677,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 ""
 
@@ -14689,9 +14694,9 @@ msgstr "Esiet sveicināti atvērtā koda pasaulē"
 #: 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 ""
 
@@ -14710,8 +14715,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
@@ -14737,17 +14742,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 ""
 
@@ -14759,7 +14764,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 ""
 
@@ -14797,7 +14802,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
@@ -14816,7 +14821,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
@@ -14834,7 +14839,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
@@ -14849,18 +14854,17 @@ msgstr ""
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
 msgid "<b>Mandriva Products</b>"
-msgstr "Mandrivalinux kontroles centrs"
+msgstr "Mandriva Linux kontroles centrs"
 
 #: 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
@@ -14881,7 +14885,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 ""
 
@@ -14893,21 +14897,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 ""
 
@@ -14919,23 +14923,25 @@ msgstr ""
 #: 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 ""
 
 #: 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
@@ -15112,7 +15118,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 ""
 
@@ -15350,14 +15356,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux kontroles centrs</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux kontroles centrs</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 ""
 
@@ -15380,21 +15386,21 @@ 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 kontroles centrs"
+msgstr "Mandriva Linux kontroles centrs"
 
 #: 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 ""
 
 #: share/advertising/27.pl:17
@@ -15411,7 +15417,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
@@ -15422,7 +15428,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 ""
 
@@ -15436,7 +15442,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
@@ -15448,14 +15454,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
@@ -15474,7 +15480,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
@@ -15497,33 +15503,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
 #, fuzzy, c-format
 msgid "<b>Mandriva Expert</b>"
-msgstr "Mandrivalinux kontroles centrs"
+msgstr "Mandriva Linux kontroles centrs"
 
 #: 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 ""
 
 #
@@ -15831,7 +15837,7 @@ msgstr ""
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
-msgstr "Mandrivalinux kontroles centrs"
+msgstr "Mandriva Linux kontroles centrs"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -15889,8 +15895,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
@@ -15926,7 +15932,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"
@@ -15973,8 +15979,8 @@ msgstr ""
 #, 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"
@@ -18533,13 +18539,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
 msgstr "Mandrake kļūdu ziņojuma rīks"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux kontroles centrs"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux kontroles centrs"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19020,20 +19026,20 @@ msgstr "Palaists pie ielādes"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Šis %s skeneris jākonfigurē ar printerdrake.\n"
-"Jūs varat palaist printerdrake no Mandrivalinux kontroles centra Aparatūras "
+"Jūs varat palaist printerdrake no Mandriva Linux kontroles centra Aparatūras "
 "sekcijā."
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Šis %s skeneris jākonfigurē ar printerdrake.\n"
-"Jūs varat palaist printerdrake no Mandrivalinux kontroles centra Aparatūras "
+"Jūs varat palaist printerdrake no Mandriva Linux kontroles centra Aparatūras "
 "sekcijā."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -19085,7 +19091,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -19385,9 +19391,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
@@ -19915,7 +19921,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "Mandrake kontroles centrs"
 
 #: standalone/drakhelp:36
@@ -20507,7 +20513,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
@@ -22132,7 +22138,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 ""
 "Jūsu datora TV karte netika noteikta. Lūdzu pārliecinieties, ka Linux "
 "atbalstīta Video/TV karte ir pareizi iesprausta.\n"
@@ -22141,7 +22147,7 @@ msgstr ""
 "Jūs varat aplūkot mūsu aparatūras datubāzi šeit:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -22826,13 +22832,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 ""
-"Šis ir HardDrake, Mandrivalinux aparatūras konfigurēšanas rīks.\n"
+"Šis ir HardDrake, Mandriva Linux aparatūras konfigurēšanas rīks.\n"
 "<span foreground=\"royalblue3\">Versija:</span> %s\n"
 "<span foreground=\"royalblue3\">Autors:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -22940,7 +22946,7 @@ msgstr "Izmaiņa ir notikusi, bet, lai to padarītu efektīvu, Jums jāatslēdza
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "Mandrake rīku apraksti"
 
 #: standalone/logdrake:51
@@ -23450,7 +23456,7 @@ msgstr "Savienojuma ātrums"
 #, 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
@@ -23684,7 +23690,7 @@ msgstr ""
 #: standalone/scannerdrake:101
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "Šī Mandrivalinux versija neatbalsta %s."
+msgstr "Šī Mandriva Linux versija neatbalsta %s."
 
 #: standalone/scannerdrake:104
 #, fuzzy, c-format
@@ -23724,7 +23730,7 @@ msgstr ""
 #: standalone/scannerdrake:144
 #, fuzzy, c-format
 msgid "The %s is not supported under Linux."
-msgstr "Šī Mandrivalinux versija neatbalsta %s."
+msgstr "Šī Mandriva Linux versija neatbalsta %s."
 
 #: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
@@ -24286,7 +24292,6 @@ msgstr "Instalēšana neizdevās"
 #~ msgid "No network card"
 #~ msgstr "Nav tīkla kartes"
 
-
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Pārlūks nav pieejams. Lūdzu, instalējiet kādu"
 
@@ -24754,12 +24759,6 @@ msgstr "Instalēšana neizdevās"
 #~ msgid "mkraid failed"
 #~ msgstr "mkraid neizdevās"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
-#~ msgid "The package %s is needed. Install it?"
-#~ msgstr "Ir nepieciešama pakotne %s. Instalēt to?"
-
 #~ msgid "SILO Installation"
 #~ msgstr "SILO instalēšana"
 
diff --git a/perl-install/share/po/mk.po b/perl-install/share/po/mk.po
index 5720d09e4..84340b3bd 100644
--- a/perl-install/share/po/mk.po
+++ b/perl-install/share/po/mk.po
@@ -1281,11 +1281,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"
 "достапни кога инсталацијата ќе заврши и кога ќе го\n"
 "рестартирате системот."
@@ -3691,7 +3691,7 @@ msgstr "овозможи радио поддршка"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
@@ -3887,7 +3887,7 @@ 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"
@@ -3901,11 +3901,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"
@@ -3957,7 +3958,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Сега е време да изберете програми што ќе се инсталираат на Вашиот систем.\n"
-"Постојат илјадници пакети за Mandrivalinux, и од Вас не се очекува да\n"
+"Постојат илјадници пакети за Mandriva Linux, и од Вас не се очекува да\n"
 "ги препознете напамет.\n"
 "\n"
 "Ако вршите стандардна инсталација од CD, прво ќе бидете запрашани за тоа\n"
@@ -4060,10 +4061,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"
@@ -4267,7 +4268,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"
@@ -4434,12 +4435,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"
@@ -4466,7 +4467,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"
@@ -4475,7 +4476,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"
@@ -4495,7 +4497,7 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Сега треба да изберете каде на Вашиот диск да се инсталира Mandrivalinux\n"
+"Сега треба да изберете каде на Вашиот диск да се инсталира Mandriva Linux\n"
 "оперативниот систем. Ако Вашиот диск е празен или ако веќе некој оперативен\n"
 "систем го користи целокупниот простор, ќе треба да го партицирате. \n"
 "Партицирањето се состои од логичко делење за да се создаде простор за\n"
@@ -4531,7 +4533,7 @@ msgstr ""
 "Менувањето на големина може да се изведе без губиток на податоци,\n"
 "под услов претходно да сте ја дефрагментирале Windows партицијата. Не би "
 "било лошо ни да направите бекап на Вашите податоци.\n"
-"Оваа солуција се пропорачува ако сакате да ги користите и Mandrivalinux и\n"
+"Оваа солуција се пропорачува ако сакате да ги користите и Mandriva Linux и\n"
 "Microsoft Windows на истиот компјутер.\n"
 "\n"
 "   Пред избирање на оваа опција треба да знаете дека по ова Microsoft "
@@ -4708,7 +4710,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."
@@ -4752,7 +4754,7 @@ msgstr "Претходно"
 #: 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"
@@ -4793,7 +4795,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"
@@ -4821,7 +4823,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"
@@ -4979,7 +4981,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"
@@ -5057,7 +5059,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"
@@ -5066,13 +5068,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 ""
 "Оваа постапка се активира само ако на Вашиот компјутер се најде некоја стара "
 "GNU/Linux партиција.\n"
@@ -5087,13 +5090,13 @@ msgstr ""
 "\n"
 " * \"%s\": Ова ви овозможува да ги надградите пакетите кои веќе се "
 "инсталирани на Вашиот систем\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"
-"�����``Upgrade'' ����should work fine on Mandrivalinux systems\n"
+"�����``Upgrade'' ����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."
 
 #: help.pm:591
 #, fuzzy, 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"
@@ -5392,7 +5396,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"
@@ -5413,7 +5417,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 ""
 "Сега се избира принтерски систем за Вашиот компјутер. Некои други "
@@ -5571,7 +5575,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"
@@ -5588,7 +5593,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"
@@ -5650,7 +5655,7 @@ 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"
@@ -6003,7 +6008,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 партиција е премногу фрагментирана. Рестартирајте го "
@@ -6123,13 +6128,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"
@@ -6183,7 +6188,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"
@@ -6220,7 +6225,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"
@@ -6319,7 +6324,7 @@ msgstr ""
 "програми. Mandriva S.A. го задржува правото да ги модифицира или \n"
 "адаптира софтверските производи, како целина или во делови, на било кој\n"
 "начин и за било која цел.\n"
-"\"Mandriva\", \"Mandrivalinux\" и придружените логотипи се заштитени знаци\n"
+"\"Mandriva\", \"Mandriva Linux\" и придружените логотипи се заштитени знаци\n"
 "на Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6418,8 +6423,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"
@@ -6427,7 +6432,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"
@@ -6446,8 +6451,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
@@ -6476,7 +6481,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 ""
@@ -7019,7 +7024,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 ""
 "Контактирање со веб сајтот на Мандрак Линукс за добивање на листата на "
 "огледала..."
@@ -7244,8 +7249,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
@@ -9829,13 +9834,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 конфигуратор\n"
 "\n"
-"Ова конфигурира личен огнен ѕид за оваа Mandrivalinux машина.\n"
+"Ова конфигурира личен огнен ѕид за оваа Mandriva Linux машина.\n"
 "За моќно и наменско решение на огнен ѕид, видете ја специјализираната\n"
 "дистрибуција MandrakeSecurity Firewall."
 
@@ -13752,8 +13757,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 ""
 
@@ -15634,18 +15639,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>!"
+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."
@@ -15654,7 +15659,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 ""
 
@@ -15671,9 +15676,9 @@ msgstr "Добредојдовте во светот на Open Source."
 #: 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 ""
 
@@ -15692,8 +15697,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
@@ -15719,17 +15724,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 ""
 
@@ -15741,7 +15746,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 ""
 
@@ -15779,7 +15784,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
@@ -15798,7 +15803,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
@@ -15816,7 +15821,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
@@ -15831,17 +15836,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
@@ -15862,7 +15867,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 ""
 
@@ -15874,21 +15879,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 ""
 
@@ -15906,17 +15911,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
@@ -16092,7 +16099,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 ""
 
@@ -16327,14 +16334,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 ""
 
@@ -16357,15 +16364,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
@@ -16388,7 +16395,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
@@ -16399,7 +16406,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 ""
 
@@ -16413,7 +16420,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
@@ -16425,14 +16432,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
@@ -16451,7 +16458,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
@@ -16474,7 +16481,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
@@ -16486,21 +16493,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
@@ -16881,8 +16888,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"
@@ -16924,7 +16931,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"
@@ -19604,13 +19611,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
 msgstr "Mandrake Bug Report алатка"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux контролен центар"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux контролен центар"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20097,7 +20104,7 @@ msgstr "Покренато при стартување"
 #, 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 ""
 "овој интерфејс не е конфигуриран.\n"
 " Стартувај го волшебникот за конфгурација."
@@ -20106,7 +20113,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 ""
 "овој интерфејс не е конфигуриран.\n"
 " Стартувај го волшебникот за конфгурација."
@@ -20159,7 +20166,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20460,9 +20467,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
@@ -21015,8 +21022,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
@@ -21666,7 +21673,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"
@@ -21675,7 +21682,7 @@ msgstr ""
 "\n"
 "Можете да ја посетите базата која ги содржи подржаните хардвери на:\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, fuzzy, c-format
@@ -23300,7 +23307,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 ""
 "Не е пронајдена ТВ картичка на Вашиот компјутер. Проверете дали правилно е "
 "внесена Видео/ТВ картичката која е подржана од Linux\n"
@@ -23309,7 +23316,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
@@ -24016,13 +24023,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, е алатка за конфигурација на хардверот\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
@@ -24132,8 +24139,8 @@ msgstr "Промената е направена, но за да има ефек
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Логови за алтките на Mandrivalinux"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Логови за алтките на Mandriva Linux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -24647,7 +24654,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"
 "Потврдете ја вашата конфигурација во Мандрак Контролниот Центар."
diff --git a/perl-install/share/po/mn.po b/perl-install/share/po/mn.po
index 437277f23..92ae29a3e 100644
--- a/perl-install/share/po/mn.po
+++ b/perl-install/share/po/mn.po
@@ -1202,7 +1202,7 @@ msgstr "Хэл"
 #: any.pm:733
 #, fuzzy, 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 "вы бол вы."
@@ -3451,7 +3451,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 ""
@@ -3567,7 +3567,7 @@ 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"
@@ -3581,11 +3581,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"
@@ -3700,10 +3701,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"
@@ -3927,12 +3928,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"
@@ -3959,7 +3960,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"
@@ -3968,7 +3969,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"
@@ -4104,7 +4106,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."
@@ -4122,7 +4124,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"
@@ -4151,7 +4153,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"
@@ -4167,7 +4169,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"
@@ -4253,7 +4255,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"
@@ -4304,7 +4306,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"
@@ -4313,13 +4315,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"
@@ -4365,7 +4368,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"
@@ -4531,7 +4535,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"
@@ -4552,7 +4556,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"
@@ -4655,7 +4659,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"
@@ -4672,7 +4677,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"
@@ -4749,7 +4754,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 ""
 
@@ -5059,7 +5064,7 @@ msgstr "хэмжээ аас Цонхнууд"
 #, fuzzy, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr "Цонхнууд бол Цонхнууд."
 
@@ -5162,13 +5167,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"
@@ -5222,7 +5227,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"
@@ -5259,7 +5264,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"
@@ -5334,8 +5339,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"
@@ -5343,14 +5348,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
@@ -5375,7 +5380,7 @@ msgstr ""
 #, fuzzy, 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 "бол Та вы текст текст."
@@ -5877,7 +5882,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
@@ -6082,7 +6087,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
@@ -8642,7 +8647,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 "г."
@@ -12282,8 +12287,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 ""
 
@@ -13996,18 +14001,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>!"
+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."
@@ -14016,7 +14021,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 ""
 
@@ -14033,9 +14038,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 ""
 
@@ -14054,8 +14059,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
@@ -14081,17 +14086,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 ""
 
@@ -14103,7 +14108,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 ""
 
@@ -14141,7 +14146,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
@@ -14160,7 +14165,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
@@ -14178,7 +14183,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
@@ -14198,12 +14203,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
@@ -14224,7 +14229,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 ""
 
@@ -14236,21 +14241,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 ""
 
@@ -14268,17 +14273,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
@@ -14454,7 +14461,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 ""
 
@@ -14689,14 +14696,14 @@ msgstr ""
 
 #: 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 ""
 
@@ -14719,8 +14726,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 ""
 
@@ -14750,7 +14757,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
@@ -14761,7 +14768,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 ""
 
@@ -14775,7 +14782,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
@@ -14787,14 +14794,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
@@ -14813,7 +14820,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
@@ -14836,7 +14843,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
@@ -14848,21 +14855,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
@@ -15213,8 +15220,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"
@@ -15261,7 +15268,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"
@@ -17821,12 +17828,12 @@ 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"
+msgid "Mandriva Linux Control Center"
 msgstr "Мандрак удирдлагын төв"
 
 #: standalone/drakbug:48
@@ -18301,14 +18308,14 @@ msgstr "Ачаалахад эхэлсэн"
 #, 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 "ямх"
 
 #: 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 "ямх"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18359,7 +18366,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18653,9 +18660,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
@@ -19145,7 +19152,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "Мандрак удирдлагын төв"
 
 #: standalone/drakhelp:36
@@ -19733,10 +19740,10 @@ 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"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, fuzzy, c-format
@@ -21341,10 +21348,10 @@ 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"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -22030,7 +22037,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 ""
 
@@ -22139,7 +22146,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "Мандрак удирдлагын төв"
 
 #: standalone/logdrake:51
@@ -22643,7 +22650,7 @@ msgstr "Холболт."
 #, fuzzy, 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/ms.po b/perl-install/share/po/ms.po
index 139463a10..bb7bb6aee 100644
--- a/perl-install/share/po/ms.po
+++ b/perl-install/share/po/ms.po
@@ -1208,7 +1208,7 @@ msgstr "Pilihan Tidak Sah"
 #: any.pm:733
 #, fuzzy, 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 "dan ulanghidup."
@@ -3457,7 +3457,7 @@ msgstr "Hidupkan sokongan SSL"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 "dalam off."
@@ -3576,7 +3576,7 @@ 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"
@@ -3587,11 +3587,12 @@ msgstr "on on dan."
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for 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"
@@ -3706,10 +3707,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"
@@ -3823,7 +3824,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"
@@ -3934,12 +3935,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"
@@ -3966,7 +3967,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"
@@ -3975,7 +3976,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"
@@ -4121,7 +4123,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"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."
@@ -4139,7 +4141,7 @@ msgstr "Terdahulu"
 #: 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"
@@ -4168,7 +4170,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of 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"
@@ -4184,7 +4186,7 @@ msgstr "Pentadbir Domain:"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4285,7 +4287,7 @@ msgstr "normal"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4335,7 +4337,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"
@@ -4344,13 +4346,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 ""
 "on\n"
 " keluar fail on\n"
@@ -4394,7 +4397,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"
@@ -4558,7 +4562,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"
@@ -4579,7 +4583,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 ""
 "Lain-lain\n"
@@ -4682,7 +4686,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"
@@ -4699,7 +4704,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"
@@ -4776,7 +4781,7 @@ msgstr "Perkhidmatan"
 #, 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 "dalam on dan!"
 
@@ -5086,7 +5091,7 @@ msgstr "Kemasukan Tidak Sah bagi Saiz Partisyen"
 #, fuzzy, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr "Tetingkap Tetingkap ulanghidup."
 
@@ -5189,13 +5194,13 @@ msgstr "Mematikan daemon palam rangkaian: "
 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"
@@ -5249,7 +5254,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"
@@ -5286,7 +5291,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"
@@ -5363,8 +5368,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"
@@ -5372,14 +5377,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 "Tahniah dan on on dalam Pengguna."
 
 #. -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
@@ -5404,7 +5409,7 @@ msgstr "Memasuki permulaan interaktif"
 #, fuzzy, 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 "on on."
@@ -5920,7 +5925,7 @@ msgstr "Internet?"
 #: 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
@@ -6127,8 +6132,8 @@ msgstr "on"
 
 #: install_steps_newt.pm:20
 #, fuzzy, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Arahan Pemasangan - Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Arahan Pemasangan - Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8691,7 +8696,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 "dan."
@@ -12267,8 +12272,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 ""
 
@@ -13933,18 +13938,18 @@ msgstr "Henti"
 
 #: share/advertising/01.pl:13
 #, fuzzy, c-format
-msgid "<b>What is Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
 msgstr "Pilihan Anda? (1-%d) "
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Selamat Datang ke <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Selamat Datang ke <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."
@@ -13953,7 +13958,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 ""
 
@@ -13970,9 +13975,9 @@ msgstr "Selamat Datang Buka."
 #: 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 ""
 
@@ -13991,8 +13996,8 @@ msgstr "GPL"
 #: 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
@@ -14018,17 +14023,17 @@ msgstr "Sertai Saluran..."
 #: 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 ""
 
@@ -14040,7 +14045,7 @@ msgstr " - Versi sijil: #%d\n"
 #: 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 ""
 
@@ -14078,7 +14083,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
@@ -14097,7 +14102,7 @@ msgstr "Red Hat Enterprise Linux Desktop"
 
 #: 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
@@ -14115,7 +14120,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
@@ -14130,17 +14135,17 @@ msgstr ""
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
 msgid "<b>Mandriva Products</b>"
-msgstr "/_Produk Mandrivalinux"
+msgstr "/_Produk 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
 #, fuzzy, c-format
-msgid "The Mandrivalinux products are:"
+msgid "The Mandriva Linux products are:"
 msgstr "Hujah yang sah adalah:"
 
 #: share/advertising/09.pl:18
@@ -14161,7 +14166,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 ""
 
@@ -14173,21 +14178,21 @@ msgstr " PenimbalBingkai jauh - Hak Cipta (C) %s Mandriva S.A."
 #: 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 ""
 
@@ -14205,17 +14210,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
@@ -14391,7 +14398,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 ""
 
@@ -14626,14 +14633,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Pusat Kawalan Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Pusat Kawalan 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 ""
 
@@ -14656,8 +14663,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 ""
 
@@ -14687,7 +14694,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
@@ -14698,7 +14705,7 @@ msgstr "Mandriva Club"
 #: 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 ""
 
@@ -14712,7 +14719,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
@@ -14724,14 +14731,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
@@ -14750,7 +14757,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
@@ -14773,7 +14780,7 @@ msgstr "Membaca kemaskini anaconda..."
 #: 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
@@ -14785,21 +14792,21 @@ msgstr "Mandriva Expert"
 #, 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
@@ -15148,8 +15155,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 ""
 "NAMA\n"
 "\n"
@@ -15192,7 +15199,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"
@@ -17717,13 +17724,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
 msgstr "Lapor pepijat pada GNOME"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Pusat Kawalan Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Pusat Kawalan Mandriva Linux"
 
 #: standalone/drakbug:48
 #, fuzzy, c-format
@@ -18194,14 +18201,14 @@ msgstr "_Aktifkan semasa boot"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr "dalam utama"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr "dalam utama"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -18252,7 +18259,7 @@ msgstr "Mematikan pengurus paparan: "
 
 #: standalone/drakedm:36
 #, fuzzy, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr "Mematikan pengurus paparan: "
 
 #: standalone/drakedm:37
@@ -18542,9 +18549,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
@@ -19028,7 +19035,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "Pusat Bantuan KDE"
 
 #: standalone/drakhelp:36
@@ -19627,10 +19634,10 @@ 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 ""
 "Tidak Bunyi on Bunyi dalam\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, fuzzy, c-format
@@ -21227,10 +21234,10 @@ 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 ""
 "Tidak on Video dalam\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, fuzzy, c-format
@@ -21917,7 +21924,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 ""
 
@@ -22026,7 +22033,7 @@ msgstr "siap"
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "Alatan Konfigurasi Pelayan"
 
 #: standalone/logdrake:51
@@ -22532,7 +22539,7 @@ msgstr "Konfigurasi Selesai"
 #, fuzzy, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr "dalam."
 
 #: standalone/net_monitor:341
diff --git a/perl-install/share/po/mt.po b/perl-install/share/po/mt.po
index 1100d21ba..83025fd1e 100644
--- a/perl-install/share/po/mt.po
+++ b/perl-install/share/po/mt.po
@@ -1310,7 +1310,7 @@ msgstr "Għażla ta' lingwa"
 #: 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 "Tista' tagħżel lingwi oħra li jkun u disponibbli wara li tinstalla"
@@ -3730,12 +3730,12 @@ msgstr "ippermetti sapport għal radju"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
 "Qabel tkompli int mitlub taqra sew it-termini ta' din il-liċenzja. Hija\n"
-"tkopri d-distribuzzjoni sħiħa ta' Mandrivalinux. Jekk taqbel mat-termini\n"
+"tkopri d-distribuzzjoni sħiħa ta' Mandriva Linux. Jekk taqbel mat-termini\n"
 "kollha tagħha, agħfas il-buttuna \"%s\". Jekk ma taqbilx, agħfas \"%s\" "
 "biex\n"
 "tirributja l-kompjuter."
@@ -3905,13 +3905,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The 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 ""
-"L-installazzjoni ta' Mandrivalinux hija maqsuma fuq diversi CD-ROMs. Jekk\n"
+"L-installazzjoni ta' Mandriva Linux hija maqsuma fuq diversi CD-ROMs. Jekk\n"
 "pakkett qiegħed fuq CD-ROM oħra, DrakX jiftaħ is-CDROM u jitolbok iddaħħal "
 "is-\n"
 "CD li jmiss. Jekk m'għandekx dik is-CD tista' tikklikkja \"%s\" u l-pakketti "
@@ -3922,11 +3922,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"
@@ -3978,11 +3979,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "Issa wasal il-mument fejn tagħżel liema programmi tixtieq tinstalla fuq\n"
-"is-sistema tiegħek. Hemm eluf ta' pakketti disponibbli għal Mandrivalinux,\n"
+"is-sistema tiegħek. Hemm eluf ta' pakketti disponibbli għal Mandriva Linux,\n"
 "u biex ikun iżjed faċli timmaniġġjahom, qegħdin imqassmin fi gruppi ta'\n"
 "programmi simili.\n"
 "\n"
-"Mandrivalinux iqassam il-gruppi ta' pakketti fi tlett kategoriji. Tista' \n"
+"Mandriva Linux iqassam il-gruppi ta' pakketti fi tlett kategoriji. Tista' \n"
 "tagħżel u tħallat programmi minn diversi kategoriji, jiġifieri "
 "installazzjoni\n"
 "\"workstation\" tista' tinkludi programmi mis-sezzjoni \"server\", eċċ.\n"
@@ -4083,10 +4084,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"
@@ -4115,7 +4116,7 @@ msgstr ""
 "li tgħidlek għal xiex jintuża dak il-pakkett.\n"
 "!! Jekk pakkett ta' server jiġi installat intenzjonalment jew għax jifforma\n"
 "parti minn grupp, int tintalab tikkonferma jekk verament tridx lill dawn\n"
-"is-servizzi jiġu nstallati. Fil-Mandrivalinux, is-servizzi li tinstalla "
+"is-servizzi jiġu nstallati. Fil-Mandriva Linux, is-servizzi li tinstalla "
 "jiġu\n"
 "mtella' awtomatikament meta tixgħel. Għalkemm dawn kienu siguri u ma kien "
 "fihom\n"
@@ -4271,7 +4272,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"
@@ -4326,7 +4327,7 @@ msgid ""
 "not successful in getting the display configured."
 msgstr ""
 "X (għal Sistema X Window) huwa l-qalb ta' l-interfaċċja grafika GNU/Linux\n"
-"li fuqu huma bbażati l-ambjenti grafiċi kollha inklużi ma' Mandrivalinux "
+"li fuqu huma bbażati l-ambjenti grafiċi kollha inklużi ma' Mandriva Linux "
 "(KDE,\n"
 "GNOME, AfterStep, WindowMaker, eċċ).\n"
 "\n"
@@ -4441,12 +4442,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"
@@ -4473,7 +4474,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"
@@ -4482,7 +4483,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"
@@ -4503,12 +4505,12 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "F'dan il-punt int trid tagħżel fejn, fuq il-ħard disk, trid tinstalla s-\n"
-"sistema operattiva Mandrivalinux. Jekk il-ħard disk huwa vojt, jew jekk\n"
+"sistema operattiva Mandriva Linux. Jekk il-ħard disk huwa vojt, jew jekk\n"
 "hemm sistema operattiva qed tokkupaha kollha, l-ewwel trid toħloq \n"
 "partizzjonijiet. Bażikament, il-partizzjonijiet tal-ħard disk jaqsmu d-"
 "diska\n"
 "f'partijiet biex ikun hemm sezzjonijiet fejn tiġi nstallata s-sistema ġdida\n"
-"Mandrivalinux.\n"
+"Mandriva Linux.\n"
 "\n"
 "Peress li l-effett ta' partizzjonament tal-ħard disk m'humiex riversibbli,\n"
 "u jista' jwassal għal telf ta' informazzjoni, dan il-proċess jista' jidher\n"
@@ -4705,7 +4707,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."
@@ -4728,7 +4730,7 @@ msgstr ""
 "Agħfas \"%s\" meta tkun lest biex tifformattja l-partizzjonijiet.\n"
 "\n"
 "Agħfas \"%s\" jekk trid tagħżel partizzjoni oħra għas-sistema ġdida\n"
-"Mandrivalinux.\n"
+"Mandriva Linux.\n"
 "\n"
 "Agħfas \"%s\" biex tagħżel partizzjonijiet biex jiġu ċċekkjati għal blokki\n"
 "ħżiena fuq id-diska."
@@ -4745,7 +4747,7 @@ msgstr "Ta' qabel"
 #: 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"
@@ -4757,7 +4759,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Fid-data meta tinstalla l-Mandrivalinux, aktarx ikunu ġew aġġornati xi\n"
+"Fid-data meta tinstalla l-Mandriva Linux, aktarx ikunu ġew aġġornati xi\n"
 "pakketti minn meta ġiet pubblikata. Xi żbalji jistgħu ikunu ġew irranġati,\n"
 "u problemi ta' sigurtà ġew riżolti. Sabiex tibbenifika minn dawn l-\n"
 "aġġornamenti, jaqbillek tniżżilhom minn fuq l-internet. Agħżel \"%s\" jekk\n"
@@ -4786,7 +4788,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"
@@ -4801,7 +4803,7 @@ msgstr ""
 "\n"
 "Jekk ma tafx liema tagħżel, żomm l-għażla impliċita. Tkun tista' tibdel dan\n"
 "il-livell iżjed 'il quddiem bl-għodda draksex, li jifforma parti miċ-Ċentru\n"
-"ta' Kontroll Mandrivalinux.\n"
+"ta' Kontroll Mandriva Linux.\n"
 "\n"
 "Imla' l-kaxxa \"%s\" bl-indirizz tal-imejl tal-persuna responsabbli mis-"
 "sigurtà.\n"
@@ -4816,7 +4818,7 @@ msgstr "Amministratur tas-sigurtà"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4887,7 +4889,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "F'dan il-punt trid tagħżel liema partizzjoni(jiet) se jintużaw għall-\n"
-"installazzjoni tas-sistema Mandrivalinux. Jekk diġà ġew definiti xi\n"
+"installazzjoni tas-sistema Mandriva Linux. Jekk diġà ġew definiti xi\n"
 "partizzjonijiet, jew minn installazzjoni preċedenti ta' GNU/Linux jew minn\n"
 "għodda ta' partizzjonament oħra, tista' tuża l-partizzjonijiet eżistenti.\n"
 "Altrimenti, l-partizzjonijiet tal-ħard disk iridu jiġu definiti.\n"
@@ -4975,7 +4977,7 @@ msgstr "Aqleb bejn modalità normali u esperta"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5005,7 +5007,7 @@ msgid ""
 msgstr ""
 "Instabu iżjed minn partizzjoni waħda tal-Microsoft fuq il-ħard disk. Jekk \n"
 "jogħġbok agħżel liema minnhom trid iċċekken biex tinstalla s-sistema \n"
-"operattiva Mandrivalinux.\n"
+"operattiva Mandriva Linux.\n"
 "\n"
 "Kull partizzjoni hija mmarkata hekk: \"Isem tal-Linux\", \"Isem fil-Windows"
 "\",\n"
@@ -5055,7 +5057,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing 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"
@@ -5064,19 +5066,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 ""
 "Dan il-pass jiġi attivat biss jekk instabet partizzjoni eżistenti GNU/Linux\n"
 "fuq il-kompjuter.\n"
 "\n"
 "DrakX issa għandu bżonn ikun jaf jekk tridx tagħmel installazzjoni ġdida\n"
-"jew aġġornament tas-sistema eżistenti Mandrivalinux:\n"
+"jew aġġornament tas-sistema eżistenti Mandriva Linux:\n"
 "\n"
 " * \"%s\". Fil-parti l-kbira, din tħassar is-sistema antika għal kollox.\n"
 "Però, skond l-iskema ta' partizzjonijiet, tista' ma tħallix ċerti \n"
@@ -5085,16 +5088,16 @@ msgstr ""
 "fajls, għandek tagħżel din l-għażla.\n"
 "\n"
 " * \"%s\". Din il-klassi ta' installazzjoni tħallik taġġorna l-pakketti\n"
-"installati bħalissa fuq is-sistema Mandrivalinux. Il-partizzjonijiet "
+"installati bħalissa fuq is-sistema Mandriva Linux. Il-partizzjonijiet "
 "eżistenti\n"
 "u d-data tal-utenti ma jintmessux. Ħafna mill-passi l-oħra tal-"
 "konfigurazzjoni\n"
 "jibqgħu disponibbli u huma simili għal installazzjoni normali.\n"
 "\n"
-"L-użu tal-għażla \"Aġġorna\" għandha taħdem tajjeb fuq sistemi "
-"Mandrivalinux\n"
+"L-użu tal-għażla \"Aġġorna\" għandha taħdem tajjeb fuq sistemi Mandriva "
+"Linux\n"
 "minn verżjoni \"8.1\" 'il fuq. Mhux rakkomandat li tagħmel aġġornament ta'\n"
-"sistema Mandrivalinux qabel 8.1."
+"sistema Mandriva Linux qabel 8.1."
 
 #: help.pm:591
 #, c-format
@@ -5148,7 +5151,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"
@@ -5191,7 +5195,7 @@ msgstr ""
 "tal-karattri intenzjonata biex tipprovdi sapport għal-lingwi kollha. Però \n"
 "s-sapport għaliha fil-Linux għadu qed jiġi żviluppat. Għalhekk, l-użu tal-"
 "UTF-8\n"
-"fil-Mandrivalinux jiddependi mill-għażla tal-utent:\n"
+"fil-Mandriva Linux jiddependi mill-għażla tal-utent:\n"
 "\n"
 "* Jekk tagħżel lingwa b'ħafna sapport eżistenti f'kodifika oħra (eż, "
 "lingwi \n"
@@ -5440,7 +5444,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"
@@ -5461,11 +5465,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 ""
 "Issa wasal il-waqt li tagħżel sistema ta' printjar għall-kompjuter tiegħek.\n"
-"Sistemi operattivi oħra joffrulek waħda, Mandrivalinux jagħtik tnejn.\n"
+"Sistemi operattivi oħra joffrulek waħda, Mandriva Linux jagħtik tnejn.\n"
 "Kull waħda minn dawn is-sistema hija idejali għal ċirkostanzi differenti.\n"
 " * \"%s\" - li jfisser \"printja minngħajr kju\", hija l-aħjar għażla\n"
 "jekk għandek konnessjoni diretta mal-printer, trid il-faċilità li twaqqaf\n"
@@ -5485,7 +5489,7 @@ msgstr ""
 "\n"
 "Jekk tagħmel għażla issa, u wara tiskopri li ma togħġbokx din is-sistema,\n"
 "tista' tibdilha billi tħaddem PrinterDrake miċ-ċentru tal-kontroll ta' \n"
-"Mandrivalinux u tikklikkja l-buttuna \"%s\"."
+"Mandriva Linux u tikklikkja l-buttuna \"%s\"."
 
 #: help.pm:765
 #, c-format
@@ -5601,7 +5605,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"
@@ -5618,7 +5623,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"
@@ -5665,7 +5670,7 @@ msgstr ""
 "\n"
 " * \"%s\": jekk tixtieq tikkonfigura l-aċċess għall-internet jew network\n"
 "lokali tista tagħmel dan issa. Irreferi għad-dokumentazzjoni stampata jew\n"
-"uża ċ-Ċentru tal-Kontroll Mandrivalinux wara li tlesti l-installazzjoni "
+"uża ċ-Ċentru tal-Kontroll Mandriva Linux wara li tlesti l-installazzjoni "
 "biex\n"
 "tikseb għajnuna online sħiħa.\n"
 "\n"
@@ -5688,7 +5693,7 @@ msgstr ""
 "din il-buttuna. Dan għandu jsir minn utenti avvanzati biss. Irreferi għad-\n"
 "dokumentazzjoni stampata, jew l-għajnuna online dwar il-konfigurazzjoni "
 "tal-\n"
-"bootloader fiċ-Ċentru tal-Kontroll Mandrivalinux.\n"
+"bootloader fiċ-Ċentru tal-Kontroll Mandriva Linux.\n"
 "\n"
 " * \"%s\": permezz ta' dan l-element tista' tirfina liema servizzi se \n"
 "jitħaddmu fuq il-kompjuter. Jekk qed tippjana li tuża l-kompjuter bħala \n"
@@ -5749,11 +5754,11 @@ msgstr "Servizzi"
 #, 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 ""
 "Agħżel liema ħard disk trid tħassar biex tinstalla l-partizzjonijiet tal-\n"
-"Mandrivalinux fuqha. Oqgħod attent, l-informazzjoni kollha fuq din id-\n"
+"Mandriva Linux fuqha. Oqgħod attent, l-informazzjoni kollha fuq din id-\n"
 "diska jintilef u ma jkunx jista' jinġab lura!"
 
 #: help.pm:863
@@ -6108,7 +6113,7 @@ msgstr "Qed jiġi kalkulat id-daqs tal-partizzjoni Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Il-partizzjoni tal-Windows hija mgerfxa wisq. Jekk jogħġbok ħaddem \"defrag"
@@ -6229,13 +6234,13 @@ msgstr "Qed inniżżel in-network"
 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"
@@ -6289,7 +6294,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"
@@ -6326,7 +6331,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"
@@ -6438,8 +6443,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"
@@ -6447,14 +6452,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 ""
 "Prosit! L-installazzjoni issa lesta.\n"
 "Neħħi l-flopi/CD u agħfas Enter biex tirristartja.\n"
 "\n"
 "\n"
 "Għal informazzjoni dwar aġġornamenti li saru għal din il-verżjoni ta' \n"
-"Mandrivalinux, iċċekkja s-sezzjoni \"Errata\" li hemm fuq:\n"
+"Mandriva Linux, iċċekkja s-sezzjoni \"Errata\" li hemm fuq:\n"
 "\n"
 "\n"
 "%s\n"
@@ -6462,13 +6467,13 @@ msgstr ""
 "\n"
 "Informazzjoni dwar kif tissettja s-sistema tinstab fil-kapitlu \"Post-install"
 "\"\n"
-"fil-Mandrivalinux User's Guide uffiċjali."
+"fil-Mandriva Linux User's Guide uffiċjali."
 
 #. -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
@@ -6497,12 +6502,13 @@ msgstr "Dieħel fil-pass \"%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 ""
 "Is-sistema hija nieqsa mir-riżorsi. Jista' jkollok problema biex tinstalla \n"
-"l-Mandrivalinux. Jekk jiġri dan, ipprova installazzjoni testwali. Għal dan,\n"
+"l-Mandriva Linux. Jekk jiġri dan, ipprova installazzjoni testwali. Għal "
+"dan,\n"
 "agħfas F1 meta titla' s-CD, imbagħad ittajpja \"text\"."
 
 #: install_steps_gtk.pm:228 install_steps_interactive.pm:624
@@ -7041,9 +7047,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 ""
-"Qed nikkuntattja l-website ta' Mandrivalinux biex nikseb lista tal-mirja "
+"Qed nikkuntattja l-website ta' Mandriva Linux biex nikseb lista tal-mirja "
 "disponibbli"
 
 #: install_steps_interactive.pm:840
@@ -7268,8 +7274,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Installazzjoni Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Installazzjoni Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9855,13 +9861,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 ""
 "Konfiguratur drakfirewall\n"
 "\n"
-"Dan jikkonfigura firewall personali għal din is-sistema Mandrivalinux.\n"
+"Dan jikkonfigura firewall personali għal din is-sistema Mandriva Linux.\n"
 "Għal kompjuter firewall dedikat, jekk jogħġbok ara d-distribuzzjoni\n"
 "speċjalizzata MandrakeSecurity Firewall."
 
@@ -13881,8 +13887,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 ""
 
@@ -15806,23 +15812,23 @@ msgstr "Ieqaf"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>X'inhu Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>X'inhu Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Merħba għal <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Merħba għ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."
 msgstr ""
-"Mandrivalinux hija <b>distribuzzjoni tal-Linux</b> li jinkludi l-qalba tas-"
+"Mandriva Linux hija <b>distribuzzjoni tal-Linux</b> li jinkludi l-qalba tas-"
 "sistema, magħrufa bħala s-<b>sistema operattiva</b> (ibbażata fuq il-kernel "
 "Linux) flimkien ma' <b>ħafna programmi</b> li għandhom jaqdu kull ħtieġa li "
 "qatt jista' jkollok."
@@ -15830,10 +15836,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 hija l-iżjed distribuzzjoni ta' Linux <b>faċli tużaha</b> "
+"Mandriva Linux hija l-iżjed distribuzzjoni ta' Linux <b>faċli tużaha</b> "
 "illum Hija wkoll waħda mill-iżjed distribuzzjonijiet ta' Linux tintuża "
 "madwar id-dinja!"
 
@@ -15850,15 +15856,15 @@ msgstr "Merħba għad-<b>dinja ta' Sors Miftuħ</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 hija kommessa għall-mudell ta' sors miftuħ. Dan ifisser li din "
-"l-edizzjoni ġdida hija riżultat ta' <b>kollaborazzjoni</b> bejn <b>it-tim "
-"ta' żviluppaturi ta' Mandriva</b> u l-<b>komunità dinjija</b> ta' "
-"kontributuri ta' Mandrivalinux."
+"Mandriva Linux hija kommessa għall-mudell ta' sors miftuħ. Dan ifisser li "
+"din l-edizzjoni ġdida hija riżultat ta' <b>kollaborazzjoni</b> bejn <b>it-"
+"tim ta' żviluppaturi ta' Mandriva</b> u l-<b>komunità dinjija</b> ta' "
+"kontributuri ta' Mandriva Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -15877,10 +15883,10 @@ msgstr "<b>Il-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 ""
-"Ħafna mis-softwer inkluż mad-distribuzzjoni u l-għodda kollha Mandrivalinux "
+"Ħafna mis-softwer inkluż mad-distribuzzjoni u l-għodda kollha Mandriva Linux "
 "huma liċenzjati taħt il-<b>Liċenzja Ġenerali Pubblika (GPL)</b>"
 
 #: share/advertising/03.pl:17
@@ -15911,26 +15917,26 @@ msgstr "<b>Issieħeb mal-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 ""
-"Mandrivalinux għandha waħda mill-<b>ikbar komunitajiet</b> ta' utenti u "
+"Mandriva Linux għandha waħda mill-<b>ikbar komunitajiet</b> ta' utenti u "
 "żviluppaturi. Ir-rwol ta' din il-komunità huwa wiesa', u jinkludi mir-"
 "rappurtar ta' \"bugs\" sa l-iżvilupp ta' programmi ġodda. Il-komunità "
-"għandha <b>rwol kruċjali</b> fid-dinja ta' Mandrivalinux."
+"għandha <b>rwol kruċjali</b> fid-dinja ta' 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 ""
 "Biex <b>issir taf iżjed</b> dwar il-komunità dinamika tagħna, jekk jogħġbok "
-"żur <b>www.mandrakelinux.com</b> jew mur direttament fuq <b>www."
-"mandrakelinux.com/en/cookerdevel.php3</b> jekk trid tkun involut fl-"
+"żur <b>www.mandrivalinux.com</b> jew mur direttament fuq <b>www."
+"mandrivalinux.com/en/cookerdevel.php3</b> jekk trid tkun involut fl-"
 "iżviluppar."
 
 #: share/advertising/05.pl:15
@@ -15941,11 +15947,11 @@ msgstr "<b>Verżjoni download</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 ""
-"Int qed tinstalla <b>Mandrivalinux Download</b>. Din hija verżjoni b'xejn li "
-"Mandriva jixtiequ jibqgħu <b>jipprovdu lil kulħadd</b>"
+"Int qed tinstalla <b>Mandriva Linux Download</b>. Din hija verżjoni b'xejn "
+"li Mandriva jixtiequ jibqgħu <b>jipprovdu lil kulħadd</b>"
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -15988,8 +15994,8 @@ msgstr "<b>Discovery, l-ewwel desktop tal-Linux tiegħek</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Int qed tinstalla <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Int qed tinstalla <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16012,8 +16018,8 @@ msgstr "<b>PowerPack, L-Aqwa Desktop tal-Linux</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Int qed tinstalla <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Int qed tinstalla <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16033,8 +16039,8 @@ msgstr "<b>PowerPack+, Is-Soluzzjoni tal-Linux għal Desktops u Servers</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Int qed tinstalla <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Int qed tinstalla <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16056,14 +16062,14 @@ msgstr "<b>Prodotti 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> żviluppaw għażla sħiħa ta' prodotti <b>Mandrivalinux</b>."
+"<b>Mandriva</b> żviluppaw għażla sħiħa ta' prodotti <b>Mandriva Linux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Il-prodotti Mandrivalinux huma:"
+msgid "The Mandriva Linux products are:"
+msgstr "Il-prodotti Mandriva Linux huma:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16084,11 +16090,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 għal x86-64</b>, Is-soluzzjoni Mandrivalinux biex tieħu "
-"l-massimu mill-proċessatur 64-bit tiegħek."
+"\t* <b>Mandriva Linux għal x86-64</b>, Is-soluzzjoni Mandriva Linux biex "
+"tieħu l-massimu mill-proċessatur 64-bit tiegħek."
 
 #: share/advertising/10.pl:15
 #, c-format
@@ -16098,28 +16104,28 @@ msgstr "<b>Prodotti Mandriva (Prodotti Nomadi)</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 żviluppaw żewġ prodotti li jħalluk tuża Mandrivalinux <b>fuq "
+"Mandriva żviluppaw żewġ prodotti li jħalluk tuża Mandriva Linux <b>fuq "
 "kwalinkwa kompjuter</b> mingħajr m'hemm bżonn tinstallah:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a 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>, distribuzzjoni ta' Mandrivalinux li taħdem totalment minn "
+"\t* <b>Move</b>, distribuzzjoni ta' Mandriva Linux li taħdem totalment minn "
 "fuq CDROM jibbutja."
 
 #: 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>, distribuzzjoni ta' Mandrivalinux installata bil-"
+"\t* <b>GlobeTrotter</b>, distribuzzjoni ta' Mandriva Linux installata bil-"
 "lest fuq “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
@@ -16138,20 +16144,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>, Id-desktop Mandrivalinux għan-negozju."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Id-desktop Mandriva Linux għan-negozju."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Is-soluzzjoni server ta' Mandrivalinux"
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Is-soluzzjoni server ta' Mandriva Linux"
 
 #: 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>, Is-soluzzjoni at' sigurtà ta' "
-"Mandrivalinux"
+"\t* <b>Multi-Network Firewall</b>, Is-soluzzjoni at' sigurtà ta' Mandriva "
+"Linux"
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16351,10 +16359,10 @@ msgstr "<b>Ħu Gost bil-Varjetà Kbira ta' Programmi</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 ""
-"Fil-menu Mandrivalinux issib programmi <b>faċli tużahom</b> għax-<b>xogħol "
+"Fil-menu Mandriva Linux issib programmi <b>faċli tużahom</b> għax-<b>xogħol "
 "kollu</b> li trid:"
 
 #: share/advertising/18.pl:16
@@ -16616,18 +16624,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Ċentru tal-Kontroll Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Ċentru tal-Kontroll 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 ""
-"Iċ-<b>Ċentru ta' Kontroll Mandrivalinux</b> huwa kollezzjoni essenzjali ta' "
-"programmi speċifiċi ta' Mandrivalinux li jissimplifikaw il-konfigurazzjoni "
+"Iċ-<b>Ċentru ta' Kontroll Mandriva Linux</b> huwa kollezzjoni essenzjali ta' "
+"programmi speċifiċi ta' Mandriva Linux li jissimplifikaw il-konfigurazzjoni "
 "tal-kompjuter."
 
 #: share/advertising/25.pl:17
@@ -16652,15 +16660,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 ""
 "Bħal kull programmar tal-kompjuter, softwer sors miftuħ <b>jiħtieġ ħin u "
 "nies</b> biex jiżviluppawh. Sabiex tirrispetta l-filosofija tas-sors miftuħ, "
 "Mandriva ibiegħu prodotti b'valur miżjud u servizzi biex <b>ikomplu itejbu "
-"lil Mandrivalinux</b>. Jekk tixtieq <b>tappoġġja l-filosofija ta' sors "
-"miftuħ</b> u l-iżvilupp ta' Mandrivalinux, <b>jekk jogħġbok</b> ikkunsidra "
+"lil Mandriva Linux</b>. Jekk tixtieq <b>tappoġġja l-filosofija ta' sors "
+"miftuħ</b> u l-iżvilupp ta' Mandriva Linux, <b>jekk jogħġbok</b> ikkunsidra "
 "li tixtri wieħed mill-prodotti jew servizzi tagħna!"
 
 #: share/advertising/27.pl:13
@@ -16695,8 +16703,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Aqbeż qabża llum għand <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Aqbeż qabża llum għand <b>store.mandriva.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16706,11 +16714,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> huwa s-<b>sieħeb idejali</b> għall-prodott "
-"Mandrivalinux tiegħek.."
+"<b>Mandriva Club</b> huwa s-<b>sieħeb idejali</b> għall-prodott Mandriva "
+"Linux tiegħek.."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -16723,10 +16731,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>Skontijiet speċjali</b> fuq prodotti u servizzi tal-ħanut online "
-"tagħna<b>store.mandrakesoft.com</b>."
+"tagħna<b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -16739,17 +16747,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Parteċipazzjoni fil-<b>forums tal-utenti</b> Mandrivalinux."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Parteċipazzjoni fil-<b>forums tal-utenti</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>Aċċess kmieni u privileġġjat</b>, qabel il-ħarġa pubblika, għal "
-"<b>ISO images</b> Mandrivalinux."
+"<b>ISO images</b> Mandriva Linux."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -16769,10 +16777,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 jipprovdi firxa ta' servizzi tajbin biex <b>faċilment "
-"taġġorna</b> s-sistemi Mandrivalinux:"
+"taġġorna</b> s-sistemi Mandriva Linux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16798,9 +16806,9 @@ msgstr "\t* <b>Skedi</b> flessibbli ta' aġġornamenti."
 #: 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* L-immaniġġjar tas-<b>sistemi kollha Mandrivalinux</b> minn kont wieħed."
+"\t* L-immaniġġjar tas-<b>sistemi kollha Mandriva Linux</b> minn kont wieħed."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -16811,28 +16819,29 @@ 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 ""
 "Għandek bżonn l-<b>għajnuna</b>? Iltaqa' mal-esperti tekniċi ta' Mandriva "
-"fuq il-<b>pjattaforma ta' għajnuna teknika</b> www.mandrakeexpert.com."
+"fuq il-<b>pjattaforma ta' għajnuna teknika</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 ""
-"Grazzi għall-għajnuna ta' <b>esperti kwalifikati ta' Mandrivalinux</b>, int "
+"Grazzi għall-għajnuna ta' <b>esperti kwalifikati ta' Mandriva Linux</b>, int "
 "tiffranka ħafna ħin."
 
 #: 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 ""
-"Għal kwalinkwa mistoqsija relatata ma' Mandrivalinux, għandek il-possibbiltà "
-"li tixtri inċidenti ta' sapport minn fuq <b>store.mandrakesoft.com</b>."
+"Għal kwalinkwa mistoqsija relatata ma' Mandriva Linux, għandek il-"
+"possibbiltà li tixtri inċidenti ta' sapport minn fuq <b>store.mandriva.com</"
+"b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17201,8 +17210,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
@@ -17238,7 +17247,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"
@@ -20062,13 +20071,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Għodda tal-Mandrivalinux biex tirrapporta bugs"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Għodda tal-Mandriva Linux biex tirrapporta bugs"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Ċentru tal-Kontroll Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Ċentru tal-Kontroll Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20558,19 +20567,19 @@ msgstr "Tella' fil-bidu"
 #, 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 ""
 "Din l-interfaċċja għadha ma ġietx ikkonfigurata.\n"
-"Ħaddem is-saħħar \"Żid interfaċċja\" miċ-Ċentru tal-Kontroll Mandrivalinux"
+"Ħaddem is-saħħar \"Żid interfaċċja\" miċ-Ċentru tal-Kontroll 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 ""
 "M'għandek ebda konnessjoni mal-internet ikkonfigurata.\n"
-"Ħaddem is-saħħar \"%s\" miċ-Ċentru tal-Kontroll Mandrivalinux"
+"Ħaddem is-saħħar \"%s\" miċ-Ċentru tal-Kontroll Mandriva Linux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20620,8 +20629,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
@@ -20925,18 +20934,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 ta' Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (verżjoni oriġinali)\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
@@ -21493,8 +21502,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Ċentru ta' l-Għajnuna Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Ċentru ta' l-Għajnuna Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22156,7 +22165,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 ""
 "Ebda kard tal-awdjo ma nstabet fuq il-kompjuter. Jekk jogħġbok iċċekkja li "
 "hemm kard li tieħu l-Linux imqabbda sew.\n"
@@ -22165,7 +22174,7 @@ msgstr ""
 "Tista' żżur id-database ta' apparat magħruf fuq:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -23995,7 +24004,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 ""
 "Ebda kard TV ma nstabet fuq il-kompjuter. Jekk jogħġbok iċċekkja li hemm "
 "kard li tieħu l-Linux imqabbda sew.\n"
@@ -24004,7 +24013,7 @@ msgstr ""
 "Tista' żżur id-database ta' apparat magħruf fuq:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -24712,14 +24721,14 @@ 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 ""
-"Dan huwa Harddrake, għodda tal-Mandrivalinux għall-konfigurazzjoni tal-"
+"Dan huwa Harddrake, għodda tal-Mandriva Linux għall-konfigurazzjoni tal-"
 "ħardwer.\n"
 "<span foreground=\"royalblue3\">Verżjoni:</span> %s\n"
 "<span foreground=\"royalblue3\">Awtur:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -24827,7 +24836,7 @@ msgstr "Il-bidliet saru, imma biex ikunu effettivi trid tilloggja 'l barra"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "Log tal-għodda Mandrake"
 
 #: standalone/logdrake:51
@@ -25341,10 +25350,10 @@ msgstr "Konnessjoni lesta."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Konnessjoni falliet.\n"
-"Ivverifika l-konfigurazzjoni fiċ-Ċentru tal-Kontroll Mandrivalinux."
+"Ivverifika l-konfigurazzjoni fiċ-Ċentru tal-Kontroll Mandriva Linux."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/nb.po b/perl-install/share/po/nb.po
index 2e27791b2..59ca72b10 100644
--- a/perl-install/share/po/nb.po
+++ b/perl-install/share/po/nb.po
@@ -18,7 +18,7 @@ msgstr ""
 "POT-Creation-Date: 2005-04-21 14:27+0200\n"
 "PO-Revision-Date: 2005-04-02 01:48+0100\n"
 "Last-Translator: Eskild Hustvedt <eskild@mandrake.org>\n"
-"Language-Team: Norsk Bokmål <cooker-i18n@linux-mandrake.com>\n"
+"Language-Team: Norsk Bokmål <cooker-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1320,11 +1320,11 @@ msgstr "Spåkvalg"
 #: 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 kan støtte flere språk. Velg\n"
+"Mandriva Linux kan støtte flere språk. Velg\n"
 "språkene du ønsker å installere. Disse vil bli tilgjengelige\n"
 "når installasjonen er ferdig og du har startet systemet på nytt."
 
@@ -3742,12 +3742,12 @@ msgstr "aktiver radiostøtte"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 lese betingelsene i lisensen nøye. Den dekker hele\n"
-"Mandrivalinux-distribusjonen. Hvis du er enig med alle betingelsene,\n"
+"Mandriva Linux-distribusjonen. Hvis du er enig med alle betingelsene,\n"
 "sjekk av \"%s\"-boksen- Hvis ikke, så vil det år trykke på '%s'k-knappen "
 "starte\n"
 "maskinen din på nytt."
@@ -3936,13 +3936,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The 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-installasjonen er spredd ut over flere CD-ROMer. \n"
+"Mandriva Linux-installasjonen er spredd ut over flere CD-ROMer. \n"
 "Hvis en valgt pakke er på en annen CDROM, vil DrakX løse ut den nåværende\n"
 "CD og be deg sette i en den rette CDen som kreves. Hvis du ikke har den som\n"
 "trengs nå, bare klikk på «%s», pakken(e) vil da ikke bli installert."
@@ -3951,11 +3951,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"
@@ -4007,7 +4008,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Det er nå på tide å spesifisere hvilke programmer du ønsker å installere på\n"
-"systemet ditt. Det er tusenvis av pakker tilgjengelig for Mandrivalinux, "
+"systemet ditt. Det er tusenvis av pakker tilgjengelig for Mandriva Linux, "
 "for\n"
 "å gjøre det enklere å håndtere pakkene så har de blitt plassert i grupper "
 "med\n"
@@ -4015,7 +4016,7 @@ msgstr ""
 "\n"
 "Pakkene er delt inn i grupper som svarer til forskjellig typisk bruk av din "
 "maskin.\n"
-"Mandrivalinux har fire forhåndsdefinerte installasjoner tilgjengelig.\n"
+"Mandriva Linux har fire forhåndsdefinerte installasjoner tilgjengelig.\n"
 "Du kan mikse og matche applikasjoner fra forskjellige grupper, så en\n"
 "``Arbeidsstasjon''-installasjon kan fortsatt ha applikasjoner fra\n"
 "``Utvikling''-gruppa installert.\n"
@@ -4118,10 +4119,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"
@@ -4154,13 +4155,13 @@ msgstr ""
 "eller fordi den var medlem av en gruppe pakker, vil du bli bedt om å "
 "bekrefte at du\n"
 "virkelig ønsker å installere de valgte tjenerne.\n"
-"Som standard i Mandrivalinux vil alle installerte tjenere bli startet ved "
+"Som standard i Mandriva Linux vil alle installerte tjenere bli startet ved "
 "oppstart.\n"
 "Selv om de er sikre og ikke har noen kjente sikkerhetshull når denne "
 "distribusjonen\n"
 "ble sluppet,\n"
 "så kan det være at sikkerhetshull ble oppdaget etter at denne versjonen\n"
-"av Mandrivalinux ble sluppet. Hvis du ikke vet hva en type tjener gjør, "
+"av Mandriva Linux ble sluppet. Hvis du ikke vet hva en type tjener gjør, "
 "eller\n"
 "hvorfor den blir installert, klikk «%s».\n"
 "«%s» vil installere de listede tjenerene og de vil bli\n"
@@ -4318,7 +4319,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"
@@ -4375,7 +4376,7 @@ msgstr ""
 "X (for X Window System) er hjertet i GNU/Linux sitt grafiske grensesnitt "
 "som\n"
 "alle de grafiske miljøene (KDE, GNOME Afterstep, Windowmaker osv.)\n"
-"som følger med Mandrivalinux er avhengige av.\n"
+"som følger med Mandriva Linux er avhengige av.\n"
 "\n"
 "Du vil få en liste med forkjellige parametre som kan forandres for å få et\n"
 "optimalt grafisk grensesnitt: \n"
@@ -4503,12 +4504,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"
@@ -4535,7 +4536,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"
@@ -4544,7 +4545,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"
@@ -4564,14 +4566,15 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Du må nå avgjøre hvor du ønsker å installere Mandrivalinux-operativsystemet\n"
+"Du må nå avgjøre hvor du ønsker å installere Mandriva Linux-"
+"operativsystemet\n"
 "på din harddisk. Hvis din harddisk er tom, eller et eksisterende\n"
 "operativsystem benytter all plassen som er tilgjengelig, vil du bli nødt til "
 "å\n"
 "ompartisjonere disken. Partisjonering av en harddisk vil si å dele den inn "
 "i\n"
 "logiske enheter for å skape plassen som trengs for å installere ditt nye\n"
-"Mandrivalinux-system.\n"
+"Mandriva Linux-system.\n"
 "\n"
 "Ettersom partisjoneringsprosessen ikke kan tilbakestilles, og kan føre til "
 "tapte\n"
@@ -4606,7 +4609,7 @@ msgstr ""
 "har\n"
 "defragmentert Windows-partisjonen. Det anbefales sterkt at du tar \n"
 "sikkerhetskopi av dine data. Dette valget er anbefalt, dersom du ønsker \n"
-"å kjøre både Mandrivalinux og Microsoft Windows på samme maskin.\n"
+"å kjøre både Mandriva Linux og Microsoft Windows på samme maskin.\n"
 "\n"
 "   Før du velger dette valget, må du være klar over at størrelsen på din\n"
 "Microsoft Windows-partisjon vil være mindre enn når du startet. Du vil \n"
@@ -4615,7 +4618,7 @@ msgstr ""
 "\n"
 " * \"%s\": hvis du ønsker å slette alle partisjoner og data, og erstatte dem "
 "med ditt\n"
-"nye Mandrivalinux-system, så velg dette valget. Vær forsiktig, du vil ikke "
+"nye Mandriva Linux-system, så velg dette valget. Vær forsiktig, du vil ikke "
 "kunne gjøre\n"
 "om dette etter at du har bekreftet valget.\n"
 "\n"
@@ -4783,7 +4786,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."
@@ -4807,7 +4810,7 @@ msgstr ""
 "Klikk «%s» når du er klar til å formatere partisjonene.\n"
 "\n"
 "Klikk «%s» om du vil velge andre partisjoner for din nye\n"
-"Mandrivalinux-operativsysteminstallasjon. \n"
+"Mandriva Linux-operativsysteminstallasjon. \n"
 "\n"
 "Klikk på «%s» hvis du ønsker å velge partisjoner som skal sjekkes for\n"
 "ødelagte blokker på disken."
@@ -4824,7 +4827,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"
@@ -4836,7 +4839,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Når du installerer Mandrivalinux, er det sannsynlig at enkelte pakker\n"
+"Når du installerer Mandriva Linux, er det sannsynlig at enkelte pakker\n"
 "er blitt oppdatert siden denne versjonen ble sluppet. Noen feil kan ha\n"
 "blitt fikset, eller sikkerhetsproblemer løst. For at du skal få utnytte\n"
 "disse forbedringene kan du nå laste dem ned fra internett. Kryss av  «%s»\n"
@@ -4864,7 +4867,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"
@@ -4877,7 +4880,7 @@ msgstr ""
 "gjerne på bekostning av brukervennligheten.\n"
 "\n"
 "Hvis du ikke vet hva du skal velge, behold standardvalget. Du vil kunne\n"
-"endre sikkerhetsnivået senere med verktøyet draksec fra Mandrivalinux\n"
+"endre sikkerhetsnivået senere med verktøyet draksec fra Mandriva Linux\n"
 "Kontrollsenter.\n"
 "\n"
 "'%s'-feltet kan informere systemet om den bruker på systemet som\n"
@@ -4893,7 +4896,7 @@ msgstr "Sikkerhetsadministrator"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4964,7 +4967,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "På dette punktet må du velge hvilke partisjon(er) som skal brukes til å\n"
-"installere ditt nye Mandrivalinux-system på. Hvis partisjoner allerede har\n"
+"installere ditt nye Mandriva Linux-system på. Hvis partisjoner allerede har\n"
 "blitt definert enten fra en tidligere installasjon av GNU/Linux eller fra et "
 "annet\n"
 "partisjoneringsverktøy, kan du bruke eksisterende partisjoner. I andre\n"
@@ -5058,7 +5061,7 @@ msgstr "Skift mellom normal-/ekspert-modus"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5090,7 +5093,7 @@ msgstr ""
 "din.\n"
 "Vennligst velg den du ønsker å endre størrelsen på for å installere ditt "
 "nye\n"
-"Mandrivalinux-operativsystem.\n"
+"Mandriva Linux-operativsystem.\n"
 "\n"
 "Hver partisjon er listet som følger: \"Linux-navn\",\n"
 " \"Windows-navn\", \"Kapasitet\".\n"
@@ -5138,7 +5141,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"
@@ -5147,20 +5150,21 @@ 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 trinnet blir bare aktivert dersom det blir funnet en eksisterende\n"
 "GNU/Linux-partisjon på maskinen din.\n"
 "\n"
 "DrakX trenger nå å vite om du vil utføre en ny installasjon eller en "
 "oppgradering\n"
-"av et eksisterende Mandrivalinux-system:\n"
+"av et eksisterende Mandriva Linux-system:\n"
 "\n"
 " * «%s»: Dette vil stort sett slette hele det gamle systemet. Dersom du\n"
 "ønsker å forandre hvordan harddiskene blir partisjonert, eller forandre på\n"
@@ -5169,12 +5173,12 @@ msgstr ""
 "du avverge at noen av de gamle dataene blir overskrevet.\n"
 "\n"
 " * «%s»: Denne installasjonsklassen lar deg oppgradere pakkene som\n"
-"er installert på ditt nåværende Mandrivalinux-system. Dine nåværende\n"
+"er installert på ditt nåværende Mandriva Linux-system. Dine nåværende\n"
 "partisjonsoppdelinger og brukerdata blir ikke berørt. De fleste andre "
 "oppsettstrinn\n"
 "forblir tilgjengelige, i likhet med en standard installasjon.\n"
 "\n"
-"«Oppgrader»-valget bør fungere fint på Mandrivalinux systemer som kjører\n"
+"«Oppgrader»-valget bør fungere fint på Mandriva Linux systemer som kjører\n"
 "versjon «8.1» eller nyere. Oppgradering av versjoner tidligere enn «8.1» er\n"
 " ikke anbefalt. "
 
@@ -5235,7 +5239,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"
@@ -5277,7 +5282,7 @@ msgstr ""
 "Om UTF-8 (ISO 10646) støtte. ISO 10646 er en ny tegnsettskoding det\n"
 "er ment til å dekke alle eksisterende språk. Men full støtte for det i GNU/"
 "Linux er\n"
-"stadig under utvikling. Av denne grunnen vil Mandrivalinux bruke det\n"
+"stadig under utvikling. Av denne grunnen vil Mandriva Linux bruke det\n"
 "eller ei avhengig av brukerens valg:\n"
 "\n"
 " * Hvis du velger et språk med sterk binding til gammel kodnng (latin1-\n"
@@ -5530,7 +5535,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"
@@ -5551,11 +5556,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å er det på tide å velge utskriftsystemet for din maskin. Andre\n"
-"operativsystemer tilbyr kanskje en, men Mandrivalinux tilbyr to.\n"
+"operativsystemer tilbyr kanskje en, men Mandriva Linux tilbyr to.\n"
 "Hvert av systemene er best for et spesiell type oppsett.\n"
 "\n"
 " * «%s» -- som står for ``print, do not queue'', er valget hvis du har en\n"
@@ -5579,7 +5584,7 @@ msgstr ""
 "\n"
 "Hvis du gjør et valg nå, og så senere finner ut at du ikke liker ditt "
 "utskriftssystem,\n"
-"så kan du endre det ved å kjøre PrinterDrake fra Mandrivalinux "
+"så kan du endre det ved å kjøre PrinterDrake fra Mandriva Linux "
 "Kontrollsenter og\n"
 "klikke på «%s»-knappen. "
 
@@ -5701,7 +5706,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"
@@ -5718,7 +5724,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"
@@ -5773,7 +5779,7 @@ msgstr ""
 " * «%s»: hvis du vil sette opp din internett- eller lokale "
 "nettverkstilkobling\n"
 "kan du gjøre det nå. Sjekk den utskrevne dokumentasjonen eller bruk\n"
-"Mandrivalinux Kontrollsenter etter at installasjonen er ferdig for å\n"
+"Mandriva Linux Kontrollsenter etter at installasjonen er ferdig for å\n"
 "få full hjelp med oppsettet.\n"
 "\n"
 " * «%s»: lar deg sette opp HTTP og FTP mellomtjener-adresser hvis maskinen\n"
@@ -5793,7 +5799,7 @@ msgstr ""
 "denne\n"
 "knappen. Dette er kun for avanserte brukere. Sjekk den utskrevne "
 "dokumentasjonen\n"
-"eller innebygd hjelp om oppstartslaster-oppsettet i Mandrivalinux "
+"eller innebygd hjelp om oppstartslaster-oppsettet i Mandriva Linux "
 "Kontrollsenter.\n"
 "\n"
 " * «%s»: igjennom dette valget kan du finjustere hvilke tjenester som skal "
@@ -5857,11 +5863,11 @@ 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 ""
 "Velg den harddisken du ønsker å slette for å installere din nye\n"
-"Mandrivalinux-partisjon. Vær forsiktig, alle data på denne partisjonen vil "
+"Mandriva Linux-partisjon. Vær forsiktig, alle data på denne partisjonen vil "
 "gå tapt\n"
 "og vil ikke kunne gjenopprettes!"
 
@@ -6218,11 +6224,11 @@ msgstr "Beregner den ledige plassen på Windows-partisjonen"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Windows-partisjonen din er for fragmentert. Vennligst restart maskinen din "
-"under Windows, kjør ``defrag'' -verktøyet, så start Mandrivalinux-"
+"under Windows, kjør ``defrag'' -verktøyet, så start Mandriva Linux-"
 "installasjonen på nytt."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6339,13 +6345,13 @@ msgstr "Tar ned nettverket"
 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"
@@ -6399,7 +6405,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"
@@ -6436,7 +6442,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"
@@ -6458,12 +6464,12 @@ msgstr ""
 "Introduksjon\n"
 "\n"
 "Dette operativsystemet og de forskjellige komponentene som følger med "
-"Mandrivalinux\n"
+"Mandriva Linux\n"
 "kalles heretter \"programvareproduktene\". Programvareproduktene inkluderer, "
 "men er ikke\n"
 "begrenset til det settet med programmer, metoder, regler og dokumentasjon "
 "relatert til\n"
-"operativsystemet og de forskjellige komponentene til Mandrivalinux-"
+"operativsystemet og de forskjellige komponentene til Mandriva Linux-"
 "distribusjonen.\n"
 "\n"
 "\n"
@@ -6515,8 +6521,8 @@ msgstr ""
 "advokatsalær, rettslig ilagt\n"
 "straff, eller annet påført tap) som oppstår som følge av besittelse og bruk "
 "av programvareproduktene\n"
-"eller som følge av nedlasting av programvarekomponenter fra noen av "
-"Mandrivalinux-nettstedene\n"
+"eller som følge av nedlasting av programvarekomponenter fra noen av Mandriva "
+"Linux-nettstedene\n"
 "som er forbudt eller begrenset i enkelte land ved lokal lov. Dette "
 "begrensede\n"
 "ansvaret gjelder, men er ikke begrenset til, sterke kryptografiprodukter som "
@@ -6553,7 +6559,7 @@ msgstr ""
 "seg retten til å\n"
 "modifisere eller tilpasse programvareproduktene helt eller delvis, på alle "
 "måter og for alle formål.\n"
-"\"Mandriva\", \"Mandrivalinux\" og tilhørende logoer er varemerker "
+"\"Mandriva\", \"Mandriva Linux\" og tilhørende logoer er varemerker "
 "tilhørende Mandriva S.A.\n"
 "\n"
 "\n"
@@ -6660,8 +6666,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"
@@ -6669,14 +6675,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 ""
 "Gratulerer, installasjonen er fullført.\n"
 "Fjern oppstartsmediet og trykk enter for å starte på nytt.\n"
 "\n"
 "\n"
-"For informasjon om fikser som er tilgjengelige for denne utgaven av "
-"Mandrivalinux,\n"
+"For informasjon om fikser som er tilgjengelige for denne utgaven av Mandriva "
+"Linux,\n"
 "sjekk errataen tilgjengelig fra:\n"
 "\n"
 "\n"
@@ -6684,13 +6690,13 @@ msgstr ""
 "\n"
 "\n"
 "Informasjon om oppsett av systemet ditt finnes i post\n"
-"install-kapittelet i Official Mandrivalinux User's Guide."
+"install-kapittelet i 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
@@ -6718,12 +6724,12 @@ msgstr "Entrer trinn `%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 ""
 "Systemet ditt har lite ressurser. Du kan muligens oppleve noen problemer\n"
-"ved installering av Mandrivalinux. Hvis dette skjer kan du prøve tekst- "
+"ved installering av Mandriva Linux. Hvis dette skjer kan du prøve tekst- "
 "installering\n"
 "i stedet. Trykk `F1' ved oppstart av CD-ROM, skriv så `text'."
 
@@ -7267,9 +7273,10 @@ 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-nettstedet for å få liste over tilgjengelige speil..."
+"Kontakter Mandriva Linux-nettstedet for å få liste over tilgjengelige "
+"speil..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7493,8 +7500,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux-installasjon %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux-installasjon %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10082,13 +10089,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-oppsett\n"
 "\n"
-"Dette setter opp en personlig brannmur for denne Mandrivalinux-maskinen.\n"
+"Dette setter opp en personlig brannmur for denne Mandriva Linux-maskinen.\n"
 "For en kraftig dedikert brannmurløsning ta en kikk på den\n"
 "spesialiserte MandrakeSecurity Firewall-distribusjonen."
 
@@ -14158,11 +14165,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 ""
-"Kjør Scannerdrake (Maskinvare/Scanner i Mandrivalinux Kontrollsenter) for å "
+"Kjør Scannerdrake (Maskinvare/Scanner i Mandriva Linux Kontrollsenter) for å "
 "dele scanneren din på nettverket.\n"
 "\n"
 
@@ -16095,33 +16102,33 @@ msgstr "Stopp"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Hva er Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Hva 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-distribusjon</b> som inneholder kjernen i "
+"Mandriva Linux er en <b>Linux-distribusjon</b> som inneholder kjernen i "
 "systemet, kalt <b>operativsystemet</b> (basert på Linux-kjernen) sammen med "
 "<b>mange programmer</b> som møter alle behov du kan tenke på."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"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>brukervennlige</b> Linux-distribusjonen i dag. "
+"Mandriva Linux er den mest <b>brukervennlige</b> Linux-distribusjonen i dag. "
 "Det er også en av de <b>mest brukte</b> Linux-distribusjonene i verden!"
 
 #: share/advertising/02.pl:13
@@ -16137,15 +16144,15 @@ msgstr "Velkommen til <b>Open Source-verdenen</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 er og skal fortsette å være basert på åpen kildekode-modellen. "
-"Dette betyr at hver nye utgivelse er resultatet av <b>samarbeid</b> mellom "
-"<b>Mandriva's utviklergruppe</b> og det <b>verdensomspennende samfunnet</b> "
-"av Mandrivalinux bidragsytere."
+"Mandriva Linux er og skal fortsette å være basert på åpen kildekode-"
+"modellen. Dette betyr at hver nye utgivelse er resultatet av <b>samarbeid</"
+"b> mellom <b>Mandriva's utviklergruppe</b> og det <b>verdensomspennende "
+"samfunnet</b> av Mandriva Linux bidragsytere."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16164,10 +16171,10 @@ msgstr "<b>GPL-lisensen</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 ""
-"De fleste programmene inkludert i distribusjonen og alle Mandrivalinux-"
+"De fleste programmene inkludert i distribusjonen og alle Mandriva Linux-"
 "verktøyene er lisensert under <b>General Public License</b>-lisensen."
 
 #: share/advertising/03.pl:17
@@ -16194,30 +16201,30 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Bli med i Mandrivalinux-samfunnet!</b>"
+msgstr "<b>Bli med i Mandriva Linux-samfunnet!</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 av de <b>største samfunnene</b> med brukere og "
+"Mandriva Linux har et av de <b>største samfunnene</b> med brukere og "
 "utviklere. Rollen til et slikt samfunn er veldig bred, alt fra "
 "feilrapportering til utvikling av nye programmer. Samfunnet har en "
-"<b>avgjørende rolle</b> i Mandrivalinux-verdenen."
+"<b>avgjørende rolle</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 <b>å lære mer</b> om vårt dynamiske samfunn, vennligst besøk <b>www."
-"mandrakelinux.com</b> eller direkte <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> eller direkte <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> hvis du vil bli <b>involvert</b> i utviklingen."
 
 #: share/advertising/05.pl:15
@@ -16228,10 +16235,10 @@ msgstr "<b>Nedlastingsversjon</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 nå <b>Mandrivalinux Download</b>. Dette er gratisversjonen "
+"Du installerer nå <b>Mandriva Linux Download</b>. Dette er gratisversjonen "
 "som Mandriva vil ha <b>tilgjengelig for alle</b>."
 
 #: share/advertising/05.pl:19
@@ -16274,8 +16281,8 @@ msgstr "<b>Discovery, ditt første Linux-system</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Du installerer nå <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Du installerer nå <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16297,8 +16304,8 @@ msgstr "<b>PowerPack, det ultimate Linux-skrivebordet</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Du installerer nå <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Du installerer nå <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16318,8 +16325,8 @@ msgstr "<b>PowerPack+, Linux-løsningen for hjemme-PCer og tjenere</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Du installerer nå <b>Mandrivalinux PowerPack+</b>"
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Du installerer nå <b>Mandriva Linux PowerPack+</b>"
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16341,15 +16348,15 @@ msgstr "<b>Mandriva-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 utviklet en lang rekke med <b>Mandrivalinux</b>-"
+"<b>Mandriva</b> har utviklet en lang rekke med <b>Mandriva Linux</b>-"
 "produkter."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux-produktene er:"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux-produktene er:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16369,10 +16376,10 @@ msgstr "\t* <b>PowerPack+</b>, Linux-løsningen for hjemme PC-er og tjenere"
 #: 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 "
+"\t* <b>Mandriva Linux for x86-64</b>, Mandriva Linux løsningen for å få mest "
 "mulig ut av din 64-bits prosessor."
 
 #: share/advertising/10.pl:15
@@ -16383,28 +16390,28 @@ msgstr "<b>Mandriva-Produkter (Nomade 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 utviklet to produkter som lar deg bruke Mandrivalinux <b>på "
+"Mandriva har utviklet to produkter som lar deg bruke Mandriva Linux <b>på "
 "hvilken som helst PC</b> uten å trenge å 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-distribusjon som kjøres helt fra en "
+"\t* <b>Move</b>, en Mandriva Linux-distribusjon som kjøres helt fra en "
 "oppstartbar 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 distribusjon ferdig installert på "
+"\t* <b>GlobeTrotter</b>, en Mandriva Linux distribusjon ferdig installert på "
 "den ultra-kompakte «LaCie Mobile Hard Drive»."
 
 #: share/advertising/11.pl:13
@@ -16422,18 +16429,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>, Mandrivalinux-systemet for bedrifter."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Mandriva Linux-systemet for bedrifter."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Mandrivalinux-tjenerløsningen."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandriva Linux-tjenerløsningen."
 
 #: 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-sikkerhetsløsningen."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, Mandriva Linux-sikkerhetsløsningen."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16634,10 +16643,10 @@ msgstr "<b>Nyt den lange rekken med 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-menyen vil du finne programmer som er <b>enkle å bruke</b> "
+"I Mandriva Linux-menyen vil du finne programmer som er <b>enkle å bruke</b> "
 "for <b>alle dine oppgaver</b>:"
 
 #: share/advertising/18.pl:16
@@ -16900,18 +16909,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux Kontrollsenter</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux Kontrollsenter</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 Kontrollsenter</b> er en uunværlig samling av Mandrivalinux-"
-"spesifikke verktøy for å forenkle oppsettet av din maskin."
+"<b>Mandriva Linux Kontrollsenter</b> er en uunværlig samling av Mandriva "
+"Linux-spesifikke verktøy for å forenkle oppsettet av din maskin."
 
 #: share/advertising/25.pl:17
 #, c-format
@@ -16936,15 +16945,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 all dataprogrammering, trenger open source-programvare <b>tid og folk</"
 "b> for utvikling. For å respektere open source-filosofien selger Mandriva "
-"ekstra produkter og tjenester for å <b>fortsette å forbedre Mandrivalinux</"
+"ekstra produkter og tjenester for å <b>fortsette å forbedre Mandriva Linux</"
 "b>. Hvis du vil <b>støtte open source-filosofien</b> og utviklingen av "
-"Mandrivalinux, <b>vennligst</b> vurder å kjøpe et av våre produkter eller "
+"Mandriva Linux, <b>vennligst</b> vurder å kjøpe et av våre produkter eller "
 "tjenester!"
 
 #: share/advertising/27.pl:13
@@ -16978,8 +16987,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Stopp innom i dag på <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Stopp innom i dag på <b>store.mandriva.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16989,10 +16998,10 @@ 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 <p>perfekte partner</b> til ditt Mandrivalinux-"
+"<b>Mandriva Club</b> er den <p>perfekte partner</b> til ditt Mandriva Linux-"
 "produkt.."
 
 #: share/advertising/28.pl:19
@@ -17006,10 +17015,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>Spesielle rabatter</b> for produkter og tjenester hos vår nettbutikk "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -17022,17 +17031,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Delta i Mandrivalinux-<b>brukerforum</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Delta i Mandriva Linux-<b>brukerforum</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 priviligert tilgang</b>, før offentlige utgivelser til "
-"Mandrivalinux-<b>ISO-imagefiler</b>."
+"Mandriva Linux-<b>ISO-imagefiler</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -17052,10 +17061,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 tilbyr en lang rekke med verdifulle tjenester for <b>enkel "
-"oppdatering</b> av dine Mandrivalinux-systemer:"
+"oppdatering</b> av dine Mandriva Linux-systemer:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17080,9 +17089,9 @@ msgstr "\t* Fleksible <b>planlagte</b> oppdateringer."
 #: 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* Håndtering av <b>alle dine Mandrivalinux-systemer</b> med en konto."
+"\t* Håndtering av <b>alle dine Mandriva Linux-systemer</b> med en konto."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -17093,28 +17102,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>assistanse?</b> Mæt Mandriva's tekniske eksperter på "
-"<b>vår tekniske kundestøtteplattform</b> www.mandrakeexpert.com."
+"<b>vår tekniske kundestøtteplattform</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 hjelpa fra <b>kvalifiserte Mandrivalinux-eksperter</b>, så vil "
+"Takket være hjelpa fra <b>kvalifiserte Mandriva Linux-eksperter</b>, så vil "
 "du få spart 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ørsmål relatert til Mandrivalinux så har du muligheten til å "
-"kjøpe kundestøttetilfeller på <b>store.mandrakesoft.com</b>."
+"For alle spørsmål relatert til Mandriva Linux så har du muligheten til å "
+"kjøpe kundestøttetilfeller på <b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17506,8 +17515,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 ""
 "[VALG] [PROGRAMNAVN]\n"
 "\n"
@@ -17568,7 +17577,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"
@@ -17582,7 +17591,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[VALG]...\n"
-"Mandrivalinux Terminaltjener-oppsett\n"
+"Mandriva Linux Terminaltjener-oppsett\n"
 "--enable         : aktiver MTS\n"
 "--disable        : deaktiver MTS\n"
 "--start          : start MTS\n"
@@ -20409,13 +20418,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux-feilrapporteringsverktøy"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux-feilrapporteringsverktøy"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux Kontrollsenter"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux Kontrollsenter"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20906,19 +20915,20 @@ msgstr "Startet ved oppstart"
 #, 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 grensesnittet har ikke blitt satt opp ennå.\n"
-"Kjør \"Legg til et grensesnitt\"-assistenten fra Mandrivalinux Kontrollsenter"
+"Kjør \"Legg til et grensesnitt\"-assistenten fra Mandriva Linux "
+"Kontrollsenter"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Du har ikke satt opp en internettilkobling enda.\n"
-"Kjør «%s»-assistenten fra Mandrivalinux Kontrollsenter."
+"Kjør «%s»-assistenten fra Mandriva Linux Kontrollsenter."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20968,8 +20978,8 @@ msgstr "KDM (KDE-Innloggingshåndterer)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Mandrivalinux-Innloggingshåndterer)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Mandriva Linux-Innloggingshåndterer)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21273,18 +21283,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 (opprinnelig versjon)\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
@@ -21859,8 +21869,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux hjelpesenter"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux hjelpesenter"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22522,7 +22532,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 ""
 "Inget lydkort har blitt oppdaget på din maskin. Vennligst sjekk at et\n"
 "Linux-støttet lydkort er riktig installert.\n"
@@ -22531,7 +22541,7 @@ msgstr ""
 "Du kan besøke vår maskinvaredatabase på:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24550,7 +24560,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 ""
 "Inget TV-kort har blitt oppdaget på din maskin. Vennligst sjekk at du\n"
 "har et Linux-støttet Video/TV-kort riktig installert.\n"
@@ -24559,7 +24569,7 @@ msgstr ""
 "Du kan besøke vår maskinvaredatabase på:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25271,13 +25281,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 maskinvareoppsettsverktøy.\n"
 "<span foreground=\"royalblue3\">Versjon:</span> %s\n"
 "<span foreground=\"royalblue3\">Forfatter:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25385,8 +25395,8 @@ msgstr "Endringen er gjort, men for å være effektivisert så må du logge ut"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinuxverktøy-logger"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linuxverktøy-logger"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25902,10 +25912,10 @@ msgstr "Oppkobling ferdig."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Oppkobling feilet.\n"
-"Sjekk oppsettet ditt i Mandrivalinux Kontrollsenter."
+"Sjekk oppsettet ditt i Mandriva Linux Kontrollsenter."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/nl.po b/perl-install/share/po/nl.po
index ba296de37..60be27dcb 100644
--- a/perl-install/share/po/nl.po
+++ b/perl-install/share/po/nl.po
@@ -1324,11 +1324,11 @@ msgstr "Taalkeuze"
 #: 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 kan meerdere talen aan. Selecteer de talen\n"
+"Mandriva Linux kan meerdere talen aan. Selecteer de talen\n"
 "die u wenst te installeren. Ze zullen beschikbaar zijn wanneer\n"
 "de installatie afgerond is en u uw computer opnieuw start."
 
@@ -3768,12 +3768,12 @@ msgstr "activeer radio ondersteuning"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 verdergaat dient u eerst de voorwaarden in de licentie\n"
-"aandachtig te lezen. Zij beslaan de gehele Mandrivalinux distributie.\n"
+"aandachtig te lezen. Zij beslaan de gehele Mandriva Linux distributie.\n"
 "Indien u akkoord gaat met alle voorwaarden erin kruist u het\n"
 "\"%s\"-vakje aan. Zoniet, dan zal het klikken van de \"%s\"-knop\n"
 "uw computer herstarten."
@@ -3956,13 +3956,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The 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 ""
-"De Mandrivalinux-installatie is verdeeld over meerdere CD-ROMs. Als een \n"
+"De Mandriva Linux-installatie is verdeeld over meerdere CD-ROMs. Als een \n"
 "geselecteerd pakket te vinden is op een andere CD-ROM, zal het \n"
 "installatieprogramma de huidige CD uitwerpen en u vragen om de\n"
 "correcte CD in te leggen. Mocht u de betreffende CD niet bij de hand "
@@ -3974,11 +3974,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"
@@ -4034,7 +4035,7 @@ msgstr ""
 "Linux, en om het overzichtelijker te maken zijn de pakketten in groepen\n"
 "van vergelijkbare toepassingen geplaatst.\n"
 "\n"
-"Mandrivalinux sorteert groepen pakketten in vier categorieën.\n"
+"Mandriva Linux sorteert groepen pakketten in vier categorieën.\n"
 "U kunt de toepassingen uit de verschillende categorieën uitkiezen\n"
 "en samenvoegen naar eigen inzicht, zodat een ``Werkstation''-installatie\n"
 "nog steeds toepassingen geïnstalleerd kan hebben uit de ``Server''\n"
@@ -4146,10 +4147,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"
@@ -4181,11 +4182,11 @@ msgstr ""
 "!! Als een server-pakket geselecteerd is, ofwel omdat u dat pakket\n"
 "specifiek gekozen heeft ofwel omdat het onderdeel is van een hele groep\n"
 "pakketten, zal u gevraagd worden om te bevestigen dat u deze servers echt\n"
-"wilt installeren. Onder Mandrivalinux worden alle geïnstalleerde servers\n"
+"wilt installeren. Onder Mandriva Linux worden alle geïnstalleerde servers\n"
 "standaard ingeschakeld tijdens het opstarten. Zelfs wanneer zij veilig\n"
 "zijn en geen bekende beveiligingsgebreken hadden op het moment dat de\n"
 "distributie werd uitgebracht, kan het gebeuren dat beveiligingsfouten\n"
-"ontdekt worden nadat deze versie van Mandrivalinux afgemaakt werd.\n"
+"ontdekt worden nadat deze versie van Mandriva Linux afgemaakt werd.\n"
 "Indien u niet weet wat een bepaalde dienst geacht wordt te doen of waarom\n"
 "deze geïnstalleerd wordt, klikt u dan \"%s\". Klikken op \"%s\" zal\n"
 "de getoonde diensten installeren en ze zullen automatisch worden\n"
@@ -4343,7 +4344,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"
@@ -4400,7 +4401,7 @@ msgstr ""
 "X (voor X Window System) is het hart van de grafische interface van GNU/\n"
 "Linux waarvan alle grafische omgevingen (KDE, GNOME, AfterStep, "
 "WindowMaker,\n"
-"etc.) die bij Mandrivalinux worden geleverd, afhankelijk zijn.\n"
+"etc.) die bij Mandriva Linux worden geleverd, afhankelijk zijn.\n"
 "\n"
 "U krijgt een lijst te zien van verschillende parameters die u kunt "
 "aanpassen\n"
@@ -4519,12 +4520,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"
@@ -4551,7 +4552,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"
@@ -4560,7 +4561,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"
@@ -4580,12 +4582,12 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Op dit punt dient u te kiezen waar op uw harde schijf u uw Mandrivalinux\n"
+"Op dit punt dient u te kiezen waar op uw harde schijf u uw Mandriva Linux\n"
 "besturingssysteem wilt installeren. Als uw harde schijf leeg is of als een\n"
 "ander besturingssysteem alle beschikbare ruimte inneemt, dan zult u\n"
 "de harde schijf moeten partitioneren. Partitioneren houdt in dat u uw harde\n"
 "schijf in logische stukken onderverdeelt om ruimte te creëren voor uw\n"
-"nieuwe Mandrivalinux besturingssysteem.\n"
+"nieuwe Mandriva Linux besturingssysteem.\n"
 "\n"
 "Omdat de effecten van het partitioneringsproces over het algemeen niet\n"
 "terug te draaien zijn en kan leiden tot gegevensverlies als er reeds een\n"
@@ -4618,7 +4620,7 @@ msgstr ""
 "verlies van enige gegevens, vooropgesteld dat u eerst de Windows-partitie\n"
 "gedefragmenteerd heeft. Een reservekopie maken van uw gegevens is\n"
 "uitdrukkelijk aangeraden. Deze optie is aanbevolen indien u zowel\n"
-"Mandrivalinux als Microsoft Windows op dezelfde computer wilt gebruiken.\n"
+"Mandriva Linux als Microsoft Windows op dezelfde computer wilt gebruiken.\n"
 "\n"
 "   Laat het goed tot u doordringen, voordat u deze optie kiest, dat uw\n"
 "Microsoft Windows partitie na afloop van deze procedure minder groot\n"
@@ -4627,7 +4629,7 @@ msgstr ""
 "installeren.\n"
 "\n"
 " * \"%s\": indien u alle gegevens en alle partities op uw\n"
-"harde schijf wilt verwijderen en vervangen door uw nieuwe Mandrivalinux-\n"
+"harde schijf wilt verwijderen en vervangen door uw nieuwe Mandriva Linux-\n"
 "systeem, kiest u deze optie. Weest u voorzichtig met deze oplossing omdat u\n"
 "na bevestiging deze keuze niet meer ongedaan kunt maken.\n"
 "\n"
@@ -4794,7 +4796,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."
@@ -4817,7 +4819,7 @@ msgstr ""
 "Klik op \"%s\" wanneer u klaar bent om de partities te formatteren.\n"
 "\n"
 "Klik op \"%s\" indien u een andere partitie voor uw nieuwe\n"
-"Mandrivalinux besturingssysteem wilt kiezen.\n"
+"Mandriva Linux besturingssysteem wilt kiezen.\n"
 "\n"
 "Klik op \"%s\" indien u partities wenst te selecteren die op\n"
 "onleesbare blokken gecontroleerd moeten worden."
@@ -4834,7 +4836,7 @@ msgstr "Vorige"
 #: 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"
@@ -4846,7 +4848,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Op het moment dat u Mandrivalinux installeert, is het waarschijnlijk\n"
+"Op het moment dat u Mandriva Linux installeert, is het waarschijnlijk\n"
 "dat sommige pakketten herzien zijn sinds het moment dat het werd\n"
 "uitgebracht. Sommige onvolkomenheden kunnen gerepareerd zijn en\n"
 "beveiligingsproblemen opgelost. Om u te kunnen laten profiteren van\n"
@@ -4877,7 +4879,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"
@@ -4892,7 +4894,7 @@ msgstr ""
 "\n"
 "Als u niet weet wat te kiezen, behoudt u de standaard optie. U zult \n"
 "later nog in staat zijn het beveiligingsniveau te veranderen met het\n"
-"draksec-hulpprogramma vanuit het Mandrivalinux Configuratiecentrum.\n"
+"draksec-hulpprogramma vanuit het Mandriva Linux Configuratiecentrum.\n"
 "\n"
 "Vul in het \"%s\"-veld het e-mailadres in van de persoon die\n"
 "verantwoordelijk is voor de beveiliging. Beveiligingsmeldingen\n"
@@ -4907,7 +4909,7 @@ msgstr "Beveiligingsbeheerder"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4978,7 +4980,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Op dit punt dient u te kiezen welke partitie(s) gebruikt zullen worden voor\n"
-"de installatie van uw Mandrivalinux systeem. Indien er reeds partities\n"
+"de installatie van uw Mandriva Linux systeem. Indien er reeds partities\n"
 "gedefinieerd zijn, van een vorige GNU/Linux installatie of door een\n"
 "ander partitioneringsprogramma, kunt u bestaande partities gebruiken.\n"
 "In andere gevallen moeten er harde schijf-partities gedefinieerd worden.\n"
@@ -5077,7 +5079,7 @@ msgstr "Normale/expert-modus"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5106,7 +5108,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Er is meer dan één Microsoft-partitie op uw harde schijf gevonden.\n"
-"Kiest u degene die u wilt verkleinen om uw nieuwe Mandrivalinux\n"
+"Kiest u degene die u wilt verkleinen om uw nieuwe Mandriva Linux\n"
 "besturingssysteem te kunnen installeren.\n"
 "\n"
 "Elke partitie wordt getoond als volgt: \"Linux naam\", \"Windows naam\"\n"
@@ -5155,7 +5157,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"
@@ -5164,19 +5166,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 ""
 "Deze stap activeert slechts wanneer een bestaande GNU/Linux-partitie\n"
 "gevonden is op uw computer.\n"
 "\n"
 "Nu is het noodzakelijk dat u aangeeft of u een nieuwe installatie\n"
-"of een opwaardering van een bestaand Mandrivalinux-systeem\n"
+"of een opwaardering van een bestaand Mandriva Linux-systeem\n"
 "wilt uitvoeren:\n"
 "\n"
 " * \"%s\". Dit verwijdert het oude systeem vrijwel volledig.\n"
@@ -5187,14 +5190,15 @@ msgstr ""
 "bestandssysteem wenst te wijzigen, dan dient u deze optie te kiezen.\n"
 "\n"
 " * \"%s\". Deze installatieklasse stelt u in staat de pakketten\n"
-"die momenteel op uw Mandrivalinux-systeem zijn geïnstalleerd te verversen.\n"
+"die momenteel op uw Mandriva Linux-systeem zijn geïnstalleerd te verversen.\n"
 "Uw huidige partitioneringsschema en gebruikersgegevens worden niet\n"
 " veranderd. De meeste andere configuratiestappen blijven beschikbaar,\n"
 "zoals bij een gewone installatie.\n"
 "\n"
 "Het gebruik van de ``Opwaardering''-optie zou prima moeten werken op\n"
-"Mandrivalinux versie \"8.1\" of recenter. Het uitvoeren van een\n"
-"opwaardering op versies eerder dan Mandrivalinux versie \"8.1\" is afgeraden."
+"Mandriva Linux versie \"8.1\" of recenter. Het uitvoeren van een\n"
+"opwaardering op versies eerder dan Mandriva Linux versie \"8.1\" is "
+"afgeraden."
 
 # Extra stukje toegevoegd over Nederlandse layout
 #: help.pm:591
@@ -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"
@@ -5298,7 +5303,7 @@ msgstr ""
 "Over UTF-8 (unicode)-ondersteuning: Unicode is een nieuwe tekencodering\n"
 "bedoeld om alle bestaande geschreven talen te omvatten. Volledige\n"
 "GNU/Linux-ondersteuning ervoor is echter nog in ontwikkeling.\n"
-"Daarom gebruikt Mandrivalinux het al dan niet, afhankelijk van de keuze\n"
+"Daarom gebruikt Mandriva Linux het al dan niet, afhankelijk van de keuze\n"
 "van de gebruiker:\n"
 "\n"
 " * Indien u talen kiest met een sterke coderingstraditie (latin1\n"
@@ -5546,7 +5551,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"
@@ -5567,11 +5572,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 ""
 "Het is nu tijd een afdruksysteem voor uw computer te selecteren. Andere\n"
-"besturingssystemen geven u er wellicht maar één, maar Mandrivalinux\n"
+"besturingssystemen geven u er wellicht maar één, maar Mandriva Linux\n"
 "biedt er twee. Elk van deze afdruksystemen is het meest geschikt voor\n"
 "bepaalde typen configuraties.\n"
 "\n"
@@ -5597,7 +5602,8 @@ msgstr ""
 "\n"
 "Wanneer u nu een keuze maakt en er later achter komt dat uw afdruksysteem\n"
 "u niet bevalt dan kunt u het veranderen door PrinterDrake uit te voeren\n"
-"vanuit het Mandrivalinux Configuratiecentrum en op de \"%s\"-knop te klikken."
+"vanuit het Mandriva Linux Configuratiecentrum en op de \"%s\"-knop te "
+"klikken."
 
 #: help.pm:765
 #, c-format
@@ -5717,7 +5723,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"
@@ -5734,7 +5741,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"
@@ -5787,7 +5794,7 @@ msgstr ""
 "\n"
 " * \"%s\": Als u uw internettoegang of toegang tot het lokale\n"
 "netwerk wilt instellen, kunt u dat nu doen. Raadpleeg de gedrukte\n"
-"documentatie of gebruik het Mandrivalinux Configuratiecentrum nadat\n"
+"documentatie of gebruik het Mandriva Linux Configuratiecentrum nadat\n"
 "de installatie klaar is om te profiteren van volledige on-line hulp.\n"
 "\n"
 " * \"%s\": stelt u in staat HTTP- en FTP-proxy adressen te configureren\n"
@@ -5804,7 +5811,7 @@ msgstr ""
 " * \"%s\": indien u uw opstartlader-configuratie wenst te \n"
 "veranderen, klikt u op deze knop. Alleen aankomen als u een gevorderde\n"
 "gebruiker bent. Raadpleeg de gedrukte documentatie of de on-line hulp\n"
-"over de configuratie van een opstartlader in het Mandrivalinux \n"
+"over de configuratie van een opstartlader in het Mandriva Linux \n"
 "Configuratiecentrum.\n"
 " * \"%s\": U bent hier in staat om de diensten die op uw computer\n"
 "actief zullen zijn, fijn af te regelen. Indien u deze computer als server\n"
@@ -5865,10 +5872,10 @@ msgstr "Diensten"
 #, 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 de harde schijf die u wilt wissen om uw nieuwe Mandrivalinux-\n"
+"Kies de harde schijf die u wilt wissen om uw nieuwe Mandriva Linux-\n"
 "partitie op te installeren. Wees voorzichtig, alle gegevens die\n"
 "op deze schijf staan zullen verloren gaan, en niet terug te halen zijn!"
 
@@ -6227,12 +6234,12 @@ msgstr "Bezig met berekenen grootte van Windows-partitie"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Uw Windows-partitie is te gefragmenteerd. Start uw computer opnieuw op onder "
 "Windows, gebruik het ``defrag''-hulpprogramma, en herstart vervolgens de "
-"installatie van Mandrivalinux."
+"installatie van Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6351,13 +6358,13 @@ msgstr "Bezig met stoppen van het netwerk"
 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"
@@ -6386,8 +6393,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 "
@@ -6401,8 +6408,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 "
@@ -6411,7 +6418,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"
@@ -6445,10 +6452,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"
@@ -6470,12 +6477,12 @@ msgstr ""
 "Introductie\n"
 "\n"
 "Het besturingssysteem en de verschillende componenten beschikbaar in de "
-"Mandrivalinux\n"
+"Mandriva Linux\n"
 "distributie zullen vanaf nu \" Software Produkten\" heten. De Software "
 "Produkten omvatten,\n"
 "maar zijn niet beperkt tot de programma's, methoden, regels en documentatie "
 "gerelateerd aan\n"
-"het besturingssysteem en de verschillende onderdelen van de Mandrivalinux "
+"het besturingssysteem en de verschillende onderdelen van de Mandriva Linux "
 "distributie.\n"
 "\n"
 "\n"
@@ -6505,8 +6512,8 @@ msgstr ""
 "De Software Produkten en meegeleverde documentatie zijn geleverd \"als "
 "zodanig\" zonder garantie,\n"
 "voorzover dat dat wettelijk is toegestaan.\n"
-"Mandriva S.A. zal in geen enkele omstandigheid, en voorzover dat "
-"wettelijk is toegestaan,\n"
+"Mandriva S.A. zal in geen enkele omstandigheid, en voorzover dat wettelijk "
+"is toegestaan,\n"
 "aansprakelijk zijn voor elke vorm van speciale, incidentele, directe of "
 "indirecte schade (inclusief\n"
 "zonder beperking schade door verlies van zaken, interruptie van zaken, "
@@ -6521,8 +6528,8 @@ msgstr ""
 "BEPERKTE AANSPRAKELIJKHEID GEKOPPELD AAN HET BEZIT OF GEBRUIK VAN\n"
 "VERBODEN SOFTWARE IN SOMMIGE LANDEN\n"
 "\n"
-"Mandriva S.A. of zijn distributeurs zullen, voorzover wettelijk "
-"toegestaan, in geen geval aansprakelijk\n"
+"Mandriva S.A. of zijn distributeurs zullen, voorzover wettelijk toegestaan, "
+"in geen geval aansprakelijk\n"
 "zijn voor welke vorm van speciale, incidentele, directe of indirecte schade "
 "dan ook (inclusief\n"
 "zonder beperking schade door verlies van zaken, interruptie van zaken, "
@@ -6531,7 +6538,7 @@ msgstr ""
 "daaruit volgende verliezen)\n"
 "voortkomend uit het bezit of gebruik van softwarecomponenten of voortkomend "
 "uit het downloaden van\n"
-"softwarecomponenten van één van Mandrivalinux sites, welke verboden of "
+"softwarecomponenten van één van Mandriva Linux sites, welke verboden of "
 "beperkt zijn in sommige\n"
 "landen door lokale wetgeving.\n"
 "Deze beperkte aansprakelijkheid geldt voor, maar is niet beperkt tot de "
@@ -6554,8 +6561,8 @@ msgstr ""
 "alvorens enige component te gebruiken. Elke vraag over een componentlicentie "
 "kunt U richten aan de\n"
 "desbetreffende auteur en niet aan Mandriva.\n"
-"De programmatuur ontwikkeld door Mandriva S.A. valt onder de GPL-"
-"licentie. Documentatie\n"
+"De programmatuur ontwikkeld door Mandriva S.A. valt onder de GPL-licentie. "
+"Documentatie\n"
 "geschreven door Mandriva S.A. valt onder een eigen licentie. Zie de "
 "documentatie voor verdere details.\n"
 "\n"
@@ -6570,7 +6577,7 @@ msgstr ""
 "Mandriva S.A. behoudt zich het recht voor om de Software Produkten te "
 "veranderen in hun geheel\n"
 "of in onderdelen, op welke manier dan ook en voor welk doel dan ook.\n"
-"\"Mandriva\", \"Mandrivalinux\" en geassocieerde logo's zijn handelsmerken "
+"\"Mandriva\", \"Mandriva Linux\" en geassocieerde logo's zijn handelsmerken "
 "van Mandriva S.A.\n"
 "\n"
 "\n"
@@ -6588,8 +6595,7 @@ msgstr ""
 "geschikt. Als een laatste oplossing kan de zaak doorverwezen worden naar de "
 "geschikte\n"
 "gerechtshoven van Parijs - Frankrijk.\n"
-"Bij vragen over dit document, gelieve contact op te nemen met Mandriva S."
-"A.\n"
+"Bij vragen over dit document, gelieve contact op te nemen met Mandriva S.A.\n"
 "\n"
 "Dit document is vanuit het Engels vertaald door een onbeëdigde vertaler. "
 "Voor het rechtsgeldig\n"
@@ -6689,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"
@@ -6698,13 +6704,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 ""
 "Gefeliciteerd, de installatie is voltooid. \n"
 "Verwijder de opstartmedia en druk op Enter om opnieuw op te starten.\n"
 "\n"
 "\n"
-"Voor informatie over verbeteringen die voor deze versie van Mandrivalinux\n"
+"Voor informatie over verbeteringen die voor deze versie van Mandriva Linux\n"
 "beschikbaar zijn, raadpleegt u de Errata, beschikbaar van:\n"
 "\n"
 "\n"
@@ -6712,13 +6718,13 @@ msgstr ""
 "\n"
 "\n"
 "Informatie over het configureren van uw systeem is beschikbaar in het\n"
-"\"post install\"-hoofdstuk van de Official Mandrivalinux User's Guide."
+"\"post install\"-hoofdstuk van de 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/nl/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/nl/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -6747,12 +6753,12 @@ msgstr "Overgang naar stap `%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 ""
 "Uw systeem heeft weinig bronnen beschikbaar. U zou problemen kunnen\n"
-"ondervinden bij het installeren van Mandrivalinux. Als dit gebeurt,\n"
+"ondervinden bij het installeren van Mandriva Linux. Als dit gebeurt,\n"
 "kunt u een tekstinstallatie proberen. Om dit te doen, drukt u op `F1'\n"
 "terwijl de CDROM opstart, en dan voert u `text' in."
 
@@ -7298,9 +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 ""
-"Bezig te verbinden met de Mandrivalinux-website om de lijst met beschikbare "
+"Bezig te verbinden met de Mandriva Linux-website om de lijst met beschikbare "
 "mirrors op te halen..."
 
 #: install_steps_interactive.pm:840
@@ -7526,8 +7532,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux installatie %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux installatie %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10114,14 +10120,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 ""
 "Configuratie van drakfirewall\n"
 "\n"
 "Dit programma configureert een persoonlijke firewall voor deze \n"
-"Mandrivalinux machine. Voor een krachtige, specifieke\n"
+"Mandriva Linux machine. Voor een krachtige, specifieke\n"
 "firewall-oplossing, zie de gespecialiseerde MandrakeSecurity \n"
 "Firewall-distributie."
 
@@ -14218,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 ""
-"Voer Scannerdrake uit (Apparatuur/Scanner in Mandrivalinux "
+"Voer Scannerdrake uit (Apparatuur/Scanner in Mandriva Linux "
 "Configuratiecentrum) om uw scanner te delen op het netwerk.\n"
 "\n"
 
@@ -16195,23 +16201,23 @@ 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 bij <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Welkom bij <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 is een <b>Linuxdistributie</b> die bestaat uit het hart van "
+"Mandriva Linux is een <b>Linuxdistributie</b> die bestaat uit het hart van "
 "het systeem, <b>besturingssysteem</b> genoemd (gebaseerd op de Linux-kernel) "
 "tesamen met <b>vele toepassingen</b> die maken dat u alles met uw computer "
 "kunt doen wat u maar kunt verzinnen."
@@ -16219,12 +16225,12 @@ 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 is de meest <b>gebruikersvriendelijke</b> Linuxdistributie die "
-"vandaag de dag bestaat. Het is daarnaast één van de <b>meest gebruikte</b> "
-"Linuxdistributies ter wereld!"
+"Mandriva Linux is de meest <b>gebruikersvriendelijke</b> Linuxdistributie "
+"die vandaag de dag bestaat. Het is daarnaast één van de <b>meest gebruikte</"
+"b> Linuxdistributies ter wereld!"
 
 #: share/advertising/02.pl:13
 #, c-format
@@ -16239,15 +16245,15 @@ msgstr "Welkom in de <b>wereld van open source</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 legt zich toe op het open source-model. Dit betekent dat deze "
-"nieuwe uitgave het resultaat is van <b>samenwerking</b> tussen "
-"<b>Mandrivas' team van ontwikkelaars</b> en de <b>wereldwijde "
-"gemeenschap</b> van personen die meewerken aan Mandrivalinux."
+"Mandriva Linux legt zich toe op het open source-model. Dit betekent dat deze "
+"nieuwe uitgave het resultaat is van <b>samenwerking</b> tussen <b>Mandrivas' "
+"team van ontwikkelaars</b> en de <b>wereldwijde gemeenschap</b> van personen "
+"die meewerken aan Mandriva Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16266,12 +16272,11 @@ msgstr "<b>De 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 ""
-"De meeste software die bijgesloten is in de distributie en alle "
-"Mandrivalinux-hulpprogramma's zijn uitgegven onder de <b>General Public "
-"License</b>."
+"De meeste software die bijgesloten is in de distributie en alle Mandriva "
+"Linux-hulpprogramma's zijn uitgegven onder de <b>General Public License</b>."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16303,25 +16308,25 @@ msgstr "<b>Kom bij de community</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 heeft één van de <b>grootste community's</b> van gebruikers en "
-"ontwikkelaars. De rol van zo'n community is erg breed, variërend van het "
+"Mandriva Linux heeft één van de <b>grootste community's</b> van gebruikers "
+"en ontwikkelaars. De rol van zo'n community is erg breed, variërend van het "
 "melden van foutjes tot de ontwikkeling van nieuwe toepassingen. De community "
-"speelt een <b>sleutelrol</b> in de Mandrivalinux-wereld."
+"speelt een <b>sleutelrol</b> in de Mandriva Linux-wereld."
 
 #: 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 ""
 "Om <b>meer te weten te komen</b> over onze dynamische community, bezoekt u "
-"<b>www.mandrakelinux.com</b> of direct <b>www.mandrakelinux.com/nl/"
+"<b>www.mandrivalinux.com</b> of direct <b>www.mandrivalinux.com/nl/"
 "cookerdevel.php3</b>, mocht u <b>betrokken</b> willen raken bij de "
 "ontwikkeling."
 
@@ -16333,10 +16338,10 @@ msgstr "<b>Downloadversie</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 ""
-"Momenteel installeert u <b>Mandrivalinux Download</b>. Dit is de gratis "
+"Momenteel installeert u <b>Mandriva Linux Download</b>. Dit is de gratis "
 "versie die Mandriva <b>beschikbaar voor iedereen</b> wil houden."
 
 #: share/advertising/05.pl:19
@@ -16381,8 +16386,8 @@ msgstr "<b>Discovery, Uw eerste Linux-werkomgeving</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "U bent nu <b>Mandrivalinux Discovery</b> aan het installeren."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "U bent nu <b>Mandriva Linux Discovery</b> aan het installeren."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16404,8 +16409,8 @@ msgstr "<b>PowerPack, de ultieme Linux-werkomgeving</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "U bent nu <b>Mandrivalinux PowerPack</b> aan het installeren."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "U bent nu <b>Mandriva Linux PowerPack</b> aan het installeren."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16414,8 +16419,8 @@ msgid ""
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack is Mandrivas' <b>werkplek-Linux paradepaardje</b>. PowerPack "
-"bevat <b>duizenden toepassingen</b> - alles van de populairste tot de meest "
+"PowerPack is Mandrivas' <b>werkplek-Linux paradepaardje</b>. PowerPack bevat "
+"<b>duizenden toepassingen</b> - alles van de populairste tot de meest "
 "geavanceerde."
 
 #: share/advertising/08.pl:13
@@ -16425,8 +16430,8 @@ msgstr "<b>PowerPack+, de Linuxoplossing voor werkplekken en servers</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "U installeert nu <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "U installeert nu <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16449,16 +16454,15 @@ msgstr "<b>Mandriva-produkten</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> heeft een uitgebreide serie <b>Mandrivalinux</b>-"
-"produkten ontwikkeld."
+"<b>Mandriva</b> heeft een uitgebreide serie <b>Mandriva Linux</b>-produkten "
+"ontwikkeld."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "De Mandrivalinux-produkten zijn:"
+msgid "The Mandriva Linux products are:"
+msgstr "De Mandriva Linux-produkten zijn:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16478,10 +16482,10 @@ msgstr "\t* <b>PowerPack+</b>, de Linuxoplossing voor werkplekken en servers."
 #: 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 voor x86-64</b>, de Mandrivalinux-oplossing om het "
+"\t* <b>Mandriva Linux voor x86-64</b>, de Mandriva Linux-oplossing om het "
 "meeste uit uw 64-bit processor te halen."
 
 #: share/advertising/10.pl:15
@@ -16492,29 +16496,29 @@ msgstr "<b>Mandriva-produkten (Nomad-produkten)</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 heeft twee produkten ontwikkeld die u in staat stellen om "
-"Mandrivalinux <b>op iedere computer</b> te gebruiken, zonder dat u het eerst "
-"hoeft te installeren:"
+"Mandriva heeft twee produkten ontwikkeld die u in staat stellen om Mandriva "
+"Linux <b>op iedere computer</b> te gebruiken, zonder dat u het eerst hoeft "
+"te installeren:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a 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>, een Mandrivalinux-distributie die geheel vanaf een "
+"\t* <b>Move</b>, een Mandriva Linux-distributie die geheel vanaf een "
 "opstartbare CD-ROM te gebruiken is."
 
 #: 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>, een Mandrivalinux-distributie voorgeïnstalleerd op "
+"\t* <b>GlobeTrotter</b>, een Mandriva Linux-distributie voorgeïnstalleerd op "
 "de ultra-compacte “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
@@ -16525,28 +16529,30 @@ msgstr "<b>Mandriva-produkten (Professional Solutions)</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 ""
-"Hieronder de Mandriva-produkten ontworpen om te voldoen aan <b>eisen van "
-"de professional</b>:"
+"Hieronder de Mandriva-produkten ontworpen om te voldoen aan <b>eisen van de "
+"professional</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
-"\t* <b>Corporate Desktop</b>, de Mandrivalinux-werkomgeving voor bedrijven."
+"\t* <b>Corporate Desktop</b>, de Mandriva Linux-werkomgeving voor bedrijven."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, de Mandrivalinux serveroplossing."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, de Mandriva Linux serveroplossing."
 
 #: 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>, de Mandrivalinux beveiligingsoplossing."
+"\t* <b>Multi-Network Firewall</b>, de Mandriva Linux beveiligingsoplossing."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16591,8 +16597,8 @@ msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
 "environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"Met PowerPack kunt u de <b>grafische werkomgeving</b> uitkiezen. "
-"Mandriva heeft <b>KDE</b> als de standaardwerkomgeving gekozen."
+"Met PowerPack kunt u de <b>grafische werkomgeving</b> uitkiezen. Mandriva "
+"heeft <b>KDE</b> als de standaardwerkomgeving gekozen."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16619,8 +16625,8 @@ msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
 "environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"Met PowerPack+ kunt u de <b>grafische werkomgeving</b> uitkiezen. "
-"Mandriva heeft <b>KDE</b> als de standaardwerkomgeving gekozen."
+"Met PowerPack+ kunt u de <b>grafische werkomgeving</b> uitkiezen. Mandriva "
+"heeft <b>KDE</b> als de standaardwerkomgeving gekozen."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16746,11 +16752,11 @@ msgstr "<b>Beleef plezier aan de uitgebreide sortering toepassingen</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 ""
-"In het Mandrivalinux-menu vindt u <b>makkelijk te gebruiken</b> toepassingen "
-"voor <b>al uw werkzaamheden</b>:"
+"In het Mandriva Linux-menu vindt u <b>makkelijk te gebruiken</b> "
+"toepassingen voor <b>al uw werkzaamheden</b>:"
 
 #: share/advertising/18.pl:16
 #, c-format
@@ -17015,18 +17021,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux Configuratiecentrum</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux Configuratiecentrum</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 ""
-"Het <b>Mandrivalinux Configuratiecentrum</b> is een essentiële verzameling "
-"Mandrivalinux-specifieke hulpprogramma's die het configureren van uw "
+"Het <b>Mandriva Linux Configuratiecentrum</b> is een essentiële verzameling "
+"Mandriva Linux-specifieke hulpprogramma's die het configureren van uw "
 "computer vereenvoudigen."
 
 #: share/advertising/25.pl:17
@@ -17052,15 +17058,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 ""
 "Zoals bij al het computerprogrammeren, vereist open source-software <b>tijd "
 "en mensen</b> voor ontwikkeling. Teneinde de open source-filosofie te "
-"respecteren, verkoopt Mandriva produkten en diensten met toegevoegde "
-"waarde om <b>Mandrivalinux te blijven verbeteren</b>. Als u de <b>open "
-"source-filosofie wilt steunen</b> alsmede de ontwikkeling van Mandrivalinux, "
+"respecteren, verkoopt Mandriva produkten en diensten met toegevoegde waarde "
+"om <b>Mandriva Linux te blijven verbeteren</b>. Als u de <b>open source-"
+"filosofie wilt steunen</b> alsmede de ontwikkeling van Mandriva Linux, "
 "overweeg dan <b>alstublieft</b> het aanschaffen van één van onze produkten "
 "of diensten!"
 
@@ -17072,11 +17078,11 @@ msgstr "<b>Online winkel</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 ""
-"Om meer te weten te komen over Mandriva produkten en diensten, kunt u "
-"ons <b>e-commerce-platform</b> bezoeken."
+"Om meer te weten te komen over Mandriva produkten en diensten, kunt u ons "
+"<b>e-commerce-platform</b> bezoeken."
 
 #: share/advertising/27.pl:17
 #, c-format
@@ -17095,8 +17101,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Kom vandaag nog langs op <b>store.mandrakesoft.com</b>"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Kom vandaag nog langs op <b>store.mandriva.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -17106,10 +17112,10 @@ 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> is de <b>perfecte metgezel</b> voor uw Mandrivalinux-"
+"<b>Mandriva Club</b> is de <b>perfecte metgezel</b> voor uw Mandriva Linux-"
 "produkt."
 
 #: share/advertising/28.pl:19
@@ -17124,10 +17130,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>Speciale kortingen</b> op produkten en diensten bij onze online "
-"winkel <b>store.mandrakesoft.com</b>."
+"winkel <b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -17140,17 +17146,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Deelname aan Mandrivalinux <b>gebruikersfora</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Deelname aan Mandriva Linux <b>gebruikersfora</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>Vroege- en voorrangstoegang</b>, vóór publieke uitgave, tot "
-"Mandrivalinux <b>ISO-beeldbestanden</b>."
+"\t* <b>Vroege- en voorrangstoegang</b>, vóór publieke uitgave, tot Mandriva "
+"Linux <b>ISO-beeldbestanden</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -17163,17 +17169,17 @@ msgid ""
 "<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandriva Online</b> is een nieuwe premium-dienst die Mandriva met "
-"trots zijn klanten aanbiedt!"
+"<b>Mandriva Online</b> is een nieuwe premium-dienst die Mandriva met trots "
+"zijn klanten aanbiedt!"
 
 #: 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 voorziet in een breed spectrum waardevolle diensten voor het "
-"<b>eenvoudig bijwerken</b> van uw Mandrivalinux-systemen:"
+"<b>eenvoudig bijwerken</b> van uw Mandriva Linux-systemen:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17198,8 +17204,8 @@ msgstr "\t* Flexibel <b>ingeroosterd</b> bijwerken."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
-msgstr "\t* Beheer van <b>al uw Mandrivalinux-systemen</b> met één account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
+msgstr "\t* Beheer van <b>al uw Mandriva Linux-systemen</b> met één account."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -17210,28 +17216,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 ""
-"Heeft u <b>assistentie</b> nodig? Ontmoet de technische experts van "
-"Mandriva op <b>ons technisch ondersteuningsplatform</b> www."
-"mandrakeexpert.com."
+"Heeft u <b>assistentie</b> nodig? Ontmoet de technische experts van Mandriva "
+"op <b>ons technisch ondersteuningsplatform</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 ""
-"Dankzij de hulp van <b>gekwalificeerde Mandrivalinux-experts</b>, zult u "
+"Dankzij de hulp van <b>gekwalificeerde Mandriva Linux-experts</b>, zult u "
 "veel tijd besparen."
 
 #: 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 ""
-"Voor elke vraag die met Mandrivalinux te maken heeft bent u in de "
+"Voor elke vraag die met Mandriva Linux te maken heeft bent u in de "
 "gelegenheid om ondersteuningsincidenten te kopen op <b>store.mandrakesoft."
 "com</b>."
 
@@ -17626,8 +17631,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 ""
 "[OPTIES] [PROGRAMMA_NAAM]\n"
 "\n"
@@ -17688,7 +17693,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"
@@ -17702,7 +17707,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIES]...\n"
-"Mandrivalinux Terminal Server Configuratieprogramma\n"
+"Mandriva Linux Terminal Server Configuratieprogramma\n"
 "--enable         : MTS inschakelen\n"
 "--disable        : MTS uitschakelen\n"
 "--start          : MTS starten\n"
@@ -17758,16 +17763,16 @@ 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"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPTION]...\n"
-"  --no-confirmation      eerste bevestigingsvraag niet stellen in "
-"Mandriva Update modus\n"
+"  --no-confirmation      eerste bevestigingsvraag niet stellen in Mandriva "
+"Update modus\n"
 "  --no-verify-rpm        pakket-handtekeningen niet verifiëren\n"
 "  --changelog-first      veranderingenlogboek voor bestandslijst weergeven "
 "in omschrijvingsvenster\n"
@@ -20550,13 +20555,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux foutrapportage-programma"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux foutrapportage-programma"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux Configuratiecentrum"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux Configuratiecentrum"
 
 #: standalone/drakbug:48
 #, c-format
@@ -21052,7 +21057,7 @@ msgstr "Aangezet bij het opstarten"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Deze interface is nog niet geconfigureerd.\n"
 "Start de \"Interface toevoegen\"-assistent vanuit het Mandrake "
@@ -21062,10 +21067,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 ""
 "U heeft nog geen geconfigureerde Internetverbinding.\n"
-"Start de \"%s\"-assistent vanuit het Mandrivalinux configuratiecentrum."
+"Start de \"%s\"-assistent vanuit het Mandriva Linux configuratiecentrum."
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21115,8 +21120,8 @@ msgstr "KDM (KDE displaybeheer)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Mandrivalinux displaybeheer)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Mandriva Linux displaybeheer)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21423,18 +21428,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 door Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (originele versie)\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
@@ -22017,8 +22022,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux Hulpcentrum"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux Hulpcentrum"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22677,7 +22682,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 ""
 "Er is geen geluidskaart gevonden op uw computer. Ga na dat een door Linux "
 "ondersteunde geluidskaart correct aangesloten is.\n"
@@ -22686,7 +22691,7 @@ msgstr ""
 "U kunt onze randapparatuur-database bereiken op:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/nl/hardware.php3"
+"http://www.mandrivalinux.com/nl/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24476,7 +24481,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 ""
 "Er was geen TV kaart gevonden. Gaat u na dat er een Video/TV kaart met Linux-"
 "ondersteuning correct aangesloten is.\n"
@@ -24485,7 +24490,7 @@ msgstr ""
 "U kunt onze randapparatuur-database bereiken op:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/nl/hardware.php3"
+"http://www.mandrivalinux.com/nl/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25201,13 +25206,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 ""
 "Dit is HardDrake, een %s configuratieprogramma voor apparatuur.\n"
 "<span foreground=\"royalblue3\">Versie:</span> %s\n"
 "<span foreground=\"royalblue3\">Auteur:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25318,8 +25323,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Logboek van Mandrivalinux-hulpprogramma's"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Logboek van Mandriva Linux-hulpprogramma's"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25844,10 +25849,10 @@ msgstr "Verbinding voltooid."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Verbinding mislukt.\n"
-"Controleer uw configuratie in het Mandrivalinux Configuratiecentrum."
+"Controleer uw configuratie in het Mandriva Linux Configuratiecentrum."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26734,7 +26739,6 @@ msgstr "Installatie mislukt"
 #~ msgid "Save and close"
 #~ msgstr "Opslaan en sluiten"
 
-
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Geen bladerprogramma beschikbaar! Installeert u er alstublieft één."
 
@@ -26876,16 +26880,16 @@ msgstr "Installatie mislukt"
 #~ "Er is een fout opgetreden bij het openen van %s voor schrijfbewerking: %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 ""
-#~ "Dit is HardDrake, een Mandrivalinux apparatuurconfiguratieprogramma.\n"
+#~ "Dit is HardDrake, een Mandriva Linux apparatuurconfiguratieprogramma.\n"
 #~ "<span foreground=\"royalblue3\">Versie:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Auteur:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 
 #~ msgid "Use Anonymous Bind"
@@ -27296,17 +27300,17 @@ msgstr "Installatie mislukt"
 #~ "Het verwijderen van de printer \"%s\" uit Star Office/OpenOffice.org/GIMP "
 #~ "is mislukt."
 
-#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
-#~ msgstr "<b>Gefeliciteerd met het kiezen van Mandrivalinux!</b>"
+#~ msgid "<b>Congratulations for choosing Mandriva Linux!</b>"
+#~ msgstr "<b>Gefeliciteerd met het kiezen van 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 ""
-#~ "Uw nieuwe Mandrivalinux besturingssysteem en haar vele toepassingen zijn "
-#~ "het resultaat van samenwerking en inspanningen van Mandriva-"
-#~ "ontwikkelaars en personen vanuit de hele wereld die hebben bijgedragen."
+#~ "Uw nieuwe Mandriva Linux besturingssysteem en haar vele toepassingen zijn "
+#~ "het resultaat van samenwerking en inspanningen van Mandriva-ontwikkelaars "
+#~ "en personen vanuit de hele wereld die hebben bijgedragen."
 
 #~ msgid ""
 #~ "We would like to thank everyone who participated in the development of "
@@ -27424,10 +27428,11 @@ msgstr "Installatie mislukt"
 
 #~ msgid ""
 #~ "\t* Special download mirror list exclusively for Mandriva Club Members"
-#~ msgstr "\t* Speciale downloadmirror-lijst exclusief voor Mandriva Club-leden"
+#~ msgstr ""
+#~ "\t* Speciale downloadmirror-lijst exclusief voor Mandriva Club-leden"
 
-#~ msgid "\t* Voting for software to put in Mandrivalinux"
-#~ msgstr "\t* Stemmen voor software om bij Mandrivalinux te bundelen"
+#~ msgid "\t* Voting for software to put in Mandriva Linux"
+#~ msgstr "\t* Stemmen voor software om bij Mandriva Linux te bundelen"
 
 #~ msgid "\t* Plus much more"
 #~ msgstr "\t* Plus veel meer"
@@ -27444,10 +27449,10 @@ msgstr "Installatie mislukt"
 
 #~ msgid ""
 #~ "If you have Linux questions, subscribe to Mandriva Expert at <b>www."
-#~ "mandrakeexpert.com</b>"
+#~ "mandrivaexpert.com</b>"
 #~ msgstr ""
 #~ "Indien u Linuxvragen heeft, meldt u zich dan aan bij Mandriva Expert op "
-#~ "<b>www.mandrakeexpert.com</b>"
+#~ "<b>www.mandrivaexpert.com</b>"
 
 #~ msgid ""
 #~ "If you would like to get involved, please subscribe to the \"Cooker\" "
@@ -27461,25 +27466,26 @@ msgstr "Installatie mislukt"
 #~ "linux.com</b>!"
 #~ msgstr ""
 #~ "Om meer te weten te komen over onze dynamische community, kom eens langs "
-#~ "op <b>www.mandrakelinux.com</b>!"
+#~ "op <b>www.mandrivalinux.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 bevat de beroemde grafische werkomgevingen KDE en GNOME, "
+#~ "Mandriva Linux bevat de beroemde grafische werkomgevingen KDE en GNOME, "
 #~ "plus de laatste versies van de populairste Open Source-toepassingen."
 
 #~ 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 is algemeen bekend als de gebruikersvriendelijkste en "
+#~ "Mandriva Linux is algemeen bekend als de gebruikersvriendelijkste en "
 #~ "makkelijkst te installeren Linuxdistributie."
 
-#~ 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* Ontdek Mandrivalinux op een opstartbare CD met <b>Mandrakemove</b>"
+#~ "\t* Ontdek Mandriva Linux op een opstartbare CD met <b>Mandrakemove</b>"
 
 #~ msgid ""
 #~ "\t* If you use Linux mostly for Office, Internet and Multimedia tasks, "
@@ -27525,13 +27531,12 @@ msgstr "Installatie mislukt"
 
 #~ msgid ""
 #~ "<b>MandrakeClustering</b>: the power and speed of a Linux cluster "
-#~ "combined with the stability and easy-of-use of the world-famous "
-#~ "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>: de kracht en snelheid van een Linuxcluster "
 #~ "gecombineerd met de stabiliteit en het gebruiksgemak van de "
-#~ "wereldberoemde Mandrivalinux-distributie. Een unieke combinatie voor "
+#~ "wereldberoemde Mandriva Linux-distributie. Een unieke combinatie voor "
 #~ "onvergelijkbare HPC-prestaties."
 
 #~ msgid ""
@@ -27549,8 +27554,8 @@ msgstr "Installatie mislukt"
 #~ msgid "<b>Do you require assistance?</b>"
 #~ msgstr "<b>Kunt u assistentie gebruiken?</b>"
 
-#~ msgid "This is the Mandrivalinux <b>Download version</b>."
-#~ msgstr "Dit is de Mandrivalinux <b>Downloadversie</b>."
+#~ msgid "This is the Mandriva Linux <b>Download version</b>."
+#~ msgstr "Dit is de Mandriva Linux <b>Downloadversie</b>."
 
 #~ msgid ""
 #~ "The free download version does not include commercial software, and "
@@ -27562,14 +27567,14 @@ msgstr "Installatie mislukt"
 #~ "ADSL en RTC) en videokaarten (zoals ATI® en 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 ""
-#~ "Uw nieuwe Mandrivalinux besturingssysteem en haar vele toepassingen zijn "
-#~ "het resultaat van samenwerking en inspanningen van Mandriva-"
-#~ "ontwikkelaars en personen vanuit de hele wereld die aan Mandrivalinux "
-#~ "hebben bijgedragen."
+#~ "Uw nieuwe Mandriva Linux besturingssysteem en haar vele toepassingen zijn "
+#~ "het resultaat van samenwerking en inspanningen van Mandriva-ontwikkelaars "
+#~ "en personen vanuit de hele wereld die aan Mandriva Linux hebben "
+#~ "bijgedragen."
 
 #~ msgid "<b>PowerPack+</b>"
 #~ msgstr "<b>PowerPack+</b>"
@@ -27585,24 +27590,25 @@ msgstr "Installatie mislukt"
 #~ "servertoepassingen bij zit."
 
 #~ 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 ""
-#~ "Het is het enige Mandrivalinux-produkt dat ene groupware-oplossing bevat."
+#~ "Het is het enige Mandriva Linux-produkt dat ene 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 ""
-#~ "Wanneer u zich voor de eerste keer aanmeldt op uw Mandrivalinux-systeem, "
+#~ "Wanneer u zich voor de eerste keer aanmeldt op uw Mandriva Linux-systeem, "
 #~ "kunt u kiezen tussen diverse populaire werkomgevingen, waaronder: KDE, "
 #~ "GNOME, WindowMaker, IceWM, en andere."
 
 #~ 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 ""
-#~ "In het Mandrivalinux-menu vindt u makkelijk te gebruiken toepassingen "
+#~ "In het Mandriva Linux-menu vindt u makkelijk te gebruiken toepassingen "
 #~ "voor alle werkzaamheden:"
 
 #~ msgid ""
@@ -27648,13 +27654,13 @@ msgstr "Installatie mislukt"
 #~ msgstr "\t* Adresboek (server en 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 ""
-#~ "Uw nieuwe Mandrivalinux besturingssysteem is het resultaat van "
+#~ "Uw nieuwe Mandriva Linux besturingssysteem is het resultaat van "
 #~ "samenwerking en inspanningen van Mandriva-ontwikkelaars en personen "
-#~ "vanuit de hele wereld die aan Mandrivalinux hebben bijgedragen."
+#~ "vanuit de hele wereld die aan Mandriva Linux hebben bijgedragen."
 
 #~ msgid ""
 #~ "We would like to thank everyone who participated in the development of "
@@ -27726,13 +27732,13 @@ msgstr "Installatie mislukt"
 #~ 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 verdergaat dient u eerst de voorwaarden in de licentie\n"
-#~ "aandachtig te lezen. Zij beslaan de gehele Mandrivalinux distributie.\n"
+#~ "aandachtig te lezen. Zij beslaan de gehele Mandriva Linux distributie.\n"
 #~ "Indien u akkoord gaat met alle voorwaarden erin kruist u het\n"
 #~ "\"%s\"-vakje aan. Zoniet, dan zal het klikken van de \"%s\"-knop\n"
 #~ "uw computer herstarten."
@@ -27843,26 +27849,29 @@ msgstr "Installatie mislukt"
 #~ "het kruisje bij het vakje \"%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 ""
-#~ "De Mandrivalinux-installatie is verdeeld over meerdere CD-ROMs. Als een \n"
+#~ "De Mandriva Linux-installatie is verdeeld over meerdere CD-ROMs. Als "
+#~ "een \n"
 #~ "geselecteerd pakket te vinden is op een andere CD-ROM, zal het \n"
 #~ "installatieprogramma de huidige CD uitwerpen en u zonodig vragen om de\n"
 #~ "correcte CD in te leggen."
 
 #~ msgid ""
 #~ "It is now time to specify which programs you wish to install on your\n"
-#~ "system. There are thousands of packages available for 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"
@@ -27921,7 +27930,7 @@ msgstr "Installatie mislukt"
 #~ "van vergelijkbare toepassingen geplaatst.\n"
 #~ "\n"
 #~ "Pakketten zijn samengebracht in groepen die corresponderen met een\n"
-#~ "bepaald gebruik van uw computer. Mandrivalinux heeft vier "
+#~ "bepaald gebruik van uw computer. Mandriva Linux heeft vier "
 #~ "voorgedefiniëerde\n"
 #~ "installaties beschikbaar. U kunt deze installatieklasses zien als \n"
 #~ "categorieën voor de diverse pakketten. U kunt de toepassingen uit de\n"
@@ -27992,11 +28001,11 @@ msgstr "Installatie mislukt"
 #~ "chose the individual package or because it was part of a group of "
 #~ "packages,\n"
 #~ "you will be asked to confirm that you really want those servers to be\n"
-#~ "installed. By default 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"
@@ -28038,11 +28047,12 @@ msgstr "Installatie mislukt"
 #~ "specifiek gekozen heeft ofwel omdat het onderdeel is van een hele groep\n"
 #~ "pakketten, zal u gevraagd worden om te bevestigen dat u deze servers "
 #~ "echt\n"
-#~ "wilt installeren. Onder Mandrivalinux worden alle geïnstalleerde servers\n"
+#~ "wilt installeren. Onder Mandriva Linux worden alle geïnstalleerde "
+#~ "servers\n"
 #~ "standaard ingeschakeld tijdens het opstarten. Zelfs wanneer zij veilig\n"
 #~ "zijn en geen bekende beveiligingsgebreken hadden op het moment dat de\n"
 #~ "distributie werd uitgebracht, kan het gebeuren dat beveiligingsfouten\n"
-#~ "ontdekt worden nadat deze versie van Mandrivalinux afgemaakt werd.\n"
+#~ "ontdekt worden nadat deze versie van Mandriva Linux afgemaakt werd.\n"
 #~ "Indien u niet weet wat een bepaalde dienst geacht wordt te doen of "
 #~ "waarom\n"
 #~ "deze geïnstalleerd wordt, klikt u dan \"%s\". Klikken op \"%s\" zal\n"
@@ -28070,7 +28080,8 @@ msgstr "Installatie mislukt"
 #~ "You will now set up your Internet/network connection. If you wish to\n"
 #~ "connect your computer to the Internet or to a local network, click \"%s"
 #~ "\".\n"
-#~ "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"
@@ -28091,7 +28102,7 @@ msgstr "Installatie mislukt"
 #~ "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"
@@ -28101,7 +28112,7 @@ msgstr "Installatie mislukt"
 #~ msgstr ""
 #~ "Het is nu mogelijk om uw internet- of netwerkverbinding in te stellen.\n"
 #~ "Indien u wenst uw computer aan het Internet of aan een lokaal netwerk te\n"
-#~ "verbinden, klik dan op \"%s\". Mandrivalinux zal trachten om\n"
+#~ "verbinden, klik dan op \"%s\". Mandriva Linux zal trachten om\n"
 #~ "netwerkapparaten en modems automatisch te bespeuren. Als deze bespeuring\n"
 #~ "mislukt, deselecteer dan het \"%s\"-vakje. \n"
 #~ "U kunt ook besluiten het netwerk niet te configureren of het later pas\n"
@@ -28124,7 +28135,7 @@ msgstr "Installatie mislukt"
 #~ "eenvoudige modems die extra software vereisen om te kunnen werken, in \n"
 #~ "vergelijking met normale modems. Sommige van deze modems kunnen "
 #~ "functioneren\n"
-#~ "onder Mandrivalinux, sommige andere niet. U kunt de lijst van "
+#~ "onder Mandriva Linux, sommige andere niet. U kunt de lijst van "
 #~ "ondersteunde\n"
 #~ "modems raadplegen op de LinModems-webpagina.\n"
 #~ "\n"
@@ -28259,7 +28270,7 @@ msgstr "Installatie mislukt"
 #~ "X (for X Window System) is the heart of the GNU/Linux graphical "
 #~ "interface\n"
 #~ "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-#~ "WindowMaker, etc.) bundled with 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"
@@ -28324,7 +28335,7 @@ msgstr "Installatie mislukt"
 #~ "Linux\n"
 #~ "waarvan alle grafische omgevingen (KDE, GNOME, AfterStep, WindowMaker, "
 #~ "etc.)\n"
-#~ "die bij Mandrivalinux worden geleverd, afhankelijk zijn.\n"
+#~ "die bij Mandriva Linux worden geleverd, afhankelijk zijn.\n"
 #~ "\n"
 #~ "U krijgt een lijst te zien van verschillende parameters die u kunt "
 #~ "aanpassen\n"
@@ -28459,7 +28470,7 @@ msgstr "Installatie mislukt"
 #~ "have to partition the drive. Basically, partitioning a hard drive "
 #~ "consists\n"
 #~ "of logically dividing it to create the space needed to install your new\n"
-#~ "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 "
@@ -28498,7 +28509,7 @@ msgstr "Installatie mislukt"
 #~ "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 #~ "data, provided you have previously defragmented the Windows partition.\n"
 #~ "Backing up your data is strongly recommended.. Using this option is\n"
-#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "
+#~ "recommended if you want to use both Mandriva Linux and Microsoft Windows "
 #~ "on\n"
 #~ "the same computer.\n"
 #~ "\n"
@@ -28508,7 +28519,7 @@ msgstr "Installatie mislukt"
 #~ "Windows to store your data or to install new software.\n"
 #~ "\n"
 #~ " * \"%s\": if you want to delete all data and all partitions present on\n"
-#~ "your hard drive and replace them with your new 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"
@@ -28533,14 +28544,15 @@ msgstr "Installatie mislukt"
 #~ "refer to the ``Managing Your Partitions'' section in the ``Starter "
 #~ "Guide''."
 #~ msgstr ""
-#~ "Op dit punt dient u te kiezen waar op uw harde schijf u uw Mandrivalinux\n"
+#~ "Op dit punt dient u te kiezen waar op uw harde schijf u uw Mandriva "
+#~ "Linux\n"
 #~ "besturingssysteem wilt installeren. Als uw harde schijf leeg is of als "
 #~ "een\n"
 #~ "ander besturingssysteem alle beschikbare ruimte inneemt, dan zult u\n"
 #~ "de harde schijf moeten partitioneren. Partitioneren houdt in dat u uw "
 #~ "harde\n"
 #~ "schijf in logische stukken onderverdeelt om ruimte te creëren voor uw\n"
-#~ "nieuwe Mandrivalinux besturingssysteem.\n"
+#~ "nieuwe Mandriva Linux besturingssysteem.\n"
 #~ "\n"
 #~ "Omdat de effecten van het partitioneringsproces over het algemeen niet\n"
 #~ "terug te draaien zijn en kan leiden tot gegevensverlies als er reeds een\n"
@@ -28576,7 +28588,8 @@ msgstr "Installatie mislukt"
 #~ "partitie\n"
 #~ "gedefragmenteerd heeft. Een reservekopie maken van uw gegevens kan\n"
 #~ "bepaald geen kwaad. Deze optie is aanbevolen indien u zowel\n"
-#~ "Mandrivalinux als Microsoft Windows op dezelfde computer wilt gebruiken.\n"
+#~ "Mandriva Linux als Microsoft Windows op dezelfde computer wilt "
+#~ "gebruiken.\n"
 #~ "\n"
 #~ "   Laat het goed tot u doordringen, voordat u deze optie kiest, dat uw\n"
 #~ "Microsoft Windows partitie na afloop van deze procedure minder groot\n"
@@ -28585,7 +28598,8 @@ msgstr "Installatie mislukt"
 #~ "installeren.\n"
 #~ "\n"
 #~ " * \"%s\": indien u alle gegevens en alle partities op uw\n"
-#~ "harde schijf wilt verwijderen en vervangen door uw nieuwe Mandrivalinux-\n"
+#~ "harde schijf wilt verwijderen en vervangen door uw nieuwe Mandriva "
+#~ "Linux-\n"
 #~ "systeem, kiest u deze optie. Weest u voorzichtig met deze oplossing omdat "
 #~ "u\n"
 #~ "na bevestiging deze keuze niet meer ongedaan kunt maken.\n"
@@ -28706,7 +28720,7 @@ msgstr "Installatie mislukt"
 #~ "Click on \"%s\" when you are ready to format the partitions.\n"
 #~ "\n"
 #~ "Click on \"%s\" if you want to choose another partition for your new\n"
-#~ "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"
@@ -28733,13 +28747,13 @@ msgstr "Installatie mislukt"
 #~ "Klik op \"%s\" wanneer u klaar bent om de partities te formatteren.\n"
 #~ "\n"
 #~ "Klik op \"%s\" indien u een andere partitie voor uw nieuwe\n"
-#~ "Mandrivalinux besturingssysteem wilt kiezen.\n"
+#~ "Mandriva Linux besturingssysteem wilt kiezen.\n"
 #~ "\n"
 #~ "Klik op \"%s\" indien u partities wenst te selecteren die op\n"
 #~ "onleesbare blokken gecontroleerd moeten worden."
 
 #~ msgid ""
-#~ "At the time you are installing 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"
@@ -28754,7 +28768,7 @@ msgstr "Installatie mislukt"
 #~ "the\n"
 #~ "selected package(s), or \"%s\" to abort."
 #~ msgstr ""
-#~ "Op het moment dat u Mandrivalinux installeert, is het waarschijnlijk\n"
+#~ "Op het moment dat u Mandriva Linux installeert, is het waarschijnlijk\n"
 #~ "dat sommige pakketten vernieuwd zijn sinds het moment dat het werd\n"
 #~ "uitgebracht. Sommige onvolkomenheden kunnen gerepareerd zijn en\n"
 #~ "beveiligingsproblemen opgelost. Om u te kunnen laten profiteren van\n"
@@ -28822,7 +28836,7 @@ msgstr "Installatie mislukt"
 #~ "\n"
 #~ "DrakX now needs to know if you want to perform a new install or an "
 #~ "upgrade\n"
-#~ "of an existing 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"
@@ -28834,22 +28848,22 @@ msgstr "Installatie mislukt"
 #~ "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 ""
 #~ "Deze stap activeert slechts wanneer een bestaande GNU/Linux-partitie\n"
 #~ "gevonden is op uw computer.\n"
 #~ "\n"
 #~ "Nu is het noodzakelijk dat u het installatieprogramma informeert of u "
 #~ "een \n"
-#~ "nieuwe installatie of een opwaardering van een bestaand Mandrivalinux\n"
+#~ "nieuwe installatie of een opwaardering van een bestaand Mandriva Linux\n"
 #~ "systeem wilt uitvoeren:\n"
 #~ "\n"
 #~ " * \"%s\": Dit verwijdert het oude systeem vrijwel volledig.\n"
@@ -28859,7 +28873,7 @@ msgstr "Installatie mislukt"
 #~ "overschreven. Dit is afhankelijk van uw partitioneringsschema.\n"
 #~ "\n"
 #~ " * \"%s\": deze installatieklasse stelt u in staat de pakketten\n"
-#~ "die momenteel op uw Mandrivalinux-systeem zijn geïnstalleerd te "
+#~ "die momenteel op uw Mandriva Linux-systeem zijn geïnstalleerd te "
 #~ "verversen.\n"
 #~ "Uw huidige partitioneringsschema en gebruikersgegevens worden niet "
 #~ "veranderd.\n"
@@ -28867,8 +28881,8 @@ msgstr "Installatie mislukt"
 #~ "gewone installatie.\n"
 #~ "\n"
 #~ "Het gebruik van de ``Opwaardering''-optie zou prima moeten werken op\n"
-#~ "Mandrivalinux versie \"8.1\" of recenter. Het uitvoeren van een\n"
-#~ "opwaardering op versies eerder dan Mandrivalinux versie \"8.1\" is "
+#~ "Mandriva Linux versie \"8.1\" of recenter. Het uitvoeren van een\n"
+#~ "opwaardering op versies eerder dan Mandriva Linux versie \"8.1\" is "
 #~ "afgeraden."
 
 #~ msgid ""
@@ -28935,7 +28949,8 @@ msgstr "Installatie mislukt"
 #~ "About UTF-8 (unicode) support: Unicode is a new character encoding meant "
 #~ "to\n"
 #~ "cover all existing languages. Though full support for it in GNU/Linux is\n"
-#~ "still under development. For that reason, 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"
@@ -28981,7 +28996,7 @@ msgstr "Installatie mislukt"
 #~ "Over UTF-8 (unicode)-ondersteuning: Unicode is een nieuwe tekencodering\n"
 #~ "bedoeld om alle bestaande geschreven talen te omvatten. Volledige\n"
 #~ "GNU/Linux-ondersteuning ervoor is echter nog in ontwikkeling.\n"
-#~ "Daarom gebruikt Mandrivalinux het al dan niet, afhankelijk van de keuze\n"
+#~ "Daarom gebruikt Mandriva Linux het al dan niet, afhankelijk van de keuze\n"
 #~ "van de gebruiker:\n"
 #~ "\n"
 #~ " * Indien u talen kiest met een sterke coderingstraditie (latin1\n"
@@ -29221,7 +29236,7 @@ msgstr "Installatie mislukt"
 #~ "checking this box.\n"
 #~ "\n"
 #~ "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-#~ "\"%s\"), you must ensure that you have a way to boot your 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"
@@ -29263,7 +29278,7 @@ msgstr "Installatie mislukt"
 #~ "\n"
 #~ "!! Let op dat indien u geen opstartlader installeert (door hier \n"
 #~ "\"%s\" te kiezen) u ervoor moet zorgen dat u een manier heeft om\n"
-#~ "uw Mandrivalinux-systeem op te starten! Zorg ervoor dat u weet wat u "
+#~ "uw Mandriva Linux-systeem op te starten! Zorg ervoor dat u weet wat u "
 #~ "doet\n"
 #~ "voordat u één van de opties wijzigt. !!\n"
 #~ "\n"
@@ -29361,7 +29376,7 @@ msgstr "Installatie mislukt"
 #~ msgid ""
 #~ "Now, it's time to select a printing system for your computer. Other OSs "
 #~ "may\n"
-#~ "offer you one, but 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"
@@ -29397,7 +29412,7 @@ msgstr "Installatie mislukt"
 #~ "Center and clicking the expert button."
 #~ msgstr ""
 #~ "Het is nu tijd een afdruksysteem voor uw computer te selecteren. Andere\n"
-#~ "besturingssystemen geven u er wellicht maar één, maar Mandrivalinux\n"
+#~ "besturingssystemen geven u er wellicht maar één, maar Mandriva Linux\n"
 #~ "biedt er twee. Elk van deze afdruksystemen is het meest geschikt voor\n"
 #~ "bepaalde typen configuraties.\n"
 #~ "\n"
@@ -29932,11 +29947,11 @@ msgstr "Installatie mislukt"
 #~ "vereenvoudigen."
 
 #~ 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 ""
-#~ "U kunt alle Mandriva-produkten en diensten vinden op "
-#~ "<b>MandrakeStore</b> -- ons uitgebreide service e-commerce-platform."
+#~ "U kunt alle Mandriva-produkten en diensten vinden op <b>MandrakeStore</b> "
+#~ "-- ons uitgebreide service e-commerce-platform."
 
 #~ msgid "Become a <b>MandrakeClub</b> member!"
 #~ msgstr "Wordt lid van <b>MandrakeClub</b>!"
@@ -29955,13 +29970,14 @@ msgstr "Installatie mislukt"
 #~ msgid "\t* Special discounts for products and services at MandrakeStore"
 #~ msgstr "\t* Speciale kortingen voor produkten en diensten bij MandrakeStore"
 
-#~ msgid "\t* Find out 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* Ontdek Mandrivalinux op een opstartbare CD met <b>Mandriva Move</b>"
+#~ "\t* Ontdek Mandriva Linux op een opstartbare CD met <b>Mandriva Move</b>"
 
 #~ 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 ""
 #~ "Alle Mandriva-produkten zijn te vinden op <b>MandrakeStore</b> -- ons "
 #~ "uitgebreide service/e-commerce platform."
@@ -29970,10 +29986,10 @@ msgstr "Installatie mislukt"
 #~ msgstr "<b>Wordt MandrakeClub-lid!</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 ""
-#~ "In het Mandrivalinux-menu vindt u makkelijk te gebruiken toepassingen "
+#~ "In het Mandriva Linux-menu vindt u makkelijk te gebruiken toepassingen "
 #~ "voor alle werkzaamheden:"
 
 #~ msgid ""
@@ -30011,17 +30027,6 @@ msgstr "Installatie mislukt"
 #~ "  --report          - moet een mandrake-hulpprogramma zijn\n"
 #~ "  --incident        - moet een mandrake-hulpprogramma zijn"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
-#~ msgid ""
-#~ "This interface has not been configured yet.\n"
-#~ "Run the \"Add an interface\" assistant from the Mandrake Control Center"
-#~ msgstr ""
-#~ "Deze interface is nog niet geconfigureerd.\n"
-#~ "Start de \"Interface toevoegen\"-assistent vanuit het Mandrake "
-#~ "configuratiecentrum."
-
 #~ msgid "The alert wizard had unexpectly failled:"
 #~ msgstr "De waarschuwingswizard is onverwacht afgebroken:"
 
@@ -30137,13 +30142,6 @@ msgstr "Installatie mislukt"
 #~ msgid "Please insert the Boot floppy used in drive %s"
 #~ msgstr "Plaats de gebruikte Opstartdiskette in station %s alstublieft"
 
-#~ msgid ""
-#~ "Take advantage of valuable benefits, products and services by joining "
-#~ "Mandriva Club, such as:"
-#~ msgstr ""
-#~ "Profiteer van waardevolle voordelen, produkten en diensten door u aan te "
-#~ "sluiten bij MandrakeClub, zoals:"
-
 #~ msgid "TCP/IP"
 #~ msgstr "TCP/IP"
 
diff --git a/perl-install/share/po/nn.po b/perl-install/share/po/nn.po
index 62905536b..a07006ad6 100644
--- a/perl-install/share/po/nn.po
+++ b/perl-install/share/po/nn.po
@@ -1296,7 +1296,7 @@ msgstr "Språkval"
 #: 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 ""
@@ -3695,7 +3695,7 @@ msgstr "Bruk radiostøtte"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
@@ -3891,7 +3891,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"
@@ -3906,11 +3906,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"
@@ -4065,10 +4066,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default 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"
@@ -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"
@@ -4414,12 +4415,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"
@@ -4446,7 +4447,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"
@@ -4455,7 +4456,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"
@@ -4685,7 +4687,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"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."
@@ -4721,7 +4723,7 @@ msgstr "Førre"
 #: 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"
@@ -4765,7 +4767,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of 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"
@@ -4792,7 +4794,7 @@ msgstr "Tryggleiksansvarleg"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4943,7 +4945,7 @@ msgstr "Byt mellom normal- og ekspertmodus"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5014,7 +5016,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"
@@ -5023,13 +5025,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
@@ -5086,7 +5089,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"
@@ -5245,7 +5249,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"
@@ -5266,7 +5270,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 ""
 
@@ -5369,7 +5373,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"
@@ -5386,7 +5391,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"
@@ -5448,7 +5453,7 @@ msgstr "Tenester"
 #, 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 ""
 "Vel harddisken du ønskjer å sletta for å installera den nye Mandriva Linux-\n"
@@ -5806,7 +5811,7 @@ msgstr "Reknar ut storleik på Windows-partisjon"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Windows-partisjonen for fragmentert. Start maskina på nytt under Windows, og "
@@ -5925,13 +5930,13 @@ msgstr "Koplar frå nettverket"
 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"
@@ -5985,7 +5990,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"
@@ -6022,7 +6027,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"
@@ -6102,8 +6107,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"
@@ -6111,7 +6116,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 ""
 "Gratulerer! Installeringa er fullført.\n"
 "Fjern oppstartsmediet, og trykk «Enter» for å starta maskina på nytt.\n"
@@ -6130,7 +6135,7 @@ 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 "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
@@ -6160,7 +6165,7 @@ msgstr "Køyrer steg «%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 ""
@@ -6702,7 +6707,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 "Kontaktar Mandriva Linux-nettstaden for oversikt over speglar ..."
 
 #: install_steps_interactive.pm:840
@@ -6927,7 +6932,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
+msgid "Mandriva Linux Installation %s"
 msgstr "Mandriva Linux-installering %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -9514,7 +9519,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 ""
@@ -13529,8 +13534,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 ""
 "Køyr skannaroppsettet («Maskinvare | Skannarar» i Mandriva Linux-"
@@ -15390,18 +15395,18 @@ msgstr "Stopp"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
 msgstr "<b>Kva er Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <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."
@@ -15413,7 +15418,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 ""
 "Mandriva Linux er den mest <b>brukarvenlege</b> Linux-distribusjonen "
@@ -15433,9 +15438,9 @@ msgstr "Velkommen til <b>open kjeldekode-verda</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 ""
 
@@ -15455,8 +15460,8 @@ msgstr "<b>GPL-lisensen</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 ""
 "Dei fleste programma i distribusjonen, samt alle Mandriva Linux-verktøya er "
 "lisensiert under <b>GNU General Public License</b>."
@@ -15484,17 +15489,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 ""
 
@@ -15506,7 +15511,7 @@ msgstr "<b>Nedlastingsversjon</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 ""
 
@@ -15546,7 +15551,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
@@ -15565,7 +15570,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
@@ -15583,7 +15588,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
@@ -15603,12 +15608,12 @@ msgstr "<b>Mandriva-produkt</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 "Mandriva Linux-produkta er:"
 
 #: share/advertising/09.pl:18
@@ -15629,7 +15634,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 ""
 
@@ -15641,21 +15646,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 ""
 
@@ -15673,17 +15678,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
@@ -15861,7 +15868,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 ""
 
@@ -16099,14 +16106,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
 msgstr "<b>Mandriva Linux-kontrollsenter</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 ""
 
@@ -16129,8 +16136,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 ""
 
@@ -16162,8 +16169,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Stikk innom <b>store.mandrakesoft.com</b> i dag!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Stikk innom <b>store.mandriva.com</b> i dag!"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16173,7 +16180,7 @@ msgstr "<b>Mandriva-klubben</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 ""
 
@@ -16187,7 +16194,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
@@ -16199,14 +16206,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– Delta i <b>brukarforum</b> for Mandriva Linux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"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
@@ -16225,7 +16232,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
@@ -16250,7 +16257,7 @@ msgstr "\t– Fleksible <b>oppdateringsplanar</b> updates."
 #: 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
@@ -16262,21 +16269,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
@@ -16627,8 +16634,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
@@ -16664,7 +16671,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"
@@ -19255,12 +19262,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
 msgstr "Feilrapporteringsverktøy for Mandriva Linux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
+msgid "Mandriva Linux Control Center"
 msgstr "Kontrollsenter"
 
 #: standalone/drakbug:48
@@ -19737,7 +19744,7 @@ msgstr "Starta ved oppstart"
 #, 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 ""
 "Grensesnittet er ikkje sett opp enno.\n"
 "Køyr «Legg til grensesnitt»-vegvisaren i kontrollsenteret."
@@ -19746,7 +19753,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 ""
 "Du har ikkje sett opp noko Internett-samband.\n"
 "Køyr «%s»-vegvisaren i Mandriva Linux-kontrollsenteret."
@@ -19799,7 +19806,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20089,9 +20096,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
@@ -20569,7 +20576,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr "Mandriva Linux-hjelpesenter"
 
 #: standalone/drakhelp:36
@@ -21152,7 +21159,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
@@ -22750,7 +22757,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
@@ -23440,7 +23447,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 ""
 "Dette er verktøy for oppsett av maskinvare i %s.\n"
@@ -23556,7 +23563,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr "Loggverktøy for Mandriva Linux"
 
 #: standalone/logdrake:51
@@ -24073,7 +24080,7 @@ msgstr "Har kopla til."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Feil ved tilkopling.\n"
 "Sjå etter at oppsett er rett i kontrollsenteret."
diff --git a/perl-install/share/po/pa_IN.po b/perl-install/share/po/pa_IN.po
index 39213ae44..24436765b 100644
--- a/perl-install/share/po/pa_IN.po
+++ b/perl-install/share/po/pa_IN.po
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "\n"
 "ਮਸ਼ੀਨ ਮੁੜ ਚਲਾਉਣ ਲਈ ਬਟਨ ਦਬਾਓ, ਲਾ ਦਿਓ, ਲਿਖਣ ਮਨਾਹੀ ਹਟਾਓ,\n"
-"ਕੁੰਜੀ ਫਿਰ ਜੋੜੋ, ਅਤੇ ਮੈਂਡਰਿਕ ਮੂਵ ਅਗੇਨ ਚਲਾਓ।"
+"ਕੁੰਜੀ ਫਿਰ ਜੋੜੋ, ਅਤੇ ਮੈਂਡਰਿਵ ਮੂਵ ਅਗੇਨ ਚਲਾਓ।"
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -102,7 +102,7 @@ msgstr ""
 "\n"
 "\n"
 "ਤੁਸੀਂ USB ਕੁੰਜੀ ਤੋਂ ਬਿਨਾ ਜਾਰੀ ਕਰ ਸਕਦੇ ਹੋ - ਤੁਸੀਂ ਹਾਲੇ ਵੀ \n"
-"Mandriva Move ਨੂੰ ਸਧਾਰਨ ਲਾਈਵ ਮੈਂਡਰਿਕ ਆਪਰੇਟਿੰਗ ਸਿਸਟਮ \n"
+"Mandriva Move ਨੂੰ ਸਧਾਰਨ ਲਾਈਵ ਮੈਂਡਰਿਵ ਆਪਰੇਟਿੰਗ ਸਿਸਟਮ \n"
 "ਤੌਰ ਤੇ ਵਰਤਣ ਦੇ ਯੋਗ ਹੋ।"
 
 #: ../move/move.pm:483
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "\n"
 "ਤੁਸੀਂ USB ਕੁੰਜੀ ਤੋਂ ਬਿਨਾ ਜਾਰੀ ਕਰ ਸਕਦੇ ਹੋ - ਤੁਸੀਂ ਹਾਲੇ ਵੀ \n"
-"Mandriva Move ਨੂੰ ਸਧਾਰਨ ਲਾਈਵ ਮੈਂਡਰਿਕ ਆਪਰੇਟਿੰਗ ਸਿਸਟਮ \n"
+"Mandriva Move ਨੂੰ ਸਧਾਰਨ ਲਾਈਵ ਮੈਂਡਰਿਵ ਆਪਰੇਟਿੰਗ ਸਿਸਟਮ \n"
 "ਤੌਰ ਤੇ ਵਰਤਣ ਦੇ ਯੋਗ ਹੋ।"
 
 #: ../move/move.pm:494
@@ -270,7 +270,7 @@ msgstr ""
 "%s\n"
 "\n"
 "ਇਹ USB ਕੁੰਜੀ ਉੱਪਰ ਖਰਾਬ ਸਿਸਟਮ ਸੰਰਚਨਾ ਫਾਇਲਾਂ ਦਾ ਕਾਰਨ \n"
-"ਹੋ ਸਕਦਾ ਹੈ, ਇਸ ਮੁੱਦੇ ਵਿੱਚ ਇਹਨਾਂ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਅਤੇ ਫਿਰ Mandrake \n"
+"ਹੋ ਸਕਦਾ ਹੈ, ਇਸ ਮੁੱਦੇ ਵਿੱਚ ਇਹਨਾਂ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਅਤੇ ਫਿਰ Mandriva \n"
 "Move ਮੁੜ ਚਲਾਉਣ ਨਾਲ ਸਮੱਸਿਆ ਠੀਕ ਹੋ ਸਕਦੀ ਹੈ। ਅਜਿਹਾ ਕਰਨ ਲਈ,\n"
 "ਅਨੁਸਾਰੀ ਬਟਨ ਦਬਾਓ।\n"
 "\n"
@@ -1300,11 +1300,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 ""
-"ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕਈ ਬੋਲੀਆਂ ਨੂੰ ਸਹਿਯੋਗ ਦੇ ਸਕਦਾ ਹੈ। ਭਾਸ਼ਾ ਜੋ\n"
+"ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਕਈ ਬੋਲੀਆਂ ਨੂੰ ਸਹਿਯੋਗ ਦੇ ਸਕਦਾ ਹੈ। ਭਾਸ਼ਾ ਜੋ\n"
 "ਤੁਸੀਂ ਇੰਸਟਾਲ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ ਚੁਣੋ। ਇਹ ਉਪਲੱਬਧ ਹੋਣਗੇ ਜਦੋਂ ਤੁਹਾਡੀ\n"
 "ਇੰਸਟਾਲੇਸ਼ਨ ਸਮਾਪਤ ਹੋ ਗਈ ਅਤੇ ਆਪਣਾ ਸਿਸਟਮ ਸਿਸਟਮ ਮੁੜ ਚਲਾਇਆ।"
 
@@ -3687,12 +3687,12 @@ 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 ""
 "ਜਾਰੀ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ, ਤੁਹਾਨੂੰ ਲਾਈਸਿੰਸ ਧਿਆਨ ਨਾਲ ਪੜਨਾ ਚਾਹੀਦਾ ਹੈ। ਇਹ\n"
-"ਪੂਰੇ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਵੰਡ ਨੂੰ ਦਰਸਾਉਂਦੀ ਹੈ। ਜੇ ਤੁਸੀਂ ਸਾਰੀਆਂ ਗੱਲਾਂ ਨਾਲ ਸਹਿਮਤ\n"
+"ਪੂਰੇ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਵੰਡ ਨੂੰ ਦਰਸਾਉਂਦੀ ਹੈ। ਜੇ ਤੁਸੀਂ ਸਾਰੀਆਂ ਗੱਲਾਂ ਨਾਲ ਸਹਿਮਤ\n"
 "ਹੋ ਜੋ ਇਸ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹਨ, \"%s\" ਬਕਸੇ ਨੂੰ ਚੁਣੋ। ਜੇ ਨਹੀਂ, \"%s\" ਬਟਨ ਤੇ ਕਲਿੱਕ\n"
 "ਕਰਕੇ ਕੰਪਿਊਟਰ ਮੁੜ ਚੱਲੇਗਾ।"
 
@@ -3801,13 +3801,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 ""
-"ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਇੰਸਟਾਲੇਸ਼ਨ ਕਈ CD-ROM ਤੇ ਵੰਡੀ ਗਈ ਹੈ। ਜੇ ਇੱਕ ਚੁਣਿਆ\n"
+"ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਇੰਸਟਾਲੇਸ਼ਨ ਕਈ CD-ROM ਤੇ ਵੰਡੀ ਗਈ ਹੈ। ਜੇ ਇੱਕ ਚੁਣਿਆ\n"
 "ਪੈਕੇਜ ਹੋਰ CD-ROM ਤੇ ਸਥਿਤ ਹੈ, DrakX ਮੌਜੂਦਾ CD ਨੂੰ ਰੱਦ ਕਰ ਦੇਵੇਗਾ\n"
 "ਤੁਹਾਨੂੰ ਲੋੜੀਂਦੀ CD ਪਾਉਣ ਲਈ ਪੁੱਛੇਗਾ। ਜੇ ਤੁਹਾਡੇ ਕੋਲ ਲੋੜੀਂਦੀ CD ਨਹੀਂ\n"
 "ਹੈ, ਸਿਰਫ \"%s\" ਤੇ ਕਲਿੱਕ ਕਰੋ, ਅਨੁਸਾਰੀ ਪੈਕੇਜ ਇੰਸਟਾਲ ਨਹੀਂ\n"
@@ -3817,11 +3817,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"
@@ -3928,10 +3929,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"
@@ -4044,7 +4045,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"
@@ -4162,12 +4163,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"
@@ -4194,7 +4195,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both 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"
@@ -4203,7 +4204,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"
@@ -4332,7 +4334,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."
@@ -4350,7 +4352,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"
@@ -4379,7 +4381,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"
@@ -4395,7 +4397,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"
@@ -4481,7 +4483,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"
@@ -4529,7 +4531,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"
@@ -4538,13 +4540,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
@@ -4585,7 +4588,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"
@@ -4744,7 +4748,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"
@@ -4765,7 +4769,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 ""
 
@@ -4868,7 +4872,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"
@@ -4885,7 +4890,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"
@@ -4947,10 +4952,10 @@ 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"
+"ਤੁਹਾਡਾ ਨਵਾਂ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਭਾਗ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਸਾਫ ਕਰਨ ਵਾਸਤੇ\n"
 "ਹਾਰਡ ਡਰਾਈਵ ਚੁਣੋ। ਧਿਆਨ ਰੱਖੋ, ਇਸ ਡਰਾਈਵ ਤੇ ਸਾਰਾ ਡਾਟਾ ਗੁੰਮ ਹੋ ਜਾਵੇਗਾ\n"
 "ਅਤੇ ਮੁੜ ਪ੍ਰਾਪਤ ਹੋਣ ਯੋਗ ਨਹੀਂ ਰਹੇਗਾ!"
 
@@ -5290,11 +5295,11 @@ msgstr "Windows ਭਾਗ ਦਾ ਅਕਾਰ ਪਤਾ ਕਰ ਰਿਹਾ ਹ�
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "ਤੁਹਾਡਾ Windows ਭਾਗ ਬਹੁਤ ਫਰੈਗਮਿੰਟਡ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਕੰਪਿਊਟਰ Windows ਅਧੀਨ ਮੁੜ ਚਲਾਓ, "
-"``defrag'' ਸਹੂਲਤ ਚਲਾਓ, ਫਿਰ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਇੰਸਟਾਲੇਸ਼ਨ ਮੁੜ ਚਲਾਓ।"
+"``defrag'' ਸਹੂਲਤ ਚਲਾਓ, ਫਿਰ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਇੰਸਟਾਲੇਸ਼ਨ ਮੁੜ ਚਲਾਓ।"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -5397,13 +5402,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"
@@ -5457,7 +5462,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"
@@ -5494,7 +5499,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"
@@ -5572,8 +5577,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"
@@ -5581,14 +5586,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
 #, fuzzy, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/101errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/101errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -5616,11 +5621,11 @@ 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"
+"ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ ਸਰੋਤ ਘੱਟ ਹਨ। ਤੁਹਾਨੂੰ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਇੰਸਟਾਲ ਕਰਨ ਸਮੇਂ ਮੁਸ਼ਕਿਲ\n"
 "ਆ ਸਕਦੀ ਹੈ। ਜੇ ਅਜਿਹਾ ਹੋਇਆ, ਤੁਸੀਂ ਪਾਠ ਇੰਸਟਾਲੇਸ਼ਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਇਸ ਲਈ,\n"
 "`F1' ਦਬਾਓ ਜਦੋਂ CDROM ਤੋਂ ਬੂਟ ਕਰਦੇ ਹੋ, ਫਿਰ `ਪਾਠ' ਭਰੋ।"
 
@@ -6146,8 +6151,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
-msgstr "ਉਪਲੱਬਧ ਪ੍ਰਤੀਬਿੰਬਾਂ ਦੀ ਸੂਚੀ ਵੇਖਣ ਲਈ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਵੈਬ ਸਾਈਟ ਨਾਲ ਸੰਪਰਕ ਜਾਰੀ ਹੈ..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr "ਉਪਲੱਬਧ ਪ੍ਰਤੀਬਿੰਬਾਂ ਦੀ ਸੂਚੀ ਵੇਖਣ ਲਈ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਵੈਬ ਸਾਈਟ ਨਾਲ ਸੰਪਰਕ ਜਾਰੀ ਹੈ..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -6364,8 +6369,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਇੰਸਟਾਲੇਸ਼ਨ %s "
+msgid "Mandriva Linux Installation %s"
+msgstr "ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਇੰਸਟਾਲੇਸ਼ਨ %s "
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8950,14 +8955,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 ਸੰਰਚਨਾਕਾਰ\n"
 "\n"
-"ਇਹ ਇਸ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਮਸ਼ੀਨ ਲਈ ਨਿੱਜੀ ਫਾਇਲਵਾਲ ਸੰਰਚਿਤ ਕਰਦਾ ਹੈ।\n"
-"ਸ਼ਕਤੀਸ਼ਾਲੀ ਅਤੇ ਵਿਸ਼ਵਾਸੀ ਫਾਇਰਵਾਲ ਹੱਲ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ ਖਾਸ ਮੈਂਡਰਿਕ-ਸੁਰੱਖਿਆ\n"
+"ਇਹ ਇਸ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਮਸ਼ੀਨ ਲਈ ਨਿੱਜੀ ਫਾਇਲਵਾਲ ਸੰਰਚਿਤ ਕਰਦਾ ਹੈ।\n"
+"ਸ਼ਕਤੀਸ਼ਾਲੀ ਅਤੇ ਵਿਸ਼ਵਾਸੀ ਫਾਇਰਵਾਲ ਹੱਲ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ ਖਾਸ ਮੈਂਡਰਿਵ-ਸੁਰੱਖਿਆ\n"
 "ਫਾਇਰਵਾਲ ਰੀਲੀਜ਼ ਵੇਖੋ।"
 
 #: network/drakfirewall.pm:164
@@ -12780,8 +12785,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 ""
 
@@ -14605,33 +14610,33 @@ msgstr "ਰੋਕੋ"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕੀ ਹੈ?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਕੀ ਹੈ?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "<b>ਮੈਂਡਰਿਕ-ਲੀਨਕਸ</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 ""
-"ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਇੱਕ <b>ਲੀਨਕਸ ਵੰਡ</b> ਹੈ ਜੋ ਸਿਸਟਮ ਦੀ ਕੋਰ, ਜਿਸ ਨੂੰ <b>ਆਪਰੇਟਿੰਗ ਸਿਸਟਮ</b> "
+"ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਇੱਕ <b>ਲੀਨਕਸ ਵੰਡ</b> ਹੈ ਜੋ ਸਿਸਟਮ ਦੀ ਕੋਰ, ਜਿਸ ਨੂੰ <b>ਆਪਰੇਟਿੰਗ ਸਿਸਟਮ</b> "
 "ਕਹਿੰਦੇ ਹਨ, ਨੂੰ ਸ਼ਾਮਿਲ ਕਰਦਾ ਹੈ, (ਲੀਨਕਸ ਕਰਨਲ ਤੇ ਅਧਾਰਿਤ) <b>ਕੁਝ ਕਾਰਜਾਂ</b> ਸਮੇਤ ਤੁਹਾਡੀਆਂ ਸਭ "
 "ਲੋੜਾਂ ਪੂਰੀਆਂ ਕਰਦਾ ਹੈ।"
 
 #: 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> ਲੀਨਕਸ ਵੰਡ ਹੈ। ਇਹ <b>ਜਿਆਦਾ ਵਰਤਿਆ ਜਾਣ ਵਾਲਾ</"
+"ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਅੱਜ ਇੱਕ <b>ਉਪਭੋਗੀ-ਮਿੱਤਰ</b> ਲੀਨਕਸ ਵੰਡ ਹੈ। ਇਹ <b>ਜਿਆਦਾ ਵਰਤਿਆ ਜਾਣ ਵਾਲਾ</"
 "b> ਲੀਨਕਸ ਵੰਡ ਵਰਡਵਾਈਡ ਵੀ ਹੈ!"
 
 #: share/advertising/02.pl:13
@@ -14647,9 +14652,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 ""
 
@@ -14668,10 +14673,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 ""
-"ਬਹੁਤੇ ਸਾਫਟਵੇਅਰ ਵੰਢ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹਨ ਅਤੇ ਸਭ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸੰਦ <b>ਜਨਰਲ ਪਬਲਿਕ ਲਾਈਸਿੰਸ</b> "
+"ਬਹੁਤੇ ਸਾਫਟਵੇਅਰ ਵੰਢ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹਨ ਅਤੇ ਸਭ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਸੰਦ <b>ਜਨਰਲ ਪਬਲਿਕ ਲਾਈਸਿੰਸ</b> "
 "ਅਧੀਨ ਲਾਈਸਿੰਸੀ ਹਨ।"
 
 #: share/advertising/03.pl:17
@@ -14701,21 +14706,21 @@ 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 ""
 
 #: 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
@@ -14726,10 +14731,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>ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਡਾਊਨਲੋਡ</b> ਇੰਸਟਾਲ ਕਰ ਰਹੇ ਹੋ। ਇਹ ਮੁਕਤ ਵਰਜ਼ਨ ਹੈ ਜੋ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ "
+"ਤੁਸੀਂ ਹੁਣ <b>ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਡਾਊਨਲੋਡ</b> ਇੰਸਟਾਲ ਕਰ ਰਹੇ ਹੋ। ਇਹ ਮੁਕਤ ਵਰਜ਼ਨ ਹੈ ਜੋ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ "
 "ਨੇ <b>ਹਰੇਕ ਨੂੰ ਉਪਲੱਬਧ</b> ਕੀਤਾ ਹੈ।"
 
 #: share/advertising/05.pl:19
@@ -14761,7 +14766,7 @@ msgid ""
 "You will not have access to the <b>services included</b> in the other "
 "Mandriva products either."
 msgstr ""
-"ਤੁਹਾਨੂੰ ਹੋਰ ਮੈਂਡਰਿਕ-ਸਾਫਟ ਉਤਪਾਦ ਵਿੱਚ <b>ਸ਼ਾਮਿਲ ਸੇਵਾਵਾਂ</b> ਵਰਤਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੋਵੇਗੀ।"
+"ਤੁਹਾਨੂੰ ਹੋਰ ਮੈਂਡਰਿਵ-ਸਾਫਟ ਉਤਪਾਦ ਵਿੱਚ <b>ਸ਼ਾਮਿਲ ਸੇਵਾਵਾਂ</b> ਵਰਤਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੋਵੇਗੀ।"
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -14770,8 +14775,8 @@ msgstr "<b>ਖੋਜ, ਤੁਹਾਡਾ ਪਹਿਲਾ ਲੀਨਕਸ ਵਿ�
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "ਤੁਸੀਂ ਹੁਣ <b>ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਖੋਜ</b> ਇੰਸਟਾਲ ਕਰ ਰਹੇ ਹੋ।"
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "ਤੁਸੀਂ ਹੁਣ <b>ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਖੋਜ</b> ਇੰਸਟਾਲ ਕਰ ਰਹੇ ਹੋ।"
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -14789,8 +14794,8 @@ msgstr "<b>PowerPack, ਮੁਢਲਾ ਲੀਨਕਸ ਵਿਹੜਾ</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "ਤੁਸੀਂ ਹੁਣ <b>ਮੈਂਡਰਿਕ-ਲੀਨਕਸ PowerPack</b> ਇੰਸਟਾਲ ਕਰ ਰਹੇ ਹੋ।"
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "ਤੁਸੀਂ ਹੁਣ <b>ਮੈਂਡਰਿਵ-ਲੀਨਕਸ PowerPack</b> ਇੰਸਟਾਲ ਕਰ ਰਹੇ ਹੋ।"
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -14799,7 +14804,7 @@ msgid ""
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack ਮੈਂਡਰਿਕ-ਸਾਫਟ ਦਾ <b>ਮੁਢਲਾ ਲੀਨਕਸ ਵਿਹੜਾ</b> ਉਤਪਾਦ ਹੈ। PowerPack ਵਿੱਚ "
+"PowerPack ਮੈਂਡਰਿਵ-ਸਾਫਟ ਦਾ <b>ਮੁਢਲਾ ਲੀਨਕਸ ਵਿਹੜਾ</b> ਉਤਪਾਦ ਹੈ। PowerPack ਵਿੱਚ "
 "<b>ਹਜ਼ਾਰਾਂ ਕਾਰਜ</b> ਸ਼ਾਮਿਲ ਹਨ - ਵਧੇਰੇ ਪ੍ਰਸਿੱਧ ਤੋਂ ਲੈ ਕੇ ਵਧੇਰੇ ਤਕਨੀਕੀ ਤੱਕ।"
 
 #: share/advertising/08.pl:13
@@ -14809,8 +14814,8 @@ msgstr "<b>PowerPack+, ਵਿਹੜੇ ਅਤੇ ਸਰਵਰਾਂ ਲਈ ਲ�
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "ਤੁਸੀਂ ਹੁਣ <b>ਮੈਂਡਰਿਕ-ਲੀਨਕਸ PowerPack+</b> ਇੰਸਟਾਲ ਕਰ ਰਹੇ ਹੋ।"
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "ਤੁਸੀਂ ਹੁਣ <b>ਮੈਂਡਰਿਵ-ਲੀਨਕਸ PowerPack+</b> ਇੰਸਟਾਲ ਕਰ ਰਹੇ ਹੋ।"
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -14824,18 +14829,18 @@ msgstr ""
 #: share/advertising/09.pl:13
 #, c-format
 msgid "<b>Mandriva Products</b>"
-msgstr "<b>ਮੈਂਡਰਿਕ-ਸਾਫਟ ਉਤਪਾਦ</b>"
+msgstr "<b>ਮੈਂਡਰਿਵ-ਸਾਫਟ ਉਤਪਾਦ</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
-msgstr "<b>ਮੈਂਡਰਿਕ-ਸਾਫਟ</b> ਨੇ ਬਹੁਤ ਸਾਰੇ <b>ਮੈਂਡਰਿਕ-ਲੀਨਕਸ</b> ਉਤਪਾਦਾਂ ਦਾ ਵਿਕਾਸ ਕੀਤਾ।"
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
+msgstr "<b>ਮੈਂਡਰਿਵ-ਸਾਫਟ</b> ਨੇ ਬਹੁਤ ਸਾਰੇ <b>ਮੈਂਡਰਿਵ-ਲੀਨਕਸ</b> ਉਤਪਾਦਾਂ ਦਾ ਵਿਕਾਸ ਕੀਤਾ।"
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ 10.1 ਦੇ ਉਤਪਾਦ ਹਨ:"
+msgid "The Mandriva Linux products are:"
+msgstr "ਮੈਂਡਰਿਵ-ਲੀਨਕਸ 10.1 ਦੇ ਉਤਪਾਦ ਹਨ:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -14855,47 +14860,47 @@ msgstr "\t* <b>PowerPack+</b>, ਵਿਹੜੇ ਅਤੇ ਸਰਵਰਾਂ ਲ�
 #: share/advertising/09.pl:21
 #, fuzzy, 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 ਲਈ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ 10.1</b>, ਤੁਹਾਡੇ ਬਹੁਤੇ 64-ਬਿੱਟ ਪਰੋਸੈੱਸਰਾਂ ਲਈ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ "
+"\t* <b>x86-64 ਲਈ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ 10.1</b>, ਤੁਹਾਡੇ ਬਹੁਤੇ 64-ਬਿੱਟ ਪਰੋਸੈੱਸਰਾਂ ਲਈ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ "
 "ਹੱਲ।"
 
 #: share/advertising/10.pl:15
 #, c-format
 msgid "<b>Mandriva Products (Nomad Products)</b>"
-msgstr "<b>ਮੈਂਡਰਿਕ-ਸਾਫਟ ਉਤਪਾਦ (Nomad ਉਤਪਾਦ)</b>"
+msgstr "<b>ਮੈਂਡਰਿਵ-ਸਾਫਟ ਉਤਪਾਦ (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 ""
-"ਮੈਂਡਰਿਕ-ਸਾਫਟ ਨੇ ਦੋ ਉਤਪਾਦਾਂ ਦਾ ਵਿਕਾਸ ਕੀਤਾ ਹੈ ਤੁਹਾਨੂੰ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਨੂੰ <b>ਕਿਸੇ ਕੰਪਿਊਟਰ ਤੇ</b> "
+"ਮੈਂਡਰਿਵ-ਸਾਫਟ ਨੇ ਦੋ ਉਤਪਾਦਾਂ ਦਾ ਵਿਕਾਸ ਕੀਤਾ ਹੈ ਤੁਹਾਨੂੰ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਨੂੰ <b>ਕਿਸੇ ਕੰਪਿਊਟਰ ਤੇ</b> "
 "ਅਤੇ ਇਸ ਨੂੰ ਅਸਲ ਵਿੱਚ ਇੰਸਟਾਲ ਕੀਤੇ ਬਿਨਾ ਵਰਤਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿੰਦਾ ਹੈ:"
 
 #: 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>, ਇੱਕ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਵੰਡ ਜੋ ਪੂਰੀ ਤਰਾਂ ਬੂਟ ਹੋਣ ਯੋਗ CD-ROM ਤੋਂ ਚੱਲਦੀ ਹੈ।"
+"\t* <b>ਲਿਜਾਓ</b>, ਇੱਕ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਵੰਡ ਜੋ ਪੂਰੀ ਤਰਾਂ ਬੂਟ ਹੋਣ ਯੋਗ 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>, ਇੱਕ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਵੰਡ ਜੋ ultra-compact “LaCie ਮੋਬਾਈਲ ਹਾਰਡ "
+"\t* <b>GlobeTrotter</b>, ਇੱਕ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਵੰਡ ਜੋ ultra-compact “LaCie ਮੋਬਾਈਲ ਹਾਰਡ "
 "ਡਰਾਈਵ” ਤੇ ਪਹਿਲਾ ਇੰਸਟਾਲ ਕੀਤੀ।"
 
 #: share/advertising/11.pl:13
 #, c-format
 msgid "<b>Mandriva Products (Professional Solutions)</b>"
-msgstr "<b>ਮੈਂਡਰਿਕ-ਸਾਫਟ ਉਤਪਾਦ (ਪੇਸ਼ੇਵਰ ਹੱਲ)</b>"
+msgstr "<b>ਮੈਂਡਰਿਵ-ਸਾਫਟ ਉਤਪਾਦ (ਪੇਸ਼ੇਵਰ ਹੱਲ)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
@@ -14906,18 +14911,20 @@ msgstr "ਹੇਠਾਂ <b>ਪੇਸ਼ੇਵਰ ਲੋੜਾਂ</b> ਦੀ ਪੂ�
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
-msgstr "\t* <b>ਸਹਿਕਾਰੀ ਵਿਹੜਾ</b>, ਕਿੱਤੇ ਲਈ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਵਿਹੜਾ।"
+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."
-msgstr "\t* <b>ਸਹਿਕਾਰੀ ਸਰਵਰ</b>, ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸਰਵਰ ਹੱਲ।"
+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."
-msgstr "\t* <b>ਬਹੁ-ਨੈੱਟਵਰਕ ਫਾਇਰਵਾਲ</b>, ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸੁਰੱਖਿਆ ਹੱਲ।"
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr "\t* <b>ਬਹੁ-ਨੈੱਟਵਰਕ ਫਾਇਰਵਾਲ</b>, ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਸੁਰੱਖਿਆ ਹੱਲ।"
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -14962,7 +14969,7 @@ msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
 "environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"PowerPack ਨਾਲ, ਤੁਹਾਡੇ ਕੋਲ <b>ਗਰਾਫੀਕਲ ਵਿਹੜਾ ਵਾਤਾਵਰਨ</b> ਦੀ ਚੋਣ ਹੈ। ਮੈਂਡਰਿਕ-ਸਾਫਟ ਨੇ "
+"PowerPack ਨਾਲ, ਤੁਹਾਡੇ ਕੋਲ <b>ਗਰਾਫੀਕਲ ਵਿਹੜਾ ਵਾਤਾਵਰਨ</b> ਦੀ ਚੋਣ ਹੈ। ਮੈਂਡਰਿਵ-ਸਾਫਟ ਨੇ "
 "<b>ਕੇ ਡੀ ਈ</b> ਨੂੰ ਮੂਲ ਚੁਣਿਆ ਹੈ।"
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -14989,7 +14996,7 @@ msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
 "environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"PowerPack+ ਨਾਲ, ਤੁਹਾਡੇ ਕੋਲ <b>ਗਰਾਫੀਕਲ ਵਿਹੜਾ ਵਾਤਾਵਰਨ</b> ਦੀ ਚੋਣ ਹੋਵੇਗੀ। ਮੈਂਡਰਿਕ-ਸਾਫਟ "
+"PowerPack+ ਨਾਲ, ਤੁਹਾਡੇ ਕੋਲ <b>ਗਰਾਫੀਕਲ ਵਿਹੜਾ ਵਾਤਾਵਰਨ</b> ਦੀ ਚੋਣ ਹੋਵੇਗੀ। ਮੈਂਡਰਿਵ-ਸਾਫਟ "
 "ਨੇ <b>ਕੇ ਡੀ ਈ</b> ਮੂਲ ਤੌਰ ਤੇ ਚੁਣਿਆ ਹੈ।"
 
 #: share/advertising/14.pl:15
@@ -15112,10 +15119,10 @@ msgstr "<b>ਕਈ ਕਾਰਜਾਂ ਦਾ ਆਨੰਦ ਮਾਣੋ</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> ਕਾਰਜ ਵੇਖੋਗੇ:"
+"ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਮੇਨੂ ਵਿੱਚ ਤੁਸੀਂ <b>ਆਪਣੇ ਸਭ ਕਾਰਜਾਂ</b> ਲਈ <b>ਵਰਤਣ-ਲਈ-ਸੌਖੇ</b> ਕਾਰਜ ਵੇਖੋਗੇ:"
 
 #: share/advertising/18.pl:16
 #, c-format
@@ -15366,17 +15373,17 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ</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> ਮੈਂਡਰਿਕਲੀਨਕਸ-ਖਾਸ ਸਹੂਲਤਾਂ ਦਾ ਸਮੂਹ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਤੁਹਾਡੇ "
+"<b>ਮੈਂਡਰਿਵਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ</b> ਮੈਂਡਰਿਵਲੀਨਕਸ-ਖਾਸ ਸਹੂਲਤਾਂ ਦਾ ਸਮੂਹ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਤੁਹਾਡੇ "
 "ਕੰਪਿਊਟਰ ਤੇ ਸੰਰਚਨਾ ਨੂੰ ਸੌਖਾ ਬਣਾ ਦਿੰਦਾ ਹੈ।"
 
 #: share/advertising/25.pl:17
@@ -15398,8 +15405,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 ""
 
@@ -15413,7 +15420,7 @@ msgstr "<b>ਆਨਲਾਈਨ ਭੰਡਾਰ</b>"
 msgid ""
 "To learn more about Mandriva products and services, you can visit our <b>e-"
 "commerce platform</b>."
-msgstr "ਮੈਂਡਰਿਕ-ਸਾਫਟ ਅਤੇ ਸੇਵਾਵਾਂ ਬਾਰੇ ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ ਸਾਡਾ <b>ਈ-ਕਮਰਸ ਪਲੇਟਫਾਰਮ</b> ਵੇਖੋ"
+msgstr "ਮੈਂਡਰਿਵ-ਸਾਫਟ ਅਤੇ ਸੇਵਾਵਾਂ ਬਾਰੇ ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ ਸਾਡਾ <b>ਈ-ਕਮਰਸ ਪਲੇਟਫਾਰਮ</b> ਵੇਖੋ"
 
 #: share/advertising/27.pl:17
 #, c-format
@@ -15429,35 +15436,35 @@ 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
 msgid "<b>Mandriva Club</b>"
-msgstr "<b>ਮੈਂਡਰਿਕ-ਕਲੱਬ</b>"
+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> ਹੈ.."
+msgstr "<b>ਮੈਂਡਰਿਵ-ਕਲੱਬ</b> ਤੁਹਾਡੇ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਉਤਪਾਦ ਲਈ ਇੱਕ <b>ਸੰਪੂਰਣ ਸਾਥੀ</b> ਹੈ.."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
 "Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
-msgstr "ਮੈਂਡਰਿਕ-ਕਲੱਬ ਨਾਲ ਜੁੜ ਕੇ <b>ਯੋਗ ਫਾਇਦਿਆਂ</b> ਦਾ ਲਾਭ ਲਵੋ, ਜਿਵੇਂ:"
+msgstr "ਮੈਂਡਰਿਵ-ਕਲੱਬ ਨਾਲ ਜੁੜ ਕੇ <b>ਯੋਗ ਫਾਇਦਿਆਂ</b> ਦਾ ਲਾਭ ਲਵੋ, ਜਿਵੇਂ:"
 
 #: 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>."
+"<b>store.mandriva.com</b>."
 msgstr ""
-"\t* ਸਾਡੇ ਆਨਲਾਈਨ ਭੰਡਾਰ <b>store.mandrakesoft.com</b> ਦੀ ਉਤਪਾਦ ਅਤੇ ਸੇਵਾਵਾਂ ਉੱਪਰ "
-"<b>ਖਾਸ ਛੋਟ</b>।"
+"\t* ਸਾਡੇ ਆਨਲਾਈਨ ਭੰਡਾਰ <b>store.mandriva.com</b> ਦੀ ਉਤਪਾਦ ਅਤੇ ਸੇਵਾਵਾਂ ਉੱਪਰ <b>ਖਾਸ "
+"ਛੋਟ</b>।"
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -15468,22 +15475,22 @@ msgstr "\t* <b>ਵਪਾਰਿਕ ਕਾਰਜਾਂ</b> ਨੂੰ ਪਹੁੰ�
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* ਮੈਂਡਰਿਕ-ਲੀਨਕਸ <b>ਉਪਭੋਗੀ ਲੋਕ-ਚਰਚਾ-ਸਥਾਨ</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>ISO ਪ੍ਰਤੀਬਿੰਬ</b> ਨੂੰ, <b>ਪਹਿਲੀ ਅਤੇ ਮਨਜੂਰ "
+"\t* ਪਬਲਿਕ ਜਾਰੀ ਤੋਂ ਪਹਿਲਾਂ, ਮੈਂਡਰਿਵ-ਲੀਨਕਸ <b>ISO ਪ੍ਰਤੀਬਿੰਬ</b> ਨੂੰ, <b>ਪਹਿਲੀ ਅਤੇ ਮਨਜੂਰ "
 "ਪਹੁੰਚ</b>।"
 
 #: share/advertising/29.pl:13
 #, c-format
 msgid "<b>Mandriva Online</b>"
-msgstr "<b>ਮੈਂਡਰਿਕ-ਆਨਲਾਈਨ</b>"
+msgstr "<b>ਮੈਂਡਰਿਵ-ਆਨਲਾਈਨ</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
@@ -15491,16 +15498,16 @@ msgid ""
 "<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>ਮੈਂਡਰਿਕ-ਆਨਲਾਈਨ</b> ਇੱਕ ਨਵੀਂ ਲਾਭਅੰਸ਼ ਸੇਵਾ ਹੈ ਜਿਸ ਨੂੰ ਮੈਂਡਰਿਕ-ਸਾਫਟ ਆਪਣੇ ਗਾਹਕਾਂ ਨੂੰ ਮੁਹੱਈਆ ਕਰਨ "
+"<b>ਮੈਂਡਰਿਵ-ਆਨਲਾਈਨ</b> ਇੱਕ ਨਵੀਂ ਲਾਭਅੰਸ਼ ਸੇਵਾ ਹੈ ਜਿਸ ਨੂੰ ਮੈਂਡਰਿਵ-ਸਾਫਟ ਆਪਣੇ ਗਾਹਕਾਂ ਨੂੰ ਮੁਹੱਈਆ ਕਰਨ "
 "ਬਾਰੇ ਸੋਚਦਾ ਹੈ!"
 
 #: 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 ""
-"ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਤੁਹਾਡੇ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸਿਸਟਮ <b>ਸੌਖੇ ਨਵਿਨੀਕਰਨ</b> ਲਈ ਬਹੁਤ ਸਾਰੀਆਂ ਸੇਵਾਵਾਂ "
+"ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਤੁਹਾਡੇ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਸਿਸਟਮ <b>ਸੌਖੇ ਨਵਿਨੀਕਰਨ</b> ਲਈ ਬਹੁਤ ਸਾਰੀਆਂ ਸੇਵਾਵਾਂ "
 "ਮੁਹੱਈਆ ਕਰਦਾ ਹੈ:"
 
 #: share/advertising/29.pl:18
@@ -15523,27 +15530,27 @@ msgstr "\t* ਲਚਕਦਾਰ <b>ਕ੍ਰਮਬੱਧ</b> ਨਵਿਨੀਕ�
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
-msgstr "\t* ਇੱਕ ਖਾਤੇ ਨਾਲ <b>ਤੁਹਾਡੇ ਸਭ ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸਿਸਟਮਾਂ</b> ਦਾ ਪ੍ਰਬੰਧਨ।"
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
+msgstr "\t* ਇੱਕ ਖਾਤੇ ਨਾਲ <b>ਤੁਹਾਡੇ ਸਭ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਸਿਸਟਮਾਂ</b> ਦਾ ਪ੍ਰਬੰਧਨ।"
 
 #: share/advertising/30.pl:13
 #, c-format
 msgid "<b>Mandriva Expert</b>"
-msgstr "<b>ਮੈਂਡਰਿਕ-ਮਾਹਿਰ</b>"
+msgstr "<b>ਮੈਂਡਰਿਵ-ਮਾਹਿਰ</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 ""
 "ਕੀ ਤੁਹਾਨੂੰ <b>ਸਹਾਇਕ?</b> ਦੀ ਲੋੜ ਹੈ, <b>ਸਾਡੇ ਤਕਨੀਕੀ ਸਹਿਯੋਗ ਪਲੇਟਫਾਰਮ</b> 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 ""
 "<b>ਸਿੱਖਿਅਤ ਮੈਡਰਿਕ-ਲੀਨਕਸ ਮਾਹਿਰ</b> ਦੀ ਸਹਾਇਤਾ ਲਈ ਧੰਨਵਾਦ, ਤੁਸੀਂ ਸਮੇਂ ਦੀ ਬਚਤ ਕੀਤੀ।"
@@ -15551,11 +15558,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
@@ -15849,7 +15856,7 @@ msgstr "ਪ੍ਰਬੰਧਨ ਸੰਦ, ਕਾਰਜ ਅਕਾਊਂਟਿੰ�
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
-msgstr "ਮੈਂਡਰਿਕ-ਸਾਫਟ ਤਖਤੀ"
+msgstr "ਮੈਂਡਰਿਵ-ਸਾਫਟ ਤਖਤੀ"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -15907,8 +15914,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
@@ -15950,7 +15957,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"
@@ -15964,7 +15971,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਟਰਮੀਨਲ ਸਰਵਰ ਸੰਰਚਨਾ-ਕਾਰ\n"
+"ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਟਰਮੀਨਲ ਸਰਵਰ ਸੰਰਚਨਾ-ਕਾਰ\n"
 "--ਯੋਗ         : MTS ਯੋਗ ਕਰੋ\n"
 "--ਅਯੋਗ        : MTS ਅਯੋਗ ਕਰੋ\n"
 "--ਚਲਾਓ          : MTS ਚਲਾਓ\n"
@@ -16017,7 +16024,7 @@ msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPTION]...\n"
-"  --no-confirmation      ਮੈਂਡਰਿਕ ਨਵਿਨੀਕਰਨ ਵਿਧੀ ਵਿੱਚ ਪਹਿਲਾਂ ਤਸਦੀਕੀ ਪ੍ਰਸ਼ਨ ਨਾ ਪੁਛੋ\n"
+"  --no-confirmation      ਮੈਂਡਰਿਵ ਨਵਿਨੀਕਰਨ ਵਿਧੀ ਵਿੱਚ ਪਹਿਲਾਂ ਤਸਦੀਕੀ ਪ੍ਰਸ਼ਨ ਨਾ ਪੁਛੋ\n"
 "  --no-verify-rpm        ਪੈਕੇਜ ਦਸਤਖਤ ਜਾਂਚ ਨਾ ਕਰੋ\n"
 "  --changelog-first      ਵਰਣਨ ਝਰੋਖੇ ਵਿੱਚ ਫਾਇਲ-ਸੂਚੀ ਤੋਂ ਪਹਿਲਾਂ changelog ਨਾ ਵਿਖਾਓ\n"
 "  --merge-all-rpmnew     ਸਭ .rpmnew/.rpmsave ਫਾਇਲਾਂ ਸ਼ਾਮਿਲ ਕਰਨ ਦਾ ਮਕਸਦ ਮਿਲਿਆ"
@@ -18599,13 +18606,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਬੱਗ ਰਿਪੋਰਟ ਸੰਦ"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਬੱਗ ਰਿਪੋਰਟ ਸੰਦ"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕੰਟਰੋਲ ਸੈਂਟਰ"
+msgid "Mandriva Linux Control Center"
+msgstr "ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਕੰਟਰੋਲ ਸੈਂਟਰ"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18626,7 +18633,7 @@ msgstr "HardDrake"
 #: standalone/drakbug:51
 #, c-format
 msgid "Mandriva Online"
-msgstr "ਮੈਂਡਰਿਕ-ਆਨਲਾਈਨ"
+msgstr "ਮੈਂਡਰਿਵ-ਆਨਲਾਈਨ"
 
 #: standalone/drakbug:52
 #, c-format
@@ -18671,7 +18678,7 @@ msgstr "ਸੰਰਚਨਾ ਤਖਤੀ"
 #: standalone/drakbug:81
 #, c-format
 msgid "Select Mandriva Tool:"
-msgstr "ਮੈਂਡਰਿਕ-ਸਾਫਟ ਸੰਦ ਚੁਣੋ:"
+msgstr "ਮੈਂਡਰਿਵ-ਸਾਫਟ ਸੰਦ ਚੁਣੋ:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -19089,19 +19096,19 @@ 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"
-"ਮੈਂਡਰਿਕਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ \"ਇੰਟਰਫੇਸ ਸ਼ਾਮਲ\" ਚਲਾਓ।"
+"ਮੈਂਡਰਿਵਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ \"ਇੰਟਰਫੇਸ ਸ਼ਾਮਲ\" ਚਲਾਓ।"
 
 #: 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 ""
 "ਤੁਹਾਡੇ ਕੋਲ ਹਾਲੇ ਕੋਈ ਵੀ ਇੰਟਰਨੈਟ ਕੁਨੈਕਸ਼ਨ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ।\n"
-"ਮੈਂਡਰਿਕਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ \"ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਲ\" ਚਲਾਓ।"
+"ਮੈਂਡਰਿਵਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ \"ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਲ\" ਚਲਾਓ।"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -19151,8 +19158,8 @@ msgstr "KDM (KDE ਦ੍ਰਿਸ਼ ਮੈਨੇਜਰ)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਦ੍ਰਿਸ਼ ਮੈਨੇਜਰ)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਦ੍ਰਿਸ਼ ਮੈਨੇਜਰ)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -19456,18 +19463,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) 2001-2002 ਮੈਂਡਰਿਕ-ਸਾਫਟ ਦੁਆਰਾ \n"
+"ਅਧਿਕਾਰ (C) 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
@@ -19975,7 +19982,7 @@ msgid ""
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"ਅਧਿਕਾਰ (C) 2003-2004 ਮੈਂਡਰਿਕ-ਸਾਫਟ।\n"
+"ਅਧਿਕਾਰ (C) 2003-2004 ਮੈਂਡਰਿਵ-ਸਾਫਟ।\n"
 "ਇਹ ਮੁਕਤ ਸਾਫਟਵੇਅਰ ਹੈ ਅਤੇ GNU GPL ਦੇ ਅਧੀਨ ਮੁੜ ਵੰਡਿਆ ਜਾ ਸਕਦਾ ਹੈ।\n"
 "\n"
 "ਉਪਯੋਗਤਾ: \n"
@@ -20001,8 +20008,8 @@ msgstr " --doc <link>          - ਹੋਰ ਵੈਬ ਸਫਿਆਂ ਨੂੰ �
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸਹਾਇਤਾ ਕੇਂਦਰ"
+msgid "Mandriva Linux Help Center"
+msgstr "ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਸਹਾਇਤਾ ਕੇਂਦਰ"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -20646,7 +20653,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"
@@ -20655,7 +20662,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
@@ -22510,7 +22517,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 ""
 "ਤੁਹਾਡੀ ਮਸ਼ੀਨ ਤੇ ਕੋਈ TV ਕਾਰਡ ਨਹੀਂ ਲੱਭਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਇਹ ਪੜਤਾਲ ਕਰੋ ਕਿ ਲੀਨਕਸ-ਸਹਾਇਕ "
 "ਵੀਡਿਓ/TV ਕਾਰਡ ਲਗਾਇਆ ਗਿਆ ਹੈ।\n"
@@ -22519,7 +22526,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
@@ -23222,13 +23229,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
@@ -23336,8 +23343,8 @@ msgstr "ਤਬਦੀਲੀ ਕੀਤੀ ਗਈ, ਪਰ ਲਾਗੂ ਕਰਨ �
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਸੰਦ ਲਾਗ"
+msgid "Mandriva Linux Tools Logs"
+msgstr "ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਸੰਦ ਲਾਗ"
 
 #: standalone/logdrake:51
 #, c-format
@@ -23849,10 +23856,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"
-"ਮੈਂਡਰਿਕ-ਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ ਆਪਣੀ ਸੰਰਚਨਾ ਦੀ ਜਾਂਚ ਕਰੋ।"
+"ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ ਆਪਣੀ ਸੰਰਚਨਾ ਦੀ ਜਾਂਚ ਕਰੋ।"
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/pl.po b/perl-install/share/po/pl.po
index e4ec43a57..626b55ec7 100644
--- a/perl-install/share/po/pl.po
+++ b/perl-install/share/po/pl.po
@@ -107,7 +107,7 @@ msgstr ""
 "\n"
 "Można także kontynuować bez klucza USB - wciąż będzie można\n"
 "korzystać z Mandriva Move tak jak z normalnego systemu\n"
-"operacyjnego Mandrake."
+"operacyjnego Mandriva."
 
 #: ../move/move.pm:483
 #, c-format
@@ -135,7 +135,7 @@ msgstr ""
 "\n"
 "Można także kontynuować bez klucza USB - wciąż będzie można\n"
 "korzystać z Mandriva Move tak jak z normalnego systemu\n"
-"operacyjnego Mandrake."
+"operacyjnego Mandriva."
 
 #: ../move/move.pm:494
 #, c-format
@@ -1320,11 +1320,11 @@ msgstr "Wybór języka"
 #: 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 obsługuje wiele języków. Wybierz\n"
+"Mandriva Linux obsługuje wiele języków. Wybierz\n"
 "języki do zainstalowania. Będą one dostępne po zakończeniu\n"
 "instalacji i ponownym uruchomieniu systemu."
 
@@ -3751,12 +3751,12 @@ msgstr "włączona obsługa radia"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
 "Przed kontynuowaniem, należy przeczytać uważnie warunki licencji dotyczącej "
-"całej dystrybucji Mandrivalinux. Jeśli zgadzasz się\n"
+"całej dystrybucji Mandriva Linux. Jeśli zgadzasz się\n"
 "z wszystkimi warunkami w niej zawartymi, zaznacz opcję \"%s\".\n"
 "Jeśli nie kliknij na przycisk \"%s\" w celu ponownego uruchomienia\n"
 "komputera."
@@ -3934,13 +3934,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The 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 ""
-"Instalacja Mandrivalinux jest rozpowszechniana na kilku płytach CD.\n"
+"Instalacja Mandriva Linux jest rozpowszechniana na kilku płytach CD.\n"
 "Jeśli wybrany pakiet jest zlokalizowany na innej płycie CD\n"
 " instalator wysunie bieżącą płytę CD oraz wyświetli prośbę\n"
 "o włożenie wymaganej płyty CD. Jeśli nie posiadasz wymaganej\n"
@@ -3951,11 +3951,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"
@@ -4007,7 +4008,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Nadszedł czas na określenie, jakie programy mają zostać zainstalowane w\n"
-"systemie. Dla Mandrivalinux są dostępne tysiące pakietów. Aby uczynić\n"
+"systemie. Dla Mandriva Linux są dostępne tysiące pakietów. Aby uczynić\n"
 "zarządzanie pakietami łatwiejszym, zostały one uporządkowane na podstawie\n"
 "podobieństwa aplikacji.\n"
 "\n"
@@ -4121,10 +4122,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"
@@ -4155,7 +4156,7 @@ msgstr ""
 "!! Jeśli zostanie wybrany pakiet serwera, niezależnie czy wybrany został\n"
 "on w drodze indywidualnego wyboru pakietów, lub też jako pakiet grupy,\n"
 "zostanie wyświetlona prośba o potwierdzenie wyboru pakietu serwera\n"
-"przed jego instalacją. W systemie Mandrivalinux, wszystkie zainstalowane\n"
+"przed jego instalacją. W systemie Mandriva Linux, wszystkie zainstalowane\n"
 "serwery są uruchamiane domyślnie w trakcie\n"
 "uruchamiania całego systemu. Nawet jeśli dany pakiet jest uważany\n"
 "za bezpieczny i w trakcie instalacji nie są znane żadne problemy z nim\n"
@@ -4313,7 +4314,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"
@@ -4369,7 +4370,7 @@ msgid ""
 msgstr ""
 "X (od systemu X Window) to serce graficznego interfejsu GNU/Linux,\n"
 "z którego korzystają wszystkie środowiska graficzne (KDE, GNOME,\n"
-"AfterStep, WindowMaker, itd.) dostępne w systemie Mandrivalinux.\n"
+"AfterStep, WindowMaker, itd.) dostępne w systemie Mandriva Linux.\n"
 "\n"
 "Zostanie wyświetlona lista różnych parametrów pozwalających\n"
 "na zmianę sposobu wyświetlania.\n"
@@ -4489,12 +4490,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"
@@ -4521,7 +4522,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"
@@ -4530,7 +4531,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"
@@ -4551,11 +4553,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "W tym etapie instalacji należy określić, gdzie na dysku zostanie\n"
-"zainstalowany system operacyjny Mandrivalinux. Jeśli dysk jest pusty\n"
+"zainstalowany system operacyjny Mandriva Linux. Jeśli dysk jest pusty\n"
 "lub istniejące systemy operacyjne zajmują całe dostępne miejsce,\n"
 "należy podzielić dysk na partycje.\n"
 "Partycjonowanie to po prostu logiczny podział twardego dysku na oddzielne\n"
-"obszary w celu zainstalowania systemu Mandrivalinux.\n"
+"obszary w celu zainstalowania systemu Mandriva Linux.\n"
 "\n"
 "Ponieważ efekt partycjonowania jest nieodwracalny, czynność wydaje się\n"
 "niebezpieczna i jest stresująca dla niedoświadczonych użytkowników.\n"
@@ -4592,7 +4594,7 @@ msgstr ""
 "\n"
 " * \"%s\": Jeśli chcesz usunąć z dysku\n"
 "wszystkie dane i wszystkie partycje istniejące na dysku oraz zainstalować\n"
-"w to miejsce nowy system Mandrivalinux, wybierz to rozwiązanie.\n"
+"w to miejsce nowy system Mandriva Linux, wybierz to rozwiązanie.\n"
 "Pamiętaj, że po zatwierdzeniu tego wyboru nie nie będzie możliwości "
 "odwrotu.\n"
 "\n"
@@ -4756,7 +4758,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."
@@ -4778,7 +4780,7 @@ msgstr ""
 "Kliknij \"%s\", jeśli już można przystąpić do formatowania partycji.\n"
 "\n"
 "Kliknij \"%s\", jeśli chcesz wybrać inne partycje dla nowej instalacji\n"
-"Mandrivalinux.\n"
+"Mandriva Linux.\n"
 "\n"
 "Kliknij \"%s\" jeśli chcesz wybrać sprawdzanie niektórych partycji\n"
 "w poszukiwaniu uszkodzonych sektorów na dysku."
@@ -4795,7 +4797,7 @@ msgstr "Wstecz"
 #: 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"
@@ -4807,7 +4809,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Podczas instalacji Mandrivalinux, być może niektóre pakiety\n"
+"Podczas instalacji Mandriva Linux, być może niektóre pakiety\n"
 "zostały zaktualizowane od wydania początkowego. Niektóre błędy mogą\n"
 "zostać naprawione, zaś problemy z bezpieczeństwem rozwiązane. Aby\n"
 "skorzystać z możliwości aktualizacji, dobrze jest pobrać część danych\n"
@@ -4836,7 +4838,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of 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"
@@ -4851,7 +4853,7 @@ msgstr ""
 "Jeśli nie wiesz co wybrać, użyj domyślnej opcji. Będzie można zmienić "
 "poziom\n"
 "bezpieczeństwa w późniejszym czasie przy użyciu narzędzia draksec\n"
-"uruchamianego z Centrum Sterowania Mandrivalinux.\n"
+"uruchamianego z Centrum Sterowania Mandriva Linux.\n"
 "\n"
 "Pole \"%s\" może informować system o użytkowniku komputera odpowiedzialnego\n"
 "za bezpieczeństwo. Komunikaty bezpieczeństwa będą przesyłane na ten adres."
@@ -4865,7 +4867,7 @@ msgstr "Administrator zabezpieczeń"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4936,7 +4938,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "W tym etapie instalacji wybierasz partycje, na których będzie instalowany\n"
-"Mandrivalinux. Jeśli istnieją (np. pozostały po poprzedniej instalacji,\n"
+"Mandriva Linux. Jeśli istnieją (np. pozostały po poprzedniej instalacji,\n"
 "lub też zostały założone innym narzędziem), można ich użyć do instalacji.\n"
 "W innym przypadku należy je utworzyć.\n"
 "\n"
@@ -5025,7 +5027,7 @@ msgstr "Przełącz między trybem zwykłym a zaawansowanym"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5054,7 +5056,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Na dysku wykryto więcej niż jedną partycję Windows. Wybierz, którą\n"
-"z nich chcesz zmniejszyć w celu zainstalowania systemu Mandrivalinux\n"
+"z nich chcesz zmniejszyć w celu zainstalowania systemu Mandriva Linux\n"
 "\n"
 "Każda partycja jest określana za pomocą informacji: \"Nazwa linuksowa\",\n"
 "\"Nazwa Windows\" i \"Rozmiar\".\n"
@@ -5100,7 +5102,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"
@@ -5109,19 +5111,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 ""
 "Ten krok jest aktywowany tylko jeśli na twoim komputerze została\n"
 "znaleziona stara partycja GNU/Linux.\n"
 "\n"
 "Instalator musi teraz otrzymać informację czy chcesz przeprowadzić nową\n"
-"instalację, czy też uaktualnić istniejący system Mandrivalinux:\n"
+"instalację, czy też uaktualnić istniejący system Mandriva Linux:\n"
 "\n"
 " * \"%s\": W większości przypadków, ta opcja powoduje całkowite\n"
 "usunięcie starego systemu. Jednak w zależności od schematu\n"
@@ -5131,13 +5134,13 @@ msgstr ""
 "opcji.\n"
 "\n"
 " * \"%s\": Ta klasa instalacji umożliwia uaktualnienie pakietów\n"
-"aktualnie zainstalowanych w systemie Mandrivalinux. Twój bieżący\n"
+"aktualnie zainstalowanych w systemie Mandriva Linux. Twój bieżący\n"
 "schemat partycjonowania oraz dane użytkownika nie zostaną zmienione.\n"
 "Większość z innych kroków konfiguracyjnych pozostanie dostępnych,\n"
 "podobnie do instalacji standardowej.\n"
 "\n"
 "Użycie wersji \"Uaktualnienie\" powinno zadziałać dobrze na systemach\n"
-"Mandrivalinux w wersji \"8.1\" i późniejszych. Przeprowadzanie\n"
+"Mandriva Linux w wersji \"8.1\" i późniejszych. Przeprowadzanie\n"
 "uaktualnienia z wersji wcześniejszych niż \"8.1\" nie jest zalecane."
 
 #: help.pm:591
@@ -5196,7 +5199,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"
@@ -5240,7 +5244,7 @@ msgstr ""
 "Uwaga dotycząca obsługi UTF-8 (unikodu): Unikod jest nowym kodowaniem\n"
 "znaków umożliwiającym równoczesną osługę wszystkich istniejących\n"
 "języków. Jednak pełna obsługa tego standardu jest wciąż w trakcie\n"
-"rozwoju w systemach GNU/Linux. Z tego powodu, Mandrivalinux\n"
+"rozwoju w systemach GNU/Linux. Z tego powodu, Mandriva Linux\n"
 "używa go lub nie w zależności od wyboru użytkownika:\n"
 "\n"
 "* Po wybraniu języków z często używanym kodowaniem (języki latin1,\n"
@@ -5485,7 +5489,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"
@@ -5506,11 +5510,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 ""
 "Nadszedł czas na wybranie systemu drukowania. Inne systemy operacyjne\n"
-"mogą zaoferować jeden, lecz Mandrivalinux oferuje dwa. Każdy z tych\n"
+"mogą zaoferować jeden, lecz Mandriva Linux oferuje dwa. Każdy z tych\n"
 "systemów wydruku jest najlepszy dla określonego typu konfiguracji.\n"
 "\n"
 " * \"%s\" oznaczający \"print, do not queue\" (drukuj, nie buforuj),\n"
@@ -5535,7 +5539,7 @@ msgstr ""
 "\n"
 "Jeśli wybór zostanie dokonany w tymi miejscu, zaś później okaże się,\n"
 "że system wydruku nie odpowiada twoim potrzebom, można go zmienić\n"
-"uruchamiając program PrinterDrake z Centrum Sterowania Mandrake.\n"
+"uruchamiając program PrinterDrake z Centrum Sterowania Mandriva.\n"
 "Należy tam także kliknąć przycisk \"%s\"."
 
 #: help.pm:765
@@ -5657,7 +5661,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"
@@ -5674,7 +5679,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"
@@ -5728,7 +5733,7 @@ msgstr ""
 "\n"
 " * \"%s\": jeśli chcesz skonfigurować połączenie z Internetem lub\n"
 "sieć lokalną użyj tej opcji. Zobacz na wydrukowaną dokumentację lub\n"
-"użyj Centrum Sterownia Mandrivalinux po zakończeniu instalacji\n"
+"użyj Centrum Sterownia Mandriva Linux po zakończeniu instalacji\n"
 "aby otrzymać pełną pomoc.\n"
 "\n"
 " * \"%s\": umożliwia konfigurację adresów pośrednika HTTP i FTP,\n"
@@ -5806,11 +5811,11 @@ msgstr "Usługi"
 #, 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 ""
 "Wybierz dysk, który chcesz wykasować, by założyć na nim\n"
-"partycję Mandrivalinux. Pamiętaj, że wszystkie dane z tego\n"
+"partycję Mandriva Linux. Pamiętaj, że wszystkie dane z tego\n"
 "dysku zostaną utracone bez możliwości odzyskania!"
 
 #: help.pm:863
@@ -6162,12 +6167,12 @@ msgstr "Obliczanie rozmiaru partycji Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Partycja Windows jest zbyt pofragmentowana. Należy uruchomić komputer pod "
 "systemem Windows, uruchomić narzędzie \"defrag\" i następnie ponownie "
-"rozpocząć instalację Mandrivalinux."
+"rozpocząć instalację Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6286,13 +6291,13 @@ msgstr "Zatrzymywanie sieci"
 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"
@@ -6346,7 +6351,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"
@@ -6383,7 +6388,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"
@@ -6405,12 +6410,12 @@ msgstr ""
 "Wprowadzenie\n"
 "\n"
 "System operacyjny wraz z innymi komponentami dostępnymi w dystrybucji "
-"Mandrivalinux\n"
+"Mandriva Linux\n"
 "zwany jest dalej \"Oprogramowaniem\". Oprogramowanie zawiera między innymi "
 "zbiór \n"
 "programów, metod, zasad oraz dokumentacji związanej z systemem operacyjnym "
 "oraz \n"
-"innych komponentów dystrybucji Mandrivalinux.\n"
+"innych komponentów dystrybucji Mandriva Linux.\n"
 "\n"
 "1. Umowa licencyjna\n"
 "\n"
@@ -6460,7 +6465,7 @@ msgstr ""
 "powstałe w wyniku\n"
 "używania lub niemożności używania Oprogramowania lub w wyniku pobrania "
 "komponentów\n"
-"oprogramowania z jednej ze stron Mandrivalinux, które są zabronione lub "
+"oprogramowania z jednej ze stron Mandriva Linux, które są zabronione lub "
 "zastrzeżone w niektórych\n"
 "krajach przez lokalne prawo. Ta ograniczona odpowiedzialność dotyczy między "
 "innymi komponentów\n"
@@ -6480,7 +6485,7 @@ msgstr ""
 "komponentu przed\n"
 "jego użyciem. Dowolne pytanie dotyczące licencji powinno być przesyłane do "
 "autora, nie\n"
-"do firmy Mandriva. Programy stworzone przez Mandrakesoft S.A. są wydane na "
+"do firmy Mandriva. Programy stworzone przez Mandriva S.A. są wydane na "
 "zasadach\n"
 "licencji GPL. Dokumentacja napisana przez Mandriva S.A. jest wydana na "
 "zasadach\n"
@@ -6496,7 +6501,7 @@ msgstr ""
 "Firma Mandriva S.A. zastrzega sobie prawo do zmiany lub przystosowania "
 "Oprogramowania,\n"
 "jako całości lub w częściach, w każdym sensie i w dowolny celu.\n"
-"\"Mandriva\", \"Mandrivalinux\" oraz związane znaki graficzne są znakami "
+"\"Mandriva\", \"Mandriva Linux\" oraz związane znaki graficzne są znakami "
 "handlowymi firmy\n"
 "Mandriva S.A.\n"
 "\n"
@@ -6608,8 +6613,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"
@@ -6617,13 +6622,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 ""
 "Gratulacje, instalacja została zakończona.\n"
 "Usuń nośniki wymienne i naciśnij enter, by ponownie uruchomić komputer.\n"
 "\n"
 "\n"
-"Informacje o poprawkach dotyczących tej wersji Mandrivalinux\n"
+"Informacje o poprawkach dotyczących tej wersji Mandriva Linux\n"
 "znajdziesz na stronach:\n"
 "\n"
 "\n"
@@ -6631,13 +6636,13 @@ msgstr ""
 "\n"
 "\n"
 "Informacje o konfiguracji systemu znajdują się\n"
-"w Oficjalnym Podręczniku Użytkownika Mandrivalinux."
+"w Oficjalnym Podręczniku Użytkownika 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
@@ -6666,7 +6671,7 @@ msgstr "Przechodzę do kroku `%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 ""
@@ -7210,9 +7215,10 @@ 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 ""
-"Łączenie ze stroną Mandrivalinux w celu pobrania listy dostępnych serwerów..."
+"Łączenie ze stroną Mandriva Linux w celu pobrania listy dostępnych "
+"serwerów..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7437,8 +7443,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Instalacja Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Instalacja Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10027,7 +10033,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 ""
@@ -10035,7 +10041,7 @@ msgstr ""
 "\n"
 "Narzędzie to umożliwia konfigurację prostej zapory ogniowej.\n"
 "Jeśli potrzebujesz silnego dedykowanego rozwiązania,\n"
-"skorzystaj z dystrybucji Mandrake Security Firewall."
+"skorzystaj z dystrybucji Mandriva Security Firewall."
 
 #: network/drakfirewall.pm:164
 #, c-format
@@ -12743,7 +12749,7 @@ msgstr ""
 "\n"
 "Jeśli chcesz dodać, usunąć lub zmienić nazwę drukarki, lub tez chcesz "
 "zmienić domyślną opcję ustawień (podajnik papieru, jakość wydruku,...), "
-"wybierz \"Drukarka\" w sekcji \"%s\" Centrum Sterowania Mandrake."
+"wybierz \"Drukarka\" w sekcji \"%s\" Centrum Sterowania Mandriva."
 
 #: printer/printerdrake.pm:1207 printer/printerdrake.pm:1437
 #: printer/printerdrake.pm:1500 printer/printerdrake.pm:1592
@@ -14099,11 +14105,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 ""
-"Uruchom Scannerdrake (Sprzęt/Skanery w Centrum Sterowania Mandrivalinux), "
+"Uruchom Scannerdrake (Sprzęt/Skanery w Centrum Sterowania Mandriva Linux), "
 "aby udostępnić skaner w sieci.\n"
 "\n"
 
@@ -16057,23 +16063,23 @@ msgstr "Zatrzymaj"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Czym jest Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Czym jest Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Witamy w systemie <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Witamy w systemie <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 jest <b>dystrybucją Linuksa</b> zawierającą podstawowy system "
+"Mandriva Linux jest <b>dystrybucją Linuksa</b> zawierającą podstawowy system "
 "zwany <b>systemem operacyjnym</b> (opartym o jądro Linuksa) wraz z <b>dużą "
 "liczbą aplikacji</b> realizujących wszystkie zadania o jakich można tylko "
 "pomyśleć."
@@ -16081,12 +16087,12 @@ 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 jest  najbardziej <b>przyjazną dla użytkownika</b> dystrybucją "
-"Linuksa. Jest ona także jedną z <b>najczęściej używanych</b> dystrybucji "
-"Linuksa na świecie!"
+"Mandriva Linux jest  najbardziej <b>przyjazną dla użytkownika</b> "
+"dystrybucją Linuksa. Jest ona także jedną z <b>najczęściej używanych</b> "
+"dystrybucji Linuksa na świecie!"
 
 #: share/advertising/02.pl:13
 #, c-format
@@ -16101,15 +16107,15 @@ msgstr "Witaj w <b>świecie Otwartego Oprogramowania</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 został wydany na zasadzie Open Source. To oznacza, że to nowe "
+"Mandriva Linux został wydany na zasadzie Open Source. To oznacza, że to nowe "
 "wydanie jest wynikiem <b>współpracy</b> pomiędzy <b>zespołem programistów "
-"Mandriva</b> oraz <b>światową społecznością</b> współpracownikół "
-"Mandrivalinux."
+"Mandriva</b> oraz <b>światową społecznością</b> współpracownikół Mandriva "
+"Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16128,11 +16134,11 @@ msgstr "<b>Licencja 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 ""
 "Większość oprogramowania załączonego w dystrybucji oraz wszystkie narzędzia "
-"Mandrivalinux jest licencjonowana na zasadach <b>Powszechnej Licencji "
+"Mandriva Linux jest licencjonowana na zasadach <b>Powszechnej Licencji "
 "Publicznej</b> (GPL)."
 
 #: share/advertising/03.pl:17
@@ -16164,26 +16170,26 @@ msgstr "<b>Dołącz do społeczności</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 posiada jedną z <b>największych społeczności</b> użytkowników "
+"Mandriva Linux posiada jedną z <b>największych społeczności</b> użytkowników "
 "i deweloperów. Rola takiej społeczności jest bardzo szeroka, poczynając od "
 "zgłaszania błędów a kończąc na tworzeniu nowych aplikacji. Społeczność "
-"odgrywa <b>kluczową rolę</b> w świecie Mandrivalinux."
+"odgrywa <b>kluczową rolę</b> w świecie 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 ""
 "Aby <b>dowiedzieć się więcej</b> na temat naszej dynamicznej społeczności, "
-"zajrzyj na stronę <b>www.mandrakelinux.com</b> lub bezpośrednio na <b>www."
-"mandrakelinux.com/en/cookerdevel.php3</b> jeśli chcesz <b>wziąć udział</b> w "
+"zajrzyj na stronę <b>www.mandrivalinux.com</b> lub bezpośrednio na <b>www."
+"mandrivalinux.com/en/cookerdevel.php3</b> jeśli chcesz <b>wziąć udział</b> w "
 "rozwijaniu dystrybucji."
 
 #: share/advertising/05.pl:15
@@ -16194,10 +16200,10 @@ msgstr "<b>Wersja Download</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 ""
-"Właśnie instalujesz <b>Mandrivalinux Download</b>. Ta wersja jest wersją "
+"Właśnie instalujesz <b>Mandriva Linux Download</b>. Ta wersja jest wersją "
 "bezpłatną, którą Mandriva chce utrzymać jako <b>dostępną dla wszystkich</b>."
 
 #: share/advertising/05.pl:19
@@ -16242,8 +16248,8 @@ msgstr "<b>Discovery,Twój Pierwszy Linux</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Właśnie instalujesz <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Właśnie instalujesz <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16266,8 +16272,8 @@ msgstr "<b>PowerPack, Potężny System Linuksowy</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Właśnie instalujesz <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Właśnie instalujesz <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16287,8 +16293,8 @@ msgstr "<b>PowerPack+, Linuksowe rozwiązanie na biurka i serwery</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Właśnie instalujesz <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Właśnie instalujesz <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16311,15 +16317,15 @@ msgstr "<b>Produkty 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 ""
 "Firma <b>Mandriva</b> stworzyła szeroką gamę produktów dla dystrybucji "
-"<b>Mandrivalinux</b>."
+"<b>Mandriva Linux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Produktami Mandrivalinux są:"
+msgid "The Mandriva Linux products are:"
+msgstr "Produktami Mandriva Linux są:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16339,11 +16345,11 @@ msgstr "\t* <b>PowerPack+</b>,  Linuksowe rozwiązanie na biurka i serwery"
 #: 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 dla x86-64</b>, edycja Mandrivalinux dla procesorów 64-"
-"ro bitowych."
+"\t* <b>Mandriva Linux dla x86-64</b>, edycja Mandriva Linux dla procesorów "
+"64-ro bitowych."
 
 #: share/advertising/10.pl:15
 #, c-format
@@ -16353,28 +16359,28 @@ msgstr "<b>Produkty Mandriva (Produkty Nomada)</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 storzył dwa produkty umożliwiające używanie dystrybucji "
-"Mandrivalinux <b>na dowolnym komputerze</b> bez potrzeby jej instalowania."
+"Mandriva storzył dwa produkty umożliwiające używanie dystrybucji Mandriva "
+"Linux <b>na dowolnym komputerze</b> bez potrzeby jej instalowania."
 
 #: 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>, dystrybucja Mandrivalinux uruchamiana bezpośrednio z płyty "
+"\t* <b>Move</b>, dystrybucja Mandriva Linux uruchamiana bezpośrednio z płyty "
 "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>, dystrybucja Mandrivalinux preinstalowana na "
+"\t* <b>GlobeTrotter</b>, dystrybucja Mandriva Linux preinstalowana na "
 "ultrakompaktowym dysku LaCie Mobile."
 
 #: share/advertising/11.pl:13
@@ -16393,23 +16399,25 @@ 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>Corporate Desktop</b>, Biurkowa edycja Mandrivalinux do zastosowań "
+"\t* <b>Corporate Desktop</b>, Biurkowa edycja Mandriva Linux do zastosowań "
 "biznesowych."
 
 #: 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>Corporate Server</b>, Serwerowa edycja Mandrivalinux do zastosowań "
+"\t* <b>Corporate Server</b>, Serwerowa edycja Mandriva Linux do zastosowań "
 "biznesowych."
 
 #: 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>, Edycja Mandrivalinux do zastosowań w "
+"\t* <b>Multi-Network Firewall</b>, Edycja Mandriva Linux do zastosowań w "
 "zakresie bezpieczeństwa."
 
 #: share/advertising/12.pl:13
@@ -16614,10 +16622,10 @@ msgstr "<b>Korzystaj z szerokiej gamy aplikacji</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 ""
-"W menu systemu Mandrivalinux znajdziesz <b>łatwe w użyciu</b> aplikacje do "
+"W menu systemu Mandriva Linux znajdziesz <b>łatwe w użyciu</b> aplikacje do "
 "<b>wielu swoich zadań</b>:"
 
 #: share/advertising/18.pl:16
@@ -16885,18 +16893,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Centrum Sterowania Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Centrum Sterowania 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>Centrum Sterowania Mandrivalinux</b> jest zbiorem autorskich narzędzi "
-"Mandrivalinux ułatwiających konfigurację komputera."
+"<b>Centrum Sterowania Mandriva Linux</b> jest zbiorem autorskich narzędzi "
+"Mandriva Linux ułatwiających konfigurację komputera."
 
 #: share/advertising/25.pl:17
 #, c-format
@@ -16920,21 +16928,21 @@ 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 ""
 "Tak jak każde oprogramowanie komputerowe, oprogramowanie Open Source "
 "<b>wymaga czasu i ludzi</b> do tworzenia. W celu uszanowania filozofii Open "
 "Source, Mandriva sprzedaje produkty wartości dodanej oraz usługi aby "
-"<b>ulepszyć dystrybucję Mandrivalinux</b>. Jeśli chcesz <b>wesprzeć ruch "
-"Open Source</b> oraz rozwój dystrybucji Mandrivalinux, <b>rozważ</b> zakup "
+"<b>ulepszyć dystrybucję Mandriva Linux</b>. Jeśli chcesz <b>wesprzeć ruch "
+"Open Source</b> oraz rozwój dystrybucji Mandriva Linux, <b>rozważ</b> zakup "
 "jednego z naszych produktów lub usług!"
 
 #: share/advertising/27.pl:13
 #, c-format
 msgid "<b>Online Store</b>"
-msgstr "<b>Sklep internetowy Mandrake</b>"
+msgstr "<b>Sklep internetowy Mandriva</b>"
 
 #: share/advertising/27.pl:15
 #, c-format
@@ -16963,7 +16971,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 "Zatrzymaj się pod adresem <b>www.mandrakestore.pl</b>"
 
 #: share/advertising/28.pl:15
@@ -16974,11 +16982,11 @@ msgstr "<b>Klub Mandriva</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>Klub Mandriva</b> jest <b>doskonałym dodatkiem</b> do twojego produktu "
-"Mandrivalinux."
+"Mandriva Linux."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -16986,16 +16994,16 @@ msgid ""
 "Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 "Skorzystaj z <b>wartościowych korzyści</b> poprzez dołączenie do Klub "
-"Mandrake, są to m.in.:"
+"Mandriva, są to m.in.:"
 
 #: 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>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 "\t* <b>Specjalne zniżki</b> na produkty i usługi w naszym sklepie "
-"internetowym <b>store.mandrakesoft.com</b>."
+"internetowym <b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -17008,19 +17016,19 @@ 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* Możliwość brania udziału w dyskusjach na <b>forach użytkowników</b> "
-"Mandrivalinux."
+"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>Wcześniejszy i uprzywilejowany dostęp</b>, przed wydaniem publicznym, "
-"do <b>obrazów ISO</b> dystrybucji Mandrivalinux."
+"do <b>obrazów ISO</b> dystrybucji Mandriva Linux."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -17040,10 +17048,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 dostarcza szeroką gamę wartościowych usług do "
-"<b>łatwiejszego uaktualniania</b> swoich systemów Mandrivalinux:"
+"<b>łatwiejszego uaktualniania</b> swoich systemów Mandriva Linux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17069,9 +17077,9 @@ msgstr "\t* Elastyczne <b>planowanie czasu</b> aktualizacji."
 #: 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* Zarządzanie <b>całym systemem Mandrivalinux</b> z użyciem jednego konta."
+"\t* Zarządzanie <b>całym systemem Mandriva Linux</b> z użyciem jednego konta."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -17082,27 +17090,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 ""
 "Potrzebujesz <b>pomocy?</b>. Nasi eksperci techniczni Mandriva <b>naszej "
-"platformy wsparcia technicznego</b> udzielą pomocy: www.mandrakeexpert.com."
+"platformy wsparcia technicznego</b> udzielą pomocy: 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 ""
-"Dzięki pomocy <b>wykwalifikowanych ekspertów Mandrivalinux</b>, oszczędzisz "
+"Dzięki pomocy <b>wykwalifikowanych ekspertów Mandriva Linux</b>, oszczędzisz "
 "wiele czasu."
 
 #: 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 ""
-"W przypadku dowolnego pytania związanego z dystrybucją Mandrivalinux, masz "
+"W przypadku dowolnego pytania związanego z dystrybucją Mandriva Linux, masz "
 "możliwość zakupu zdarzeń wsparcia pod adresem <b>www.mandrakestore.pl</b>."
 
 #: share/compssUsers.pl:25
@@ -17491,15 +17499,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 ""
 "[OPCJE] [NAZWA_PROGRAMU]\n"
 "\n"
 "OPCJE:\n"
 "  --help            - wyświetla ten komunikat pomocy.\n"
-"  --report          - program powinien być jednym z narzędzi Mandrivalinux\n"
-"  --incident        - program powinien być jednym z narzędzi Mandrivalinux"
+"  --report          - program powinien być jednym z narzędzi Mandriva Linux\n"
+"  --incident        - program powinien być jednym z narzędzi Mandriva Linux"
 
 #: standalone.pm:63
 #, c-format
@@ -17553,7 +17561,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"
@@ -17567,7 +17575,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPCJE]...\n"
-"Konfigurator Serwera Terminali Mandrivalinux\n"
+"Konfigurator Serwera Terminali Mandriva Linux\n"
 "--enable         : włącza MTS\n"
 "--disable        : wyłącza MTS\n"
 "--start          : uruchamia MTS\n"
@@ -20409,13 +20417,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Narzędzie raportowania błędów Mandrivalinux"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Narzędzie raportowania błędów Mandriva Linux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Centrum Sterowania Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Centrum Sterowania Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20906,19 +20914,19 @@ msgstr "Uruchamiany przy starcie"
 #, 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 ""
 "Ten interfejs nie został jeszcze skonfigurowany.\n"
-"Uruchom druida \"Dodaj interfejs\" z Centrum Sterowania Mandrivalinux"
+"Uruchom druida \"Dodaj interfejs\" z Centrum Sterowania 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 ""
 "Nie posiadasz żadnego skonfigurowanego połączenia internetowego. Uruchom "
-"asystenta \"%s\" z Centrum Sterowania Mandrivalinux"
+"asystenta \"%s\" z Centrum Sterowania Mandriva Linux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20968,8 +20976,8 @@ msgstr "KDM (Menedżer wyświetlania KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Menedżer wyświetlania Mandrivalinux)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Menedżer wyświetlania Mandriva Linux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21273,18 +21281,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 (oryginalna wersja)\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
@@ -21860,8 +21868,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Centrum Pomocy Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Centrum Pomocy Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22522,7 +22530,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 ""
 "W komputerze nie wykryto karty dźwiękowej. Sprawdź czy obsługiwana karta "
 "jest poprawnie włożona.\n"
@@ -22531,7 +22539,7 @@ msgstr ""
 "Możesz odwiedzić bazę danych sprzętu pod adresem:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24448,7 +24456,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 ""
 "W komputerze nie wykryto karty telewizyjnej. Sprawdź czy obsługiwana karta "
 "jest poprawnie włożona.\n"
@@ -24457,7 +24465,7 @@ msgstr ""
 "Możesz odwiedzić bazę danych sprzętu pod adresem:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25178,13 +25186,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 ""
 "To jest Harddrake, narzędzie konfiguracji sprzętu %s.\n"
 "<span foreground=\"royalblue3\">Wersja:</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
@@ -25294,8 +25302,8 @@ msgstr "Zostały dokonane zmiany, wyloguj się by je zastosować"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Dzienniki narzędzi Mandrivalinux"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Dzienniki narzędzi Mandriva Linux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25819,10 +25827,10 @@ msgstr "Próba połączenia zakończona powodzeniem."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Próba połączenia zakończona niepowodzeniem.\n"
-"Sprawdź konfigurację w Centrum Sterowania Mandrivalinux."
+"Sprawdź konfigurację w Centrum Sterowania Mandriva Linux."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26704,14 +26712,14 @@ msgstr "Instalacja zakończyła się niepowodzeniem"
 #~ msgid "You've not selected any font"
 #~ msgstr "Nie wybrano żadnego fontu"
 
-#~ msgid "The Mandrivalinux 10.1 products are:"
-#~ msgstr "Produktami Mandrivalinux 10.1 są:"
+#~ msgid "The Mandriva Linux 10.1 products are:"
+#~ msgstr "Produktami Mandriva Linux 10.1 są:"
 
 #~ 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>Mandrivalinux 10.1 dla x86-64</b>, edycja Mandrivalinux dla "
+#~ "\t* <b>Mandriva Linux 10.1 dla x86-64</b>, edycja Mandriva Linux dla "
 #~ "procesorów 64-ro bitowych."
 
 #~ msgid "No browser available! Please install one"
diff --git a/perl-install/share/po/pt.po b/perl-install/share/po/pt.po
index 1b8f7ff82..500023c2e 100644
--- a/perl-install/share/po/pt.po
+++ b/perl-install/share/po/pt.po
@@ -5,9 +5,9 @@
 # translation of pt.po to Português
 # translation of pt.po to português
 #
-# Latest versions of po files are at http://www.mandrakelinux.com/l10n/pt.php3
+# Latest versions of po files are at http://www.mandrivalinux.com/l10n/pt.php3
 #
-# Copyright (C) 2000 MandrakeSoft
+# Copyright (C) 2000 Mandriva
 # Fernando Moreira <fmoreira@netc.pt>, 1999.
 # Jorge Costa <Jorgercosta@netc.pt>, 2001.
 # José JORGE <jose.jorge@oreka.com>, 2002,2003.
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-24 14:10+0100\n"
+"POT-Creation-Date: 2005-04-21 14:27+0200\n"
 "PO-Revision-Date: 2005-04-21 20:41+0100\n"
 "Last-Translator: José Melo <mmodem00@gmail.com>\n"
 "Language-Team: Português <pt@li.org>\n"
@@ -78,29 +78,29 @@ msgid "Continue without USB key"
 msgstr "Continuar sem chave USB"
 
 #: ../move/move.pm:462
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The USB key seems to have write protection enabled, but we can not safely\n"
 "unplug it now.\n"
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "A chave USB parece ter a protecção de escrita activada, mas não\n"
 "podemos desliga-la com segurança.\n"
 "\n"
 "\n"
 "Clique no botão para reiniciar o computador, desligue-a, retire a\n"
-"protecção de escrita, volte-a a ligar e, execute o Mandrake Move."
+"protecção de escrita, volte-a a ligar e, execute o Mandriva Move."
 
-#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1317
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
 msgid "Reboot"
 msgstr "Reiniciar"
 
 #: ../move/move.pm:473
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Your USB key does not have any valid Windows (FAT) partitions.\n"
 "We need one to continue (beside, it's more standard so that you\n"
@@ -110,7 +110,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "A sua chave USB não contém nenhuma partição Windows (FAT)\n"
@@ -121,14 +121,14 @@ msgstr ""
 "\n"
 "\n"
 "Pode também proceder sem uma chave USB - continuará na\n"
-"mesma a poder usar o Mandrake Move como um sistema\n"
-"operativo Mandrake normal."
+"mesma a poder usar o Mandriva Move como um sistema\n"
+"operativo Mandriva normal."
 
 #: ../move/move.pm:483
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -136,11 +136,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Não foi detectada nenhuma chave USB no seu sistema. Se ligar\n"
-"uma chave USB agora, o Mandrake Move irá ter a capacidade de\n"
+"uma chave USB agora, o Mandriva Move irá ter a capacidade de\n"
 "guardar transparentemente os dados na sua directoria pessoal\n"
 "e na configuração global do sistema, para o próximo arranque\n"
 "neste computador ou num outro. Nota: se ligar agora uma chave,\n"
@@ -148,8 +148,8 @@ msgstr ""
 "\n"
 "\n"
 "Pode também proceder sem uma chave USB - continuará a poder\n"
-"usar na mesma o Mandrake Move como um sistema operativo\n"
-"Mandrake normal."
+"usar na mesma o Mandriva Move como um sistema operativo\n"
+"Mandriva normal."
 
 #: ../move/move.pm:494
 #, c-format
@@ -190,60 +190,63 @@ msgstr "Por favor aguarde, a detectar e a configurar dispositivos..."
 
 #: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664
 #: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:227
-#: diskdrake/interactive.pm:240 diskdrake/interactive.pm:393
-#: diskdrake/interactive.pm:411 diskdrake/interactive.pm:541
-#: diskdrake/interactive.pm:546 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:183
-#: install_any.pm:1564 install_any.pm:1587 install_steps.pm:82
+#: diskdrake/interactive.pm:240 diskdrake/interactive.pm:401
+#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:555
+#: diskdrake/interactive.pm:560 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:182
+#: install_any.pm:1699 install_any.pm:1722 install_steps.pm:82
 #: install_steps_interactive.pm:38 interactive/http.pm:117
-#: interactive/http.pm:118 network/netconnect.pm:1037
-#: network/netconnect.pm:1041 network/netconnect.pm:1046
-#: network/netconnect.pm:1072 network/netconnect.pm:1141
-#: network/netconnect.pm:1145 network/netconnect.pm:1283
-#: network/netconnect.pm:1288 network/netconnect.pm:1306
-#: network/netconnect.pm:1491 printer/printerdrake.pm:238
-#: printer/printerdrake.pm:245 printer/printerdrake.pm:270
-#: printer/printerdrake.pm:416 printer/printerdrake.pm:421
-#: printer/printerdrake.pm:434 printer/printerdrake.pm:444
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:635
-#: printer/printerdrake.pm:1288 printer/printerdrake.pm:1335
-#: printer/printerdrake.pm:1372 printer/printerdrake.pm:1416
-#: printer/printerdrake.pm:1420 printer/printerdrake.pm:1434
-#: printer/printerdrake.pm:1524 printer/printerdrake.pm:1605
-#: printer/printerdrake.pm:1609 printer/printerdrake.pm:1613
-#: printer/printerdrake.pm:1662 printer/printerdrake.pm:1719
-#: printer/printerdrake.pm:1723 printer/printerdrake.pm:1737
-#: printer/printerdrake.pm:1848 printer/printerdrake.pm:1852
-#: printer/printerdrake.pm:1889 printer/printerdrake.pm:1957
-#: printer/printerdrake.pm:1975 printer/printerdrake.pm:1984
-#: printer/printerdrake.pm:1993 printer/printerdrake.pm:2004
-#: printer/printerdrake.pm:2066 printer/printerdrake.pm:2159
-#: printer/printerdrake.pm:2678 printer/printerdrake.pm:2949
-#: printer/printerdrake.pm:2955 printer/printerdrake.pm:3501
-#: printer/printerdrake.pm:3505 printer/printerdrake.pm:3509
-#: printer/printerdrake.pm:3965 printer/printerdrake.pm:4205
-#: printer/printerdrake.pm:4225 printer/printerdrake.pm:4301
-#: printer/printerdrake.pm:4366 printer/printerdrake.pm:4483
-#: standalone/drakTermServ:392 standalone/drakTermServ:753
-#: standalone/drakTermServ:760 standalone/drakTermServ:779
-#: standalone/drakTermServ:998 standalone/drakTermServ:1478
-#: standalone/drakTermServ:1483 standalone/drakTermServ:1490
-#: standalone/drakTermServ:1502 standalone/drakTermServ:1523
-#: standalone/drakauth:35 standalone/drakbackup:511 standalone/drakbackup:625
-#: standalone/drakbackup:1127 standalone/drakbackup:1160
-#: standalone/drakbackup:1671 standalone/drakbackup:1827
-#: standalone/drakbackup:2421 standalone/drakbackup:4110
-#: standalone/drakbackup:4330 standalone/drakbug:191 standalone/drakclock:124
-#: standalone/drakconnect:649 standalone/drakconnect:652
-#: standalone/drakconnect:671 standalone/drakfloppy:297
-#: standalone/drakfloppy:300 standalone/drakfloppy:306 standalone/drakfont:209
-#: standalone/drakfont:222 standalone/drakfont:258 standalone/drakfont:604
-#: standalone/draksplash:21 standalone/draksplash:501 standalone/drakxtv:107
-#: standalone/finish-install:39 standalone/logdrake:169
+#: interactive/http.pm:118 network/ndiswrapper.pm:27 network/ndiswrapper.pm:41
+#: network/ndiswrapper.pm:89 network/ndiswrapper.pm:101
+#: network/netconnect.pm:1001 network/netconnect.pm:1131
+#: network/netconnect.pm:1135 network/netconnect.pm:1139
+#: network/netconnect.pm:1144 network/netconnect.pm:1273
+#: network/netconnect.pm:1277 network/netconnect.pm:1339
+#: network/netconnect.pm:1344 network/netconnect.pm:1364
+#: network/netconnect.pm:1575 printer/printerdrake.pm:244
+#: printer/printerdrake.pm:251 printer/printerdrake.pm:276
+#: printer/printerdrake.pm:422 printer/printerdrake.pm:427
+#: printer/printerdrake.pm:440 printer/printerdrake.pm:450
+#: printer/printerdrake.pm:514 printer/printerdrake.pm:641
+#: printer/printerdrake.pm:1352 printer/printerdrake.pm:1399
+#: printer/printerdrake.pm:1436 printer/printerdrake.pm:1481
+#: printer/printerdrake.pm:1485 printer/printerdrake.pm:1499
+#: printer/printerdrake.pm:1591 printer/printerdrake.pm:1672
+#: printer/printerdrake.pm:1676 printer/printerdrake.pm:1680
+#: printer/printerdrake.pm:1729 printer/printerdrake.pm:1787
+#: printer/printerdrake.pm:1791 printer/printerdrake.pm:1805
+#: printer/printerdrake.pm:1920 printer/printerdrake.pm:1924
+#: printer/printerdrake.pm:1967 printer/printerdrake.pm:2042
+#: printer/printerdrake.pm:2060 printer/printerdrake.pm:2069
+#: printer/printerdrake.pm:2078 printer/printerdrake.pm:2089
+#: printer/printerdrake.pm:2153 printer/printerdrake.pm:2247
+#: printer/printerdrake.pm:2767 printer/printerdrake.pm:3042
+#: printer/printerdrake.pm:3048 printer/printerdrake.pm:3596
+#: printer/printerdrake.pm:3600 printer/printerdrake.pm:3604
+#: printer/printerdrake.pm:4064 printer/printerdrake.pm:4309
+#: printer/printerdrake.pm:4329 printer/printerdrake.pm:4406
+#: printer/printerdrake.pm:4472 printer/printerdrake.pm:4592
+#: standalone/drakTermServ:392 standalone/drakTermServ:746
+#: standalone/drakTermServ:753 standalone/drakTermServ:772
+#: standalone/drakTermServ:991 standalone/drakTermServ:1467
+#: standalone/drakTermServ:1472 standalone/drakTermServ:1479
+#: standalone/drakTermServ:1491 standalone/drakTermServ:1512
+#: standalone/drakauth:36 standalone/drakbackup:511 standalone/drakbackup:625
+#: standalone/drakbackup:1126 standalone/drakbackup:1159
+#: standalone/drakbackup:1674 standalone/drakbackup:1830
+#: standalone/drakbackup:2429 standalone/drakbackup:4117
+#: standalone/drakbackup:4337 standalone/drakclock:124
+#: standalone/drakconnect:683 standalone/drakconnect:687
+#: standalone/drakconnect:692 standalone/drakconnect:707
+#: standalone/drakfloppy:297 standalone/drakfloppy:300
+#: standalone/drakfloppy:306 standalone/drakfont:209 standalone/drakfont:222
+#: standalone/drakfont:260 standalone/draksplash:21 standalone/draksplash:507
+#: standalone/drakxtv:107 standalone/finish-install:39 standalone/logdrake:169
 #: standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59
 #: standalone/scannerdrake:202 standalone/scannerdrake:261
 #: standalone/scannerdrake:715 standalone/scannerdrake:726
 #: standalone/scannerdrake:865 standalone/scannerdrake:876
 #: standalone/scannerdrake:946 wizards.pm:95 wizards.pm:99 wizards.pm:121
+#: wizards2.pm:95 wizards2.pm:99 wizards2.pm:121
 #, c-format
 msgid "Error"
 msgstr "Erro"
@@ -263,7 +266,7 @@ msgid "An error occurred"
 msgstr "Ocorreu um erro"
 
 #: ../move/move.pm:666
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "An error occurred:\n"
 "\n"
@@ -272,7 +275,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -287,7 +290,7 @@ msgstr ""
 "%s\n"
 "\n"
 "Isto pode vir de uma configuração corrompida no sistema\n"
-"de ficheiros da chave USB, nesse caso se a remover e reiniciar o Mandrake "
+"de ficheiros da chave USB, nesse caso se a remover e reiniciar o Mandriva "
 "Move o problema pode ficar resolvido.\n"
 "Para o fazer, clique no botão correspondente.\n"
 "\n"
@@ -323,8 +326,8 @@ msgid "No CDROM support"
 msgstr "Sem suporte CD-ROM"
 
 #: ../move/tree/mdk_totem:76 diskdrake/hd_gtk.pm:95
-#: diskdrake/interactive.pm:1020 diskdrake/interactive.pm:1030
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1038 diskdrake/interactive.pm:1048
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Read carefully!"
 msgstr "Leia com atenção!"
@@ -460,7 +463,8 @@ msgstr "Xorg %s com aceleração hardware 3D"
 #: Xconfig/card.pm:411
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with Xorg %s."
-msgstr "A sua placa pode ter suporte para aceleração hardware 3D com o Xorg %s."
+msgstr ""
+"A sua placa pode ter suporte para aceleração hardware 3D com o Xorg %s."
 
 #: Xconfig/card.pm:417
 #, c-format
@@ -476,15 +480,15 @@ msgstr ""
 "A sua placa pode ter suporte para aceleração hardware 3D com o Xorg%s,\n"
 "ATENÇÃO ESTE SUPORTE É EXPERIMENTAL E PODE BLOQUEAR O COMPUTADOR."
 
-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:117 any.pm:914
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:921
 #, c-format
 msgid "Custom"
 msgstr "Personalizado"
 
 #: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14
-#: install_steps_interactive.pm:86 printer/printerdrake.pm:737
-#: printer/printerdrake.pm:4296 printer/printerdrake.pm:4742
-#: standalone/draksplash:120 standalone/logdrake:174 standalone/net_applet:183
+#: install_steps_interactive.pm:86 printer/printerdrake.pm:744
+#: printer/printerdrake.pm:4401 printer/printerdrake.pm:4853
+#: standalone/draksplash:120 standalone/logdrake:174 standalone/net_applet:229
 #: standalone/scannerdrake:477
 #, c-format
 msgid "Quit"
@@ -495,12 +499,12 @@ msgstr "Sair"
 msgid "Graphic Card"
 msgstr "Placa Gráfica"
 
-#: Xconfig/main.pm:120 Xconfig/monitor.pm:111
+#: Xconfig/main.pm:120 Xconfig/monitor.pm:110
 #, c-format
 msgid "Monitor"
 msgstr "Monitor"
 
-#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:221
+#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:288
 #, c-format
 msgid "Resolution"
 msgstr "Resolução"
@@ -510,9 +514,9 @@ msgstr "Resolução"
 msgid "Test"
 msgstr "Teste"
 
-#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:437
+#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:445
 #: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:80
-#: standalone/drakfont:493 standalone/drakfont:555
+#: standalone/drakfont:491 standalone/drakfont:553
 #, c-format
 msgid "Options"
 msgstr "Opções"
@@ -535,38 +539,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:112
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Escolha um monitor para a cabeça #%d"
 
-#: Xconfig/monitor.pm:112
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Escolha um monitor"
 
-#: Xconfig/monitor.pm:118
+#: Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: Xconfig/monitor.pm:119 mouse.pm:49
+#: Xconfig/monitor.pm:118 mouse.pm:49
 #, c-format
 msgid "Generic"
 msgstr "Genérico"
 
-#: Xconfig/monitor.pm:120 standalone/drakconnect:569 standalone/harddrake2:52
-#: standalone/harddrake2:86
+#: Xconfig/monitor.pm:119 standalone/drakconnect:602 standalone/harddrake2:53
+#: standalone/harddrake2:87
 #, c-format
 msgid "Vendor"
 msgstr "Marca"
 
-#: Xconfig/monitor.pm:130
+#: Xconfig/monitor.pm:129
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr "Verificação Plug'n Play falhada. Por favor escolha o monitor correcto"
 
-#: Xconfig/monitor.pm:135
+#: Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -590,12 +594,12 @@ msgstr ""
 "que esteja além das capacidades do seu monitor: pode danificar seu monitor.\n"
 " Se tiver dúvidas, escolha definições conservadoras."
 
-#: Xconfig/monitor.pm:142
+#: Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Taxa de refrescamento horizontal"
 
-#: Xconfig/monitor.pm:143
+#: Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Taxa de refrescamento vertical"
@@ -620,60 +624,71 @@ msgstr "65 mil cores (16 bits)"
 msgid "16 million colors (24 bits)"
 msgstr "16 milhões de cores (24 bits)"
 
-#: Xconfig/resolution_and_depth.pm:133
+#: Xconfig/resolution_and_depth.pm:129
 #, c-format
 msgid "Resolutions"
 msgstr "Resoluções"
 
-#: Xconfig/resolution_and_depth.pm:270
+#: Xconfig/resolution_and_depth.pm:310 diskdrake/hd_gtk.pm:339
+#: install_steps_gtk.pm:288 mouse.pm:168 services.pm:162
+#: standalone/drakbackup:1612 standalone/drakperm:251
+#, c-format
+msgid "Other"
+msgstr "Outros"
+
+#: Xconfig/resolution_and_depth.pm:359
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Escolha a resolução e a profundidade da cor"
 
-#: Xconfig/resolution_and_depth.pm:271
+#: Xconfig/resolution_and_depth.pm:360
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Placa Gráfica: %s"
 
-#: Xconfig/resolution_and_depth.pm:285 interactive.pm:424
-#: interactive/gtk.pm:768 interactive/http.pm:103 interactive/http.pm:156
-#: interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39
+#: Xconfig/resolution_and_depth.pm:374 interactive.pm:433
+#: interactive/gtk.pm:767 interactive/http.pm:103 interactive/http.pm:156
+#: interactive/newt.pm:319 interactive/newt.pm:421 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
 #: standalone/drakTermServ:199 standalone/drakTermServ:490
-#: standalone/drakbackup:3967 standalone/drakbackup:4027
-#: standalone/drakbackup:4071 standalone/drakconnect:165
-#: standalone/drakconnect:849 standalone/drakconnect:936
-#: standalone/drakconnect:1035 standalone/drakfont:576 standalone/drakroam:388
-#: standalone/drakups:208 standalone/net_monitor:344 ugtk2.pm:409 ugtk2.pm:506
-#: ugtk2.pm:900 ugtk2.pm:923
+#: standalone/drakbackup:1376 standalone/drakbackup:3974
+#: standalone/drakbackup:4034 standalone/drakbackup:4078
+#: standalone/drakconnect:166 standalone/drakconnect:885
+#: standalone/drakconnect:972 standalone/drakconnect:1071
+#: standalone/drakfont:574 standalone/drakfont:586 standalone/drakperm:310
+#: standalone/drakroam:387 standalone/draksplash:167 standalone/drakups:212
+#: standalone/net_monitor:345 ugtk2.pm:409 ugtk2.pm:506 ugtk2.pm:909
+#: ugtk2.pm:932
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: Xconfig/resolution_and_depth.pm:285 diskdrake/smbnfs_gtk.pm:81 help.pm:89
-#: help.pm:444 install_steps_gtk.pm:480 install_steps_interactive.pm:422
-#: install_steps_interactive.pm:826 interactive.pm:425 interactive/gtk.pm:772
-#: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316
-#: interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3579
-#: standalone/drakautoinst:217 standalone/drakbackup:3893
-#: standalone/drakbackup:3897 standalone/drakbackup:3955
-#: standalone/drakconnect:164 standalone/drakconnect:934
-#: standalone/drakconnect:1034 standalone/drakfont:668 standalone/drakfont:745
-#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:343
-#: ugtk2.pm:403 ugtk2.pm:504 ugtk2.pm:513 ugtk2.pm:900
+#: Xconfig/resolution_and_depth.pm:374 diskdrake/smbnfs_gtk.pm:81 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:484 install_steps_interactive.pm:422
+#: install_steps_interactive.pm:827 interactive.pm:434 interactive/gtk.pm:771
+#: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:318
+#: interactive/newt.pm:425 interactive/stdio.pm:39 interactive/stdio.pm:142
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3676
+#: standalone/drakautoinst:217 standalone/drakbackup:1376
+#: standalone/drakbackup:3900 standalone/drakbackup:3904
+#: standalone/drakbackup:3962 standalone/drakconnect:165
+#: standalone/drakconnect:970 standalone/drakconnect:1070
+#: standalone/drakfont:586 standalone/drakfont:664 standalone/drakfont:741
+#: standalone/drakperm:310 standalone/draksplash:167 standalone/drakups:219
+#: standalone/logdrake:174 standalone/net_monitor:344 ugtk2.pm:403
+#: ugtk2.pm:504 ugtk2.pm:513 ugtk2.pm:909
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: Xconfig/resolution_and_depth.pm:285 diskdrake/hd_gtk.pm:153
-#: install_steps_gtk.pm:228 install_steps_gtk.pm:629 interactive.pm:519
-#: interactive/gtk.pm:638 interactive/gtk.pm:640 standalone/drakTermServ:284
-#: standalone/drakbackup:3889 standalone/drakbug:104
-#: standalone/drakconnect:160 standalone/drakconnect:245
-#: standalone/drakfont:511 standalone/drakperm:134 standalone/draksec:336
+#: Xconfig/resolution_and_depth.pm:374 diskdrake/hd_gtk.pm:153
+#: install_steps_gtk.pm:232 install_steps_gtk.pm:633 interactive.pm:528
+#: interactive/gtk.pm:637 interactive/gtk.pm:639 standalone/drakTermServ:284
+#: standalone/drakbackup:3896 standalone/drakbug:104
+#: standalone/drakconnect:161 standalone/drakconnect:246
+#: standalone/drakfont:509 standalone/drakperm:134 standalone/draksec:336
 #: standalone/draksec:338 standalone/draksec:356 standalone/draksec:358
-#: ugtk2.pm:1031 ugtk2.pm:1032
+#: ugtk2.pm:1041 ugtk2.pm:1042
 #, c-format
 msgid "Help"
 msgstr "Ajuda"
@@ -811,7 +826,7 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "Que norma usa a sua TV?"
 
-#: Xconfig/xfree.pm:571
+#: Xconfig/xfree.pm:627
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
@@ -820,20 +835,20 @@ msgstr ""
 "_:proporção de aspecto estranho\n"
 "outro"
 
-#: any.pm:140 harddrake/sound.pm:191 install_any.pm:652 interactive.pm:462
-#: standalone/drakconnect:167 standalone/drakconnect:613 standalone/draksec:68
-#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:231
+#: any.pm:143 harddrake/sound.pm:191 interactive.pm:471 pkgs.pm:481
+#: standalone/drakconnect:168 standalone/drakconnect:646 standalone/draksec:68
+#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:236
 #: standalone/service_harddrake:204
 #, c-format
 msgid "Please wait"
 msgstr "Por favor aguarde"
 
-#: any.pm:140
+#: any.pm:143
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "Instalação do carregador de arranque em progresso"
 
-#: any.pm:151
+#: any.pm:154
 #, c-format
 msgid ""
 "LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
@@ -850,12 +865,13 @@ msgstr ""
 "\n"
 "Atribuir um novo ID de Volume?"
 
-#: any.pm:162
+#: any.pm:165
 #, c-format
 msgid "Installation of bootloader failed. The following error occurred:"
-msgstr "Instalação do carregador de arranque falhada. Ocorreram os seguintes erros:"
+msgstr ""
+"Instalação do carregador de arranque falhada. Ocorreram os seguintes erros:"
 
-#: any.pm:168
+#: any.pm:171
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
@@ -873,7 +889,7 @@ msgstr ""
 " Depois digite: shut-down\n"
 " No próximo arranque deve ver a prompt do carregador de arranque."
 
-#: any.pm:206
+#: any.pm:209
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -888,256 +904,257 @@ msgstr ""
 "\n"
 "Em que drive está a arrancar?"
 
-#: any.pm:229 help.pm:739
+#: any.pm:232 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "Primeiro sector do disco (MBR)"
 
-#: any.pm:230
+#: any.pm:233
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Primeiro sector da partição de raiz"
 
-#: any.pm:232
+#: any.pm:235
 #, c-format
 msgid "On Floppy"
 msgstr "Na Disquete"
 
-#: any.pm:234 help.pm:739 printer/printerdrake.pm:3962
+#: any.pm:237 help.pm:739 printer/printerdrake.pm:4061
 #, c-format
 msgid "Skip"
 msgstr "Saltar"
 
-#: any.pm:238
+#: any.pm:241
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "Instalação do LILO/grub"
 
-#: any.pm:239
+#: any.pm:242
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "Onde deseja instalar o carregador de arranque?"
 
-#: any.pm:264 standalone/drakboot:307
+#: any.pm:268 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Configuração de Estilo do Arranque"
 
-#: any.pm:266 any.pm:298
+#: any.pm:270 any.pm:302
 #, c-format
 msgid "Bootloader main options"
 msgstr "Principais opções do carregador de arranque"
 
-#: any.pm:270
+#: any.pm:274
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "Indicar o tamanho da RAM em MB"
 
-#: any.pm:272
+#: any.pm:276
 #, c-format
-msgid "Option ``Restrict command line options'' is of no use without a password"
+msgid ""
+"Option ``Restrict command line options'' is of no use without a password"
 msgstr "Opção ``Restringir opções da linha de comando'' não tem uso sem senha"
 
-#: any.pm:273 any.pm:606 authentication.pm:176
+#: any.pm:277 any.pm:610 authentication.pm:182
 #, c-format
 msgid "The passwords do not match"
 msgstr "As senhas não coincidem"
 
-#: any.pm:273 any.pm:606 authentication.pm:176 diskdrake/interactive.pm:1270
+#: any.pm:277 any.pm:610 authentication.pm:182 diskdrake/interactive.pm:1291
 #, c-format
 msgid "Please try again"
 msgstr "Por favor tente novamente"
 
-#: any.pm:278 any.pm:301
+#: any.pm:282 any.pm:305
 #, c-format
 msgid "Bootloader to use"
 msgstr "Carregador de arranque a usar"
 
-#: any.pm:280 any.pm:303
+#: any.pm:284 any.pm:307
 #, c-format
 msgid "Boot device"
 msgstr "Dispositivo de arranque"
 
-#: any.pm:282
+#: any.pm:286
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Atraso antes de arrancar a imagem predefinida"
 
-#: any.pm:283
+#: any.pm:287
 #, c-format
 msgid "Enable ACPI"
 msgstr "Activar ACPI"
 
-#: any.pm:285
+#: any.pm:289
 #, c-format
 msgid "Force no APIC"
 msgstr "Forçar sem APIC"
 
-#: any.pm:287
+#: any.pm:291
 #, c-format
 msgid "Force No Local APIC"
 msgstr "Forçar Sem APIC Local"
 
-#: any.pm:289 any.pm:633 authentication.pm:181 diskdrake/smbnfs_gtk.pm:180
-#: network/netconnect.pm:633 printer/printerdrake.pm:1596
-#: printer/printerdrake.pm:1716 standalone/drakbackup:1653
-#: standalone/drakbackup:3495 standalone/drakups:295
+#: any.pm:293 any.pm:637 authentication.pm:187 diskdrake/smbnfs_gtk.pm:180
+#: network/netconnect.pm:680 printer/printerdrake.pm:1663
+#: printer/printerdrake.pm:1784 standalone/drakbackup:1656
+#: standalone/drakbackup:3503 standalone/drakups:299
 #, c-format
 msgid "Password"
 msgstr "Senha"
 
-#: any.pm:290 any.pm:634 authentication.pm:182
+#: any.pm:294 any.pm:638 authentication.pm:188
 #, c-format
 msgid "Password (again)"
 msgstr "Senha (novamente)"
 
-#: any.pm:291
+#: any.pm:295
 #, c-format
 msgid "Restrict command line options"
 msgstr "Restringir opções da linha de comando"
 
-#: any.pm:291
+#: any.pm:295
 #, c-format
 msgid "restrict"
 msgstr "restringir"
 
-#: any.pm:293
+#: any.pm:297
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Limpar /tmp a cada arranque"
 
-#: any.pm:294
+#: any.pm:298
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Tamanho da RAM exacto se necessário (%d MB encontrados)"
 
-#: any.pm:302
+#: any.pm:306
 #, c-format
 msgid "Init Message"
 msgstr "Mensagem Init"
 
-#: any.pm:304
+#: any.pm:308
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Atraso Open Firmware"
 
-#: any.pm:305
+#: any.pm:309
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Intervalo de Arranque do Kernel"
 
-#: any.pm:306
+#: any.pm:310
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "Activar Arranque de CD?"
 
-#: any.pm:307
+#: any.pm:311
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "Activar Arranque OF?"
 
-#: any.pm:308
+#: any.pm:312
 #, c-format
 msgid "Default OS?"
 msgstr "OS predefinido?"
 
-#: any.pm:361
+#: any.pm:365
 #, c-format
 msgid "Image"
 msgstr "Imagem"
 
-#: any.pm:362 any.pm:372
+#: any.pm:366 any.pm:376
 #, c-format
 msgid "Root"
 msgstr "Root"
 
-#: any.pm:363 any.pm:385
+#: any.pm:367 any.pm:389
 #, c-format
 msgid "Append"
 msgstr "Adicionar"
 
-#: any.pm:365 standalone/drakboot:309 standalone/drakboot:313
+#: any.pm:369 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "Modo Vídeo"
 
-#: any.pm:367
+#: any.pm:371
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:368
+#: any.pm:372
 #, c-format
 msgid "Network profile"
 msgstr "Perfil de rede"
 
-#: any.pm:377 any.pm:382 any.pm:384
+#: any.pm:381 any.pm:386 any.pm:388
 #, c-format
 msgid "Label"
 msgstr "Rótulo"
 
-#: any.pm:379 any.pm:389 harddrake/v4l.pm:275 standalone/drakfloppy:84
+#: any.pm:383 any.pm:393 harddrake/v4l.pm:275 standalone/drakfloppy:84
 #: standalone/drakfloppy:90 standalone/draksec:52
 #, c-format
 msgid "Default"
 msgstr "Predefinido"
 
-#: any.pm:386
+#: any.pm:390
 #, c-format
 msgid "Initrd-size"
 msgstr "Tamanho Initrd"
 
-#: any.pm:388
+#: any.pm:392
 #, c-format
 msgid "NoVideo"
 msgstr "Sem Vídeo"
 
-#: any.pm:399
+#: any.pm:403
 #, c-format
 msgid "Empty label not allowed"
 msgstr "Não é permitido um rótulo vazio"
 
-#: any.pm:400
+#: any.pm:404
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Deve especificar uma imagem Kernel"
 
-#: any.pm:400
+#: any.pm:404
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Deve especificar uma partição raiz"
 
-#: any.pm:401
+#: any.pm:405
 #, c-format
 msgid "This label is already used"
 msgstr "Este rótulo já está a ser usado"
 
-#: any.pm:415
+#: any.pm:419
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Que tipo de entrada deseja adicionar?"
 
-#: any.pm:416
+#: any.pm:420
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:416
+#: any.pm:420
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "Outro OS (SunOS...)"
 
-#: any.pm:417
+#: any.pm:421
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Outro OS (MacOS...)"
 
-#: any.pm:417
+#: any.pm:421
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "Outro OS (Windows...)"
 
-#: any.pm:445
+#: any.pm:449
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1146,72 +1163,74 @@ msgstr ""
 "Aqui estão as entradas do menu de arranque até agora.\n"
 "Pode criar entradas adicionais ou mudar as existentes."
 
-#: any.pm:592
+#: any.pm:596
 #, c-format
 msgid "access to X programs"
 msgstr "acesso aos programas X"
 
-#: any.pm:593
+#: any.pm:597
 #, c-format
 msgid "access to rpm tools"
 msgstr "acesso às ferramentas rpm"
 
-#: any.pm:594
+#: any.pm:598
 #, c-format
 msgid "allow \"su\""
 msgstr "permitir \"su\""
 
-#: any.pm:595
+#: any.pm:599
 #, c-format
 msgid "access to administrative files"
 msgstr "acesso aos ficheiros administrativos"
 
-#: any.pm:596
+#: any.pm:600
 #, c-format
 msgid "access to network tools"
 msgstr "acesso às ferramentas da rede"
 
-#: any.pm:597
+#: any.pm:601
 #, c-format
 msgid "access to compilation tools"
 msgstr "acesso às ferramentas de compilação"
 
-#: any.pm:602
+#: any.pm:606
 #, c-format
 msgid "(already added %s)"
 msgstr "(já adicionado %s)"
 
-#: any.pm:607
+#: any.pm:611
 #, c-format
 msgid "This password is too simple"
 msgstr "Essa senha é demasiado simples"
 
-#: any.pm:608
+#: any.pm:612
 #, c-format
 msgid "Please give a user name"
 msgstr "Por favor indique um nome de utilizador"
 
-#: any.pm:609
+#: any.pm:613
 #, c-format
-msgid "The user name must contain only lower cased letters, numbers, `-' and `_'"
-msgstr "O nome de utilizador deve conter apenas letras minúsculas, números, `-' e `_'"
+msgid ""
+"The user name must contain only lower cased letters, numbers, `-' and `_'"
+msgstr ""
+"O nome de utilizador deve conter apenas letras minúsculas, números, `-' e `_'"
 
-#: any.pm:610
+#: any.pm:614
 #, c-format
 msgid "The user name is too long"
 msgstr "O nome de utilizador é demasiado longo"
 
-#: any.pm:611
+#: any.pm:615
 #, c-format
 msgid "This user name has already been added"
 msgstr "Este nome de utilizador já foi adicionado"
 
-#: any.pm:615
+#: any.pm:619
 #, c-format
 msgid "Add user"
 msgstr "Adicionar utilizador"
 
-#: any.pm:616
+#: any.pm:620
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1220,140 +1239,160 @@ msgstr ""
 "Introduza um utilizador\n"
 "%s"
 
-#: any.pm:619 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157
+#: any.pm:623 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157
 #: diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530
-#: interactive/http.pm:151 printer/printerdrake.pm:191
-#: printer/printerdrake.pm:376 printer/printerdrake.pm:4742
-#: standalone/drakbackup:2708 standalone/scannerdrake:668
+#: interactive/http.pm:151 printer/printerdrake.pm:197
+#: printer/printerdrake.pm:382 printer/printerdrake.pm:4853
+#: standalone/drakbackup:2716 standalone/scannerdrake:668
 #: standalone/scannerdrake:818
 #, c-format
 msgid "Done"
 msgstr "Pronto"
 
-#: any.pm:620 help.pm:51
+#: any.pm:624 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "Aceitar utilizador"
 
-#: any.pm:631
+#: any.pm:635
 #, c-format
 msgid "Real name"
 msgstr "Nome real"
 
-#: any.pm:632 standalone/drakbackup:1648
+#: any.pm:636 standalone/drakbackup:1651
 #, c-format
 msgid "Login name"
 msgstr "Nome de utilizador"
 
-#: any.pm:635
+#: any.pm:639
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: any.pm:637
+#: any.pm:641
 #, c-format
 msgid "Icon"
 msgstr "Ícone"
 
-#: any.pm:684 security/l10n.pm:14
+#: any.pm:688 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Autologin"
 
-#: any.pm:685
+#: any.pm:689
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
-msgstr "Posso configurar o computador para ligar automaticamente um utilizador."
+msgstr ""
+"Posso configurar o computador para ligar automaticamente um utilizador."
 
-#: any.pm:686 help.pm:51
+#: any.pm:690 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Quer usar esta opção?"
 
-#: any.pm:687
+#: any.pm:690 help.pm:180 help.pm:285 help.pm:444 install_any.pm:887
+#: interactive.pm:158 modules/interactive.pm:71 printer/printerdrake.pm:743
+#: standalone/drakbackup:2516 standalone/drakgw:287 standalone/drakgw:288
+#: standalone/drakgw:296 standalone/drakgw:306 standalone/draksec:55
+#: standalone/harddrake2:310 standalone/net_applet:309 ugtk2.pm:908
+#: wizards.pm:156 wizards2.pm:158
+#, c-format
+msgid "Yes"
+msgstr "Sim"
+
+#: any.pm:690 help.pm:180 help.pm:285 help.pm:313 help.pm:444
+#: install_any.pm:887 interactive.pm:158 modules/interactive.pm:71
+#: standalone/drakbackup:2516 standalone/draksec:54 standalone/harddrake2:311
+#: standalone/net_applet:305 ugtk2.pm:908 wizards.pm:156 wizards2.pm:158
+#, c-format
+msgid "No"
+msgstr "Não"
+
+#: any.pm:692
 #, c-format
 msgid "Choose the default user:"
 msgstr "Escolha o utilizador predefinido:"
 
-#: any.pm:688
+#: any.pm:693
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Escolha o gestor de janelas a executar:"
 
-#: any.pm:700
+#: any.pm:706
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Por favor escolha a linguagem a usar."
 
-#: any.pm:701
+#: any.pm:707
 #, c-format
 msgid "Language choice"
 msgstr "Escolha da língua"
 
-#: any.pm:727
-#, c-format
+#: any.pm:733
+#, fuzzy, c-format
 msgid ""
-"Mandrakelinux 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 ""
-"O Mandrakelinux suporta várias línguas. Seleccione as\n"
+"O Mandriva Linux suporta várias línguas. Seleccione as\n"
 "linguagens que deseja instalar. Estas estarão disponíveis\n"
 "quando terminar a instalação e reiniciar o seu sistema."
 
-#: any.pm:746 help.pm:647
+#: any.pm:752 any.pm:773 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Usar Unicode por omissão"
 
-#: any.pm:747 help.pm:647
+#: any.pm:753 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "Todas as línguas"
 
-#: any.pm:786 help.pm:566 help.pm:855 install_steps_interactive.pm:946
+#: any.pm:794 help.pm:566 help.pm:855 install_steps_interactive.pm:947
 #, c-format
 msgid "Country / Region"
 msgstr "País / Região"
 
-#: any.pm:787
+#: any.pm:795
 #, c-format
 msgid "Please choose your country."
 msgstr "Por favor escolha o seu país."
 
-#: any.pm:789
+#: any.pm:797
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Aqui está a lista completa dos países disponíveis"
 
-#: any.pm:790
+#: any.pm:798
 #, c-format
 msgid "Other Countries"
 msgstr "Outros Países"
 
-#: any.pm:798
+#: any.pm:806
 #, c-format
 msgid "Input method:"
 msgstr "Método de entrada:"
 
-#: any.pm:799 install_any.pm:388 network/netconnect.pm:323
-#: network/netconnect.pm:328 printer/printerdrake.pm:99
-#: printer/printerdrake.pm:2111
+#: any.pm:807 install_any.pm:422 network/netconnect.pm:181
+#: network/netconnect.pm:372 network/netconnect.pm:377
+#: network/netconnect.pm:1330 printer/printerdrake.pm:105
+#: printer/printerdrake.pm:2199
 #, c-format
 msgid "None"
 msgstr "Nenhum"
 
-#: any.pm:914
+#: any.pm:921
 #, c-format
 msgid "No sharing"
 msgstr "Não partilhar"
 
-#: any.pm:914
+#: any.pm:921
 #, c-format
 msgid "Allow all users"
 msgstr "Permitir todos os utilizadores"
 
-#: any.pm:918
+#: any.pm:925
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1368,7 +1407,7 @@ msgstr ""
 "\n"
 "\"Personalizado\" permite escolher a cada utilizador.\n"
 
-#: any.pm:930
+#: any.pm:937
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
@@ -1377,7 +1416,7 @@ msgstr ""
 "NFS: o sistema de partilha de ficheiros tradicional do Unix, com menos "
 "suporte em Mac e Windows."
 
-#: any.pm:933
+#: any.pm:940
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
@@ -1386,27 +1425,28 @@ msgstr ""
 "SMB: um sistema de partilha de ficheiros usado pelo Windows, Mac OS X e "
 "muitos sistemas Linux modernos."
 
-#: any.pm:941
+#: any.pm:948
 #, c-format
-msgid "You can export using NFS or SMB. Please select which you would like to use."
+msgid ""
+"You can export using NFS or SMB. Please select which you would like to use."
 msgstr "Pode exportar com NFS ou SMB. Por favor escolha qual deseja usar."
 
-#: any.pm:966
+#: any.pm:973
 #, c-format
 msgid "Launch userdrake"
 msgstr "Executar userdrake"
 
-#: any.pm:966 printer/printerdrake.pm:3802 printer/printerdrake.pm:3805
-#: printer/printerdrake.pm:3806 printer/printerdrake.pm:3807
-#: printer/printerdrake.pm:5036 standalone/drakTermServ:294
-#: standalone/drakbackup:4089 standalone/drakbug:126 standalone/drakfont:499
-#: standalone/drakfont:595 standalone/net_monitor:123
+#: any.pm:973 printer/printerdrake.pm:3900 printer/printerdrake.pm:3903
+#: printer/printerdrake.pm:3904 printer/printerdrake.pm:3905
+#: printer/printerdrake.pm:5162 standalone/drakTermServ:294
+#: standalone/drakbackup:4096 standalone/drakbug:126 standalone/drakfont:497
+#: standalone/drakroam:234 standalone/net_monitor:123
 #: standalone/printerdrake:547
 #, c-format
 msgid "Close"
 msgstr "Fechar"
 
-#: any.pm:968
+#: any.pm:975
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1415,59 +1455,60 @@ msgstr ""
 "A partilha do utilizador normal usa o grupo \"fileshare\". \n"
 "Pode usar o userdrake para adicionar um utilizador a este grupo."
 
-#: authentication.pm:16
+#: authentication.pm:24
 #, c-format
 msgid "Local file"
 msgstr "Ficheiro local"
 
-#: authentication.pm:17
+#: authentication.pm:25
 #, c-format
 msgid "LDAP"
 msgstr "LDAP"
 
-#: authentication.pm:18
+#: authentication.pm:26
 #, c-format
 msgid "NIS"
 msgstr "NIS"
 
-#: authentication.pm:19
+#: authentication.pm:27
 #, c-format
 msgid "Smart Card"
 msgstr "Cartão Smart"
 
-#: authentication.pm:20 authentication.pm:148
+#: authentication.pm:28 authentication.pm:153
 #, c-format
 msgid "Windows Domain"
 msgstr "Domínio Windows"
 
-#: authentication.pm:21
+#: authentication.pm:29
 #, c-format
 msgid "Active Directory with SFU"
 msgstr "Directório Activo com SFU"
 
-#: authentication.pm:22
+#: authentication.pm:30
 #, c-format
 msgid "Active Directory with Winbind"
 msgstr "Directório Activo com Winbind"
 
-#: authentication.pm:51
+#: authentication.pm:56
 #, c-format
 msgid "Local file:"
 msgstr "Ficheiro local:"
 
-#: authentication.pm:51
+#: authentication.pm:56
 #, c-format
-msgid "Use local for all authentication and information user tell in local file"
+msgid ""
+"Use local for all authentication and information user tell in local file"
 msgstr ""
 "Usar local para todas as autenticações e informações dadas pelo utilizador "
 "no ficheiro local"
 
-#: authentication.pm:52
+#: authentication.pm:57
 #, c-format
 msgid "LDAP:"
 msgstr "LDAP:"
 
-#: authentication.pm:52
+#: authentication.pm:57
 #, c-format
 msgid ""
 "Tells your computer to use LDAP for some or all authentication. LDAP "
@@ -1477,26 +1518,26 @@ msgstr ""
 "autenticações. O LDAP consolida certos tipos de informação na sua "
 "organização."
 
-#: authentication.pm:53
+#: authentication.pm:58
 #, c-format
 msgid "NIS:"
 msgstr "NIS:"
 
-#: authentication.pm:53
+#: authentication.pm:58
 #, c-format
 msgid ""
 "Allows you to run a group of computers in the same Network Information "
 "Service domain with a common password and group file."
 msgstr ""
-"Permite-lhe correr um grupo de computadores no mesmo domínio de Serviços "
-"de Informação de Rede com uma senha comum e um ficheiro de grupo."
+"Permite-lhe correr um grupo de computadores no mesmo domínio de Serviços de "
+"Informação de Rede com uma senha comum e um ficheiro de grupo."
 
-#: authentication.pm:54
+#: authentication.pm:59
 #, c-format
 msgid "Windows Domain:"
 msgstr "Domínio Windows:"
 
-#: authentication.pm:54
+#: authentication.pm:59
 #, c-format
 msgid ""
 "Winbind allows the system to retrieve information and authenticate users in "
@@ -1505,116 +1546,117 @@ msgstr ""
 "O Winbind permite ao sistema recuperar informações e autenticar utilizadores "
 "num domínio Windows."
 
-#: authentication.pm:55
+#: authentication.pm:60
 #, c-format
 msgid "Active Directory with SFU:"
 msgstr "Directório Activo com SFU:"
 
-#: authentication.pm:55 authentication.pm:56
+#: authentication.pm:60 authentication.pm:61
 #, c-format
-msgid "Kerberos is a secure system for providing network authentication services."
+msgid ""
+"Kerberos is a secure system for providing network authentication services."
 msgstr ""
-"Kerberos é um sistema seguro que providencia serviços de autenticação "
-"na rede."
+"Kerberos é um sistema seguro que providencia serviços de autenticação na "
+"rede."
 
-#: authentication.pm:56
+#: authentication.pm:61
 #, c-format
 msgid "Active Directory with Winbind:"
 msgstr "Directório Activo com Winbind:"
 
-#: authentication.pm:81
+#: authentication.pm:86
 #, c-format
 msgid "Authentication LDAP"
 msgstr "Autenticação LDAP"
 
-#: authentication.pm:82
+#: authentication.pm:87
 #, c-format
 msgid "LDAP Base dn"
 msgstr "dn de base LDAP"
 
-#: authentication.pm:83 share/compssUsers.pl:101
+#: authentication.pm:88 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
-#: authentication.pm:96 fsedit.pm:21
+#: authentication.pm:101 fsedit.pm:21
 #, c-format
 msgid "simple"
 msgstr "simples"
 
-#: authentication.pm:97
+#: authentication.pm:102
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: authentication.pm:98
+#: authentication.pm:103
 #, c-format
 msgid "SSL"
 msgstr "SSL"
 
-#: authentication.pm:99
+#: authentication.pm:104
 #, c-format
 msgid "security layout (SASL/Kerberos)"
 msgstr "disposição de segurança (SASL/Kerberos)"
 
-#: authentication.pm:106 authentication.pm:144
+#: authentication.pm:111 authentication.pm:149
 #, c-format
 msgid "Authentication Active Directory"
 msgstr "Autenticação do Directório Activo"
 
-#: authentication.pm:107 authentication.pm:146 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:112 authentication.pm:151 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr "Domínio"
 
-#: authentication.pm:109 diskdrake/dav.pm:63 help.pm:146
-#: printer/printerdrake.pm:135 share/compssUsers.pl:81
+#: authentication.pm:114 diskdrake/dav.pm:63 help.pm:146
+#: printer/printerdrake.pm:141 share/compssUsers.pl:81
 #: standalone/drakTermServ:269
 #, c-format
 msgid "Server"
 msgstr "Servidor"
 
-#: authentication.pm:110
+#: authentication.pm:115
 #, c-format
 msgid "LDAP users database"
 msgstr "Base de Dados dos utilizadores LDAP"
 
-#: authentication.pm:111
+#: authentication.pm:116
 #, c-format
 msgid "Use Anonymous BIND "
 msgstr "Usar BIND Anónimo"
 
-#: authentication.pm:112
+#: authentication.pm:117
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
 msgstr "Utilizador LDAP autorizado a navegar no Directório Activo"
 
-#: authentication.pm:113
+#: authentication.pm:118
 #, c-format
 msgid "Password for user"
 msgstr "Senha para utilizador"
 
-#: authentication.pm:114
+#: authentication.pm:119
 #, c-format
 msgid "Encryption"
 msgstr "Encriptação"
 
-#: authentication.pm:125
+#: authentication.pm:130
 #, c-format
 msgid "Authentication NIS"
 msgstr "Autenticação NIS"
 
-#: authentication.pm:126
+#: authentication.pm:131
 #, c-format
 msgid "NIS Domain"
 msgstr "Domínio NIS"
 
-#: authentication.pm:127
+#: authentication.pm:132
 #, c-format
 msgid "NIS Server"
 msgstr "Servidor NIS"
 
-#: authentication.pm:132
+#: authentication.pm:137
 #, c-format
 msgid ""
 "For this to work for a W2K PDC, you will probably need to have the admin "
@@ -1630,78 +1672,79 @@ msgid ""
 "The command 'wbinfo -t' will test whether your authentication secrets are "
 "good."
 msgstr ""
-"Para que isto funcione para um W2K PDC, irá provavelmente precisar de "
-"ter o administrador a executar: C:\\>net grupolocal \"Pre-Windows 2000 "
-"Acesso Compatível\" todos /add e reinicie o servidor.\n"
-"Irá também precisar do nome/senha de um Administrador de Domínio para "
-"juntar a máquina ao domínio Windows(TM).\n"
+"Para que isto funcione para um W2K PDC, irá provavelmente precisar de ter o "
+"administrador a executar: C:\\>net grupolocal \"Pre-Windows 2000 Acesso "
+"Compatível\" todos /add e reinicie o servidor.\n"
+"Irá também precisar do nome/senha de um Administrador de Domínio para juntar "
+"a máquina ao domínio Windows(TM).\n"
 "Se a rede ainda não está activada, o DrakX irá tentar juntar-se ao domínio a "
 "seguir ao passo da configuração da rede.\n"
 "Se este passo falhar por alguma razão e a autenticação no domínio não "
-"funcionar, execute 'smbpasswd -j DOMÍNIO -U UTILIZADOR%%SENHA' usando "
-"o seu Domínio "
-"Windows (TM), e o Nome/Senha do Admin, depois do arranque do sistema.\n"
+"funcionar, execute 'smbpasswd -j DOMÍNIO -U UTILIZADOR%%SENHA' usando o seu "
+"Domínio Windows (TM), e o Nome/Senha do Admin, depois do arranque do "
+"sistema.\n"
 "O comando 'wbinfo -t' irá testar se os segredos da sua autenticação estão "
 "bem."
 
-#: authentication.pm:144
+#: authentication.pm:149
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr "Autenticação do Domínio Windows"
 
-#: authentication.pm:149
+#: authentication.pm:154
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "Nome do Utilizador/Administrador do Domínio"
 
-#: authentication.pm:150
+#: authentication.pm:155
 #, c-format
 msgid "Domain Admin Password"
 msgstr "Senha de Admin do Domínio"
 
-#: authentication.pm:151
+#: authentication.pm:156
 #, c-format
 msgid "Use Idmap for store UID/SID "
 msgstr "Usar Idmap para armazenar UID/SID "
 
-#: authentication.pm:152
+#: authentication.pm:157
 #, c-format
 msgid "Default Idmap "
 msgstr "Idmap predefinido "
 
-#: authentication.pm:165
+#: authentication.pm:171
 #, c-format
 msgid "Set administrator (root) password and network authentication methods"
-msgstr "Define a senha de administrador (root) e os métodos de autenticação da rede"
+msgstr ""
+"Define a senha de administrador (root) e os métodos de autenticação da rede"
 
-#: authentication.pm:166
+#: authentication.pm:172
 #, c-format
 msgid "Set administrator (root) password"
 msgstr "Definir a senha do administrador (root)"
 
-#: authentication.pm:167 standalone/drakvpn:1125
+#: authentication.pm:173 standalone/drakvpn:1125
 #, c-format
 msgid "Authentication method"
 msgstr "Método de autenticação"
 
 #. -PO: keep this short or else the buttons will not fit in the window
-#: authentication.pm:172 help.pm:722
+#: authentication.pm:178 help.pm:722
 #, c-format
 msgid "No password"
 msgstr "Nenhuma senha"
 
-#: authentication.pm:178
+#: authentication.pm:184
 #, c-format
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "Essa senha é demasiado simples (pelo menos deve ter %d caracteres)"
 
-#: authentication.pm:183 network/netconnect.pm:328 network/netconnect.pm:634
-#: standalone/drakauth:23 standalone/drakauth:25 standalone/drakconnect:459
+#: authentication.pm:189 network/netconnect.pm:377 network/netconnect.pm:681
+#: standalone/drakauth:24 standalone/drakauth:26 standalone/drakconnect:492
 #, c-format
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: authentication.pm:296
+#: authentication.pm:302
 #, c-format
 msgid "Can not use broadcast with no NIS domain"
 msgstr "Não foi possível usar 'broadcast' sem um domínio NIS"
@@ -1711,7 +1754,7 @@ msgstr "Não foi possível usar 'broadcast' sem um domínio NIS"
 # so use only 7bit for this message (and do transliteration or
 # leave it in English, as it is the best for your language)
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:728
+#: bootloader.pm:752
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1726,37 +1769,37 @@ msgstr ""
 "espere pelo arranque predefinido.\n"
 "\n"
 
-#: bootloader.pm:815
+#: bootloader.pm:839
 #, c-format
 msgid "LILO with graphical menu"
 msgstr "LILO com lista gráfica"
 
-#: bootloader.pm:816
+#: bootloader.pm:840
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO com menu texto"
 
-#: bootloader.pm:817
+#: bootloader.pm:841
 #, c-format
 msgid "Grub"
 msgstr "Grub"
 
-#: bootloader.pm:818
+#: bootloader.pm:842
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:881
+#: bootloader.pm:906
 #, c-format
 msgid "not enough room in /boot"
 msgstr "não há espaço suficiente em /boot"
 
-#: bootloader.pm:1295
+#: bootloader.pm:1348
 #, c-format
 msgid "You can not install the bootloader on a %s partition\n"
 msgstr "Não pode instalar o carregador de arranque numa partição %s\n"
 
-#: bootloader.pm:1340
+#: bootloader.pm:1393
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
@@ -1765,7 +1808,7 @@ msgstr ""
 "A configuração do seu carregador de arranque deve ser actualizada pois a "
 "partição foi renumerada"
 
-#: bootloader.pm:1355
+#: bootloader.pm:1408
 #, c-format
 msgid ""
 "The bootloader can not be installed correctly. You have to boot rescue and "
@@ -1774,155 +1817,239 @@ msgstr ""
 "O carregador de arranque não pode ser instalado correctamente. Tem de "
 "arrancar usar em modo de emergência e escolher \"%s\""
 
-#: bootloader.pm:1356
+#: bootloader.pm:1409
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "Reinstalar o carregador de arranque"
 
-#: common.pm:125
+#: common.pm:139
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: common.pm:125
+#: common.pm:139
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: common.pm:125
+#: common.pm:139
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: common.pm:133
+#: common.pm:147
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: common.pm:141
+#: common.pm:155
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
-#: common.pm:143
+#: common.pm:157
 #, c-format
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: common.pm:145
+#: common.pm:159
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
-#: common.pm:240
+#: common.pm:254
 #, c-format
 msgid "kdesu missing"
 msgstr "kdesu em falta"
 
-#: common.pm:243
+#: common.pm:257
 #, c-format
 msgid "consolehelper missing"
 msgstr "ajuda da consola em falta"
 
-#: crypto.pm:14 crypto.pm:43 lang.pm:202 network/adsl_consts.pm:50
-#: network/adsl_consts.pm:58 network/adsl_consts.pm:66
+#: crypto.pm:14 crypto.pm:49 lang.pm:207 network/adsl_consts.pm:66
+#: network/adsl_consts.pm:75 network/adsl_consts.pm:84
 #, c-format
 msgid "Austria"
 msgstr "Áustria"
 
-#: crypto.pm:15 crypto.pm:34 lang.pm:209 network/adsl_consts.pm:74
-#: network/adsl_consts.pm:82 network/adsl_consts.pm:93
-#: network/adsl_consts.pm:101 network/netconnect.pm:50
+#: crypto.pm:15 crypto.pm:48 lang.pm:208 standalone/drakxtv:48
+#, c-format
+msgid "Australia"
+msgstr "Austrália"
+
+#: crypto.pm:16 crypto.pm:50 lang.pm:214 network/adsl_consts.pm:93
+#: network/adsl_consts.pm:102 network/adsl_consts.pm:114
+#: network/adsl_consts.pm:123 network/netconnect.pm:51
 #, c-format
 msgid "Belgium"
 msgstr "Bélgica"
 
-#: crypto.pm:16 lang.pm:230 network/adsl_consts.pm:780
-#: network/adsl_consts.pm:788 network/adsl_consts.pm:798
+#: crypto.pm:17 crypto.pm:51 lang.pm:223 network/adsl_consts.pm:132
+#: network/adsl_consts.pm:143 network/adsl_consts.pm:152
+#: network/adsl_consts.pm:161
+#, c-format
+msgid "Brazil"
+msgstr "Brasil"
+
+#: crypto.pm:18 crypto.pm:52 lang.pm:230
+#, c-format
+msgid "Canada"
+msgstr "Canadá"
+
+#: crypto.pm:19 crypto.pm:75 lang.pm:235 network/adsl_consts.pm:881
+#: network/adsl_consts.pm:890 network/adsl_consts.pm:901
 #, c-format
 msgid "Switzerland"
 msgstr "Suíça"
 
-#: crypto.pm:17 lang.pm:237
+#: crypto.pm:20 lang.pm:242
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: crypto.pm:18 crypto.pm:35 lang.pm:243 network/adsl_consts.pm:319
+#: crypto.pm:21 crypto.pm:53 lang.pm:248 network/adsl_consts.pm:368
 #, c-format
 msgid "Czech Republic"
 msgstr "República Checa"
 
-#: crypto.pm:19 crypto.pm:36 lang.pm:244 network/adsl_consts.pm:437
-#: network/adsl_consts.pm:445
+#: crypto.pm:22 crypto.pm:58 lang.pm:249 network/adsl_consts.pm:499
+#: network/adsl_consts.pm:508
 #, c-format
 msgid "Germany"
 msgstr "Alemanha"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:262 network/adsl_consts.pm:343
-#: network/adsl_consts.pm:354 network/adsl_consts.pm:365
-#: network/adsl_consts.pm:375 network/adsl_consts.pm:385
-#: network/adsl_consts.pm:396 network/adsl_consts.pm:407
-#: network/adsl_consts.pm:417 network/adsl_consts.pm:427
-#: network/netconnect.pm:47
+#: crypto.pm:23 crypto.pm:54 lang.pm:251 network/adsl_consts.pm:378
+#, c-format
+msgid "Denmark"
+msgstr "Dinamarca"
+
+#: crypto.pm:24 crypto.pm:55 lang.pm:256
+#, c-format
+msgid "Estonia"
+msgstr "Estónia"
+
+#: crypto.pm:25 crypto.pm:73 lang.pm:260 network/adsl_consts.pm:749
+#: network/adsl_consts.pm:760 network/adsl_consts.pm:771
+#: network/adsl_consts.pm:782 network/adsl_consts.pm:791
+#: network/adsl_consts.pm:800 network/adsl_consts.pm:809
+#: network/adsl_consts.pm:818 network/adsl_consts.pm:827
+#: network/adsl_consts.pm:836 network/adsl_consts.pm:845
+#: network/adsl_consts.pm:854 network/adsl_consts.pm:863
+#, c-format
+msgid "Spain"
+msgstr "Espanha"
+
+#: crypto.pm:26 crypto.pm:56 lang.pm:262 network/adsl_consts.pm:387
+#, c-format
+msgid "Finland"
+msgstr "Finlândia"
+
+#: crypto.pm:27 crypto.pm:57 lang.pm:267 network/adsl_consts.pm:396
+#: network/adsl_consts.pm:408 network/adsl_consts.pm:420
+#: network/adsl_consts.pm:431 network/adsl_consts.pm:442
+#: network/adsl_consts.pm:454 network/adsl_consts.pm:466
+#: network/adsl_consts.pm:477 network/adsl_consts.pm:488
+#: network/netconnect.pm:48
 #, c-format
 msgid "France"
 msgstr "França"
 
-#: crypto.pm:21 crypto.pm:37 lang.pm:275 network/adsl_consts.pm:455
+#: crypto.pm:28 crypto.pm:59 lang.pm:280 network/adsl_consts.pm:519
 #, c-format
 msgid "Greece"
 msgstr "Grécia"
 
-#: crypto.pm:22 lang.pm:286 network/adsl_consts.pm:463
+#: crypto.pm:29 crypto.pm:60 lang.pm:291 network/adsl_consts.pm:528
 #, c-format
 msgid "Hungary"
 msgstr "Hungria"
 
-#: crypto.pm:23 crypto.pm:42 lang.pm:295 network/adsl_consts.pm:489
-#: network/adsl_consts.pm:499 network/adsl_consts.pm:509
-#: network/adsl_consts.pm:517 network/netconnect.pm:49 standalone/drakxtv:47
+#: crypto.pm:30 crypto.pm:61 lang.pm:293 network/adsl_consts.pm:537
+#: standalone/drakxtv:47
+#, c-format
+msgid "Ireland"
+msgstr "Irlanda"
+
+#: crypto.pm:31 crypto.pm:62 lang.pm:294 network/adsl_consts.pm:546
+#, c-format
+msgid "Israel"
+msgstr "Israel"
+
+#: crypto.pm:32 crypto.pm:63 lang.pm:300 network/adsl_consts.pm:557
+#: network/adsl_consts.pm:569 network/adsl_consts.pm:580
+#: network/adsl_consts.pm:589 network/netconnect.pm:50 standalone/drakxtv:47
 #, c-format
 msgid "Italy"
 msgstr "Itália"
 
-#: crypto.pm:24 crypto.pm:41 lang.pm:347 network/adsl_consts.pm:545
-#: network/adsl_consts.pm:553 network/adsl_consts.pm:561
-#: network/adsl_consts.pm:569 network/netconnect.pm:48
+#: crypto.pm:33 crypto.pm:64 lang.pm:303
+#, c-format
+msgid "Japan"
+msgstr "Japão"
+
+#: crypto.pm:34 crypto.pm:65 lang.pm:352 network/adsl_consts.pm:620
+#: network/adsl_consts.pm:629 network/adsl_consts.pm:638
+#: network/adsl_consts.pm:647 network/netconnect.pm:49
 #, c-format
 msgid "Netherlands"
 msgstr "Holanda"
 
-#: crypto.pm:25 crypto.pm:38 lang.pm:348 network/adsl_consts.pm:577
-#: network/adsl_consts.pm:582 network/adsl_consts.pm:587
-#: network/adsl_consts.pm:592 network/adsl_consts.pm:597
-#: network/adsl_consts.pm:602 network/adsl_consts.pm:607
+#: crypto.pm:35 crypto.pm:67 lang.pm:353 network/adsl_consts.pm:656
+#: network/adsl_consts.pm:661 network/adsl_consts.pm:666
+#: network/adsl_consts.pm:671 network/adsl_consts.pm:676
+#: network/adsl_consts.pm:681 network/adsl_consts.pm:686
 #, c-format
 msgid "Norway"
 msgstr "Noruega"
 
-#: crypto.pm:26 lang.pm:360 network/adsl_consts.pm:614
-#: network/adsl_consts.pm:624
+#: crypto.pm:36 crypto.pm:66 lang.pm:357
+#, c-format
+msgid "New Zealand"
+msgstr "Nova Zelândia"
+
+#: crypto.pm:37 crypto.pm:68 lang.pm:365 network/adsl_consts.pm:693
+#: network/adsl_consts.pm:704
 #, c-format
 msgid "Poland"
 msgstr "Polónia"
 
-#: crypto.pm:27 crypto.pm:39 lang.pm:377 network/adsl_consts.pm:772
+#: crypto.pm:38 crypto.pm:69 lang.pm:370 network/adsl_consts.pm:716
+#, c-format
+msgid "Portugal"
+msgstr "Portugal"
+
+#: crypto.pm:39 crypto.pm:70 lang.pm:376 network/adsl_consts.pm:725
+#, c-format
+msgid "Russia"
+msgstr "Rússia"
+
+#: crypto.pm:40 crypto.pm:74 lang.pm:382 network/adsl_consts.pm:872
 #, c-format
 msgid "Sweden"
 msgstr "Suécia"
 
-#: crypto.pm:28 lang.pm:382
+#: crypto.pm:41 crypto.pm:71 lang.pm:387
 #, c-format
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
-#: crypto.pm:29 lang.pm:406
+#: crypto.pm:42 crypto.pm:77 lang.pm:401 network/adsl_consts.pm:910
+#, c-format
+msgid "Thailand"
+msgstr "Tailândia"
+
+#: crypto.pm:43 crypto.pm:76 lang.pm:411
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: crypto.pm:40 crypto.pm:75 lang.pm:411 network/netconnect.pm:51
+#: crypto.pm:44 crypto.pm:72 lang.pm:430 standalone/drakxtv:49
+#, c-format
+msgid "South Africa"
+msgstr "África do Sul"
+
+#: crypto.pm:78 crypto.pm:108 lang.pm:416 network/netconnect.pm:52
 #, c-format
 msgid "United States"
 msgstr "Estados Unidos"
@@ -1945,18 +2072,18 @@ msgstr ""
 msgid "New"
 msgstr "Novo"
 
-#: diskdrake/dav.pm:61 diskdrake/interactive.pm:443 diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:61 diskdrake/interactive.pm:451 diskdrake/smbnfs_gtk.pm:75
 #, c-format
 msgid "Unmount"
 msgstr "Desmontar"
 
-#: diskdrake/dav.pm:62 diskdrake/interactive.pm:440 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62 diskdrake/interactive.pm:448 diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "Montar"
 
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:435
-#: diskdrake/interactive.pm:653 diskdrake/interactive.pm:672
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:443
+#: diskdrake/interactive.pm:667 diskdrake/interactive.pm:686
 #: diskdrake/removable.pm:23 diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
@@ -1977,13 +2104,13 @@ msgstr "O Url deve começar com http:// ou https://"
 msgid "Server: "
 msgstr "Servidor: "
 
-#: diskdrake/dav.pm:110 diskdrake/interactive.pm:504
-#: diskdrake/interactive.pm:1166 diskdrake/interactive.pm:1241
+#: diskdrake/dav.pm:110 diskdrake/interactive.pm:518
+#: diskdrake/interactive.pm:1184 diskdrake/interactive.pm:1259
 #, c-format
 msgid "Mount point: "
 msgstr "Ponto de montagem: "
 
-#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1248
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1266
 #, c-format
 msgid "Options: %s"
 msgstr "Opções: %s"
@@ -2030,8 +2157,8 @@ msgstr ""
 msgid "Please click on a partition"
 msgstr "Por favor clique numa partição"
 
-#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:482
-#: standalone/drakbackup:2943 standalone/drakbackup:3003
+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:486
+#: standalone/drakbackup:2951 standalone/drakbackup:3011
 #, c-format
 msgid "Details"
 msgstr "Detalhes"
@@ -2071,13 +2198,7 @@ msgstr "HFS"
 msgid "Windows"
 msgstr "Janelas"
 
-#: diskdrake/hd_gtk.pm:339 install_steps_gtk.pm:284 mouse.pm:168
-#: services.pm:162 standalone/drakbackup:1609 standalone/drakperm:250
-#, c-format
-msgid "Other"
-msgstr "Outros"
-
-#: diskdrake/hd_gtk.pm:339 diskdrake/interactive.pm:1181
+#: diskdrake/hd_gtk.pm:339 diskdrake/interactive.pm:1199
 #, c-format
 msgid "Empty"
 msgstr "Vazio"
@@ -2092,21 +2213,21 @@ msgstr "Tipos de sistemas de ficheiros:"
 msgid "Use ``%s'' instead"
 msgstr "Use ``%s'' em vez de"
 
-#: diskdrake/hd_gtk.pm:360 diskdrake/interactive.pm:459
+#: diskdrake/hd_gtk.pm:360 diskdrake/interactive.pm:467
 #, c-format
 msgid "Create"
 msgstr "Criar"
 
 #: diskdrake/hd_gtk.pm:360 diskdrake/hd_gtk.pm:368
-#: diskdrake/interactive.pm:436 diskdrake/interactive.pm:606
+#: diskdrake/interactive.pm:444 diskdrake/interactive.pm:620
 #: diskdrake/removable.pm:25 diskdrake/removable.pm:48
-#: standalone/harddrake2:106 standalone/harddrake2:115
+#: standalone/harddrake2:107 standalone/harddrake2:116
 #, c-format
 msgid "Type"
 msgstr "Tipo"
 
 #. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: diskdrake/hd_gtk.pm:362 diskdrake/interactive.pm:444
+#: diskdrake/hd_gtk.pm:362 diskdrake/interactive.pm:452
 #: standalone/drakperm:124 standalone/printerdrake:235
 #, c-format
 msgid "Delete"
@@ -2240,37 +2361,37 @@ msgstr "Supermount"
 msgid "Supermount except for CDROM drives"
 msgstr "Supermount exceptado para CDROM"
 
-#: diskdrake/interactive.pm:359 help.pm:530
+#: diskdrake/interactive.pm:365 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "Gravar a tabela de partições"
 
-#: diskdrake/interactive.pm:360 help.pm:530
+#: diskdrake/interactive.pm:366 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "Restaurar a tabela de partições"
 
-#: diskdrake/interactive.pm:361 help.pm:530
+#: diskdrake/interactive.pm:367 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "Reparar a tabela de partições"
 
-#: diskdrake/interactive.pm:363 help.pm:530
+#: diskdrake/interactive.pm:369 help.pm:530
 #, c-format
 msgid "Reload partition table"
 msgstr "Recarregar a tabela de partições"
 
-#: diskdrake/interactive.pm:365
+#: diskdrake/interactive.pm:371
 #, c-format
 msgid "Removable media automounting"
 msgstr "Automontagem das médias amovíveis"
 
-#: diskdrake/interactive.pm:376 diskdrake/interactive.pm:402
+#: diskdrake/interactive.pm:384 diskdrake/interactive.pm:410
 #, c-format
 msgid "Select file"
 msgstr "Seleccione ficheiro"
 
-#: diskdrake/interactive.pm:388
+#: diskdrake/interactive.pm:396
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -2279,87 +2400,87 @@ msgstr ""
 "O backup da tabela de partições não tem o mesmo tamanho.\n"
 "Continuar mesmo assim?"
 
-#: diskdrake/interactive.pm:417
+#: diskdrake/interactive.pm:425
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr "A tentar salvar a tabela de partições"
 
-#: diskdrake/interactive.pm:423
+#: diskdrake/interactive.pm:431
 #, c-format
 msgid "Detailed information"
 msgstr "Informação detalhada"
 
-#: diskdrake/interactive.pm:438 diskdrake/interactive.pm:743
+#: diskdrake/interactive.pm:446 diskdrake/interactive.pm:761
 #, c-format
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: diskdrake/interactive.pm:439
+#: diskdrake/interactive.pm:447
 #, c-format
 msgid "Format"
 msgstr "Formatar"
 
-#: diskdrake/interactive.pm:441
+#: diskdrake/interactive.pm:449
 #, c-format
 msgid "Add to RAID"
 msgstr "Adicionar ao RAID"
 
-#: diskdrake/interactive.pm:442
+#: diskdrake/interactive.pm:450
 #, c-format
 msgid "Add to LVM"
 msgstr "Adicionar ao LVM"
 
-#: diskdrake/interactive.pm:445
+#: diskdrake/interactive.pm:453
 #, c-format
 msgid "Remove from RAID"
 msgstr "Remover do RAID"
 
-#: diskdrake/interactive.pm:446
+#: diskdrake/interactive.pm:454
 #, c-format
 msgid "Remove from LVM"
 msgstr "Remover do LVM"
 
-#: diskdrake/interactive.pm:447
+#: diskdrake/interactive.pm:455
 #, c-format
 msgid "Modify RAID"
 msgstr "Modificar RAID"
 
-#: diskdrake/interactive.pm:448
+#: diskdrake/interactive.pm:456
 #, c-format
 msgid "Use for loopback"
 msgstr "Usar para loopback"
 
-#: diskdrake/interactive.pm:497
+#: diskdrake/interactive.pm:511
 #, c-format
 msgid "Create a new partition"
 msgstr "Criar uma nova partição"
 
-#: diskdrake/interactive.pm:500
+#: diskdrake/interactive.pm:514
 #, c-format
 msgid "Start sector: "
 msgstr "Sector inicial: "
 
-#: diskdrake/interactive.pm:502 diskdrake/interactive.pm:899
+#: diskdrake/interactive.pm:516 diskdrake/interactive.pm:918
 #, c-format
 msgid "Size in MB: "
 msgstr "Tamanho em MB: "
 
-#: diskdrake/interactive.pm:503 diskdrake/interactive.pm:900
+#: diskdrake/interactive.pm:517 diskdrake/interactive.pm:919
 #, c-format
 msgid "Filesystem type: "
 msgstr "Tipo do Sistema de Ficheiros: "
 
-#: diskdrake/interactive.pm:508
+#: diskdrake/interactive.pm:522
 #, c-format
 msgid "Preference: "
 msgstr "Preferência: "
 
-#: diskdrake/interactive.pm:511
+#: diskdrake/interactive.pm:525
 #, c-format
 msgid "Logical volume name "
 msgstr "Nome do Volume Lógico "
 
-#: diskdrake/interactive.pm:541
+#: diskdrake/interactive.pm:555
 #, c-format
 msgid ""
 "You can not create a new partition\n"
@@ -2370,44 +2491,45 @@ msgstr ""
 "(porque atingiu o numero máximo de partições primárias).\n"
 "Primeiro remova uma partição primária e crie uma partição extendida."
 
-#: diskdrake/interactive.pm:571
+#: diskdrake/interactive.pm:585
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "Remover o ficheiro loopback?"
 
-#: diskdrake/interactive.pm:590
+#: diskdrake/interactive.pm:604
 #, c-format
-msgid "After changing type of partition %s, all data on this partition will be lost"
+msgid ""
+"After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
 "Após alterar o tipo de partição %s, todos os dados desta partição serão "
 "perdidos"
 
-#: diskdrake/interactive.pm:602
+#: diskdrake/interactive.pm:616
 #, c-format
 msgid "Change partition type"
 msgstr "Alterar tipo de partição"
 
-#: diskdrake/interactive.pm:603 diskdrake/removable.pm:47
+#: diskdrake/interactive.pm:617 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "Que sistema de ficheiros deseja?"
 
-#: diskdrake/interactive.pm:611
+#: diskdrake/interactive.pm:625
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "Mudar de ext2 para ext3"
 
-#: diskdrake/interactive.pm:640
+#: diskdrake/interactive.pm:654
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "Onde deseja montar o ficheiro loopback %s?"
 
-#: diskdrake/interactive.pm:641
+#: diskdrake/interactive.pm:655
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Onde deseja montar o dispositivo %s?"
 
-#: diskdrake/interactive.pm:646
+#: diskdrake/interactive.pm:660
 #, c-format
 msgid ""
 "Can not unset mount point as this partition is used for loop back.\n"
@@ -2416,48 +2538,49 @@ msgstr ""
 "Não posso desconfigurar o ponto de montagem enquanto a\n"
 "partição for usada para loopback. Remova o loopback primeiro"
 
-#: diskdrake/interactive.pm:671
+#: diskdrake/interactive.pm:685
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "Onde deseja montar %s?"
 
-#: diskdrake/interactive.pm:695 diskdrake/interactive.pm:774
+#: diskdrake/interactive.pm:709 diskdrake/interactive.pm:792
 #: install_interactive.pm:156 install_interactive.pm:188
 #, c-format
 msgid "Resizing"
 msgstr "A redimensionar"
 
-#: diskdrake/interactive.pm:695
+#: diskdrake/interactive.pm:709
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "A computar os limites do sistema de ficheiros FAT"
 
-#: diskdrake/interactive.pm:731
+#: diskdrake/interactive.pm:749
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "Esta partição não é redimensionável"
 
-#: diskdrake/interactive.pm:736
+#: diskdrake/interactive.pm:754
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "Todos os dados desta partição devem ser arquivados (backup)"
 
-#: diskdrake/interactive.pm:738
+#: diskdrake/interactive.pm:756
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "Após redimensionar a partição %s, todos os dados da partição serão perdidos"
+msgstr ""
+"Após redimensionar a partição %s, todos os dados da partição serão perdidos"
 
-#: diskdrake/interactive.pm:743
+#: diskdrake/interactive.pm:761
 #, c-format
 msgid "Choose the new size"
 msgstr "Escolha o novo tamanho"
 
-#: diskdrake/interactive.pm:744
+#: diskdrake/interactive.pm:762
 #, c-format
 msgid "New size in MB: "
 msgstr "Novo tamanho em MB: "
 
-#: diskdrake/interactive.pm:787 install_interactive.pm:196
+#: diskdrake/interactive.pm:805 install_interactive.pm:196
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
@@ -2467,117 +2590,117 @@ msgstr ""
 "a(s) partiçõe(s), a verificação do sistema de ficheiros irá ser\n"
 "executada no próximo arranque no Windows(TM)"
 
-#: diskdrake/interactive.pm:825
+#: diskdrake/interactive.pm:843
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Escolha um RAID existente para adicionar"
 
-#: diskdrake/interactive.pm:827 diskdrake/interactive.pm:844
+#: diskdrake/interactive.pm:845 diskdrake/interactive.pm:862
 #, c-format
 msgid "new"
 msgstr "novo"
 
-#: diskdrake/interactive.pm:842
+#: diskdrake/interactive.pm:860
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "Escolha um LVM existente para adicionar"
 
-#: diskdrake/interactive.pm:848
+#: diskdrake/interactive.pm:866
 #, c-format
 msgid "LVM name?"
 msgstr "Nome do LVM?"
 
-#: diskdrake/interactive.pm:884
+#: diskdrake/interactive.pm:903
 #, c-format
 msgid "This partition can not be used for loopback"
 msgstr "Esta partição não pode ser usada para loopback"
 
-#: diskdrake/interactive.pm:897
+#: diskdrake/interactive.pm:916
 #, c-format
 msgid "Loopback"
 msgstr "Loopback"
 
-#: diskdrake/interactive.pm:898
+#: diskdrake/interactive.pm:917
 #, c-format
 msgid "Loopback file name: "
 msgstr "Nome do ficheiro loopback: "
 
-#: diskdrake/interactive.pm:903
+#: diskdrake/interactive.pm:922
 #, c-format
 msgid "Give a file name"
 msgstr "Indique um nome de ficheiro"
 
-#: diskdrake/interactive.pm:906
+#: diskdrake/interactive.pm:925
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "O ficheiro já está usado por outro loopback, escolha outro"
 
-#: diskdrake/interactive.pm:907
+#: diskdrake/interactive.pm:926
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "O ficheiro já existe. Usá-lo?"
 
-#: diskdrake/interactive.pm:930
+#: diskdrake/interactive.pm:949
 #, c-format
 msgid "Mount options"
 msgstr "Opções de montagem"
 
-#: diskdrake/interactive.pm:937
+#: diskdrake/interactive.pm:956
 #, c-format
 msgid "Various"
 msgstr "Diversos"
 
-#: diskdrake/interactive.pm:1002
+#: diskdrake/interactive.pm:1020
 #, c-format
 msgid "device"
 msgstr "dispositivo"
 
-#: diskdrake/interactive.pm:1003
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "level"
 msgstr "nível"
 
-#: diskdrake/interactive.pm:1004
+#: diskdrake/interactive.pm:1022
 #, c-format
 msgid "chunk size in KiB"
 msgstr "tamanho do bloco em KiB"
 
-#: diskdrake/interactive.pm:1021
+#: diskdrake/interactive.pm:1039
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "Tenha cuidado: esta operação é perigosa."
 
-#: diskdrake/interactive.pm:1036
+#: diskdrake/interactive.pm:1054
 #, c-format
 msgid "What type of partitioning?"
 msgstr "Que tipo de particionamento?"
 
-#: diskdrake/interactive.pm:1074
+#: diskdrake/interactive.pm:1092
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Precisará reiniciar antes que as modificações tenham efeito"
 
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "A tabela de partições do drive %s irá ser escrita no disco!"
 
-#: diskdrake/interactive.pm:1096
+#: diskdrake/interactive.pm:1114
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Após formatar a partição %s, todos os dados serão perdidos"
 
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1130
 #, c-format
 msgid "Move files to the new partition"
 msgstr "Mover os ficheiros para a nova partição"
 
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1130
 #, c-format
 msgid "Hide files"
 msgstr "Esconder ficheiros"
 
-#: diskdrake/interactive.pm:1113
+#: diskdrake/interactive.pm:1131
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2586,108 +2709,108 @@ msgstr ""
 "O directório %s já contém dados\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1124
+#: diskdrake/interactive.pm:1142
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "A mover os ficheiros para a nova partição"
 
-#: diskdrake/interactive.pm:1128
+#: diskdrake/interactive.pm:1146
 #, c-format
 msgid "Copying %s"
 msgstr "A copiar %s"
 
-#: diskdrake/interactive.pm:1132
+#: diskdrake/interactive.pm:1150
 #, c-format
 msgid "Removing %s"
 msgstr "A remover %s"
 
-#: diskdrake/interactive.pm:1146
+#: diskdrake/interactive.pm:1164
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "a partição %s é agora conhecida como %s"
 
-#: diskdrake/interactive.pm:1147
+#: diskdrake/interactive.pm:1165
 #, c-format
 msgid "Partitions have been renumbered: "
 msgstr "As partições foram renumeradas: "
 
-#: diskdrake/interactive.pm:1167 diskdrake/interactive.pm:1226
+#: diskdrake/interactive.pm:1185 diskdrake/interactive.pm:1244
 #, c-format
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: diskdrake/interactive.pm:1168
+#: diskdrake/interactive.pm:1186
 #, c-format
 msgid "Devfs name: "
 msgstr "Nome do devfs: "
 
-#: diskdrake/interactive.pm:1169
+#: diskdrake/interactive.pm:1187
 #, c-format
 msgid "Volume label: "
 msgstr "Etiqueta do Volume:"
 
-#: diskdrake/interactive.pm:1170
+#: diskdrake/interactive.pm:1188
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "Letra do drive no DOS: %s (apenas um palpite)\n"
 
-#: diskdrake/interactive.pm:1174 diskdrake/interactive.pm:1183
-#: diskdrake/interactive.pm:1244
+#: diskdrake/interactive.pm:1192 diskdrake/interactive.pm:1201
+#: diskdrake/interactive.pm:1262
 #, c-format
 msgid "Type: "
 msgstr "Tipo: "
 
-#: diskdrake/interactive.pm:1178 install_steps_gtk.pm:296
+#: diskdrake/interactive.pm:1196 install_steps_gtk.pm:300
 #, c-format
 msgid "Name: "
 msgstr "Nome: "
 
-#: diskdrake/interactive.pm:1185
+#: diskdrake/interactive.pm:1203
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Inicio: sector: %s\n"
 
-#: diskdrake/interactive.pm:1186
+#: diskdrake/interactive.pm:1204
 #, c-format
 msgid "Size: %s"
 msgstr "Tamanho: %s"
 
-#: diskdrake/interactive.pm:1188
+#: diskdrake/interactive.pm:1206
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sectores"
 
-#: diskdrake/interactive.pm:1190
+#: diskdrake/interactive.pm:1208
 #, c-format
 msgid "Cylinder %d to %d\n"
 msgstr "Cilindro %d para %d\n"
 
-#: diskdrake/interactive.pm:1191
+#: diskdrake/interactive.pm:1209
 #, c-format
 msgid "Number of logical extents: %d"
 msgstr "Número de extensões lógicas: %d"
 
-#: diskdrake/interactive.pm:1192
+#: diskdrake/interactive.pm:1210
 #, c-format
 msgid "Formatted\n"
 msgstr "Formatado\n"
 
-#: diskdrake/interactive.pm:1193
+#: diskdrake/interactive.pm:1211
 #, c-format
 msgid "Not formatted\n"
 msgstr "Não formatado\n"
 
-#: diskdrake/interactive.pm:1194
+#: diskdrake/interactive.pm:1212
 #, c-format
 msgid "Mounted\n"
 msgstr "Montado\n"
 
-#: diskdrake/interactive.pm:1195
+#: diskdrake/interactive.pm:1213
 #, c-format
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1197
+#: diskdrake/interactive.pm:1215
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2696,7 +2819,7 @@ msgstr ""
 "Ficheiro(s) loopback:\n"
 "   %s\n"
 
-#: diskdrake/interactive.pm:1198
+#: diskdrake/interactive.pm:1216
 #, c-format
 msgid ""
 "Partition booted by default\n"
@@ -2705,27 +2828,27 @@ msgstr ""
 "Partição de arranque por omissão\n"
 "    (para arranque MS-DOS, não para lilo)\n"
 
-#: diskdrake/interactive.pm:1200
+#: diskdrake/interactive.pm:1218
 #, c-format
 msgid "Level %s\n"
 msgstr "Nível %s\n"
 
-#: diskdrake/interactive.pm:1201
+#: diskdrake/interactive.pm:1219
 #, c-format
 msgid "Chunk size %d KiB\n"
 msgstr "Tamanho do bloco %d KiB\n"
 
-#: diskdrake/interactive.pm:1202
+#: diskdrake/interactive.pm:1220
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "Discos RAID %s\n"
 
-#: diskdrake/interactive.pm:1204
+#: diskdrake/interactive.pm:1222
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Nome do ficheiro loopback: %s"
 
-#: diskdrake/interactive.pm:1207
+#: diskdrake/interactive.pm:1225
 #, c-format
 msgid ""
 "\n"
@@ -2738,7 +2861,7 @@ msgstr ""
 "é uma partição Driver.\n"
 "Não lhe deve mexer.\n"
 
-#: diskdrake/interactive.pm:1210
+#: diskdrake/interactive.pm:1228
 #, c-format
 msgid ""
 "\n"
@@ -2751,74 +2874,80 @@ msgstr ""
 "Bootstrap é para\n"
 "arranque dual do sistema.\n"
 
-#: diskdrake/interactive.pm:1227
+#: diskdrake/interactive.pm:1245
 #, c-format
 msgid "Read-only"
 msgstr "Apenas Leitura"
 
-#: diskdrake/interactive.pm:1228
+#: diskdrake/interactive.pm:1246
 #, c-format
 msgid "Size: %s\n"
 msgstr "Tamanho: %s\n"
 
-#: diskdrake/interactive.pm:1229
+#: diskdrake/interactive.pm:1247
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometria: %s cilindros, %s cabeças, %s sectores\n"
 
-#: diskdrake/interactive.pm:1230
+#: diskdrake/interactive.pm:1248
 #, c-format
 msgid "Info: "
 msgstr "Info: "
 
-#: diskdrake/interactive.pm:1231
+#: diskdrake/interactive.pm:1249
 #, c-format
 msgid "LVM-disks %s\n"
 msgstr "Discos LVM %s\n"
 
-#: diskdrake/interactive.pm:1232
+#: diskdrake/interactive.pm:1250
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Tipo da tabela de partições: %s\n"
 
-#: diskdrake/interactive.pm:1233
+#: diskdrake/interactive.pm:1251
 #, c-format
 msgid "on channel %d id %d\n"
 msgstr "no canal %d id %d\n"
 
-#: diskdrake/interactive.pm:1265
+#: diskdrake/interactive.pm:1286
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "Senha de encriptação do sistema de ficheiros"
 
-#: diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1287
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Escolha a sua senha de encriptação do sistema de ficheiros"
 
-#: diskdrake/interactive.pm:1269
+#: diskdrake/interactive.pm:1290
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr ""
-"Esta senha de encriptação é muito simples (pelo menos deve ter %d "
-"caracteres de comprimento)"
+"Esta senha de encriptação é muito simples (pelo menos deve ter %d caracteres "
+"de comprimento)"
 
-#: diskdrake/interactive.pm:1270
+#: diskdrake/interactive.pm:1291
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "As senhas de encriptação não correspondem"
 
-#: diskdrake/interactive.pm:1273 network/netconnect.pm:1136
-#: standalone/drakconnect:397
+#: diskdrake/interactive.pm:1294 network/netconnect.pm:1230
+#: standalone/drakconnect:430
 #, c-format
 msgid "Encryption key"
 msgstr "Senha de encriptação"
 
-#: diskdrake/interactive.pm:1274
+#: diskdrake/interactive.pm:1295
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Senha de encriptação (novamente)"
 
+#: diskdrake/interactive.pm:1296 standalone/drakvpn:1031
+#: standalone/drakvpn:1116
+#, c-format
+msgid "Encryption algorithm"
+msgstr "Algoritmo de encriptação"
+
 #: diskdrake/removable.pm:46
 #, c-format
 msgid "Change type"
@@ -2846,12 +2975,13 @@ msgstr "Mais outro"
 
 #: diskdrake/smbnfs_gtk.pm:177
 #, c-format
-msgid "Please enter your username, password and domain name to access this host."
+msgid ""
+"Please enter your username, password and domain name to access this host."
 msgstr ""
 "Por favor digite o seu nome de utilizador, senha e nome de domínio para "
 "aceder a este servidor."
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3494
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3502
 #, c-format
 msgid "Username"
 msgstr "Nome de utilizador"
@@ -2876,12 +3006,12 @@ msgstr "O pacote %s precisa ser instalado. Quere-o instalar?"
 msgid "Mandatory package %s is missing"
 msgstr "O pacote imperativo %s está em falta"
 
-#: do_pkgs.pm:172
+#: do_pkgs.pm:182
 #, c-format
 msgid "Installing packages..."
 msgstr "A instalar pacotes..."
 
-#: do_pkgs.pm:217
+#: do_pkgs.pm:227
 #, c-format
 msgid "Removing packages..."
 msgstr "A remover pacotes..."
@@ -2987,7 +3117,8 @@ msgstr "Montar o sistema de ficheiros apenas para leitura."
 #: fs/mount_options.pm:130
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
-msgstr "Todos os I/O para o sistema de ficheiros devem ser feitos sincronizadamente."
+msgstr ""
+"Todos os I/O para o sistema de ficheiros devem ser feitos sincronizadamente."
 
 #: fs/mount_options.pm:134
 #, c-format
@@ -3015,12 +3146,12 @@ msgstr "Dar acesso de escrita a utilizadores normais"
 msgid "Give read-only access to ordinary users"
 msgstr "Dar acesso de apenas-leitura a utilizadores normais"
 
-#: fs/type.pm:370
+#: fs/type.pm:372
 #, c-format
 msgid "You can not use JFS for partitions smaller than 16MB"
 msgstr "Não pode usar JFS em partições menores que 16MB"
 
-#: fs/type.pm:371
+#: fs/type.pm:373
 #, c-format
 msgid "You can not use ReiserFS for partitions smaller than 32MB"
 msgstr "Não pode usar ReiserFS em partições menores que 32MB"
@@ -3035,7 +3166,7 @@ msgstr "com /usr"
 msgid "server"
 msgstr "servidor"
 
-#: fsedit.pm:184
+#: fsedit.pm:183
 #, c-format
 msgid ""
 "I can not read the partition table of device %s, it's too corrupted for me :"
@@ -3053,22 +3184,22 @@ msgstr ""
 "\n"
 "Concorda em perder todas as partições?\n"
 
-#: fsedit.pm:401
+#: fsedit.pm:400
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Os pontos de montagem devem começar com uma /"
 
-#: fsedit.pm:402
+#: fsedit.pm:401
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "Os pontos de montagem devem apenas conter caracteres alfanuméricos"
 
-#: fsedit.pm:403
+#: fsedit.pm:402
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Já existe uma partição no ponto de montagem %s\n"
 
-#: fsedit.pm:405
+#: fsedit.pm:404
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -3079,12 +3210,12 @@ msgstr ""
 "Nenhum carregador de arranque a consegue aceder sem uma\n"
 "partição /boot. Certifique-se que adiciona uma partição /boot"
 
-#: fsedit.pm:408
+#: fsedit.pm:407
 #, c-format
 msgid "You can not use a LVM Logical Volume for mount point %s"
 msgstr "Não pode usar um Volume Lógico LVM para ponto de montagem %s"
 
-#: fsedit.pm:410
+#: fsedit.pm:409
 #, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -3095,19 +3226,20 @@ msgstr ""
 "O carregador de arranque não o consegue aceder sem uma partição /boot\n"
 "Certifique-se que adiciona uma partição /boot"
 
-#: fsedit.pm:413
+#: fsedit.pm:412
 #, c-format
 msgid ""
 "You may not be able to install lilo (since lilo does not handle a LV on "
 "multiple PVs)"
-msgstr "Pode não poder instalar o lilo (já que o lilo não gere um LV em vários PVs)"
+msgstr ""
+"Pode não poder instalar o lilo (já que o lilo não gere um LV em vários PVs)"
 
-#: fsedit.pm:416 fsedit.pm:418
+#: fsedit.pm:415 fsedit.pm:417
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Esta directoria deve permanecer dentro do sistema de ficheiros root"
 
-#: fsedit.pm:420 fsedit.pm:422
+#: fsedit.pm:419 fsedit.pm:421
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -3116,22 +3248,23 @@ msgstr ""
 "Precisa de um verdadeiro sistema de ficheiros (ext2/ext3, ReiserFS, xfs ou "
 "JFS) para este ponto de montagem\n"
 
-#: fsedit.pm:424
+#: fsedit.pm:423
 #, c-format
 msgid "You can not use an encrypted file system for mount point %s"
-msgstr "Não pode usar um sistema de ficheiros encriptado para ponto de montagem %s"
+msgstr ""
+"Não pode usar um sistema de ficheiros encriptado para ponto de montagem %s"
 
-#: fsedit.pm:485
+#: fsedit.pm:484
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "Sem espaço livre suficiente para auto-alocação"
 
-#: fsedit.pm:487
+#: fsedit.pm:486
 #, c-format
 msgid "Nothing to do"
 msgstr "Nada a fazer"
 
-#: harddrake/data.pm:61 install_any.pm:1505
+#: harddrake/data.pm:61 install_any.pm:1640
 #, c-format
 msgid "Floppy"
 msgstr "Disquete"
@@ -3141,108 +3274,108 @@ msgstr "Disquete"
 msgid "Zip"
 msgstr "Zip"
 
-#: harddrake/data.pm:81 install_any.pm:1506
+#: harddrake/data.pm:87 install_any.pm:1641
 #, c-format
 msgid "Hard Disk"
 msgstr "Disco"
 
-#: harddrake/data.pm:90 install_any.pm:1507
+#: harddrake/data.pm:96 install_any.pm:1642
 #, c-format
 msgid "CDROM"
 msgstr "CDROM"
 
-#: harddrake/data.pm:100
+#: harddrake/data.pm:106
 #, c-format
 msgid "CD/DVD burners"
 msgstr "Gravadores  CD/DVD"
 
-#: harddrake/data.pm:110
+#: harddrake/data.pm:116
 #, c-format
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: harddrake/data.pm:120 standalone/drakbackup:2051
+#: harddrake/data.pm:126 standalone/drakbackup:2059
 #, c-format
 msgid "Tape"
 msgstr "Cassete"
 
-#: harddrake/data.pm:129
+#: harddrake/data.pm:135
 #, c-format
 msgid "Videocard"
 msgstr "Placa de Vídeo"
 
-#: harddrake/data.pm:139
+#: harddrake/data.pm:145
 #, c-format
 msgid "Tvcard"
 msgstr "Placa de TV"
 
-#: harddrake/data.pm:148
+#: harddrake/data.pm:154
 #, c-format
 msgid "Other MultiMedia devices"
 msgstr "Outros dispositivos Multimédia"
 
-#: harddrake/data.pm:157
+#: harddrake/data.pm:163
 #, c-format
 msgid "Soundcard"
 msgstr "Placa de Som"
 
-#: harddrake/data.pm:166
+#: harddrake/data.pm:176
 #, c-format
 msgid "Webcam"
 msgstr "Webcam"
 
-#: harddrake/data.pm:180
+#: harddrake/data.pm:190
 #, c-format
 msgid "Processors"
 msgstr "Processadores"
 
-#: harddrake/data.pm:190
+#: harddrake/data.pm:200
 #, c-format
 msgid "ISDN adapters"
 msgstr "Adaptadores ISDN"
 
-#: harddrake/data.pm:200
+#: harddrake/data.pm:210
 #, c-format
 msgid "Ethernetcard"
 msgstr "Placa Ethernet"
 
-#: harddrake/data.pm:218 network/netconnect.pm:518
+#: harddrake/data.pm:228 network/netconnect.pm:567
 #, c-format
 msgid "Modem"
 msgstr "Modem"
 
-#: harddrake/data.pm:228
+#: harddrake/data.pm:238
 #, c-format
 msgid "ADSL adapters"
 msgstr "Adaptadores ADSL"
 
-#: harddrake/data.pm:242
+#: harddrake/data.pm:252
 #, c-format
 msgid "Memory"
 msgstr "Memória"
 
-#: harddrake/data.pm:251
+#: harddrake/data.pm:261
 #, c-format
 msgid "AGP controllers"
 msgstr "Controladores AGP"
 
-#: harddrake/data.pm:260 help.pm:186 help.pm:855
-#: install_steps_interactive.pm:978
+#: harddrake/data.pm:270 help.pm:186 help.pm:855
+#: install_steps_interactive.pm:979
 #, c-format
 msgid "Printer"
 msgstr "Impressora"
 
-#: harddrake/data.pm:270
+#: harddrake/data.pm:280
 #, c-format
 msgid "Joystick"
 msgstr "Joystick"
 
-#: harddrake/data.pm:280
+#: harddrake/data.pm:290
 #, c-format
 msgid "(E)IDE/ATA controllers"
 msgstr "Controladores (E)IDE/ATA"
 
-#: harddrake/data.pm:289
+#: harddrake/data.pm:299
 #, c-format
 msgid "SATA controllers"
 msgstr "Controladores SATA"
@@ -3252,74 +3385,74 @@ msgstr "Controladores SATA"
 msgid "RAID controllers"
 msgstr "Controladores RAID"
 
-#: harddrake/data.pm:298
+#: harddrake/data.pm:325
 #, c-format
 msgid "Firewire controllers"
 msgstr "Controladores Firewire"
 
-#: harddrake/data.pm:307
+#: harddrake/data.pm:334
 #, c-format
 msgid "PCMCIA controllers"
 msgstr "Controladores PCMCIA"
 
-#: harddrake/data.pm:316
+#: harddrake/data.pm:343
 #, c-format
 msgid "SCSI controllers"
 msgstr "Controladores SCSI"
 
-#: harddrake/data.pm:325
+#: harddrake/data.pm:352
 #, c-format
 msgid "USB controllers"
 msgstr "Controladores USB"
 
-#: harddrake/data.pm:334
+#: harddrake/data.pm:361
 #, c-format
 msgid "USB ports"
 msgstr "Portas USB"
 
-#: harddrake/data.pm:343
+#: harddrake/data.pm:370
 #, c-format
 msgid "SMBus controllers"
 msgstr "Controladores SMBus"
 
-#: harddrake/data.pm:352
+#: harddrake/data.pm:379
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "Pontes e controladores do sistema"
 
-#: harddrake/data.pm:361
-#, c-format
-msgid "UPS"
-msgstr "UPS"
-
-#: harddrake/data.pm:370 help.pm:855 install_steps_interactive.pm:118
-#: install_steps_interactive.pm:938 standalone/keyboarddrake:28
+#: harddrake/data.pm:388 help.pm:855 install_steps_interactive.pm:118
+#: install_steps_interactive.pm:939 standalone/keyboarddrake:29
 #, c-format
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: harddrake/data.pm:383 help.pm:855 install_steps_interactive.pm:971
+#: harddrake/data.pm:401 help.pm:855 install_steps_interactive.pm:972
 #, c-format
 msgid "Mouse"
 msgstr "Rato"
 
-#: harddrake/data.pm:397
+#: harddrake/data.pm:415
+#, c-format
+msgid "UPS"
+msgstr "UPS"
+
+#: harddrake/data.pm:424
 #, c-format
 msgid "Scanner"
 msgstr "Digitalizador"
 
-#: harddrake/data.pm:407 standalone/harddrake2:439
+#: harddrake/data.pm:434 standalone/harddrake2:444
 #, c-format
 msgid "Unknown/Others"
 msgstr "Desconhecido/Outros"
 
-#: harddrake/data.pm:435
+#: harddrake/data.pm:463
 #, c-format
 msgid "cpu # "
 msgstr "processador # "
 
-#: harddrake/sound.pm:191 standalone/drakconnect:169
-#: standalone/drakconnect:615
+#: harddrake/sound.pm:191 standalone/drakconnect:170
+#: standalone/drakconnect:648
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Por favor aguarde... A aplicar a configuração"
@@ -3335,8 +3468,8 @@ msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
 "currently uses \"%s\""
 msgstr ""
-"Não há nenhum drive alternativo OSS/ALSA conhecido para a sua placa de "
-"som (%s) que actualmente use \"%s\""
+"Não há nenhum drive alternativo OSS/ALSA conhecido para a sua placa de som (%"
+"s) que actualmente use \"%s\""
 
 #: harddrake/sound.pm:234
 #, c-format
@@ -3352,7 +3485,7 @@ msgstr ""
 "Aqui pode seleccionar um drive alternativo (seja OSS ou ALSA) para a sua "
 "placa de som (%s)"
 
-#. -PO: here the first %s is either "OSS" or "ALSA",
+#. -PO: here the first %s is either "OSS" or "ALSA", 
 #. -PO: the second %s is the name of the current driver
 #. -PO: and the third %s is the name of the default driver
 #: harddrake/sound.pm:241
@@ -3388,8 +3521,8 @@ msgid ""
 "the ALSA library.\n"
 msgstr ""
 "OSS (Open Sound System) era o primeiro som API. É um som API de um OS "
-"independente (está disponivel na maior parte dos sistemas Unix) mas é um "
-"API muito básico\n"
+"independente (está disponivel na maior parte dos sistemas Unix) mas é um API "
+"muito básico\n"
 "e limitado. Ainda mais, todos os drives OSS reinventam a roda.\n"
 "\n"
 "ALSA (Advanced Linux Sound Architecture) é uma arquitectura modularizada\n"
@@ -3412,18 +3545,19 @@ msgstr "Driver:"
 msgid "Trouble shooting"
 msgstr "Correcção de problemas"
 
-#: harddrake/sound.pm:270 keyboard.pm:391 lang.pm:1039
-#: network/netconnect.pm:504 printer/printerdrake.pm:1142
-#: printer/printerdrake.pm:2142 printer/printerdrake.pm:2228
-#: printer/printerdrake.pm:2274 printer/printerdrake.pm:2341
-#: printer/printerdrake.pm:2376 printer/printerdrake.pm:2684
-#: printer/printerdrake.pm:2691 printer/printerdrake.pm:3643
-#: printer/printerdrake.pm:3970 printer/printerdrake.pm:4092
-#: printer/printerdrake.pm:5183 standalone/drakTermServ:325
-#: standalone/drakTermServ:1111 standalone/drakTermServ:1172
-#: standalone/drakTermServ:1821 standalone/drakbackup:510
-#: standalone/drakbackup:609 standalone/drakboot:165 standalone/drakclock:224
-#: standalone/drakconnect:971 standalone/drakfloppy:291 standalone/drakups:27
+#: harddrake/sound.pm:270 keyboard.pm:391 lang.pm:1059
+#: network/ndiswrapper.pm:95 network/netconnect.pm:553
+#: printer/printerdrake.pm:1206 printer/printerdrake.pm:2230
+#: printer/printerdrake.pm:2316 printer/printerdrake.pm:2362
+#: printer/printerdrake.pm:2429 printer/printerdrake.pm:2464
+#: printer/printerdrake.pm:2773 printer/printerdrake.pm:2780
+#: printer/printerdrake.pm:3740 printer/printerdrake.pm:4069
+#: printer/printerdrake.pm:4193 printer/printerdrake.pm:5310
+#: standalone/drakTermServ:325 standalone/drakTermServ:1104
+#: standalone/drakTermServ:1165 standalone/drakTermServ:1810
+#: standalone/drakbackup:510 standalone/drakbackup:609 standalone/drakboot:165
+#: standalone/drakclock:224 standalone/drakconnect:1007
+#: standalone/drakfloppy:291 standalone/drakups:27 standalone/harddrake2:481
 #: standalone/scannerdrake:51 standalone/scannerdrake:940
 #, c-format
 msgid "Warning"
@@ -3553,7 +3687,8 @@ msgstr ""
 "\n"
 "O driver actual para a sua placa de som \"%s\" é \"%s\" "
 
-#: harddrake/v4l.pm:14
+#: harddrake/v4l.pm:14 standalone/net_applet:74 standalone/net_applet:75
+#: standalone/net_applet:77
 #, c-format
 msgid "Auto-detect"
 msgstr "Auto-detectar"
@@ -3622,19 +3757,19 @@ msgid "enable radio support"
 msgstr "activar o suporte de rádio"
 
 #: help.pm:11
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire 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 ""
 "Antes de continuar, deve ler atentamente os termos da licença. Ela\n"
-"cobre toda a distribuição Mandrakelinux. Se concorda com todos os termos\n"
+"cobre toda a distribuição Mandriva Linux. Se concorda com todos os termos\n"
 "presentes, active a caixa \"%s\". Se não, pode clicar no botão \"%s\" para\n"
 "reiniciar o seu computador."
 
-#: help.pm:14 install_steps_gtk.pm:552 install_steps_interactive.pm:92
+#: help.pm:14 install_steps_gtk.pm:556 install_steps_interactive.pm:92
 #: install_steps_interactive.pm:731 standalone/drakautoinst:216
 #, c-format
 msgid "Accept"
@@ -3718,23 +3853,23 @@ msgstr ""
 "depois clique em \"%s\".\n"
 "Se não está interessado nesta opção, desmarque a caixa \"%s\"."
 
-#: help.pm:51 printer/printerdrake.pm:1595 printer/printerdrake.pm:1715
+#: help.pm:51 printer/printerdrake.pm:1662 printer/printerdrake.pm:1783
 #, c-format
 msgid "User name"
 msgstr "Nome de utilizador"
 
-#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:233
-#: install_steps_gtk.pm:689 interactive.pm:424 interactive/newt.pm:317
-#: network/netconnect.pm:278 network/tools.pm:182 printer/printerdrake.pm:3581
-#: standalone/drakTermServ:382 standalone/drakbackup:3946
-#: standalone/drakbackup:4040 standalone/drakbackup:4057
-#: standalone/drakbackup:4075 ugtk2.pm:506
+#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:237
+#: install_steps_gtk.pm:698 interactive.pm:433 interactive/newt.pm:319
+#: network/netconnect.pm:327 network/tools.pm:191 printer/printerdrake.pm:3678
+#: standalone/drakTermServ:382 standalone/drakbackup:3953
+#: standalone/drakbackup:4047 standalone/drakbackup:4064
+#: standalone/drakbackup:4082 ugtk2.pm:506
 #, c-format
 msgid "Next"
 msgstr "Próximo"
 
 #: help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
-#: interactive.pm:385
+#: interactive.pm:394
 #, c-format
 msgid "Advanced"
 msgstr "Avançado"
@@ -3804,28 +3939,29 @@ msgstr ""
 "\"b\" significa \"segundo ID SCSI mais baixo\", etc."
 
 #: help.pm:85
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The Mandrakelinux 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 ""
-"A instalação Mandrakelinux é distribuída em vários CD-ROMs. Se um pacote\n"
+"A instalação Mandriva Linux é distribuída em vários CD-ROMs. Se um pacote\n"
 "seleccionado estiver localizado noutro CD-ROM, o DrakX irá ejectar o actual\n"
 "CD e pedir para inserir o CD pedido. Se não tiver o CD em questão à mão,\n"
 "clique apenas em \"%s\", o pacote correspondente não será instalado."
 
 #: help.pm:92
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"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"
@@ -3877,10 +4013,10 @@ msgid ""
 "megabytes."
 msgstr ""
 "É agora tempo de especificar que programas deseja instalar no seu\n"
-"sistema. Há centenas de pacotes disponíveis para o Mandrakelinux, e para\n"
+"sistema. Há centenas de pacotes disponíveis para o Mandriva Linux, e para\n"
 " simplificar a gestão, foram colocados em grupos de aplicações similares.\n"
 "\n"
-"O Mandrakelinux classifica os grupos de pacotes em quatro categorias.\n"
+"O Mandriva Linux classifica os grupos de pacotes em quatro categorias.\n"
 "Pode misturar e combinar aplicações de várias categorias, para que a\n"
 "instalação de uma ``Estação de trabalho'' possa ainda ter aplicações da\n"
 "categoria ``Servidor'' instaladas.\n"
@@ -3946,7 +4082,7 @@ msgstr "Desenvolvimento"
 msgid "Graphical Environment"
 msgstr "Ambiente Gráfico"
 
-#: help.pm:146 install_steps_gtk.pm:231 install_steps_interactive.pm:642
+#: help.pm:146 install_steps_gtk.pm:235 install_steps_interactive.pm:642
 #, c-format
 msgid "Individual package selection"
 msgstr "Selecção individual de pacotes"
@@ -3972,7 +4108,7 @@ msgid "Truly minimal install"
 msgstr "Verdadeira instalação mínima"
 
 #: help.pm:149
-#, c-format
+#, fuzzy, c-format
 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"
@@ -3985,10 +4121,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default 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 Mandrakelinux 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"
@@ -4019,11 +4155,11 @@ msgstr ""
 "!! Se um pacote servidor foi seleccionado, ou porque escolheu\n"
 "especificamente o pacote individual ou porque fazia parte de um grupo de\n"
 "pacotes, será-lhe pedido para confirmar que realmente quer que esses\n"
-"servidores sejam instalados. Por omissão o Mandrakelinux irá\n"
+"servidores sejam instalados. Por omissão o Mandriva Linux irá\n"
 "automaticamente iniciar qualquer serviço instalado no arranque. Mesmo\n"
 "que sejam seguros e não tenham qualquer problema conhecido na altura\n"
 "da saída da distribuição, é bem possível que sejam descobertos 'buracos'\n"
-"na segurança a seguir à finalização desta versão Mandrakelinux. Se não\n"
+"na segurança a seguir à finalização desta versão Mandriva Linux. Se não\n"
 "souber que serviço particular é suposto fazer ou porque é instalado, então\n"
 "clique em \"%s\". Ao clicar em \"%s\" irá instalar os serviços listados e\n"
 "serºao iniciados automaticamente no arranque. !!\n"
@@ -4042,24 +4178,6 @@ msgstr ""
 "de outra instalação. Veja a segunda dica do último passo sobre como criar\n"
 "essa disquete."
 
-#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:792
-#: interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2508
-#: standalone/draksec:54 standalone/harddrake2:306 standalone/net_applet:255
-#: ugtk2.pm:899 wizards.pm:156
-#, c-format
-msgid "No"
-msgstr "Não"
-
-#: help.pm:180 help.pm:285 help.pm:444 install_any.pm:792 interactive.pm:149
-#: modules/interactive.pm:71 printer/printerdrake.pm:736
-#: standalone/drakbackup:2508 standalone/drakgw:287 standalone/drakgw:288
-#: standalone/drakgw:296 standalone/drakgw:306 standalone/draksec:55
-#: standalone/harddrake2:305 standalone/net_applet:259 ugtk2.pm:899
-#: wizards.pm:156
-#, c-format
-msgid "Yes"
-msgstr "Sim"
-
 #: help.pm:180
 #, c-format
 msgid "Automatic dependencies"
@@ -4080,9 +4198,9 @@ msgstr ""
 "O interface apresentado no nosso manual é semelhante ao usado durante\n"
 "a instalação."
 
-#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:607
-#: standalone/drakbackup:2333 standalone/drakbackup:2337
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:611
 #: standalone/drakbackup:2341 standalone/drakbackup:2345
+#: standalone/drakbackup:2349 standalone/drakbackup:2353
 #, c-format
 msgid "Configure"
 msgstr "Configurar"
@@ -4153,7 +4271,7 @@ msgstr ""
 "opção instala um servidor horário que poderá ser usado por outras\n"
 "máquinas na sua rede local."
 
-#: help.pm:217 install_steps_interactive.pm:873
+#: help.pm:217 install_steps_interactive.pm:874
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr "Relógio do hardware definido na hora GMT"
@@ -4188,11 +4306,11 @@ msgstr ""
 "que melhor sirva as suas necessidades."
 
 #: help.pm:231
-#, c-format
+#, fuzzy, 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 Mandrakelinux 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"
@@ -4248,7 +4366,7 @@ msgid ""
 msgstr ""
 "X (para Sistema X Window) é o coração do interface gráfico GNU/Linux no\n"
 "qual todos os ambientes gráficos (KDE, GNOME, AfterStep, WindowMaker,\n"
-"etc.) fornecidos com o Mandrakelinux, funcionam.\n"
+"etc.) fornecidos com o Mandriva Linux, funcionam.\n"
 "\n"
 "Irá ver uma lista de parâmetros diferentes para mudar, para poder\n"
 "ter uma boa apresentação gráfica\n"
@@ -4367,14 +4485,14 @@ msgstr ""
 "sucedido a configurar o monitor."
 
 #: help.pm:316
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the 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"
-"Mandrakelinux 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"
@@ -4401,7 +4519,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4410,7 +4528,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 Mandrakelinux 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"
@@ -4431,11 +4550,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Agora precisa decidir onde deseja instalar o sistema operativo\n"
-"Mandrakelinux no seu disco rígido. Se o seu disco rígido estiver vazio\n"
+"Mandriva Linux no seu disco rígido. Se o seu disco rígido estiver vazio\n"
 "ou, se um sistema operativo existente usa todo o espaço disponível,\n"
 "irá ser preciso particionar o disco. Básicamente, particionar um disco\n"
 "rígido significa dividi-lo de maneira lógica para criar o espaço\n"
-"necessário para instalar o seu novo sistema Mandrakelinux.\n"
+"necessário para instalar o seu novo sistema Mandriva Linux.\n"
 "\n"
 "Como os efeitos da operação de particionamento são geralmente\n"
 "irreversíveis, e pode levar a perda de dados, particionar pode ser\n"
@@ -4464,7 +4583,7 @@ msgstr ""
 "perda de qualquer dado, desde que préviamente tenha desfragmentado\n"
 "a partição Windows. É recomendado que faça cópias de segurança.\n"
 "É recomendado que use esta opção, se quer usar os dois sistemas\n"
-"operativos, Mandrakelinus e Microsoft Windows no mesmo computador.\n"
+"operativos, Mandriva Linux e Microsoft Windows no mesmo computador.\n"
 "\n"
 "   Antes de escolher esta opção, por favor compreenda que a seguir a este\n"
 "procedimento, o tamanho da partição do seu Microsoft Windows será mais\n"
@@ -4472,7 +4591,7 @@ msgstr ""
 "seus dados ou instalar novo software.\n"
 "\n"
 " * \"%s\". Se deseja apagar todos os dados e todas as partições presentes\n"
-"no disco rígido e substituí-los pelo seu novo sistema Mandrakelinux, "
+"no disco rígido e substituí-los pelo seu novo sistema Mandriva Linux, "
 "escolha\n"
 "esta opção. Seja cuidadoso, porque não será mais capaz de desfazer esta\n"
 "operação após ter confirmado.\n"
@@ -4600,23 +4719,23 @@ msgstr ""
 msgid "Generate auto-install floppy"
 msgstr "Gerar disquete auto-instal"
 
-#: help.pm:409 install_steps_interactive.pm:1328
+#: help.pm:409 install_steps_interactive.pm:1331
 #, c-format
 msgid "Replay"
 msgstr "Repetir"
 
-#: help.pm:409 install_steps_interactive.pm:1328
+#: help.pm:409 install_steps_interactive.pm:1331
 #, c-format
 msgid "Automated"
 msgstr "Automática"
 
-#: help.pm:409 install_steps_interactive.pm:1331
+#: help.pm:409 install_steps_interactive.pm:1334
 #, c-format
 msgid "Save packages selection"
 msgstr "Gravar selecção de pacotes"
 
 #: help.pm:412
-#, c-format
+#, fuzzy, c-format
 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"
@@ -4635,7 +4754,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"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."
@@ -4657,24 +4776,24 @@ msgstr ""
 "Clique em \"%s\" quando estiver pronto para formatar as partições.\n"
 "\n"
 "Clique em \"%s\" se deseja escolher outra partição para o seu novo\n"
-"sistema operativo Mandrakelinux.\n"
+"sistema operativo Mandriva Linux.\n"
 "\n"
 "Clique em \"%s\" se deseja escolher partições para verificar se fisicamente\n"
 "há blocos defeituosos (\"bad blocks\") no disco."
 
-#: help.pm:431 install_steps_gtk.pm:388 interactive.pm:425
-#: interactive/newt.pm:316 printer/printerdrake.pm:3579
-#: standalone/drakTermServ:361 standalone/drakbackup:3906
-#: standalone/drakbackup:3945 standalone/drakbackup:4056
-#: standalone/drakbackup:4071 ugtk2.pm:504
+#: help.pm:431 install_steps_gtk.pm:392 interactive.pm:434
+#: interactive/newt.pm:318 printer/printerdrake.pm:3676
+#: standalone/drakTermServ:361 standalone/drakbackup:3913
+#: standalone/drakbackup:3952 standalone/drakbackup:4063
+#: standalone/drakbackup:4078 ugtk2.pm:504
 #, c-format
 msgid "Previous"
 msgstr "Anterior"
 
 #: help.pm:434
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"By the time you install Mandrakelinux, 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"
@@ -4686,7 +4805,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"No momento que instala o Mandrakelinux, é quase certo que alguns\n"
+"No momento que instala o Mandriva Linux, é quase certo que alguns\n"
 "pacotes terão sido actualizados desde a distribuição inicial. Alguns\n"
 "erros podem ter sido corrigidos, e problemas de segurança resolvidos.\n"
 "Para lhe permitir beneficiar destas actualizações, está agora apto a fazer\n"
@@ -4699,14 +4818,14 @@ msgstr ""
 "selecção, e clique em \"%s\" para descarregar e instalar os pacotes\n"
 "seleccionados, ou clique em \"%s\" para abortar."
 
-#: help.pm:444 help.pm:588 install_steps_gtk.pm:387
-#: install_steps_interactive.pm:156 standalone/drakbackup:4103
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:391
+#: install_steps_interactive.pm:156 standalone/drakbackup:4110
 #, c-format
 msgid "Install"
 msgstr "Instalar"
 
 #: help.pm:447
-#, c-format
+#, fuzzy, c-format
 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"
@@ -4715,7 +4834,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4729,7 +4848,7 @@ msgstr ""
 "\n"
 "Se não sabe o que escolher, deixe o valor predefinido. Poderá alterá-lo\n"
 "mais tarde com a ferramenta draksec, que faz parte do Centro de Controlo\n"
-"Mandrakelinux.\n"
+"Mandriva Linux.\n"
 "\n"
 "Preencha o campo \"%s\" com o e-mail da pessoa responsável pela\n"
 "segurança. As mensagens de segurança serão enviadas para esse e-mail."
@@ -4740,10 +4859,10 @@ msgid "Security Administrator"
 msgstr "Administrador de Segurança"
 
 #: help.pm:461
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your 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"
@@ -4814,7 +4933,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Neste fase, precisa escolher que partições vão ser utilizadas para a\n"
-"instalação do seu sistema Mandrakelinux. Se já foram definidas partições,\n"
+"instalação do seu sistema Mandriva Linux. Se já foram definidas partições,\n"
 "seja por uma instalação anterior do GNU/Linux seja por outra ferramenta de\n"
 "particionamento, pode utilizar-las . Senão, precisa definir partições no\n"
 "disco rígido.\n"
@@ -4897,11 +5016,11 @@ msgid "Toggle between normal/expert mode"
 msgstr "Alterna entre os modos normal/perito"
 
 #: help.pm:533
-#, c-format
+#, fuzzy, 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"
-"Mandrakelinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4931,7 +5050,7 @@ msgid ""
 msgstr ""
 "Mais do que uma partição Microsoft foi detectada no seu disco rígido.\n"
 "Por favor escolha qual deseja redimencionar para poder instalar o seu\n"
-"novo sistema operativo Mandrakelinux.\n"
+"novo sistema operativo Mandriva Linux.\n"
 "\n"
 "Cada partição é listada da seguinte maneira: \"Nome Linux\",\n"
 "\"Nome Windows\", \"Capacidade\".\n"
@@ -4972,13 +5091,13 @@ msgstr ""
 "clique no botão \"%s\" para obter a lista completa dos países."
 
 #: help.pm:569
-#, c-format
+#, fuzzy, c-format
 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 Mandrakelinux 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"
@@ -4987,19 +5106,20 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your 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 Mandrakelinux 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 Mandrakelinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
 msgstr ""
 "Este passo só fica disponível se uma partição GNU/Linux existente for\n"
 "encontrada na sua máquina.\n"
 "\n"
 "O DrakX agora precisa saber se deseja fazer uma nova instalação ou uma\n"
-"actualização num sistema Mandrakelinux existente:\n"
+"actualização num sistema Mandriva Linux existente:\n"
 "\n"
 " * \"%s\": Para a maior parte, isto apaga completamente o sistema antigo.\n"
 "No entanto, dependendo no seu esquema de particionamento, pode prevenir\n"
@@ -5011,14 +5131,14 @@ msgstr ""
 "\n"
 " * \"%s\": Este tipo de instalação permite actualizar os pacotes "
 "actualmente\n"
-"instalados no seu sistema Mandrakelinux. O seu actual esquema de\n"
+"instalados no seu sistema Mandriva Linux. O seu actual esquema de\n"
 "particionamento, assim como os dados dos utilizadores não serão alterados.\n"
 "A maior parte dos outros passos da configuração permanece disponível e "
 "similar a uma instalação standard.\n"
 "\n"
 "A opção ``Actualizar'' deverá funcionar correctamente nos sistemas\n"
-"Mandrakelinux versão \"8.1\" ou superior. É desaconselhável actualizar\n"
-"versões anteriores à versão \"8.1\" do Mandrakelinux."
+"Mandriva Linux versão \"8.1\" ou superior. É desaconselhável actualizar\n"
+"versões anteriores à versão \"8.1\" do Mandriva Linux."
 
 #: help.pm:591
 #, c-format
@@ -5058,7 +5178,7 @@ msgstr ""
 "permita mudar o teclado entre uma disposição Latim uma não Latim."
 
 #: help.pm:609
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -5074,7 +5194,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, Mandrakelinux'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"
@@ -5116,7 +5237,7 @@ msgstr ""
 "Sobre o suporte UTF-8 (unicode): Unicode é uma codificação de caracter\n"
 "feito para cobrir todas as linguagens existentes. No entanto o seu suporte\n"
 "completo em GNU/Linux ainda está a ser desenvolvido. Por essa razão,\n"
-"o uso de UTF-8 em Mandrakelinux depende das escolhas do utilizador:\n"
+"o uso de UTF-8 em Mandriva Linux depende das escolhas do utilizador:\n"
 "\n"
 " * Se escolher uma linguagem com um forte legado de codificação\n"
 "(linguagens latin1, Russo, Japonês, ChinêsCoreano, Tailandês, grego, turco,\n"
@@ -5354,10 +5475,10 @@ msgstr ""
 "esta opção apenas se souber o que está a fazer."
 
 #: help.pm:742
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but 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"
@@ -5378,11 +5499,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Agora, é tempo de escolher o sistema de impressão para o seu computador.\n"
-"Outros sistemas operativos podem oferecer um, mas o Mandrakelinux\n"
+"Outros sistemas operativos podem oferecer um, mas o Mandriva Linux\n"
 "oferece dois. Cada um dos sistemas de impressão é bem servido para tipos\n"
 "particulares de configuração.\n"
 "\n"
@@ -5403,7 +5524,7 @@ msgstr ""
 "interfaces gráficos para imprimir ou escolher as opções de impressão.\n"
 "\n"
 "Poderá mudar a sua escolha de sistema após a instalação correndo o\n"
-"PrinterDrake a partir do Centro de Controlo Mandrakelinux e clicando\n"
+"PrinterDrake a partir do Centro de Controlo Mandriva Linux e clicando\n"
 "no botão \"%s\"."
 
 #: help.pm:765
@@ -5471,14 +5592,14 @@ msgstr ""
 "listada aqui. Se verificar que a placa de som listada não é a placa que \n"
 "está presente no seu sistema, pode clicar no botão e escolher outro driver."
 
-#: help.pm:788 help.pm:855 install_steps_interactive.pm:1005
-#: install_steps_interactive.pm:1022
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1006
+#: install_steps_interactive.pm:1023
 #, c-format
 msgid "Sound card"
 msgstr "Placa de Som"
 
 #: help.pm:791
-#, c-format
+#, fuzzy, c-format
 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"
@@ -5523,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"
-"Mandrakelinux 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"
@@ -5540,7 +5662,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"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"
@@ -5589,7 +5711,7 @@ msgstr ""
 "\n"
 " * \"%s\": se deseja configurar a sua internet ou acesso de rede local\n"
 "pode fazê-lo. Refira-se a documentação impressa ou use o Centro de\n"
-"Controlo do Mandrakelinux a seguir a instalação ter terminado de\n"
+"Controlo do Mandriva Linux a seguir a instalação ter terminado de\n"
 "beneficiar da ajuda incluída.\n"
 "\n"
 " * \"%s\": permite-lhe configurar endereços HTTP e FTP proxy se a máquina\n"
@@ -5607,18 +5729,18 @@ msgstr ""
 "clique nesse botão. Isto deveria ser reservado aos utilizadores\n"
 "avançados.Referira-se à documentação impressa, ou à linha de ajuda\n"
 "sobre a configuração de carregador de arranque (bootloader) no\n"
-"Centro de Controlo Mandrakelinux.\n"
+"Centro de Controlo Mandriva Linux.\n"
 "\n"
 " * \"%s\": através desta entrada pode ajustar quais os serviços que serão\n"
 "executados na sua máquina. Se planeia configurar esta máquina como\n"
 "um servidor, é uma boa ideia rever a configuração."
 
-#: help.pm:855 install_steps_interactive.pm:964 standalone/drakclock:100
+#: help.pm:855 install_steps_interactive.pm:965 standalone/drakclock:100
 #, c-format
 msgid "Timezone"
 msgstr "Fuso horário"
 
-#: help.pm:855 install_steps_interactive.pm:1038
+#: help.pm:855 install_steps_interactive.pm:1039
 #, c-format
 msgid "TV card"
 msgstr "Placa TV"
@@ -5633,46 +5755,46 @@ msgstr "Placa ISDN"
 msgid "Graphical Interface"
 msgstr "Interface gráfico"
 
-#: help.pm:855 install_any.pm:1528 install_steps_interactive.pm:1056
-#: standalone/drakbackup:2036
+#: help.pm:855 install_any.pm:1663 install_steps_interactive.pm:1057
+#: standalone/drakbackup:2044
 #, c-format
 msgid "Network"
 msgstr "Rede"
 
-#: help.pm:855 install_steps_interactive.pm:1071
+#: help.pm:855 install_steps_interactive.pm:1072
 #, c-format
 msgid "Proxies"
 msgstr "Proxies"
 
-#: help.pm:855 install_steps_interactive.pm:1082
+#: help.pm:855 install_steps_interactive.pm:1083
 #, c-format
 msgid "Security Level"
 msgstr "Nível de Segurança"
 
-#: help.pm:855 install_steps_interactive.pm:1096
+#: help.pm:855 install_steps_interactive.pm:1097
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: help.pm:855 install_steps_interactive.pm:1110
+#: help.pm:855 install_steps_interactive.pm:1113
 #, c-format
 msgid "Bootloader"
 msgstr "Carregador de arranque"
 
-#: help.pm:855 install_steps_interactive.pm:1123 services.pm:193
+#: help.pm:855 install_steps_interactive.pm:1126 services.pm:193
 #, c-format
 msgid "Services"
 msgstr "Serviços"
 
 #: help.pm:858
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Escolha o disco que deseja apagar para instalar a sua nova partição\n"
-"Mandrakelinux. Tenha cuidado, todos os ficheiros no disco serão\n"
+"Mandriva Linux. Tenha cuidado, todos os ficheiros no disco serão\n"
 "perdidos de forma irrecuperável!"
 
 #: help.pm:863
@@ -5716,18 +5838,18 @@ msgstr ""
 "está em sintonia com a média de instalação (por favor crie uma nova disquete "
 "de arranque)"
 
-#: install2.pm:167
+#: install2.pm:172
 #, c-format
 msgid "You must also format %s"
 msgstr "Também deve formatar %s"
 
-#: install_any.pm:376
+#: install_any.pm:406
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Tem mais medias suplementares?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:379
+#: install_any.pm:409
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -5740,57 +5862,57 @@ msgstr ""
 "\n"
 "Tem alguma media de instalação suplementar para configurar?"
 
-#: install_any.pm:388 printer/printerdrake.pm:2929
-#: printer/printerdrake.pm:2936 standalone/scannerdrake:182
+#: install_any.pm:422 printer/printerdrake.pm:3022
+#: printer/printerdrake.pm:3029 standalone/scannerdrake:182
 #: standalone/scannerdrake:190 standalone/scannerdrake:241
 #: standalone/scannerdrake:248
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: install_any.pm:388
+#: install_any.pm:422
 #, c-format
 msgid "Network (http)"
 msgstr "Rede (http)"
 
-#: install_any.pm:388
+#: install_any.pm:422
 #, c-format
 msgid "Network (ftp)"
 msgstr "Rede (ftp)"
 
-#: install_any.pm:436 standalone/drakbackup:112
+#: install_any.pm:451
+#, c-format
+msgid "Insert the CD 1 again"
+msgstr "Insira o CD 1 outra vez"
+
+#: install_any.pm:479 standalone/drakbackup:112
 #, c-format
 msgid "No device found"
 msgstr "Nenhum dispositivo encontrado"
 
-#: install_any.pm:440
+#: install_any.pm:484
 #, c-format
 msgid "Insert the CD"
 msgstr "Insira o CD"
 
-#: install_any.pm:445
+#: install_any.pm:489
 #, c-format
 msgid "Unable to mount CD-ROM"
 msgstr "Não foi possível montar o CD-ROM"
 
-#: install_any.pm:468
-#, c-format
-msgid "Insert the CD 1 again"
-msgstr "Insira o CD 1 outra vez"
-
-#: install_any.pm:478 install_any.pm:482
+#: install_any.pm:521 install_any.pm:525
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL do mirror?"
 
-#: install_any.pm:515
+#: install_any.pm:558
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Não foi possível encontrar o ficheiro hdlist neste mirror"
 
-#: install_any.pm:633
+#: install_any.pm:725
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -5801,13 +5923,13 @@ msgstr ""
 "Por favor insira o Cd-Rom rotulado \"%s\" no seu drive e prima Ok quando "
 "pronto."
 
-#: install_any.pm:652
+#: install_any.pm:738
 #, c-format
 msgid "Copying in progress"
 msgstr "Cópia em progresso"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:783
+#: install_any.pm:878
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -5831,7 +5953,7 @@ msgstr ""
 "Deseja mesmo instalar estes servidores?\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:806
+#: install_any.pm:901
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -5845,22 +5967,22 @@ msgstr ""
 "\n"
 "Deseja realmente remover estes pacotes ?\n"
 
-#: install_any.pm:1214 partition_table.pm:603
+#: install_any.pm:1349 partition_table.pm:603
 #, c-format
 msgid "Error reading file %s"
 msgstr "Erro ao ler o ficheiro %s"
 
-#: install_any.pm:1425
+#: install_any.pm:1560
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Os seguintes discos foram renomeados:"
 
-#: install_any.pm:1427
+#: install_any.pm:1562
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (anteriormente conhecido por %s)"
 
-#: install_any.pm:1465
+#: install_any.pm:1600
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5869,42 +5991,42 @@ msgstr ""
 "Ocorreu um erro - nenhum dispositivo válido foi encontrado para criar novos "
 "sistemas de ficheiros. Por favor verifique no hardware a causa deste problema"
 
-#: install_any.pm:1509
+#: install_any.pm:1644
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: install_any.pm:1509
+#: install_any.pm:1644
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: install_any.pm:1509
+#: install_any.pm:1644
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: install_any.pm:1532
+#: install_any.pm:1667
 #, c-format
 msgid "Please choose a media"
 msgstr "Por favor escolha uma média"
 
-#: install_any.pm:1564
+#: install_any.pm:1699
 #, c-format
 msgid "Bad media %s"
 msgstr "Média danificada %s"
 
-#: install_any.pm:1576
+#: install_any.pm:1711
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "O ficheiro já existe. Deseja sobrepôr o ficheiro?"
 
-#: install_any.pm:1627
+#: install_any.pm:1762
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Não se podem cópias do ecrã antes de particionar"
 
-#: install_any.pm:1634
+#: install_any.pm:1769
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "As cópias de ecrã estarão disponíveis após a instalação em %s"
@@ -5998,7 +6120,8 @@ msgstr "Tamanho da partição swap em MB: "
 #: install_interactive.pm:130
 #, c-format
 msgid "There is no FAT partition to use as loopback (or not enough space left)"
-msgstr "Não há partições FAT para usar como loopback (ou não têm espaço suficiente)"
+msgstr ""
+"Não há partições FAT para usar como loopback (ou não têm espaço suficiente)"
 
 #: install_interactive.pm:139
 #, c-format
@@ -6020,15 +6143,15 @@ msgid "Computing the size of the Windows partition"
 msgstr "A calcular o tamanho da partição Windows"
 
 #: install_interactive.pm:163
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "A sua partição Windows está demasiado fragmentada. Por favor reinicie o seu "
 "computador em Windows, execute a utilidade ``defrag'', depois recomece a "
-"instalação Mandrakelinux"
+"instalação Mandriva Linux"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6118,7 +6241,8 @@ msgstr "Não consigo encontrar espaço para instalar"
 #: install_interactive.pm:275
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr "O assistente de particionamento do DrakX encontrou as seguintes soluções:"
+msgstr ""
+"O assistente de particionamento do DrakX encontrou as seguintes soluções:"
 
 #: install_interactive.pm:281
 #, c-format
@@ -6137,24 +6261,24 @@ msgstr "A desligar a rede"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:10
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"The operating system and the different components available in the 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 Mandrakelinux distribution.\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"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6176,23 +6300,23 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
-"law, be liable for any special,\n"
+"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
+"be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
 "business, interruption of business, financial loss, legal fees and penalties "
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
-"in no circumstances, be \n"
+"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
+"no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
 "limitation damages for loss of business, interruption of business, financial "
@@ -6201,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 Mandrakelinux 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"
@@ -6221,10 +6345,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6235,11 +6359,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
-"Products, as a whole or in \n"
+"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
+"as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6255,24 +6379,24 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Introdução\n"
 "\n"
 "O sistema operativo e os diferentes elementos disponíveis na distribuição "
-"Mandrakelinux \n"
+"Mandriva Linux \n"
 "deveriam ser chamados os \"Produtos de Software\" a partir daqui. Os "
 "Produtos de Software incluem, \n"
 "mas não se limitam a, o grupo de programas, métodos, regras e documentações "
 "relativos ao sistema operativo \n"
-"assim como os diferentes elementos da distribuição Mandrakelinux.\n"
+"assim como os diferentes elementos da distribuição Mandriva Linux.\n"
 "\n"
 "\n"
 "1. Termo de licença\n"
 "\n"
 "Por favor leia com atenção este documento. Este documento é o termo de "
 "licença entre você e \n"
-"a Mandrakesoft S.A. que se aplica aos Produtos de Software.\n"
+"a Mandriva S.A. que se aplica aos Produtos de Software.\n"
 "Ao instalar, duplicar ou usar os Produtos de Software de qualquer maneira, "
 "aceita explicitamente \n"
 "e completamente os termos e condições desta Licença. \n"
@@ -6293,28 +6417,28 @@ msgstr ""
 "Os Produtos de Software e a documentação são fornecidos \"como estão\", sem "
 "nenhuma garantia, \n"
 "quanto permitido pela lei.\n"
-"Mandrakesoft S.A. não vai ser, em nenhuma circunstância e quanto permitido "
-"pela lei, responsável de qualquer\n"
+"Mandriva S.A. não vai ser, em nenhuma circunstância e quanto permitido pela "
+"lei, responsável de qualquer\n"
 "acidente particular, dos danos directos ou indirectos (inclusive os "
 "resultantes de perda de lucros, interrupção\n"
 "de negócios, perda de informações e dividas legais resultando dum julgamento,"
 "ou qualquer ou perca consequente) \n"
 "decorrentes do uso ou da impossibilidade de usar os Produtos de Software, "
-"mesmo se a Mandrakesoft S.A. foi \n"
+"mesmo se a Mandriva S.A. foi \n"
 "avisada da possibilidade de ocorrimento de tais danos.\n"
 "\n"
 "LIMITAÇÃO DE RESPONSABILIDADE LIGADA A POSSESSÃO OU UTILIZAÇÃO DE PROGRAMAS "
 "PROIBIDOS EM CERTOS PAÍSES\n"
 "\n"
-"Pelo que é permitido por lei, a Mandrakesoft S.A. ou os seus distribuidores "
-"não vão ser, em nenhuma\n"
+"Pelo que é permitido por lei, a Mandriva S.A. ou os seus distribuidores não "
+"vão ser, em nenhuma\n"
 "circunstância, ser responsável por quaisque danos directos ou indirectos "
 "(inclusive os resultantes\n"
 "de perda de lucros, interrupção de negócios, perda de informações e dívidas "
 "legais resultado de um\n"
 "julgamento, ou qualquer perca consequente) decorrentes da possessão, do uso "
 "ou do descarregamento\n"
-"dos Produtos de Software a partir de um dos servidores da Mandrakelinux que "
+"dos Produtos de Software a partir de um dos servidores da Mandriva Linux que "
 "sejam proibidos\n"
 "ou limitados pela lei em certos países pelas leis locais.\n"
 "Este limite de responsabilidade inclui, mas não se limita aos elementos de "
@@ -6336,10 +6460,10 @@ msgstr ""
 "usar qualquer\n"
 "componente. Qualquer pergunta sobre uma da licença deve ser endereçada ao "
 "autor do componente\n"
-"e não à Mandrakesoft. O programas desenvolvidos pela Mandrakesoft S.A. são "
+"e não à Mandriva. O programas desenvolvidos pela Mandriva S.A. são "
 "publicados sob os\n"
-"termos da licença GPL. A documentação escrita por Mandrakesoft S.A. é "
-"publicada sob uma licença\n"
+"termos da licença GPL. A documentação escrita por Mandriva S.A. é publicada "
+"sob uma licença\n"
 "especifica. Por favor veja a documentação para mais detalhes.\n"
 "\n"
 "\n"
@@ -6349,11 +6473,11 @@ msgstr ""
 "autores respectivos \n"
 "e são protegidos pela propriedade intelectual e pelas leis de Copyright "
 "aplicáveis a produtos de software.\n"
-"Mandrakesoft S.A. reserva os seus direitos de modificar ou adaptar os "
-"Produtos de Software, como um \n"
+"Mandriva S.A. reserva os seus direitos de modificar ou adaptar os Produtos "
+"de Software, como um \n"
 "todo ou parcialmente, em qualquer sentido e para todos os fins.\n"
-"\"Mandrake\", \"Mandrakelinux\" e os logotipos associados são marcas "
-"registradas da Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandriva Linux\" e os logotipos associados são marcas "
+"registradas da Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Legislação em Vigor \n"
@@ -6368,8 +6492,8 @@ msgstr ""
 "resolvidos sem tribunal. \n"
 "Como ultima solução, o desacordo será referido ao Tribunal de Paris - "
 "França.\n"
-"Para qualquer pergunta sobre este documento, contacte por favor Mandrakesoft "
-"S.A.  \n"
+"Para qualquer pergunta sobre este documento, contacte por favor Mandriva S."
+"A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6453,14 +6577,14 @@ msgstr ""
 "e leis de copyright aplicavel aos programas software.\n"
 
 #: install_messages.pm:131
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6468,14 +6592,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "Parabéns, a instalação está completa.\n"
 "Retire a media de arranque e clique em Enter para reiniciar.\n"
 "\n"
 "\n"
-"Para informação das correcções disponíveis para esta versão do "
-"Mandrakelinux,\n"
+"Para informação das correcções disponíveis para esta versão do Mandriva "
+"Linux,\n"
 "consulte a Errata disponível em: \n"
 "\n"
 "\n"
@@ -6483,13 +6607,13 @@ msgstr ""
 "\n"
 "\n"
 "Informação em configurar o seu sistema está disponivel no\n"
-"capítulo pós-instalação do Guia Oficial do Utilizador do Mandrakelinux."
+"capítulo pós-instalação do Guia Oficial do Utilizador do 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
@@ -6509,117 +6633,114 @@ msgstr ""
 "Verifique o cdrom num computador instalado usando \"rpm -qpl media/main/*.rpm"
 "\"\n"
 
-#: install_steps.pm:599
-#, c-format
-msgid "No floppy drive available"
-msgstr "Nenhum drive de disquete disponível"
-
 #: install_steps_auto_install.pm:76 install_steps_stdio.pm:27
 #, c-format
 msgid "Entering step `%s'\n"
 msgstr "A entrar no passo `%s'\n"
 
-#: install_steps_gtk.pm:177
-#, c-format
+#: install_steps_gtk.pm:181
+#, fuzzy, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"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 ""
 "O seu sistema está baixo em recursos. Pode ter algum problema na\n"
-"instalação do Mandrakelinux. Se isso ocorrer, pode tentar instalar usando o\n"
+"instalação do Mandriva Linux. Se isso ocorrer, pode tentar instalar usando "
+"o\n"
 "modo texto. Para isso, prima `F1' no quadro de inicialização e escreva "
 "`text'."
 
-#: install_steps_gtk.pm:224 install_steps_interactive.pm:624
+#: install_steps_gtk.pm:228 install_steps_interactive.pm:624
 #, c-format
 msgid "Package Group Selection"
 msgstr "Selecção do Grupo de Pacotes"
 
-#: install_steps_gtk.pm:250 install_steps_interactive.pm:567
+#: install_steps_gtk.pm:254 install_steps_interactive.pm:567
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Tamanho total: %d / %d MB"
 
-#: install_steps_gtk.pm:295
+#: install_steps_gtk.pm:299
 #, c-format
 msgid "Bad package"
 msgstr "Pacote defeituoso"
 
-#: install_steps_gtk.pm:297
+#: install_steps_gtk.pm:301
 #, c-format
 msgid "Version: "
 msgstr "Versão: "
 
-#: install_steps_gtk.pm:298
+#: install_steps_gtk.pm:302
 #, c-format
 msgid "Size: "
 msgstr "Tamanho: "
 
-#: install_steps_gtk.pm:298
+#: install_steps_gtk.pm:302
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: install_steps_gtk.pm:299
+#: install_steps_gtk.pm:303
 #, c-format
 msgid "Importance: "
 msgstr "Importância: "
 
-#: install_steps_gtk.pm:332
+#: install_steps_gtk.pm:336
 #, c-format
 msgid "You can not select/unselect this package"
 msgstr "Não pode seleccionar/de-seleccionar esse pacote"
 
-#: install_steps_gtk.pm:336
+#: install_steps_gtk.pm:340
 #, c-format
 msgid "due to missing %s"
 msgstr "devido a faltar %s"
 
-#: install_steps_gtk.pm:337
+#: install_steps_gtk.pm:341
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "devido a %s insatisfeitas"
 
-#: install_steps_gtk.pm:338
+#: install_steps_gtk.pm:342
 #, c-format
 msgid "trying to promote %s"
 msgstr "a tentar promover %s"
 
-#: install_steps_gtk.pm:339
+#: install_steps_gtk.pm:343
 #, c-format
 msgid "in order to keep %s"
 msgstr "para manter %s"
 
-#: install_steps_gtk.pm:344
+#: install_steps_gtk.pm:348
 #, c-format
 msgid ""
 "You can not select this package as there is not enough space left to install "
 "it"
-msgstr "Não pode seleccionar esse pacote pois não existe espaço livre para o instalar"
+msgstr ""
+"Não pode seleccionar esse pacote pois não existe espaço livre para o instalar"
 
-#: install_steps_gtk.pm:347
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Os seguintes pacotes serão instalados"
 
-#: install_steps_gtk.pm:348
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Os seguintes pacotes serão removidos"
 
-#: install_steps_gtk.pm:372
+#: install_steps_gtk.pm:376
 #, c-format
 msgid "This is a mandatory package, it can not be unselected"
 msgstr "Este é um pacote obrigatório, tem que ser seleccionado"
 
-#: install_steps_gtk.pm:374
+#: install_steps_gtk.pm:378
 #, c-format
 msgid "You can not unselect this package. It is already installed"
 msgstr "Não pode deixar de seleccionar este pacote. Ele já está instalado"
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:381
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -6628,78 +6749,79 @@ msgstr ""
 "Este pacote tem que ser actualizado\n"
 "Tem certeza que não o quer seleccionar?"
 
-#: install_steps_gtk.pm:380
+#: install_steps_gtk.pm:384
 #, c-format
 msgid "You can not unselect this package. It must be upgraded"
-msgstr "Não pode deixar de seleccionar este pacote. Ele tem que ser actualizado"
+msgstr ""
+"Não pode deixar de seleccionar este pacote. Ele tem que ser actualizado"
 
-#: install_steps_gtk.pm:385
+#: install_steps_gtk.pm:389
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Mostrar pacotes seleccionados automaticamente"
 
-#: install_steps_gtk.pm:390
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "Load/Save selection"
 msgstr "Carregar/Gravar a selecção"
 
-#: install_steps_gtk.pm:391
+#: install_steps_gtk.pm:395
 #, c-format
 msgid "Updating package selection"
 msgstr "A actualizar a selecção de pacotes"
 
-#: install_steps_gtk.pm:396
+#: install_steps_gtk.pm:400
 #, c-format
 msgid "Minimal install"
 msgstr "Instalação mínima"
 
-#: install_steps_gtk.pm:410 install_steps_interactive.pm:483
+#: install_steps_gtk.pm:414 install_steps_interactive.pm:483
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Escolha os pacotes que deseja instalar"
 
-#: install_steps_gtk.pm:426 install_steps_interactive.pm:706
+#: install_steps_gtk.pm:430 install_steps_interactive.pm:706
 #, c-format
 msgid "Installing"
 msgstr "A instalar"
 
-#: install_steps_gtk.pm:433
+#: install_steps_gtk.pm:437
 #, c-format
 msgid "Estimating"
 msgstr "A estimar"
 
-#: install_steps_gtk.pm:482
+#: install_steps_gtk.pm:486
 #, c-format
 msgid "No details"
 msgstr "Sem detalhes"
 
-#: install_steps_gtk.pm:490
+#: install_steps_gtk.pm:494
 #, c-format
 msgid "Time remaining "
 msgstr "Tempo restante "
 
-#: install_steps_gtk.pm:497
+#: install_steps_gtk.pm:501
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "Por favor aguarde, a preparar a instalação..."
 
-#: install_steps_gtk.pm:512
+#: install_steps_gtk.pm:516
 #, c-format
 msgid "%d packages"
 msgstr "%d pacotes"
 
-#: install_steps_gtk.pm:517
+#: install_steps_gtk.pm:521
 #, c-format
 msgid "Installing package %s"
 msgstr "A instalar pacote %s"
 
-#: install_steps_gtk.pm:552 install_steps_interactive.pm:92
+#: install_steps_gtk.pm:556 install_steps_interactive.pm:92
 #: install_steps_interactive.pm:731
 #, c-format
 msgid "Refuse"
 msgstr "Recusar"
 
-#: install_steps_gtk.pm:556 install_steps_interactive.pm:735
+#: install_steps_gtk.pm:560 install_steps_interactive.pm:735
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -6712,29 +6834,29 @@ msgstr ""
 "feito.\n"
 "Se não o tiver, prima Cancelar para evitar a instalação deste Cd-Rom."
 
-#: install_steps_gtk.pm:571 install_steps_interactive.pm:746
+#: install_steps_gtk.pm:575 install_steps_interactive.pm:746
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Houve um erro ao ordenar os pacotes:"
 
-#: install_steps_gtk.pm:571 install_steps_gtk.pm:575
+#: install_steps_gtk.pm:575 install_steps_gtk.pm:579
 #: install_steps_interactive.pm:746 install_steps_interactive.pm:750
 #, c-format
 msgid "Go on anyway?"
 msgstr "Continuar mesmo assim?"
 
-#: install_steps_gtk.pm:575 install_steps_interactive.pm:750
+#: install_steps_gtk.pm:579 install_steps_interactive.pm:750
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "Houve um erro a instalar os pacotes:"
 
-#: install_steps_gtk.pm:617 install_steps_interactive.pm:920
-#: install_steps_interactive.pm:1072
+#: install_steps_gtk.pm:621 install_steps_interactive.pm:921
+#: install_steps_interactive.pm:1073
 #, c-format
 msgid "not configured"
 msgstr "não configurado"
 
-#: install_steps_gtk.pm:680
+#: install_steps_gtk.pm:684
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -6743,7 +6865,7 @@ msgstr ""
 "A segiuinte media de instalação foi encontrada.\n"
 "Se quer evitar alguns deles, pode desmarcá-los agora."
 
-#: install_steps_gtk.pm:684
+#: install_steps_gtk.pm:693
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -6756,7 +6878,7 @@ msgstr ""
 "Irá continuar a partir do disco rígido e os pacotes irão permanecer "
 "disponíveis assim que o sistema estiver instalado."
 
-#: install_steps_gtk.pm:686
+#: install_steps_gtk.pm:695
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Copiar todos os CDs"
@@ -6851,7 +6973,7 @@ msgstr "IDE"
 msgid "Configuring IDE"
 msgstr "A configurar IDE"
 
-#: install_steps_interactive.pm:256 network/tools.pm:172
+#: install_steps_interactive.pm:256 network/tools.pm:181
 #, c-format
 msgid "No partition available"
 msgstr "Sem partições disponíveis"
@@ -6931,7 +7053,7 @@ msgstr "A ver os pacotes já instalados..."
 msgid "Finding packages to upgrade..."
 msgstr "A procurar pacotes para actualizar..."
 
-#: install_steps_interactive.pm:421 install_steps_interactive.pm:825
+#: install_steps_interactive.pm:421 install_steps_interactive.pm:826
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Escolha um mirror para transferir os pacotes"
@@ -6959,8 +7081,8 @@ msgstr ""
 msgid "Load"
 msgstr "Ler"
 
-#: install_steps_interactive.pm:497 standalone/drakbackup:3924
-#: standalone/drakbackup:3997 standalone/logdrake:173
+#: install_steps_interactive.pm:497 standalone/drakbackup:3931
+#: standalone/drakbackup:4004 standalone/drakroam:206 standalone/logdrake:173
 #, c-format
 msgid "Save"
 msgstr "Gravar"
@@ -7039,12 +7161,12 @@ msgstr ""
 msgid "Post-install configuration"
 msgstr "Configuração pós-instalação"
 
-#: install_steps_interactive.pm:770
-#, c-format
-msgid "Please insert the Update Modules floppy in drive %s"
+#: install_steps_interactive.pm:771
+#, fuzzy, c-format
+msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Por favor Insira uma disquete com os módulos actualizados no drive %s"
 
-#: install_steps_interactive.pm:799
+#: install_steps_interactive.pm:800
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -7065,79 +7187,81 @@ msgstr ""
 "\n"
 "Deseja instalar as actualizações ?"
 
-#: install_steps_interactive.pm:820
-#, c-format
-msgid "Contacting Mandrakelinux web site to get the list of available mirrors..."
+#: install_steps_interactive.pm:821
+#, fuzzy, c-format
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
-"A contactar o site Mandrakelinux para transferir a lista dos mirrors "
+"A contactar o site Mandriva Linux para transferir a lista dos mirrors "
 "disponíveis..."
 
-#: install_steps_interactive.pm:839
+#: install_steps_interactive.pm:840
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
-msgstr "A contactar o mirror para transferir a lista dos pacotes disponíveis..."
+msgstr ""
+"A contactar o mirror para transferir a lista dos pacotes disponíveis..."
 
-#: install_steps_interactive.pm:843
+#: install_steps_interactive.pm:844
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Não foi possível contactar o mirror %s"
 
-#: install_steps_interactive.pm:843
+#: install_steps_interactive.pm:844
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Deseja tentar outra vez?"
 
-#: install_steps_interactive.pm:869 standalone/drakclock:45
+#: install_steps_interactive.pm:870 standalone/drakclock:45
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Qual é o seu fuso horário?"
 
-#: install_steps_interactive.pm:874
+#: install_steps_interactive.pm:875
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Sincronização automática da hora (com NTP)"
 
-#: install_steps_interactive.pm:882
+#: install_steps_interactive.pm:883
 #, c-format
 msgid "NTP Server"
 msgstr "Servidor NTP"
 
-#: install_steps_interactive.pm:924 steps.pm:30
+#: install_steps_interactive.pm:925 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Sumário"
 
-#: install_steps_interactive.pm:937 install_steps_interactive.pm:945
-#: install_steps_interactive.pm:963 install_steps_interactive.pm:970
-#: install_steps_interactive.pm:1122 services.pm:133
-#: standalone/drakbackup:1599
+#: install_steps_interactive.pm:938 install_steps_interactive.pm:946
+#: install_steps_interactive.pm:964 install_steps_interactive.pm:971
+#: install_steps_interactive.pm:1125 services.pm:133
+#: standalone/drakbackup:1602
 #, c-format
 msgid "System"
 msgstr "Sistema"
 
-#: install_steps_interactive.pm:977 install_steps_interactive.pm:1004
-#: install_steps_interactive.pm:1021 install_steps_interactive.pm:1037
-#: install_steps_interactive.pm:1048
+#: install_steps_interactive.pm:978 install_steps_interactive.pm:1005
+#: install_steps_interactive.pm:1022 install_steps_interactive.pm:1038
+#: install_steps_interactive.pm:1049
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: install_steps_interactive.pm:983 install_steps_interactive.pm:992
+#: install_steps_interactive.pm:984 install_steps_interactive.pm:993
 #, c-format
 msgid "Remote CUPS server"
 msgstr "Servidor CUPS remoto"
 
-#: install_steps_interactive.pm:983
+#: install_steps_interactive.pm:984
 #, c-format
 msgid "No printer"
 msgstr "Nenhuma impressora"
 
-#: install_steps_interactive.pm:1025
+#: install_steps_interactive.pm:1026
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Tem alguma placa de som ISA?"
 
-#: install_steps_interactive.pm:1027
+#: install_steps_interactive.pm:1028
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -7146,69 +7270,70 @@ msgstr ""
 "Execute \"alsaconf\" ou \"sndconfig\" depois da instalação para configurar a "
 "sua placa de som"
 
-#: install_steps_interactive.pm:1029
+#: install_steps_interactive.pm:1030
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "Nenhuma placa de som detectada. Tente \"harddrake\" depois da instalação"
+msgstr ""
+"Nenhuma placa de som detectada. Tente \"harddrake\" depois da instalação"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1050
 #, c-format
 msgid "Graphical interface"
 msgstr "Interface gráfico"
 
-#: install_steps_interactive.pm:1055 install_steps_interactive.pm:1070
+#: install_steps_interactive.pm:1056 install_steps_interactive.pm:1071
 #, c-format
 msgid "Network & Internet"
 msgstr "Rede & Internet"
 
-#: install_steps_interactive.pm:1072
+#: install_steps_interactive.pm:1073
 #, c-format
 msgid "configured"
 msgstr "configurado"
 
-#: install_steps_interactive.pm:1081 install_steps_interactive.pm:1095
+#: install_steps_interactive.pm:1082 install_steps_interactive.pm:1096
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "Segurança"
 
-#: install_steps_interactive.pm:1100
+#: install_steps_interactive.pm:1101
 #, c-format
 msgid "activated"
 msgstr "activado"
 
-#: install_steps_interactive.pm:1100
+#: install_steps_interactive.pm:1101
 #, c-format
 msgid "disabled"
 msgstr "desactivado"
 
-#: install_steps_interactive.pm:1109
+#: install_steps_interactive.pm:1112
 #, c-format
 msgid "Boot"
 msgstr "Arranque"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1113
+#: install_steps_interactive.pm:1116
 #, c-format
 msgid "%s on %s"
 msgstr "%s em %s"
 
-#: install_steps_interactive.pm:1127 services.pm:175
+#: install_steps_interactive.pm:1130 services.pm:175
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr "Serviços: %d activados para %d registados"
 
-#: install_steps_interactive.pm:1137
+#: install_steps_interactive.pm:1140
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Não configurou o X. Tem a certeza que realmente quer isto?"
 
-#: install_steps_interactive.pm:1217
+#: install_steps_interactive.pm:1220
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "A preparar o carregador de arranque..."
 
-#: install_steps_interactive.pm:1227
+#: install_steps_interactive.pm:1230
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -7221,12 +7346,12 @@ msgstr ""
 "irá precisar de usar o BootX ou algum outro meio para arrancar a sua "
 "máquina. O argumento do kernel para root fs é: root=%s"
 
-#: install_steps_interactive.pm:1233
+#: install_steps_interactive.pm:1236
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "Quer usar o aboot?"
 
-#: install_steps_interactive.pm:1236
+#: install_steps_interactive.pm:1239
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7235,7 +7360,7 @@ msgstr ""
 "Erro ao instalar o aboot, \n"
 "tentar forçar a instalação mesmo que isso destrua a primeira partição?"
 
-#: install_steps_interactive.pm:1257
+#: install_steps_interactive.pm:1260
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -7244,22 +7369,22 @@ msgstr ""
 "Neste nível de segurança, o acesso aos ficheiros na partição do Windows é "
 "limitado ao administrador."
 
-#: install_steps_interactive.pm:1286 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1289 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Insira uma disquete vazia no drive %s"
 
-#: install_steps_interactive.pm:1291
+#: install_steps_interactive.pm:1294
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "Por favor Insira outra disquete para o disco de drivers"
 
-#: install_steps_interactive.pm:1293
+#: install_steps_interactive.pm:1296
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "A criar disquete de auto-instalação..."
 
-#: install_steps_interactive.pm:1305
+#: install_steps_interactive.pm:1308
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7270,12 +7395,12 @@ msgstr ""
 "\n"
 "Quer realmente sair agora?"
 
-#: install_steps_interactive.pm:1321
+#: install_steps_interactive.pm:1324
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Gerar disquete de auto instalação"
 
-#: install_steps_interactive.pm:1323
+#: install_steps_interactive.pm:1326
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7291,52 +7416,54 @@ msgstr ""
 "Pode preferir repetir a instalação.\n"
 
 #: install_steps_newt.pm:20
-#, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Instalação do Mandrakelinux %s"
+#, fuzzy, c-format
+msgid "Mandriva Linux Installation %s"
+msgstr "Instalação do Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
 #, c-format
-msgid "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
-msgstr " <Tab>/<Alt-Tab> entre opções  | <Espaço> seleccione | <F12> próximo ecrâ"
+msgid ""
+"  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
+msgstr ""
+" <Tab>/<Alt-Tab> entre opções  | <Espaço> seleccione | <F12> próximo ecrâ"
 
-#: interactive.pm:184
+#: interactive.pm:193
 #, c-format
 msgid "Choose a file"
 msgstr "Escolha um ficheiro"
 
-#: interactive.pm:309 interactive/gtk.pm:489 standalone/drakbackup:1540
-#: standalone/drakfont:593 standalone/drakfont:660 standalone/drakups:297
-#: standalone/drakups:357 standalone/drakups:377 standalone/drakvpn:333
+#: interactive.pm:318 interactive/gtk.pm:489 standalone/drakbackup:1543
+#: standalone/drakfont:656 standalone/drakroam:214 standalone/drakups:301
+#: standalone/drakups:361 standalone/drakups:381 standalone/drakvpn:333
 #: standalone/drakvpn:694
 #, c-format
 msgid "Add"
 msgstr "Adicionar"
 
-#: interactive.pm:309 interactive/gtk.pm:489
+#: interactive.pm:318 interactive/gtk.pm:489
 #, c-format
 msgid "Modify"
 msgstr "Modificar"
 
-#: interactive.pm:309 interactive/gtk.pm:489 standalone/drakups:299
-#: standalone/drakups:359 standalone/drakups:379 standalone/drakvpn:333
-#: standalone/drakvpn:694
+#: interactive.pm:318 interactive/gtk.pm:489 standalone/drakroam:198
+#: standalone/drakups:303 standalone/drakups:363 standalone/drakups:383
+#: standalone/drakvpn:333 standalone/drakvpn:694
 #, c-format
 msgid "Remove"
 msgstr "Remover"
 
-#: interactive.pm:386
+#: interactive.pm:395
 #, c-format
 msgid "Basic"
 msgstr "Básico"
 
-#: interactive.pm:424 interactive/newt.pm:317 ugtk2.pm:506
+#: interactive.pm:433 interactive/newt.pm:319 ugtk2.pm:506
 #, c-format
 msgid "Finish"
 msgstr "Terminar"
 
-#: interactive/newt.pm:92
+#: interactive/newt.pm:94
 #, c-format
 msgid "Do"
 msgstr "Fazer"
@@ -7415,339 +7542,339 @@ msgstr ""
 msgid "Re-submit"
 msgstr "Re-submeter"
 
-#: keyboard.pm:170 keyboard.pm:204
+#: keyboard.pm:171 keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTZ)"
 msgstr "Checo (QWERTZ)"
 
-#: keyboard.pm:171 keyboard.pm:206
+#: keyboard.pm:172 keyboard.pm:207
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German"
 msgstr "Alemão"
 
-#: keyboard.pm:172
+#: keyboard.pm:173
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak"
 msgstr "Dvorak"
 
-#: keyboard.pm:173 keyboard.pm:223
+#: keyboard.pm:174 keyboard.pm:224
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Spanish"
 msgstr "Espanhol"
 
-#: keyboard.pm:174 keyboard.pm:224
+#: keyboard.pm:175 keyboard.pm:225
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Finnish"
 msgstr "Finlandês"
 
-#: keyboard.pm:175 keyboard.pm:227
+#: keyboard.pm:176 keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French"
 msgstr "Francês"
 
-#: keyboard.pm:176 keyboard.pm:275
+#: keyboard.pm:177 keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Norwegian"
 msgstr "Norueguês"
 
-#: keyboard.pm:177
+#: keyboard.pm:178
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish"
 msgstr "Polaco"
 
-#: keyboard.pm:178 keyboard.pm:287
+#: keyboard.pm:179 keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian"
 msgstr "Russo"
 
-#: keyboard.pm:180 keyboard.pm:293
+#: keyboard.pm:181 keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swedish"
 msgstr "Sueco"
 
-#: keyboard.pm:181 keyboard.pm:320
+#: keyboard.pm:182 keyboard.pm:320
 #, c-format
 msgid "UK keyboard"
 msgstr "Teclado Inglês"
 
-#: keyboard.pm:182 keyboard.pm:323
+#: keyboard.pm:183 keyboard.pm:323
 #, c-format
 msgid "US keyboard"
 msgstr "Teclado Americano"
 
-#: keyboard.pm:184
+#: keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanêz"
 
-#: keyboard.pm:185
+#: keyboard.pm:186
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (old)"
 msgstr "Arménio (antigo)"
 
-#: keyboard.pm:186
+#: keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Arménio (máquina de escrever)"
 
-#: keyboard.pm:187
+#: keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Arménio (Fonético)"
 
-#: keyboard.pm:188
+#: keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Árabe"
 
-#: keyboard.pm:189
+#: keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaijão (latino)"
 
-#: keyboard.pm:190
+#: keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belga"
 
-#: keyboard.pm:191
+#: keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengali (disposição-Inscript)"
 
-#: keyboard.pm:192
+#: keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengali (Probhat)"
 
-#: keyboard.pm:193
+#: keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Búlgaro (fonético)"
 
-#: keyboard.pm:194
+#: keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Búlgaro (BDS)"
 
-#: keyboard.pm:195
+#: keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasileiro (ABNT-2)"
 
-#: keyboard.pm:196
+#: keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bósnio"
 
-#: keyboard.pm:197
+#: keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Bielorrusso"
 
-#: keyboard.pm:199
+#: keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Suíço (mapa Alemão)"
 
-#: keyboard.pm:201
+#: keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Suíço (mapa Francês)"
 
-#: keyboard.pm:203
+#: keyboard.pm:204
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Cherokee syllabics"
 msgstr "Cherokee silábico"
 
-#: keyboard.pm:205
+#: keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Checo (QWERTY)"
 
-#: keyboard.pm:207
+#: keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Alemão (sem teclas mortas)"
 
-#: keyboard.pm:208
+#: keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: keyboard.pm:209
+#: keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Dinamarquês"
 
-#: keyboard.pm:210
+#: keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: keyboard.pm:212
+#: keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: keyboard.pm:214
+#: keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Francês)"
 
-#: keyboard.pm:216
+#: keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (UK)"
 
-#: keyboard.pm:217
+#: keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norueguês)"
 
-#: keyboard.pm:219
+#: keyboard.pm:220
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Polaco)"
 
-#: keyboard.pm:220
+#: keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Sueco)"
 
-#: keyboard.pm:221
+#: keyboard.pm:222
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetano"
 
-#: keyboard.pm:222
+#: keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estoniano"
 
-#: keyboard.pm:226
+#: keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Faroese"
 
-#: keyboard.pm:228
+#: keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgiano (mapa \"Russo\")"
 
-#: keyboard.pm:229
+#: keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgiano (mapa \"Latim\")"
 
-#: keyboard.pm:230
+#: keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grego"
 
-#: keyboard.pm:231
+#: keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Grego (politónico)"
 
-#: keyboard.pm:232
+#: keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: keyboard.pm:233
+#: keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -7758,15 +7885,15 @@ msgstr "Gurmukhi"
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Hungarian"
-msgstr "Húngaro"
+"Croatian"
+msgstr "Croata"
 
 #: keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Croatian"
-msgstr "Croata"
+"Hungarian"
+msgstr "Húngaro"
 
 #: keyboard.pm:237
 #, c-format
@@ -7859,7 +7986,7 @@ msgid ""
 "Latin American"
 msgstr "Latino Americano"
 
-#: keyboard.pm:257
+#: keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -7873,256 +8000,270 @@ msgid ""
 "Lithuanian AZERTY (old)"
 msgstr "Lituano AZERTY (velho)"
 
-#: keyboard.pm:262
+#: keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian AZERTY (new)"
 msgstr "Lituano AZERTY (novo)"
 
-#: keyboard.pm:264
+#: keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian \"number row\" QWERTY"
 msgstr "Lituano \"número de colunas\" QWERTY"
 
-#: keyboard.pm:266
+#: keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lituano \"fonético\" QWERTY"
 
-#: keyboard.pm:267
+#: keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latuniano"
 
-#: keyboard.pm:268
+#: keyboard.pm:265
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: keyboard.pm:269
+#: keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedónio"
 
-#: keyboard.pm:270
+#: keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burmese)"
 
-#: keyboard.pm:271
+#: keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongoliano (cirílico)"
 
-#: keyboard.pm:272
+#: keyboard.pm:269
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltês (UK)"
 
-#: keyboard.pm:273
+#: keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltês (US)"
 
-#: keyboard.pm:274
+#: keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Holandês"
 
-#: keyboard.pm:276
+#: keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: keyboard.pm:277
+#: keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polaco (mapa QWERTY)"
 
-#: keyboard.pm:278
+#: keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polaco (mapa QWERTZ)"
 
-#: keyboard.pm:280
+#: keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: keyboard.pm:281
+#: keyboard.pm:278
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Português"
 
-#: keyboard.pm:283
+#: keyboard.pm:280
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Canadiano (Quebeco)"
 
-#: keyboard.pm:285
+#: keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Romeno (QWERTZ)"
 
-#: keyboard.pm:286
+#: keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romeno (QWERTY)"
 
-#: keyboard.pm:288
+#: keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Russo (Fonético)"
 
-#: keyboard.pm:289
+#: keyboard.pm:286
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (Norueguês)"
 
-#: keyboard.pm:290
+#: keyboard.pm:287
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (sueco/finlandês)"
 
-#: keyboard.pm:292
+#: keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sindhi"
 msgstr "Sindhi"
 
-#: keyboard.pm:294
+#: keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Eslovaco"
 
-#: keyboard.pm:295
+#: keyboard.pm:293
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Sinhala"
+msgstr "Sindhi"
+
+#: keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Eslovaco (QWERTZ)"
 
-#: keyboard.pm:296
+#: keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Eslovaco (QWERTY)"
 
-#: keyboard.pm:298
+#: keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbo (cirílico)"
 
-#: keyboard.pm:299
+#: keyboard.pm:298
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syriac"
 
-#: keyboard.pm:300
+#: keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syriac (Fonético)"
 
-#: keyboard.pm:301
+#: keyboard.pm:300
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: keyboard.pm:303
+#: keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (ISCII)"
 
-#: keyboard.pm:304
+#: keyboard.pm:303
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (máquina de escrever)"
 
-#: keyboard.pm:305
+#: keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Tailandês (Kedmanee)"
 
-#: keyboard.pm:306
+#: keyboard.pm:305
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Tailandês (TIS-820)"
 
-#: keyboard.pm:308
+#: keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Tailandês (Pattachote)"
 
+#: keyboard.pm:310
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Tifinagh (moroccan layout) (+latin/arabic)"
+msgstr "Tifinagh (+latin/arábico)"
+
 #: keyboard.pm:311
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"Tifinagh (+latin/arabic)"
+"Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (+latin/arábico)"
 
 #: keyboard.pm:313
@@ -8303,1145 +8444,1063 @@ msgstr ""
 #. -PO: the string "default:LTR" can be translated *ONLY* as "default:LTR"
 #. -PO: or as "default:RTL", depending if your language is written from
 #. -PO: left to right, or from right to left; any other string is wrong.
-#: lang.pm:173
+#: lang.pm:178
 #, c-format
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: lang.pm:190
+#: lang.pm:195
 #, c-format
 msgid "Andorra"
 msgstr "Andorra"
 
-#: lang.pm:191 network/adsl_consts.pm:826
+#: lang.pm:196 network/adsl_consts.pm:933
 #, c-format
 msgid "United Arab Emirates"
 msgstr "Emiratos Árabes Unidos"
 
-#: lang.pm:192
+#: lang.pm:197
 #, c-format
 msgid "Afghanistan"
 msgstr "Afeganistão"
 
-#: lang.pm:193
+#: lang.pm:198
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua e Barbuda"
 
-#: lang.pm:194
+#: lang.pm:199
 #, c-format
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: lang.pm:195
+#: lang.pm:200
 #, c-format
 msgid "Albania"
 msgstr "Albânia"
 
-#: lang.pm:196
+#: lang.pm:201
 #, c-format
 msgid "Armenia"
 msgstr "Arménia"
 
-#: lang.pm:197
+#: lang.pm:202
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Antilhas Holandesas"
 
-#: lang.pm:198
+#: lang.pm:203
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:199
+#: lang.pm:204
 #, c-format
 msgid "Antarctica"
 msgstr "Antárctica"
 
-#: lang.pm:200 network/adsl_consts.pm:40 standalone/drakxtv:50
+#: lang.pm:205 network/adsl_consts.pm:55 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr "Argentina"
 
-#: lang.pm:201
+#: lang.pm:206
 #, c-format
 msgid "American Samoa"
 msgstr "Samoa Americana"
 
-#: lang.pm:203 standalone/drakxtv:48
-#, c-format
-msgid "Australia"
-msgstr "Austrália"
-
-#: lang.pm:204
+#: lang.pm:209
 #, c-format
 msgid "Aruba"
 msgstr "Aruba"
 
-#: lang.pm:205
+#: lang.pm:210
 #, c-format
 msgid "Azerbaijan"
 msgstr "Azerbeijão"
 
-#: lang.pm:206
+#: lang.pm:211
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bósnia e Herzegovina"
 
-#: lang.pm:207
+#: lang.pm:212
 #, c-format
 msgid "Barbados"
 msgstr "Barbados"
 
-#: lang.pm:208
+#: lang.pm:213
 #, c-format
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: lang.pm:210
+#: lang.pm:215
 #, c-format
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: lang.pm:211 network/adsl_consts.pm:143 network/adsl_consts.pm:151
+#: lang.pm:216 network/adsl_consts.pm:170 network/adsl_consts.pm:179
 #, c-format
 msgid "Bulgaria"
 msgstr "Bulgária"
 
-#: lang.pm:212
+#: lang.pm:217
 #, c-format
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: lang.pm:213
+#: lang.pm:218
 #, c-format
 msgid "Burundi"
 msgstr "Burundi"
 
-#: lang.pm:214
+#: lang.pm:219
 #, c-format
 msgid "Benin"
 msgstr "Benin"
 
-#: lang.pm:215
+#: lang.pm:220
 #, c-format
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: lang.pm:216
+#: lang.pm:221
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: lang.pm:217
+#: lang.pm:222
 #, c-format
 msgid "Bolivia"
 msgstr "Bolívia"
 
-#: lang.pm:218 network/adsl_consts.pm:109 network/adsl_consts.pm:119
-#: network/adsl_consts.pm:127 network/adsl_consts.pm:135
-#, c-format
-msgid "Brazil"
-msgstr "Brasil"
-
-#: lang.pm:219
+#: lang.pm:224
 #, c-format
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: lang.pm:220
+#: lang.pm:225
 #, c-format
 msgid "Bhutan"
 msgstr "Butão"
 
-#: lang.pm:221
+#: lang.pm:226
 #, c-format
 msgid "Bouvet Island"
 msgstr "Ilha Bouvet"
 
-#: lang.pm:222
+#: lang.pm:227
 #, c-format
 msgid "Botswana"
 msgstr "Botswana"
 
-#: lang.pm:223
+#: lang.pm:228
 #, c-format
 msgid "Belarus"
 msgstr "Bielorrússia"
 
-#: lang.pm:224
+#: lang.pm:229
 #, c-format
 msgid "Belize"
 msgstr "Belize"
 
-#: lang.pm:225
-#, c-format
-msgid "Canada"
-msgstr "Canadá"
-
-#: lang.pm:226
+#: lang.pm:231
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Ilhas Cocos (Keeling)"
 
-#: lang.pm:227
+#: lang.pm:232
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "Congo (Kinshasa)"
 
-#: lang.pm:228
+#: lang.pm:233
 #, c-format
 msgid "Central African Republic"
 msgstr "República Centro-Africana"
 
-#: lang.pm:229
+#: lang.pm:234
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "Congo (Brazzaville)"
 
-#: lang.pm:231
+#: lang.pm:236
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Costa do Marfim"
 
-#: lang.pm:232
+#: lang.pm:237
 #, c-format
 msgid "Cook Islands"
 msgstr "Ilhas Cook"
 
-#: lang.pm:233
+#: lang.pm:238
 #, c-format
 msgid "Chile"
 msgstr "Chile"
 
-#: lang.pm:234
+#: lang.pm:239
 #, c-format
 msgid "Cameroon"
 msgstr "Camarões"
 
-#: lang.pm:235 network/adsl_consts.pm:159 network/adsl_consts.pm:167
-#: network/adsl_consts.pm:175 network/adsl_consts.pm:183
-#: network/adsl_consts.pm:191 network/adsl_consts.pm:199
-#: network/adsl_consts.pm:207 network/adsl_consts.pm:215
-#: network/adsl_consts.pm:223 network/adsl_consts.pm:231
-#: network/adsl_consts.pm:239 network/adsl_consts.pm:247
-#: network/adsl_consts.pm:255 network/adsl_consts.pm:263
-#: network/adsl_consts.pm:271 network/adsl_consts.pm:279
-#: network/adsl_consts.pm:287 network/adsl_consts.pm:295
-#: network/adsl_consts.pm:303 network/adsl_consts.pm:311
+#: lang.pm:240 network/adsl_consts.pm:188 network/adsl_consts.pm:197
+#: network/adsl_consts.pm:206 network/adsl_consts.pm:215
+#: network/adsl_consts.pm:224 network/adsl_consts.pm:233
+#: network/adsl_consts.pm:242 network/adsl_consts.pm:251
+#: network/adsl_consts.pm:260 network/adsl_consts.pm:269
+#: network/adsl_consts.pm:278 network/adsl_consts.pm:287
+#: network/adsl_consts.pm:296 network/adsl_consts.pm:305
+#: network/adsl_consts.pm:314 network/adsl_consts.pm:323
+#: network/adsl_consts.pm:332 network/adsl_consts.pm:341
+#: network/adsl_consts.pm:350 network/adsl_consts.pm:359
 #, c-format
 msgid "China"
 msgstr "China"
 
-#: lang.pm:236
+#: lang.pm:241
 #, c-format
 msgid "Colombia"
 msgstr "Colômbia"
 
-#: lang.pm:238
+#: lang.pm:243
 #, c-format
 msgid "Serbia & Montenegro"
 msgstr "Servia & Montenegro"
 
-#: lang.pm:239
+#: lang.pm:244
 #, c-format
 msgid "Cuba"
 msgstr "Cuba"
 
-#: lang.pm:240
+#: lang.pm:245
 #, c-format
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: lang.pm:241
+#: lang.pm:246
 #, c-format
 msgid "Christmas Island"
 msgstr "Ilhas Natal"
 
-#: lang.pm:242
+#: lang.pm:247
 #, c-format
 msgid "Cyprus"
 msgstr "Chipre"
 
-#: lang.pm:245
+#: lang.pm:250
 #, c-format
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: lang.pm:246 network/adsl_consts.pm:327
-#, c-format
-msgid "Denmark"
-msgstr "Dinamarca"
-
-#: lang.pm:247
+#: lang.pm:252
 #, c-format
 msgid "Dominica"
 msgstr "Dominica"
 
-#: lang.pm:248
+#: lang.pm:253
 #, c-format
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
-#: lang.pm:249 network/adsl_consts.pm:30
+#: lang.pm:254 network/adsl_consts.pm:44
 #, c-format
 msgid "Algeria"
 msgstr "Algéria"
 
-#: lang.pm:250
+#: lang.pm:255
 #, c-format
 msgid "Ecuador"
 msgstr "Equador"
 
-#: lang.pm:251
-#, c-format
-msgid "Estonia"
-msgstr "Estónia"
-
-#: lang.pm:252
+#: lang.pm:257
 #, c-format
 msgid "Egypt"
 msgstr "Egipto"
 
-#: lang.pm:253
+#: lang.pm:258
 #, c-format
 msgid "Western Sahara"
 msgstr "Sahara Ocidental"
 
-#: lang.pm:254
+#: lang.pm:259
 #, c-format
 msgid "Eritrea"
 msgstr "Eritreia"
 
-#: lang.pm:255 network/adsl_consts.pm:663 network/adsl_consts.pm:672
-#: network/adsl_consts.pm:682 network/adsl_consts.pm:692
-#: network/adsl_consts.pm:700 network/adsl_consts.pm:708
-#: network/adsl_consts.pm:716 network/adsl_consts.pm:724
-#: network/adsl_consts.pm:732 network/adsl_consts.pm:740
-#: network/adsl_consts.pm:748 network/adsl_consts.pm:756
-#: network/adsl_consts.pm:764
-#, c-format
-msgid "Spain"
-msgstr "Espanha"
-
-#: lang.pm:256
+#: lang.pm:261
 #, c-format
 msgid "Ethiopia"
 msgstr "Etiópia"
 
-#: lang.pm:257 network/adsl_consts.pm:335
-#, c-format
-msgid "Finland"
-msgstr "Finlândia"
-
-#: lang.pm:258
+#: lang.pm:263
 #, c-format
 msgid "Fiji"
 msgstr "Fiji"
 
-#: lang.pm:259
+#: lang.pm:264
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "Ilhas Falkland (Malvinas)"
 
-#: lang.pm:260
+#: lang.pm:265
 #, c-format
 msgid "Micronesia"
 msgstr "Micronésia"
 
-#: lang.pm:261
+#: lang.pm:266
 #, c-format
 msgid "Faroe Islands"
 msgstr "Ilhas Faroé"
 
-#: lang.pm:263
+#: lang.pm:268
 #, c-format
 msgid "Gabon"
 msgstr "Gabão"
 
-#: lang.pm:264 network/adsl_consts.pm:836 network/adsl_consts.pm:846
-#: network/netconnect.pm:52
+#: lang.pm:269 network/adsl_consts.pm:944 network/adsl_consts.pm:955
+#: network/netconnect.pm:53
 #, c-format
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: lang.pm:265
+#: lang.pm:270
 #, c-format
 msgid "Grenada"
 msgstr "Granada"
 
-#: lang.pm:266
+#: lang.pm:271
 #, c-format
 msgid "Georgia"
 msgstr "Geórgia"
 
-#: lang.pm:267
+#: lang.pm:272
 #, c-format
 msgid "French Guiana"
 msgstr "Guiana Francesa"
 
-#: lang.pm:268
+#: lang.pm:273
 #, c-format
 msgid "Ghana"
 msgstr "Gana"
 
-#: lang.pm:269
+#: lang.pm:274
 #, c-format
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: lang.pm:270
+#: lang.pm:275
 #, c-format
 msgid "Greenland"
 msgstr "Gronelândia"
 
-#: lang.pm:271
+#: lang.pm:276
 #, c-format
 msgid "Gambia"
 msgstr "Gâmbia"
 
-#: lang.pm:272
+#: lang.pm:277
 #, c-format
 msgid "Guinea"
 msgstr "Guiné"
 
-#: lang.pm:273
+#: lang.pm:278
 #, c-format
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: lang.pm:274
+#: lang.pm:279
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Guiné Equatorial"
 
-#: lang.pm:276
+#: lang.pm:281
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Sul da Geórgia e a Ilha Sandwich Sul"
 
-#: lang.pm:277
+#: lang.pm:282
 #, c-format
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: lang.pm:278
+#: lang.pm:283
 #, c-format
 msgid "Guam"
 msgstr "Guam"
 
-#: lang.pm:279
+#: lang.pm:284
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "Guiné-Bissau"
 
-#: lang.pm:280
+#: lang.pm:285
 #, c-format
 msgid "Guyana"
 msgstr "Guiana"
 
-#: lang.pm:281
+#: lang.pm:286
 #, c-format
 msgid "Hong Kong SAR (China)"
 msgstr "Hong Kong SAR (China)"
 
-#: lang.pm:282
+#: lang.pm:287
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Ilha Heard e Ilhas McDonald"
 
-#: lang.pm:283
+#: lang.pm:288
 #, c-format
 msgid "Honduras"
 msgstr "Honduras"
 
-#: lang.pm:284
+#: lang.pm:289
 #, c-format
 msgid "Croatia"
 msgstr "Croácia"
 
-#: lang.pm:285
+#: lang.pm:290
 #, c-format
 msgid "Haiti"
 msgstr "Haiti"
 
-#: lang.pm:287
+#: lang.pm:292
 #, c-format
 msgid "Indonesia"
 msgstr "Indonésia"
 
-#: lang.pm:288 network/adsl_consts.pm:471 standalone/drakxtv:47
-#, c-format
-msgid "Ireland"
-msgstr "Irlanda"
-
-#: lang.pm:289 network/adsl_consts.pm:479
-#, c-format
-msgid "Israel"
-msgstr "Israel"
-
-#: lang.pm:290
+#: lang.pm:295
 #, c-format
 msgid "India"
 msgstr "Índia"
 
-#: lang.pm:291
+#: lang.pm:296
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "Territorio Inglês no Oceano Índio"
 
-#: lang.pm:292
+#: lang.pm:297
 #, c-format
 msgid "Iraq"
 msgstr "Iraque"
 
-#: lang.pm:293
+#: lang.pm:298
 #, c-format
 msgid "Iran"
 msgstr "Irão"
 
-#: lang.pm:294
+#: lang.pm:299
 #, c-format
 msgid "Iceland"
 msgstr "Islândia"
 
-#: lang.pm:296
+#: lang.pm:301
 #, c-format
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: lang.pm:297
+#: lang.pm:302
 #, c-format
 msgid "Jordan"
 msgstr "Jordão"
 
-#: lang.pm:298
-#, c-format
-msgid "Japan"
-msgstr "Japão"
-
-#: lang.pm:299
+#: lang.pm:304
 #, c-format
 msgid "Kenya"
 msgstr "Quénia"
 
-#: lang.pm:300
+#: lang.pm:305
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: lang.pm:301
+#: lang.pm:306
 #, c-format
 msgid "Cambodia"
 msgstr "Cambodja"
 
-#: lang.pm:302
+#: lang.pm:307
 #, c-format
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: lang.pm:303
+#: lang.pm:308
 #, c-format
 msgid "Comoros"
 msgstr "Comoros"
 
-#: lang.pm:304
+#: lang.pm:309
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Santo Kitts e Nevis"
 
-#: lang.pm:305
+#: lang.pm:310
 #, c-format
 msgid "Korea (North)"
 msgstr "Coreia do Norte"
 
-#: lang.pm:306
+#: lang.pm:311
 #, c-format
 msgid "Korea"
 msgstr "Coreia"
 
-#: lang.pm:307
+#: lang.pm:312
 #, c-format
 msgid "Kuwait"
 msgstr "Koweit"
 
-#: lang.pm:308
+#: lang.pm:313
 #, c-format
 msgid "Cayman Islands"
 msgstr "Ilhas Caimão"
 
-#: lang.pm:309
+#: lang.pm:314
 #, c-format
 msgid "Kazakhstan"
 msgstr "Kazaquistão"
 
-#: lang.pm:310
+#: lang.pm:315
 #, c-format
 msgid "Laos"
 msgstr "Laos"
 
-#: lang.pm:311
+#: lang.pm:316
 #, c-format
 msgid "Lebanon"
 msgstr "Líbano"
 
-#: lang.pm:312
+#: lang.pm:317
 #, c-format
 msgid "Saint Lucia"
 msgstr "Santa Lúcia"
 
-#: lang.pm:313
+#: lang.pm:318
 #, c-format
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: lang.pm:314
+#: lang.pm:319
 #, c-format
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: lang.pm:315
+#: lang.pm:320
 #, c-format
 msgid "Liberia"
 msgstr "Libéria"
 
-#: lang.pm:316
+#: lang.pm:321
 #, c-format
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: lang.pm:317 network/adsl_consts.pm:527
+#: lang.pm:322 network/adsl_consts.pm:600
 #, c-format
 msgid "Lithuania"
 msgstr "Lituânia"
 
-#: lang.pm:318
+#: lang.pm:323
 #, c-format
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: lang.pm:319
+#: lang.pm:324
 #, c-format
 msgid "Latvia"
 msgstr "Latvia"
 
-#: lang.pm:320
+#: lang.pm:325
 #, c-format
 msgid "Libya"
 msgstr "Líbia"
 
-#: lang.pm:321 network/adsl_consts.pm:535
+#: lang.pm:326 network/adsl_consts.pm:609
 #, c-format
 msgid "Morocco"
 msgstr "Marrocos"
 
-#: lang.pm:322
+#: lang.pm:327
 #, c-format
 msgid "Monaco"
 msgstr "Mónaco"
 
-#: lang.pm:323
+#: lang.pm:328
 #, c-format
 msgid "Moldova"
 msgstr "Moldovia"
 
-#: lang.pm:324
+#: lang.pm:329
 #, c-format
 msgid "Madagascar"
 msgstr "Madagáscar"
 
-#: lang.pm:325
+#: lang.pm:330
 #, c-format
 msgid "Marshall Islands"
 msgstr "Ilhas Marshall"
 
-#: lang.pm:326
+#: lang.pm:331
 #, c-format
 msgid "Macedonia"
 msgstr "Macedónia"
 
-#: lang.pm:327
+#: lang.pm:332
 #, c-format
 msgid "Mali"
 msgstr "Mali"
 
-#: lang.pm:328
+#: lang.pm:333
 #, c-format
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: lang.pm:329
+#: lang.pm:334
 #, c-format
 msgid "Mongolia"
 msgstr "Mongólia"
 
-#: lang.pm:330
+#: lang.pm:335
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Ilhas Mariana do Norte"
 
-#: lang.pm:331
+#: lang.pm:336
 #, c-format
 msgid "Martinique"
 msgstr "Martinica"
 
-#: lang.pm:332
+#: lang.pm:337
 #, c-format
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: lang.pm:333
+#: lang.pm:338
 #, c-format
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: lang.pm:334
+#: lang.pm:339
 #, c-format
 msgid "Malta"
 msgstr "Malta"
 
-#: lang.pm:335
+#: lang.pm:340
 #, c-format
 msgid "Mauritius"
 msgstr "Maurícias"
 
-#: lang.pm:336
+#: lang.pm:341
 #, c-format
 msgid "Maldives"
 msgstr "Maldivas"
 
-#: lang.pm:337
+#: lang.pm:342
 #, c-format
 msgid "Malawi"
 msgstr "Malawi"
 
-#: lang.pm:338
+#: lang.pm:343
 #, c-format
 msgid "Mexico"
 msgstr "México"
 
-#: lang.pm:339
+#: lang.pm:344
 #, c-format
 msgid "Malaysia"
 msgstr "Malásia"
 
-#: lang.pm:340
+#: lang.pm:345
 #, c-format
 msgid "Mozambique"
 msgstr "Moçambique"
 
-#: lang.pm:341
+#: lang.pm:346
 #, c-format
 msgid "Namibia"
 msgstr "Namíbia"
 
-#: lang.pm:342
+#: lang.pm:347
 #, c-format
 msgid "New Caledonia"
 msgstr "Nova Caledónia"
 
-#: lang.pm:343
+#: lang.pm:348
 #, c-format
 msgid "Niger"
 msgstr "Níger"
 
-#: lang.pm:344
+#: lang.pm:349
 #, c-format
 msgid "Norfolk Island"
 msgstr "Ilha Norfolk"
 
-#: lang.pm:345
+#: lang.pm:350
 #, c-format
 msgid "Nigeria"
 msgstr "Nigéria"
 
-#: lang.pm:346
+#: lang.pm:351
 #, c-format
 msgid "Nicaragua"
 msgstr "Nicarágua"
 
-#: lang.pm:349
+#: lang.pm:354
 #, c-format
 msgid "Nepal"
 msgstr "Nepal"
 
-#: lang.pm:350
+#: lang.pm:355
 #, c-format
 msgid "Nauru"
 msgstr "Nauru"
 
-#: lang.pm:351
+#: lang.pm:356
 #, c-format
 msgid "Niue"
 msgstr "Niue"
 
-#: lang.pm:352
-#, c-format
-msgid "New Zealand"
-msgstr "Nova Zelândia"
-
-#: lang.pm:353
+#: lang.pm:358
 #, c-format
 msgid "Oman"
 msgstr "Oman"
 
-#: lang.pm:354
+#: lang.pm:359
 #, c-format
 msgid "Panama"
 msgstr "Panamá"
 
-#: lang.pm:355
+#: lang.pm:360
 #, c-format
 msgid "Peru"
 msgstr "Peru"
 
-#: lang.pm:356
+#: lang.pm:361
 #, c-format
 msgid "French Polynesia"
 msgstr "Polinésia Francesa"
 
-#: lang.pm:357
+#: lang.pm:362
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Papua Nova Guiné"
 
-#: lang.pm:358
+#: lang.pm:363
 #, c-format
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: lang.pm:359
+#: lang.pm:364
 #, c-format
 msgid "Pakistan"
 msgstr "Pakistão"
 
-#: lang.pm:361
+#: lang.pm:366
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "São Pedro e Miquelon"
 
-#: lang.pm:362
+#: lang.pm:367
 #, c-format
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: lang.pm:363
+#: lang.pm:368
 #, c-format
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
-#: lang.pm:364
+#: lang.pm:369
 #, c-format
 msgid "Palestine"
 msgstr "Palestina"
 
-#: lang.pm:365 network/adsl_consts.pm:634
-#, c-format
-msgid "Portugal"
-msgstr "Portugal"
-
-#: lang.pm:366
+#: lang.pm:371
 #, c-format
 msgid "Paraguay"
 msgstr "Paraguai"
 
-#: lang.pm:367
+#: lang.pm:372
 #, c-format
 msgid "Palau"
 msgstr "Palau"
 
-#: lang.pm:368
+#: lang.pm:373
 #, c-format
 msgid "Qatar"
 msgstr "Quatar"
 
-#: lang.pm:369
+#: lang.pm:374
 #, c-format
 msgid "Reunion"
 msgstr "Reunião"
 
-#: lang.pm:370
+#: lang.pm:375
 #, c-format
 msgid "Romania"
 msgstr "Roménia"
 
-#: lang.pm:371 network/adsl_consts.pm:642
-#, c-format
-msgid "Russia"
-msgstr "Rússia"
-
-#: lang.pm:372
+#: lang.pm:377
 #, c-format
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: lang.pm:373
+#: lang.pm:378
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Arábia Saudita"
 
-#: lang.pm:374
+#: lang.pm:379
 #, c-format
 msgid "Solomon Islands"
 msgstr "Ilhas Salomão"
 
-#: lang.pm:375
+#: lang.pm:380
 #, c-format
 msgid "Seychelles"
 msgstr "Seichelas"
 
-#: lang.pm:376
+#: lang.pm:381
 #, c-format
 msgid "Sudan"
 msgstr "Sudão"
 
-#: lang.pm:378
+#: lang.pm:383
 #, c-format
 msgid "Singapore"
 msgstr "Singapura"
 
-#: lang.pm:379
+#: lang.pm:384
 #, c-format
 msgid "Saint Helena"
 msgstr "Santa Helena"
 
-#: lang.pm:380 network/adsl_consts.pm:652
+#: lang.pm:385 network/adsl_consts.pm:737
 #, c-format
 msgid "Slovenia"
 msgstr "Eslovénia"
 
-#: lang.pm:381
+#: lang.pm:386
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Ilhas Svalbard e Jan Mayen"
 
-#: lang.pm:383
+#: lang.pm:388
 #, c-format
 msgid "Sierra Leone"
 msgstr "Serra Leoa"
 
-#: lang.pm:384
+#: lang.pm:389
 #, c-format
 msgid "San Marino"
 msgstr "São Marino"
 
-#: lang.pm:385
+#: lang.pm:390
 #, c-format
 msgid "Senegal"
 msgstr "Senegal"
 
-#: lang.pm:386
+#: lang.pm:391
 #, c-format
 msgid "Somalia"
 msgstr "Somália"
 
-#: lang.pm:387
+#: lang.pm:392
 #, c-format
 msgid "Suriname"
 msgstr "Suriname"
 
-#: lang.pm:388
+#: lang.pm:393
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "São Tomé e Príncipe"
 
-#: lang.pm:389
+#: lang.pm:394
 #, c-format
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: lang.pm:390
+#: lang.pm:395
 #, c-format
 msgid "Syria"
 msgstr "Síria"
 
-#: lang.pm:391
+#: lang.pm:396
 #, c-format
 msgid "Swaziland"
 msgstr "Suazilandia"
 
-#: lang.pm:392
+#: lang.pm:397
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Ilhas Turks e Caicos"
 
-#: lang.pm:393
+#: lang.pm:398
 #, c-format
 msgid "Chad"
 msgstr "Chade"
 
-#: lang.pm:394
+#: lang.pm:399
 #, c-format
 msgid "French Southern Territories"
 msgstr "Territorios Franceses do Sul"
 
-#: lang.pm:395
+#: lang.pm:400
 #, c-format
 msgid "Togo"
 msgstr "Togo"
 
-#: lang.pm:396 network/adsl_consts.pm:806
-#, c-format
-msgid "Thailand"
-msgstr "Tailândia"
-
-#: lang.pm:397
+#: lang.pm:402
 #, c-format
 msgid "Tajikistan"
 msgstr "Tajikistão"
 
-#: lang.pm:398
+#: lang.pm:403
 #, c-format
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: lang.pm:399
+#: lang.pm:404
 #, c-format
 msgid "East Timor"
 msgstr "Timor Leste"
 
-#: lang.pm:400
+#: lang.pm:405
 #, c-format
 msgid "Turkmenistan"
 msgstr "Turkmenistão"
 
-#: lang.pm:401 network/adsl_consts.pm:816
+#: lang.pm:406 network/adsl_consts.pm:921
 #, c-format
 msgid "Tunisia"
 msgstr "Tunísia"
 
-#: lang.pm:402
+#: lang.pm:407
 #, c-format
 msgid "Tonga"
 msgstr "Tanga"
 
-#: lang.pm:403
+#: lang.pm:408
 #, c-format
 msgid "Turkey"
 msgstr "Turquia"
 
-#: lang.pm:404
+#: lang.pm:409
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trinidad e Tobago"
 
-#: lang.pm:405
+#: lang.pm:410
 #, c-format
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: lang.pm:407
+#: lang.pm:412
 #, c-format
 msgid "Tanzania"
 msgstr "Tanzânia"
 
-#: lang.pm:408
+#: lang.pm:413
 #, c-format
 msgid "Ukraine"
 msgstr "Ucrânia"
 
-#: lang.pm:409
+#: lang.pm:414
 #, c-format
 msgid "Uganda"
 msgstr "Uganda"
 
-#: lang.pm:410
+#: lang.pm:415
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "Estados Unidos - Ilhas Costeiras Menores"
 
-#: lang.pm:412
+#: lang.pm:417
 #, c-format
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: lang.pm:413
+#: lang.pm:418
 #, c-format
 msgid "Uzbekistan"
 msgstr "Uzbekistão"
 
-#: lang.pm:414
+#: lang.pm:419
 #, c-format
 msgid "Vatican"
 msgstr "Vaticano"
 
-#: lang.pm:415
+#: lang.pm:420
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "São Vicente e as Grenadinas"
 
-#: lang.pm:416
+#: lang.pm:421
 #, c-format
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: lang.pm:417
+#: lang.pm:422
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Ilhas Virgens (Inglesas)"
 
-#: lang.pm:418
+#: lang.pm:423
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Ilhas Virgens (U.S.)"
 
-#: lang.pm:419
+#: lang.pm:424
 #, c-format
 msgid "Vietnam"
 msgstr "Vietname"
 
-#: lang.pm:420
+#: lang.pm:425
 #, c-format
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: lang.pm:421
+#: lang.pm:426
 #, c-format
 msgid "Wallis and Futuna"
 msgstr "Wallis e Futuna"
 
-#: lang.pm:422
+#: lang.pm:427
 #, c-format
 msgid "Samoa"
 msgstr "Samoa"
 
-#: lang.pm:423
+#: lang.pm:428
 #, c-format
 msgid "Yemen"
 msgstr "Yemen"
 
-#: lang.pm:424
+#: lang.pm:429
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:425 standalone/drakxtv:49
-#, c-format
-msgid "South Africa"
-msgstr "África do Sul"
-
-#: lang.pm:426
+#: lang.pm:431
 #, c-format
 msgid "Zambia"
 msgstr "Zâmbia"
 
-#: lang.pm:427
+#: lang.pm:432
 #, c-format
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: lang.pm:1040
+#: lang.pm:1060
 #, c-format
 msgid "You should install the following packages: %s"
 msgstr "Deve instalar os seguintes pacotes %s !"
 
 #. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
-#: lang.pm:1043 standalone/scannerdrake:135
+#: lang.pm:1063 standalone/scannerdrake:135
 #, c-format
 msgid ", "
 msgstr ", "
 
-#: lang.pm:1094
+#: lang.pm:1116
 #, c-format
 msgid "Welcome to %s"
 msgstr "Bem-vindo à %s"
@@ -9451,12 +9510,12 @@ msgstr "Bem-vindo à %s"
 msgid "Circular mounts %s\n"
 msgstr "Montagens circulares %s\n"
 
-#: lvm.pm:111
+#: lvm.pm:112
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "Remova os volumes lógicos primeiro\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:1032
+#: modules/interactive.pm:21 standalone/drakconnect:1068
 #, c-format
 msgid "Parameters"
 msgstr "Parâmetros"
@@ -9647,9 +9706,9 @@ msgstr "GlidePoint"
 
 #: mouse.pm:36 network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
 #: network/modem.pm:85 network/modem.pm:99 network/modem.pm:104
-#: network/modem.pm:137 network/netconnect.pm:645 network/netconnect.pm:650
-#: network/netconnect.pm:662 network/netconnect.pm:667
-#: network/netconnect.pm:683 network/netconnect.pm:685
+#: network/modem.pm:137 network/netconnect.pm:692 network/netconnect.pm:697
+#: network/netconnect.pm:709 network/netconnect.pm:714
+#: network/netconnect.pm:730 network/netconnect.pm:732
 #, c-format
 msgid "Automatic"
 msgstr "Automático"
@@ -9799,12 +9858,7 @@ msgstr "Qualquer rato PS/2 & USB"
 msgid "Microsoft Xbox Controller S"
 msgstr "Controlador Microsoft Xbox S"
 
-#: mouse.pm:89 mouse.pm:359 mouse.pm:368 mouse.pm:420
-#, c-format
-msgid "Synaptics Touchpad"
-msgstr "Touchpad Synaptics"
-
-#: mouse.pm:93 standalone/drakconnect:360 standalone/drakvpn:1140
+#: mouse.pm:93 standalone/drakconnect:362 standalone/drakvpn:1140
 #, c-format
 msgid "none"
 msgstr "nenhum"
@@ -9814,17 +9868,22 @@ msgstr "nenhum"
 msgid "No mouse"
 msgstr "Nenhum Rato"
 
-#: mouse.pm:546
+#: mouse.pm:299 mouse.pm:362 mouse.pm:371 mouse.pm:430
+#, c-format
+msgid "Synaptics Touchpad"
+msgstr "Touchpad Synaptics"
+
+#: mouse.pm:556
 #, c-format
 msgid "Please test the mouse"
 msgstr "Por favor teste o rato"
 
-#: mouse.pm:548
+#: mouse.pm:558
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Para activar o rato,"
 
-#: mouse.pm:549
+#: mouse.pm:559
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "MOVA A SUA RODA!"
@@ -9864,12 +9923,12 @@ msgstr "Sagem (usar PPPoA) USB"
 msgid "Sagem (using DHCP) USB"
 msgstr "Sagem (usar DHCP) USB"
 
-#: network/adsl.pm:35 network/netconnect.pm:839
+#: network/adsl.pm:35 network/netconnect.pm:898
 #, c-format
 msgid "Connect to the Internet"
 msgstr "Conectar à Internet"
 
-#: network/adsl.pm:36 network/netconnect.pm:840
+#: network/adsl.pm:36 network/netconnect.pm:899
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
@@ -9880,7 +9939,7 @@ msgstr ""
 "Algumas conexões usam PPTP, poucas usam DHCP.\n"
 "Se não sabe, escolha 'use PPPoE'"
 
-#: network/adsl.pm:41 network/netconnect.pm:844
+#: network/adsl.pm:41 network/netconnect.pm:903
 #, c-format
 msgid "ADSL connection type:"
 msgstr "Tipo de conexão ADSL:"
@@ -9940,27 +9999,22 @@ msgstr "Pedido de eco (ping)"
 msgid "BitTorrent"
 msgstr "BitTorrent"
 
-#: network/drakfirewall.pm:131
-#, c-format
-msgid "No network card"
-msgstr "Nenhuma placa de rede"
-
-#: network/drakfirewall.pm:152
-#, c-format
+#: network/drakfirewall.pm:158
+#, fuzzy, c-format
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux 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 ""
 "Configurador drakfirewall\n"
 "\n"
-"Isto configura uma firewall pessoal para esta máquina Mandrakelinux.\n"
+"Isto configura uma firewall pessoal para esta máquina Mandriva Linux.\n"
 "Para uma solução firewall poderosa e dedicada, por favor veja a \n"
 "distribuição especializada MandrakeSecurity Firewall."
 
-#: network/drakfirewall.pm:158
+#: network/drakfirewall.pm:164
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -9973,12 +10027,12 @@ msgstr ""
 "Verifique se configurou o seu acesso à Rede/Internet com o\n"
 "drakconnect antes de avançar mais."
 
-#: network/drakfirewall.pm:175
+#: network/drakfirewall.pm:181
 #, c-format
 msgid "Which services would you like to allow the Internet to connect to?"
 msgstr "Que serviços deseja permitir a que a Internet se ligue?"
 
-#: network/drakfirewall.pm:176
+#: network/drakfirewall.pm:182
 #, c-format
 msgid ""
 "You can enter miscellaneous ports. \n"
@@ -9989,7 +10043,7 @@ msgstr ""
 "Exemplos validos são: 139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
 "Veja em /etc/services para informações."
 
-#: network/drakfirewall.pm:182
+#: network/drakfirewall.pm:188
 #, c-format
 msgid ""
 "Invalid port given: %s.\n"
@@ -10004,117 +10058,120 @@ msgstr ""
 "\n"
 "Pode também dar um intervalo de portas (ex: 24300:24350/udp)"
 
-#: network/drakfirewall.pm:192
+#: network/drakfirewall.pm:198
 #, c-format
 msgid "Everything (no firewall)"
 msgstr "Tudo (sem firewall)"
 
-#: network/drakfirewall.pm:194
+#: network/drakfirewall.pm:200
 #, c-format
 msgid "Other ports"
 msgstr "Outras portas"
 
-#: network/isdn.pm:125 network/netconnect.pm:490 network/netconnect.pm:602
-#: network/netconnect.pm:605
+#: network/isdn.pm:124 network/netconnect.pm:539 network/netconnect.pm:653
+#: network/netconnect.pm:656 network/netconnect.pm:814
+#: network/netconnect.pm:818
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr "Não listado - editar manualmente"
 
-#: network/isdn.pm:168 network/netconnect.pm:422
+#: network/isdn.pm:167 network/netconnect.pm:471
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: network/isdn.pm:168 network/netconnect.pm:422
+#: network/isdn.pm:167 network/netconnect.pm:471
 #, c-format
 msgid "I do not know"
 msgstr "Eu não sei"
 
-#: network/isdn.pm:169 network/netconnect.pm:422
+#: network/isdn.pm:168 network/netconnect.pm:471
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:170 network/netconnect.pm:422
+#: network/isdn.pm:169 network/netconnect.pm:471
 #, c-format
 msgid "USB"
 msgstr "USB"
 
 #: network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
-#: network/netconnect.pm:650 network/netconnect.pm:667
-#: network/netconnect.pm:683
+#: network/netconnect.pm:697 network/netconnect.pm:714
+#: network/netconnect.pm:730
 #, c-format
 msgid "Manual"
 msgstr "Manual"
 
-#: network/netconnect.pm:90 network/netconnect.pm:519
-#: network/netconnect.pm:523
+#: network/ndiswrapper.pm:27
 #, c-format
-msgid "Manual choice"
-msgstr "Escolha manual"
+msgid "No device supporting the %s ndiswrapper driver is present!"
+msgstr ""
 
-#: network/netconnect.pm:90
+#: network/ndiswrapper.pm:33
 #, c-format
-msgid "Internal ISDN card"
-msgstr "Placa ISDN interna"
+msgid "Please select the Windows driver (.inf file)"
+msgstr "Por favor seleccione o driver Windows (ficheiro .inf)"
 
-#: network/netconnect.pm:100
-#, c-format
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
+#: network/ndiswrapper.pm:41
+#, fuzzy, c-format
+msgid "Unable to install the %s ndiswrapper driver!"
+msgstr "Escolha um driver ndiswrapper"
 
-#: network/netconnect.pm:101
+#: network/ndiswrapper.pm:89
 #, c-format
-msgid "Managed"
-msgstr "Controlado"
+msgid "Unable to load the ndiswrapper module!"
+msgstr ""
 
-#: network/netconnect.pm:102
+#: network/ndiswrapper.pm:95
 #, c-format
-msgid "Master"
-msgstr "Master"
+msgid ""
+"The selected device has already been configured with the %s driver.\n"
+"Do you really want to use a ndiswrapper driver ?"
+msgstr ""
 
-#: network/netconnect.pm:103
+#: network/ndiswrapper.pm:101
 #, c-format
-msgid "Repeater"
-msgstr "Repetidor"
+msgid "Unable to find the ndiswrapper interface!"
+msgstr ""
 
-#: network/netconnect.pm:104
+#: network/netconnect.pm:91 network/netconnect.pm:568
+#: network/netconnect.pm:572
 #, c-format
-msgid "Secondary"
-msgstr "Secundário"
+msgid "Manual choice"
+msgstr "Escolha manual"
 
-#: network/netconnect.pm:105
+#: network/netconnect.pm:91
 #, c-format
-msgid "Auto"
-msgstr "Auto"
+msgid "Internal ISDN card"
+msgstr "Placa ISDN interna"
 
-#: network/netconnect.pm:108 printer/printerdrake.pm:1354
+#: network/netconnect.pm:103 printer/printerdrake.pm:1418
 #: standalone/drakups:75
 #, c-format
 msgid "Manual configuration"
 msgstr "Configuração manual"
 
-#: network/netconnect.pm:109
+#: network/netconnect.pm:104
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "IP Automático (BOOTP/DHCP)"
 
-#: network/netconnect.pm:111
+#: network/netconnect.pm:106
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "IP Automático (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:114
+#: network/netconnect.pm:109
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "Protocolo para o resto do mundo"
 
-#: network/netconnect.pm:116 standalone/drakconnect:541
+#: network/netconnect.pm:111 standalone/drakconnect:574
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Protocolo Europeu (EDSS1)"
 
-#: network/netconnect.pm:117 standalone/drakconnect:542
+#: network/netconnect.pm:112 standalone/drakconnect:575
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -10123,169 +10180,184 @@ msgstr ""
 "Protocolo para o resto do mundo\n"
 "Sem Canal-D (linhas alugadas)"
 
-#: network/netconnect.pm:153
+#: network/netconnect.pm:148
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Modem Alcatel speedtouch USB"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:149
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Modem USB Sagem"
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:150
 #, c-format
 msgid "Bewan modem"
 msgstr "Modem Bewan"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:151
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "Modem ECI Hi-Focus"
 
-#: network/netconnect.pm:160
+#: network/netconnect.pm:155
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "Dynamic Host Configuration Protocol (DHCP)"
 
-#: network/netconnect.pm:161
+#: network/netconnect.pm:156
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "Configuração manual do TCP/IP"
 
-#: network/netconnect.pm:162
+#: network/netconnect.pm:157
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "Protocolo de Tunelamento Ponto a Ponto (PPTP)"
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:158
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "PPP através de Ethernet (PPPoE)"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:159
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "PPP através de ATM (PPPoA)"
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:160
 #, c-format
 msgid "DSL over CAPI"
 msgstr "DSL sobre CAPI"
 
-#: network/netconnect.pm:169
+#: network/netconnect.pm:164
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Bridge em Ethernet LLC"
 
-#: network/netconnect.pm:170
+#: network/netconnect.pm:165
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Bridge em Ethernet VC"
 
-#: network/netconnect.pm:171
+#: network/netconnect.pm:166
 #, c-format
 msgid "Routed IP LLC"
 msgstr "IP Routeado LLC"
 
-#: network/netconnect.pm:172
+#: network/netconnect.pm:167
 #, c-format
 msgid "Routed IP VC"
 msgstr "IP Routeado VC"
 
-#: network/netconnect.pm:173
+#: network/netconnect.pm:168
 #, c-format
 msgid "PPPoA LLC"
 msgstr "PPPoA LLC"
 
-#: network/netconnect.pm:174
+#: network/netconnect.pm:169
 #, c-format
 msgid "PPPoA VC"
 msgstr "PPPoA VC"
 
-#: network/netconnect.pm:178 standalone/drakconnect:476
+#: network/netconnect.pm:173 standalone/drakconnect:509
 #, c-format
 msgid "Script-based"
 msgstr "Baseado em Script"
 
-#: network/netconnect.pm:179 standalone/drakconnect:476
+#: network/netconnect.pm:174 standalone/drakconnect:509
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:180 standalone/drakconnect:476
+#: network/netconnect.pm:175 standalone/drakconnect:509
 #, c-format
 msgid "Terminal-based"
 msgstr "Baseado em terminal"
 
-#: network/netconnect.pm:181 standalone/drakconnect:476
+#: network/netconnect.pm:176 standalone/drakconnect:509
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:182 standalone/drakconnect:476
+#: network/netconnect.pm:177 standalone/drakconnect:509
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:238 standalone/drakconnect:59
+#: network/netconnect.pm:182
+#, c-format
+msgid "Open WEP"
+msgstr ""
+
+#: network/netconnect.pm:183
+#, fuzzy, c-format
+msgid "Restricted WEP"
+msgstr "restringir"
+
+#: network/netconnect.pm:184
+#, c-format
+msgid "WPA Pre-Shared Key"
+msgstr ""
+
+#: network/netconnect.pm:287 standalone/drakconnect:60
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "Configuração de Rede & Internet"
 
-#: network/netconnect.pm:244
+#: network/netconnect.pm:293
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(detectado na porta %s)"
 
 #  -PO: here, "(detected)" string will be appended to eg "ADSL connection"
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:246
+#: network/netconnect.pm:295
 #, c-format
 msgid "(detected %s)"
 msgstr "(detectado %s)"
 
-#: network/netconnect.pm:246
+#: network/netconnect.pm:295
 #, c-format
 msgid "(detected)"
 msgstr "(detectado)"
 
-#: network/netconnect.pm:248
+#: network/netconnect.pm:297
 #, c-format
 msgid "Modem connection"
 msgstr "Conexão por modem"
 
-#: network/netconnect.pm:249
+#: network/netconnect.pm:298
 #, c-format
 msgid "ISDN connection"
 msgstr "Conexão ISDN"
 
-#: network/netconnect.pm:250
+#: network/netconnect.pm:299
 #, c-format
 msgid "ADSL connection"
 msgstr "Conexão ADSL"
 
-#: network/netconnect.pm:251
+#: network/netconnect.pm:300
 #, c-format
 msgid "Cable connection"
 msgstr "Conexão por Cabo"
 
-#: network/netconnect.pm:252
+#: network/netconnect.pm:301
 #, c-format
 msgid "LAN connection"
 msgstr "Conexão LAN"
 
-#: network/netconnect.pm:253 network/netconnect.pm:267
+#: network/netconnect.pm:302 network/netconnect.pm:316
 #, c-format
 msgid "Wireless connection"
 msgstr "Conexão Wireless"
 
-#: network/netconnect.pm:263
+#: network/netconnect.pm:312
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Escolha a conexão que deseja configurar"
 
-#: network/netconnect.pm:277
+#: network/netconnect.pm:326
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -10298,141 +10370,140 @@ msgstr ""
 "\n"
 "Clique em \"%s\" para continuar."
 
-#: network/netconnect.pm:285 network/netconnect.pm:879
+#: network/netconnect.pm:334 network/netconnect.pm:949
 #, c-format
 msgid "Connection Configuration"
 msgstr "Configuração da Conexão"
 
-#: network/netconnect.pm:286 network/netconnect.pm:880
+#: network/netconnect.pm:335 network/netconnect.pm:950
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "Por favor preencha ou verifique os campos abaixo"
 
-#: network/netconnect.pm:293 standalone/drakconnect:532
+#: network/netconnect.pm:342 standalone/drakconnect:565
 #, c-format
 msgid "Card IRQ"
 msgstr "IRQ da Placa"
 
-#: network/netconnect.pm:294 standalone/drakconnect:533
+#: network/netconnect.pm:343 standalone/drakconnect:566
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Memória da Placa (DMA)"
 
-#: network/netconnect.pm:295 standalone/drakconnect:534
+#: network/netconnect.pm:344 standalone/drakconnect:567
 #, c-format
 msgid "Card IO"
 msgstr "IO da Placa"
 
-#: network/netconnect.pm:296 standalone/drakconnect:535
+#: network/netconnect.pm:345 standalone/drakconnect:568
 #, c-format
 msgid "Card IO_0"
 msgstr "IO_O da Placa"
 
-#: network/netconnect.pm:297
+#: network/netconnect.pm:346
 #, c-format
 msgid "Card IO_1"
 msgstr "IO_1 da Placa"
 
-#: network/netconnect.pm:298
+#: network/netconnect.pm:347
 #, c-format
 msgid "Your personal phone number"
 msgstr "O seu número de telefone pessoal"
 
-#: network/netconnect.pm:299 network/netconnect.pm:883
+#: network/netconnect.pm:348 network/netconnect.pm:953
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "Nome do provedor (ex: provedor.net)"
 
-#: network/netconnect.pm:300 standalone/drakconnect:471
+#: network/netconnect.pm:349 standalone/drakconnect:504
 #, c-format
 msgid "Provider phone number"
 msgstr "Número do telefone do provedor"
 
-#: network/netconnect.pm:301
+#: network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "Provedor DNS 1 (opcional)"
 
-#: network/netconnect.pm:302
+#: network/netconnect.pm:351
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "Provedor DNS 2 (opcional)"
 
-#: network/netconnect.pm:303 standalone/drakconnect:422
+#: network/netconnect.pm:352 standalone/drakconnect:455
 #, c-format
 msgid "Dialing mode"
 msgstr "Modo de marcação"
 
-#: network/netconnect.pm:304 standalone/drakconnect:427
-#: standalone/drakconnect:495
+#: network/netconnect.pm:353 standalone/drakconnect:460
+#: standalone/drakconnect:528
 #, c-format
 msgid "Connection speed"
 msgstr "Velocidade de conexão"
 
-#: network/netconnect.pm:305 standalone/drakconnect:432
+#: network/netconnect.pm:354 standalone/drakconnect:465
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Tempo de espera da conexão (em segundos)"
 
-#: network/netconnect.pm:308 network/netconnect.pm:329
-#: network/netconnect.pm:886 standalone/drakconnect:469
+#: network/netconnect.pm:357 network/netconnect.pm:378
+#: network/netconnect.pm:956 standalone/drakconnect:502
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Nome do utilizador da conta"
 
-#: network/netconnect.pm:309 network/netconnect.pm:330
-#: network/netconnect.pm:887 standalone/drakconnect:470
+#: network/netconnect.pm:358 network/netconnect.pm:379
+#: network/netconnect.pm:957 standalone/drakconnect:503
 #, c-format
 msgid "Account Password"
 msgstr "Senha da conta"
 
-#: network/netconnect.pm:325
+#: network/netconnect.pm:374
 #, c-format
 msgid "Cable: account options"
 msgstr "Cabo: opções da conta"
 
-#: network/netconnect.pm:328
+#: network/netconnect.pm:377
 #, c-format
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Usar BPALogin (necessário para o Telstra)"
 
-#: network/netconnect.pm:362 network/netconnect.pm:715
-#: network/netconnect.pm:920
+#: network/netconnect.pm:411 network/netconnect.pm:767
+#: network/netconnect.pm:992
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "Seleccione o interface de rede a configurar:"
 
-#: network/netconnect.pm:364 network/netconnect.pm:412
-#: network/netconnect.pm:716 network/netconnect.pm:922
-#: network/netconnect.pm:1091 network/shorewall.pm:98
-#: standalone/drakconnect:684 standalone/drakgw:224 standalone/drakvpn:221
+#: network/netconnect.pm:413 network/netconnect.pm:461
+#: network/netconnect.pm:768 network/netconnect.pm:994 network/shorewall.pm:96
+#: standalone/drakconnect:720 standalone/drakgw:224 standalone/drakvpn:221
 #, c-format
 msgid "Net Device"
 msgstr "Dispositivo de Rede"
 
-#: network/netconnect.pm:365 network/netconnect.pm:373
+#: network/netconnect.pm:414 network/netconnect.pm:422
 #, c-format
 msgid "External ISDN modem"
 msgstr "Modem ISDN externo"
 
-#: network/netconnect.pm:411 standalone/harddrake2:210
+#: network/netconnect.pm:460 standalone/harddrake2:215
 #, c-format
 msgid "Select a device!"
 msgstr "Seleccione um dispositivo !"
 
-#: network/netconnect.pm:420 network/netconnect.pm:430
-#: network/netconnect.pm:440 network/netconnect.pm:473
-#: network/netconnect.pm:487
+#: network/netconnect.pm:469 network/netconnect.pm:479
+#: network/netconnect.pm:489 network/netconnect.pm:522
+#: network/netconnect.pm:536
 #, c-format
 msgid "ISDN Configuration"
 msgstr "Configuração ISDN"
 
-#: network/netconnect.pm:421
+#: network/netconnect.pm:470
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "Que tipo de placa tem?"
 
-#: network/netconnect.pm:431
+#: network/netconnect.pm:480
 #, c-format
 msgid ""
 "\n"
@@ -10446,22 +10517,22 @@ msgstr ""
 "\n"
 "Se tiver uma placa PCMCIA, tem que saber o \"irq\" e \"io\" da sua placa.\n"
 
-#: network/netconnect.pm:435
+#: network/netconnect.pm:484
 #, c-format
 msgid "Continue"
 msgstr "Continuar"
 
-#: network/netconnect.pm:435
+#: network/netconnect.pm:484
 #, c-format
 msgid "Abort"
 msgstr "Abortar"
 
-#: network/netconnect.pm:441
+#: network/netconnect.pm:490
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "Qual destas é a sua placa ISDN?"
 
-#: network/netconnect.pm:459
+#: network/netconnect.pm:508
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -10472,25 +10543,25 @@ msgstr ""
 "mais funcionalidades do que o driver livre (como o envio de telecopias). Que "
 "driver deseja usar?"
 
-#: network/netconnect.pm:461 standalone/drakconnect:116 standalone/drakups:247
-#: standalone/harddrake2:131
+#: network/netconnect.pm:510 standalone/drakconnect:117 standalone/drakups:251
+#: standalone/harddrake2:132
 #, c-format
 msgid "Driver"
 msgstr "Driver"
 
-#: network/netconnect.pm:473
+#: network/netconnect.pm:522
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Que protocolo quer usar?"
 
-#: network/netconnect.pm:475 standalone/drakconnect:116
-#: standalone/drakconnect:309 standalone/drakconnect:540
+#: network/netconnect.pm:524 standalone/drakconnect:117
+#: standalone/drakconnect:311 standalone/drakconnect:573
 #: standalone/drakvpn:1142
 #, c-format
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: network/netconnect.pm:487
+#: network/netconnect.pm:536
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -10499,13 +10570,13 @@ msgstr ""
 "Seleccione o seu provedor.\n"
 "Se não estiver listado, escolha Não Listado"
 
-#: network/netconnect.pm:489 network/netconnect.pm:601
-#: network/netconnect.pm:757
+#: network/netconnect.pm:538 network/netconnect.pm:652
+#: network/netconnect.pm:813
 #, c-format
 msgid "Provider:"
 msgstr "Provedor:"
 
-#: network/netconnect.pm:504
+#: network/netconnect.pm:553
 #, c-format
 msgid ""
 "Your modem is not supported by the system.\n"
@@ -10514,117 +10585,117 @@ msgstr ""
 "O seu modem não é suportado pelo sistema.\n"
 "Veja em http://www.linmodems.org"
 
-#: network/netconnect.pm:516
+#: network/netconnect.pm:565
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "Seleccione o modem a configurar:"
 
-#: network/netconnect.pm:568
+#: network/netconnect.pm:619
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Por favor escolha a que porta série o seu modem está ligado."
 
-#: network/netconnect.pm:599
+#: network/netconnect.pm:650
 #, c-format
 msgid "Select your provider:"
 msgstr "Seleccione o seu provedor:"
 
-#: network/netconnect.pm:627
+#: network/netconnect.pm:674
 #, c-format
 msgid "Dialup: account options"
 msgstr "Dialup: opções da conta"
 
-#: network/netconnect.pm:630
+#: network/netconnect.pm:677
 #, c-format
 msgid "Connection name"
 msgstr "Nome da conexão"
 
-#: network/netconnect.pm:631
+#: network/netconnect.pm:678
 #, c-format
 msgid "Phone number"
 msgstr "Número do telefone"
 
-#: network/netconnect.pm:632
+#: network/netconnect.pm:679
 #, c-format
 msgid "Login ID"
 msgstr "ID de Login"
 
-#: network/netconnect.pm:647 network/netconnect.pm:680
+#: network/netconnect.pm:694 network/netconnect.pm:727
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "Dialup: parâmetros IP"
 
-#: network/netconnect.pm:650
+#: network/netconnect.pm:697
 #, c-format
 msgid "IP parameters"
 msgstr "Parâmetros IP"
 
-#: network/netconnect.pm:651 network/netconnect.pm:1018
-#: printer/printerdrake.pm:454 standalone/drakconnect:116
-#: standalone/drakconnect:325 standalone/drakconnect:879
-#: standalone/drakups:282
+#: network/netconnect.pm:698 network/netconnect.pm:1106
+#: printer/printerdrake.pm:460 standalone/drakconnect:117
+#: standalone/drakconnect:327 standalone/drakconnect:915
+#: standalone/drakups:286
 #, c-format
 msgid "IP address"
 msgstr "Endereço IP"
 
-#: network/netconnect.pm:652
+#: network/netconnect.pm:699
 #, c-format
 msgid "Subnet mask"
 msgstr "Máscara subnet"
 
-#: network/netconnect.pm:664
+#: network/netconnect.pm:711
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "Conexão Dialup: parâmetros DNS"
 
-#: network/netconnect.pm:667
+#: network/netconnect.pm:714
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: network/netconnect.pm:668
+#: network/netconnect.pm:715
 #, c-format
 msgid "Domain name"
 msgstr "Nome do domínio"
 
-#: network/netconnect.pm:669 network/netconnect.pm:884
-#: standalone/drakconnect:997
+#: network/netconnect.pm:716 network/netconnect.pm:954
+#: standalone/drakconnect:1033
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "Primeiro Servidor DNS (opcional)"
 
-#: network/netconnect.pm:670 network/netconnect.pm:885
-#: standalone/drakconnect:998
+#: network/netconnect.pm:717 network/netconnect.pm:955
+#: standalone/drakconnect:1034
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "Segundo Servidor DNS (opcional)"
 
-#: network/netconnect.pm:671
+#: network/netconnect.pm:718
 #, c-format
 msgid "Set hostname from IP"
 msgstr "Definir nome de endereço a partir do IP"
 
-#: network/netconnect.pm:683 standalone/drakconnect:336
+#: network/netconnect.pm:730 standalone/drakconnect:338
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
-#: network/netconnect.pm:684
+#: network/netconnect.pm:731
 #, c-format
 msgid "Gateway IP address"
 msgstr "Endereço IP do Gateway"
 
-#: network/netconnect.pm:715
+#: network/netconnect.pm:767
 #, c-format
 msgid "ADSL configuration"
 msgstr "Configuração ADSL"
 
-#: network/netconnect.pm:755
+#: network/netconnect.pm:811
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Por favor escolha o seu provedor ADSL"
 
-#: network/netconnect.pm:773
+#: network/netconnect.pm:832
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10635,32 +10706,32 @@ msgstr ""
 "Pode fornecê-lo agora via disquete ou pela sua partição windows,\n"
 "ou saltar e fazê-lo mais tarde."
 
-#: network/netconnect.pm:777 network/netconnect.pm:782
+#: network/netconnect.pm:836 network/netconnect.pm:841
 #, c-format
 msgid "Use a floppy"
 msgstr "Usar uma disquete"
 
-#: network/netconnect.pm:777 network/netconnect.pm:786
+#: network/netconnect.pm:836 network/netconnect.pm:845
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Usar a minha partição Windows"
 
-#: network/netconnect.pm:777 network/netconnect.pm:789
+#: network/netconnect.pm:836 network/netconnect.pm:848
 #, c-format
 msgid "Do it later"
 msgstr "Fazer mais tarde"
 
-#: network/netconnect.pm:796
+#: network/netconnect.pm:855
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr "Cópia do firmware falhada, o ficheiro %s não foi encontrado"
 
-#: network/netconnect.pm:803
+#: network/netconnect.pm:862
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "Cópia do firmware bem succedida"
 
-#: network/netconnect.pm:818
+#: network/netconnect.pm:877
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10673,22 +10744,22 @@ msgstr ""
 "%s\n"
 "e copie o mgmt.o em /usr/share/speedtouch"
 
-#: network/netconnect.pm:889
+#: network/netconnect.pm:960
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "ID do Caminho Virtual (VPI):"
 
-#: network/netconnect.pm:890
+#: network/netconnect.pm:961
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "ID do Circuito Virtual (VCI):"
 
-#: network/netconnect.pm:893
+#: network/netconnect.pm:964
 #, c-format
 msgid "Encapsulation:"
 msgstr "Encapsulamento:"
 
-#: network/netconnect.pm:910
+#: network/netconnect.pm:982
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10701,17 +10772,22 @@ msgstr ""
 "\n"
 "Pode encontrar um driver em http://eciadsl.flashtux.org/"
 
-#: network/netconnect.pm:922
+#: network/netconnect.pm:994
 #, c-format
 msgid "Manually load a driver"
 msgstr "Carregar um driver manualmente"
 
-#: network/netconnect.pm:922
+#: network/netconnect.pm:994
 #, c-format
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr "Usar um driver Windows (com o ndiswrapper)"
 
-#: network/netconnect.pm:940
+#: network/netconnect.pm:1001 printer/printerdrake.pm:3741
+#, c-format
+msgid "Could not install the %s package!"
+msgstr "Não foi possível instalar o pacote %s !"
+
+#: network/netconnect.pm:1027
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
@@ -10724,7 +10800,7 @@ msgstr ""
 "A modificação dos campos abaixo ira sobrepor esta configuração.\n"
 "Quer realmente reconfigurar este dispositivo?"
 
-#: network/netconnect.pm:954 network/netconnect.pm:1436
+#: network/netconnect.pm:1041 network/netconnect.pm:1520
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -10733,26 +10809,26 @@ msgstr ""
 "Parabéns, a configuração da rede e da Internet acabou.\n"
 "\n"
 
-#: network/netconnect.pm:971
+#: network/netconnect.pm:1058
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Resolução do nome de endereço Zeroconf"
 
-#: network/netconnect.pm:972 network/netconnect.pm:1005
+#: network/netconnect.pm:1059 network/netconnect.pm:1093
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "A configurar o dispositivo de rede %s (driver %s)"
 
-#: network/netconnect.pm:973
-#, c-format
+#: network/netconnect.pm:1060
+#, fuzzy, c-format
 msgid ""
-"The following protocols can be used to configure an ethernet connection. "
-"Please choose the one you want to use"
+"The following protocols can be used to configure a LAN connection. Please "
+"choose the one you want to use"
 msgstr ""
 "Os seguintes protocolos podem ser usados para configurar uma conexão "
 "ethernet. Por favor escolha o que pretende usar"
 
-#: network/netconnect.pm:1006
+#: network/netconnect.pm:1094
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10763,173 +10839,186 @@ msgstr ""
 "Cada item deve ser introduzido como endereço IP em notação\n"
 "ponto-decimal (por exemplo, 1.2.3.4)."
 
-#: network/netconnect.pm:1013
+#: network/netconnect.pm:1101 standalone/drakconnect:384
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Atribuir nome de endereço a partir do endereço DHCP"
 
-#: network/netconnect.pm:1014
+#: network/netconnect.pm:1102 standalone/drakconnect:386
 #, c-format
 msgid "DHCP host name"
 msgstr "Nome do servidor DHCP"
 
-#: network/netconnect.pm:1019 standalone/drakconnect:330
-#: standalone/drakconnect:880 standalone/drakgw:320
+#: network/netconnect.pm:1107 standalone/drakconnect:332
+#: standalone/drakconnect:916 standalone/drakgw:320
 #, c-format
 msgid "Netmask"
 msgstr "Netmask"
 
-#: network/netconnect.pm:1021 standalone/drakconnect:415
+#: network/netconnect.pm:1109 standalone/drakconnect:448
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr "Procurar o id da placa rede (útil para os portáteis)"
 
-#: network/netconnect.pm:1022 standalone/drakconnect:416
+#: network/netconnect.pm:1111 standalone/drakconnect:449
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Ligação à Rede \"Hotplugging\""
 
-#: network/netconnect.pm:1024 standalone/drakconnect:410
+#: network/netconnect.pm:1113 standalone/drakconnect:443
 #, c-format
 msgid "Start at boot"
 msgstr "Iniciar no arranque"
 
-#: network/netconnect.pm:1027 standalone/drakconnect:883
+#: network/netconnect.pm:1115 standalone/drakconnect:471
+#, c-format
+msgid "Metric"
+msgstr "Metrico"
+
+#: network/netconnect.pm:1117 standalone/drakconnect:380
+#: standalone/drakconnect:919
 #, c-format
 msgid "DHCP client"
 msgstr "Cliente DHCP"
 
-#: network/netconnect.pm:1041 standalone/drakconnect:389
+#: network/netconnect.pm:1119 standalone/drakconnect:390
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Tempo de espera DHCP (em segundos)"
 
-#: network/netconnect.pm:1042 standalone/drakconnect:392
+#: network/netconnect.pm:1120 standalone/drakconnect:393
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Obter servidores DNS por DHCP"
 
-#: network/netconnect.pm:1043
+#: network/netconnect.pm:1121 standalone/drakconnect:394
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Obter servidores YP por DHCP"
 
-#: network/netconnect.pm:1044
+#: network/netconnect.pm:1122 standalone/drakconnect:395
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Obter servidores NTPD por DHCP"
 
-#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
-#: standalone/drakconnect:649
+#: network/netconnect.pm:1131 printer/printerdrake.pm:1672
+#: standalone/drakconnect:683
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "O endereço IP deve estar no formato 1.2.3.4"
 
-#: network/netconnect.pm:1057 standalone/drakconnect:686
+#: network/netconnect.pm:1135 standalone/drakconnect:687
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "O netmask deve estar no formato 255.255.224.0"
 
-#: network/netconnect.pm:1041
+#: network/netconnect.pm:1139
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr "Aviso: o endereço IP %s é normalmente reservado!"
 
-#: network/netconnect.pm:1046 standalone/drakTermServ:1742
-#: standalone/drakTermServ:1743 standalone/drakTermServ:1744
+#: network/netconnect.pm:1144 standalone/drakTermServ:1731
+#: standalone/drakTermServ:1732 standalone/drakTermServ:1733
 #, c-format
 msgid "%s already in use\n"
 msgstr "%s já está em uso\n"
 
-#: network/netconnect.pm:1067
+#: network/netconnect.pm:1177
 #, c-format
 msgid "Choose an ndiswrapper driver"
 msgstr "Escolha um driver ndiswrapper"
 
-#: network/netconnect.pm:1068 network/netconnect.pm:1075
+#: network/netconnect.pm:1179
+#, fuzzy, c-format
+msgid "Use the ndiswrapper driver %s"
+msgstr "Escolha um driver ndiswrapper"
+
+#: network/netconnect.pm:1179
 #, c-format
 msgid "Install a new driver"
 msgstr "Instalar um novo driver"
 
-#: network/netconnect.pm:1068
+#: network/netconnect.pm:1191
+#, fuzzy, c-format
+msgid "Select a device:"
+msgstr "Seleccione um dispositivo !"
+
+#: network/netconnect.pm:1216
 #, c-format
-msgid "Use already installed driver (%s)"
-msgstr "Usar o driver já instalado (%s)"
+msgid "Please enter the wireless parameters for this card:"
+msgstr "Por favor indique os parâmetros wireless para esta placa:"
 
-#: network/netconnect.pm:1072 printer/printerdrake.pm:3644
+#: network/netconnect.pm:1219 standalone/drakconnect:415
 #, c-format
-msgid "Could not install the %s package!"
-msgstr "Não foi possível instalar o pacote %s !"
+msgid "Operating Mode"
+msgstr "Modo de Operação"
 
-#: network/netconnect.pm:1076
+#: network/netconnect.pm:1220
 #, c-format
-msgid "Please select the Windows driver (.inf file)"
-msgstr "Por favor seleccione o driver Windows (ficheiro .inf)"
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
 
-#: network/netconnect.pm:1126 network/netconnect.pm:1155
+#: network/netconnect.pm:1220
 #, c-format
-msgid "Please enter the wireless parameters for this card:"
-msgstr "Por favor indique os parâmetros wireless para esta placa:"
+msgid "Managed"
+msgstr "Controlado"
 
-#: network/netconnect.pm:1129 standalone/drakconnect:382
+#: network/netconnect.pm:1220
 #, c-format
-msgid "Operating Mode"
-msgstr "Modo de Operação"
+msgid "Master"
+msgstr "Master"
+
+#: network/netconnect.pm:1220
+#, c-format
+msgid "Repeater"
+msgstr "Repetidor"
+
+#: network/netconnect.pm:1220
+#, c-format
+msgid "Secondary"
+msgstr "Secundário"
+
+#: network/netconnect.pm:1220
+#, c-format
+msgid "Auto"
+msgstr "Auto"
 
-#: network/netconnect.pm:1131 standalone/drakconnect:383
+#: network/netconnect.pm:1222 standalone/drakconnect:416
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nome da Rede (ESSID)"
 
-#: network/netconnect.pm:1132 standalone/drakconnect:384
+#: network/netconnect.pm:1223 standalone/drakconnect:417
 #, c-format
 msgid "Network ID"
 msgstr "ID de Rede"
 
-#: network/netconnect.pm:1133 standalone/drakconnect:385
+#: network/netconnect.pm:1224 standalone/drakconnect:418
 #, c-format
 msgid "Operating frequency"
 msgstr "Frequência de operação"
 
-#: network/netconnect.pm:1134 standalone/drakconnect:386
+#: network/netconnect.pm:1225 standalone/drakconnect:419
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Sensibilidade do ponto inicial"
 
-#: network/netconnect.pm:1135 standalone/drakconnect:387
+#: network/netconnect.pm:1226 standalone/drakconnect:420
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (em b/s)"
 
-#: network/netconnect.pm:1141
-#, c-format
-msgid "Use Wi-Fi Protected Access (WPA)"
-msgstr "Usar Acesso Protegido Wi-Fi (WPA)"
-
-#: network/netconnect.pm:1168
-#, c-format
-msgid ""
-"Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
-"frequency), or add enough '0' (zeroes)."
-msgstr ""
-"Freq deve ter o sufixo k, M ou G (por exemplo, \"2.46G\" para uma frequência "
-"de 2.46 GHz), ou então insira suficientes '0' (zeros)."
-
-#: network/netconnect.pm:1145
-#, c-format
-msgid ""
-"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
-"enough '0' (zeroes)."
-msgstr ""
-"A taxa de transferência deve ter o sufixo k, M ou G (por exemplo, \"11M\" "
-"para 11M), ou insira suficientes '0' (zeros)."
+#: network/netconnect.pm:1227
+#, fuzzy, c-format
+msgid "Encryption mode"
+msgstr "Senha de encriptação"
 
-#: network/netconnect.pm:1158 standalone/drakconnect:398
+#: network/netconnect.pm:1231 standalone/drakconnect:431
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: network/netconnect.pm:1159
+#: network/netconnect.pm:1232
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10954,17 +11043,17 @@ msgstr ""
 "auto,  fixo ou\n"
 "desligado."
 
-#: network/netconnect.pm:1166 standalone/drakconnect:399
+#: network/netconnect.pm:1239 standalone/drakconnect:432
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentação"
 
-#: network/netconnect.pm:1167 standalone/drakconnect:400
+#: network/netconnect.pm:1240 standalone/drakconnect:433
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr "Argumentos extra do comando Iwconfig"
 
-#: network/netconnect.pm:1168
+#: network/netconnect.pm:1241
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -10981,12 +11070,12 @@ msgstr ""
 
 #  -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1175 standalone/drakconnect:401
+#: network/netconnect.pm:1248 standalone/drakconnect:434
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr "Argumentos extra do comando lwspy"
 
-#: network/netconnect.pm:1176
+#: network/netconnect.pm:1249
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -11005,12 +11094,12 @@ msgstr ""
 "\n"
 "Consulte a página do manual iwpspy(8) para mais informações."
 
-#: network/netconnect.pm:1184 standalone/drakconnect:402
+#: network/netconnect.pm:1257 standalone/drakconnect:435
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "Argumentos extra do comando lwpriv"
 
-#: network/netconnect.pm:1185
+#: network/netconnect.pm:1258
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -11038,7 +11127,25 @@ msgstr ""
 "\n"
 "Veja a página do manual iwpriv(8) para mais informações."
 
-#: network/netconnect.pm:1259
+#: network/netconnect.pm:1273
+#, c-format
+msgid ""
+"Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
+"frequency), or add enough '0' (zeroes)."
+msgstr ""
+"Freq deve ter o sufixo k, M ou G (por exemplo, \"2.46G\" para uma frequência "
+"de 2.46 GHz), ou então insira suficientes '0' (zeros)."
+
+#: network/netconnect.pm:1277
+#, c-format
+msgid ""
+"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
+"enough '0' (zeroes)."
+msgstr ""
+"A taxa de transferência deve ter o sufixo k, M ou G (por exemplo, \"11M\" "
+"para 11M), ou insira suficientes '0' (zeros)."
+
+#: network/netconnect.pm:1314
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -11051,71 +11158,71 @@ msgstr ""
 "tal como ``mybox.mylab.myco.com''.\n"
 "Pode também introduzir o endereço IP do gateway se tiver algum."
 
-#: network/netconnect.pm:1263
+#: network/netconnect.pm:1319
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr ""
 "Último, mas não menos importante, pode também escrever os seus endereços IP "
 "do seu servidor DNS."
 
-#: network/netconnect.pm:1265 standalone/drakconnect:996
+#: network/netconnect.pm:1321 standalone/drakconnect:1032
 #, c-format
 msgid "Host name (optional)"
 msgstr "Nome da máquina (opcional)"
 
-#: network/netconnect.pm:1265
+#: network/netconnect.pm:1321
 #, c-format
 msgid "Host name"
 msgstr "Nome da máquina"
 
-#: network/netconnect.pm:1267
+#: network/netconnect.pm:1323
 #, c-format
 msgid "DNS server 1"
 msgstr "Servidor DNS 1"
 
-#: network/netconnect.pm:1268
+#: network/netconnect.pm:1324
 #, c-format
 msgid "DNS server 2"
 msgstr "Servidor DNS 2"
 
-#: network/netconnect.pm:1269
+#: network/netconnect.pm:1325
 #, c-format
 msgid "DNS server 3"
 msgstr "Servidor DNS 3"
 
-#: network/netconnect.pm:1270
+#: network/netconnect.pm:1326
 #, c-format
 msgid "Search domain"
 msgstr "Domínio de procura"
 
-#: network/netconnect.pm:1271
+#: network/netconnect.pm:1327
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
-"Por defeito o domínio de procura será definido a partir do nome da "
-"máquina devidamente qualificado"
+"Por defeito o domínio de procura será definido a partir do nome da máquina "
+"devidamente qualificado"
 
-#: network/netconnect.pm:1272
+#: network/netconnect.pm:1328
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Gateway (ex. %s)"
 
-#: network/netconnect.pm:1274
+#: network/netconnect.pm:1330
 #, c-format
 msgid "Gateway device"
 msgstr "Dispositivo Gateway"
 
-#: network/netconnect.pm:1283
+#: network/netconnect.pm:1339
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "O endereço do servidor DNS deve ser no formato 1.2.3.4"
 
-#: network/netconnect.pm:1288 standalone/drakconnect:652
+#: network/netconnect.pm:1344 standalone/drakconnect:692
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "O endereço Gateway deve ser no formato 1.2.3.4"
 
-#: network/netconnect.pm:1299
+#: network/netconnect.pm:1357
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -11128,17 +11235,17 @@ msgstr ""
 "dos seus recursos partilhados que não são geridos pela rede.\n"
 "Não é necessário na maioria das redes."
 
-#: network/netconnect.pm:1303
+#: network/netconnect.pm:1361
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Nome de Máquina Zeroconf"
 
-#: network/netconnect.pm:1306
+#: network/netconnect.pm:1364
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "O nome de máquina Zeroconf não deve conter um ."
 
-#: network/netconnect.pm:1316
+#: network/netconnect.pm:1374
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -11149,57 +11256,57 @@ msgstr ""
 "Escolha aquela que deseja usar.\n"
 "\n"
 
-#: network/netconnect.pm:1318
+#: network/netconnect.pm:1376
 #, c-format
 msgid "Internet connection"
 msgstr "Conexão Internet"
 
-#: network/netconnect.pm:1326
+#: network/netconnect.pm:1385
 #, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "A configuração está completa, deseja aplicar as definições?"
 
-#: network/netconnect.pm:1336
+#: network/netconnect.pm:1392
 #, c-format
 msgid "Do you want to allow users to start the connection?"
 msgstr "Quer permitir aos utilizadores de iniciar a conexão?"
 
-#: network/netconnect.pm:1345
+#: network/netconnect.pm:1412
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "Quer iniciar a sua conexão no arranque?"
 
-#: network/netconnect.pm:1354
+#: network/netconnect.pm:1431
 #, c-format
 msgid "Automatically at boot"
 msgstr "Automáticamente no arranque"
 
-#: network/netconnect.pm:1356
+#: network/netconnect.pm:1433
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr "Ao usar a Net Applet na bandeja do painel"
 
-#: network/netconnect.pm:1358
+#: network/netconnect.pm:1435
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr "Manualmente (o interface continuará a ser activado no arranque)"
 
-#: network/netconnect.pm:1367
+#: network/netconnect.pm:1444
 #, c-format
 msgid "How do you want to dial this connection?"
 msgstr "Como quer ligar esta conexão ?"
 
-#: network/netconnect.pm:1380
+#: network/netconnect.pm:1458
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "A rede precisa ser reiniciada. Deseja reiniciá-la?"
 
-#: network/netconnect.pm:1387 network/netconnect.pm:1452
+#: network/netconnect.pm:1465 network/netconnect.pm:1536
 #, c-format
 msgid "Network Configuration"
 msgstr "Configuração da Rede"
 
-#: network/netconnect.pm:1388
+#: network/netconnect.pm:1466
 #, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -11210,27 +11317,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:1396
+#: network/netconnect.pm:1475
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "Quer tentar ligar-se à Internet agora?"
 
-#: network/netconnect.pm:1404 standalone/drakconnect:1028
+#: network/netconnect.pm:1483 standalone/drakconnect:1064
 #, c-format
 msgid "Testing your connection..."
 msgstr "A testar a sua conexão..."
 
-#: network/netconnect.pm:1420
+#: network/netconnect.pm:1503
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "O sistema está agora ligado à Internet."
 
-#: network/netconnect.pm:1421
+#: network/netconnect.pm:1504
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "Por razões de segurança, será desligada agora."
 
-#: network/netconnect.pm:1422
+#: network/netconnect.pm:1505
 #, c-format
 msgid ""
 "The system does not seem to be connected to the Internet.\n"
@@ -11239,16 +11346,16 @@ msgstr ""
 "O sistema não parece estar conectado à Internet.\n"
 "Tente reconfigurar a sua conexão."
 
-#: network/netconnect.pm:1439
+#: network/netconnect.pm:1523
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
 "avoid any hostname-related problems."
 msgstr ""
-"Após estar pronto, recomendamos que reinicie o seu ambiente X para "
-"evitar qualquer problema relacionado com o nome da máquina."
+"Após estar pronto, recomendamos que reinicie o seu ambiente X para evitar "
+"qualquer problema relacionado com o nome da máquina."
 
-#: network/netconnect.pm:1440
+#: network/netconnect.pm:1524
 #, c-format
 msgid ""
 "Problems occurred during configuration.\n"
@@ -11259,7 +11366,7 @@ msgstr ""
 "Teste a sua conexão via net_monitor ou mcc. Se a sua conexão não funcionar, "
 "pode querer relançar a configuração."
 
-#: network/netconnect.pm:1453
+#: network/netconnect.pm:1537
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -11272,7 +11379,7 @@ msgstr ""
 "Clique em OK para manter a configuração, ou Cancelar para reconfigurar as "
 "suas conexões Internet & Rede.\n"
 
-#: network/netconnect.pm:1491
+#: network/netconnect.pm:1575
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -11281,27 +11388,27 @@ msgstr ""
 "Ocorreu um erro inesperado:\n"
 "%s"
 
-#: network/network.pm:319
+#: network/network.pm:315
 #, c-format
 msgid "Proxies configuration"
 msgstr "Configuração de proxies"
 
-#: network/network.pm:320
+#: network/network.pm:316
 #, c-format
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
-#: network/network.pm:321
+#: network/network.pm:317
 #, c-format
 msgid "FTP proxy"
 msgstr "Proxy FTP"
 
-#: network/network.pm:324
+#: network/network.pm:320
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "O Proxy deve ser http://..."
 
-#: network/network.pm:325
+#: network/network.pm:321
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "O Url deve começar com 'ftp:' ou 'http:'"
@@ -11320,7 +11427,7 @@ msgstr ""
 "Aviso! Uma configuração de firewall existente foi detectada. Pode precisar "
 "de algumas correções manuais a seguir à instalação."
 
-#: network/shorewall.pm:91 standalone/drakgw:217 standalone/drakvpn:214
+#: network/shorewall.pm:89 standalone/drakgw:217 standalone/drakvpn:214
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -11337,12 +11444,12 @@ msgstr ""
 "\t\teth0, ou eth1 para uma conexão por cabo, \n"
 "\t\tippp+ para uma conexão isdn.\n"
 
-#: network/tools.pm:181
+#: network/tools.pm:190
 #, c-format
 msgid "Insert floppy"
 msgstr "Insira uma disquete"
 
-#: network/tools.pm:182
+#: network/tools.pm:191
 #, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
@@ -11351,7 +11458,7 @@ msgstr ""
 "Insira uma disquete formatada em FAT no leitor %s com %s na pasta raíz e "
 "clique em %s"
 
-#: network/tools.pm:187
+#: network/tools.pm:196
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "Erro de acesso à disquete, não é possível montar o dispositivo %s"
@@ -11392,7 +11499,7 @@ msgstr "Ficheiro de cópia de segurança danificado"
 msgid "Error writing to file %s"
 msgstr "Erro ao escrever no ficheiro %s"
 
-#: partition_table/raw.pm:240
+#: partition_table/raw.pm:249
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -11430,7 +11537,7 @@ msgstr "bom"
 msgid "maybe"
 msgstr "talvez"
 
-#: pkgs.pm:474
+#: pkgs.pm:481
 #, c-format
 msgid "Downloading file %s..."
 msgstr "A transferir o ficheiro %s..."
@@ -11455,9 +11562,9 @@ msgstr "Configurado noutras máquinas"
 msgid "On CUPS server \"%s\""
 msgstr "No servidor CUPS \"%s\""
 
-#: printer/cups.pm:117 printer/printerdrake.pm:4650
-#: printer/printerdrake.pm:4660 printer/printerdrake.pm:4805
-#: printer/printerdrake.pm:4816 printer/printerdrake.pm:5011
+#: printer/cups.pm:117 printer/printerdrake.pm:4761
+#: printer/printerdrake.pm:4771 printer/printerdrake.pm:4916
+#: printer/printerdrake.pm:4927 printer/printerdrake.pm:5137
 #, c-format
 msgid " (Default)"
 msgstr " (Predefinido)"
@@ -11507,8 +11614,8 @@ msgstr "CUPS - Sistema Unix Comum de Impressão (servidor remoto)"
 msgid "Remote CUPS"
 msgstr "CUPS remoto"
 
-#: printer/detect.pm:153 printer/detect.pm:236 printer/detect.pm:438
-#: printer/detect.pm:475
+#: printer/detect.pm:156 printer/detect.pm:239 printer/detect.pm:441
+#: printer/detect.pm:478
 #, c-format
 msgid "Unknown Model"
 msgstr "Modelo Desconhecido"
@@ -11528,7 +11635,8 @@ msgstr "Impressora remota"
 msgid "Printer on remote CUPS server"
 msgstr "Impressora num Servidor CUPS remoto"
 
-#: printer/main.pm:30 printer/printerdrake.pm:1628
+#: printer/main.pm:30 printer/printerdrake.pm:1150
+#: printer/printerdrake.pm:1695
 #, c-format
 msgid "Printer on remote lpd server"
 msgstr "Impressora num servidor lpd remoto"
@@ -11548,7 +11656,7 @@ msgstr "Impressora num servidor SMB/Windows 95/98/NT"
 msgid "Printer on NetWare server"
 msgstr "Impressora num servidor NetWare"
 
-#: printer/main.pm:34 printer/printerdrake.pm:1632
+#: printer/main.pm:34 printer/printerdrake.pm:1699
 #, c-format
 msgid "Enter a printer device URI"
 msgstr "Introduza uma impressora URI"
@@ -11558,243 +11666,242 @@ msgstr "Introduza uma impressora URI"
 msgid "Pipe job into a command"
 msgstr "Envia o trabalho para um comando"
 
-#. Translation of the "(recommended)" in printer driver entries
 #: printer/main.pm:45
 #, c-format
 msgid "recommended"
 msgstr "recomendado"
 
-#: printer/main.pm:324 printer/main.pm:629 printer/main.pm:1664
-#: printer/main.pm:2699 printer/main.pm:2708 printer/printerdrake.pm:903
-#: printer/printerdrake.pm:2094 printer/printerdrake.pm:5048
+#: printer/main.pm:329 printer/main.pm:634 printer/main.pm:1671
+#: printer/main.pm:2706 printer/main.pm:2715 printer/printerdrake.pm:910
+#: printer/printerdrake.pm:2182 printer/printerdrake.pm:5174
 #, c-format
 msgid "Unknown model"
 msgstr "Modelo desconhecido"
 
-#: printer/main.pm:349 standalone/printerdrake:186
+#: printer/main.pm:354 standalone/printerdrake:186
 #, c-format
 msgid "Configured on this machine"
 msgstr "Configurado nesta máquina"
 
-#: printer/main.pm:355 printer/printerdrake.pm:1175
+#: printer/main.pm:360 printer/printerdrake.pm:1239
 #, c-format
 msgid " on parallel port #%s"
 msgstr " na porta paralela #%s"
 
-#: printer/main.pm:358 printer/printerdrake.pm:1178
+#: printer/main.pm:363 printer/printerdrake.pm:1242
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", impressora USB #%s"
 
-#: printer/main.pm:360
+#: printer/main.pm:365
 #, c-format
 msgid ", USB printer"
 msgstr ", impressora USB"
 
-#: printer/main.pm:364
+#: printer/main.pm:369
 #, c-format
 msgid ", HP printer on a parallel port"
 msgstr ", impressora HP numa porta paralela"
 
-#: printer/main.pm:366
+#: printer/main.pm:371
 #, c-format
 msgid ", HP printer on USB"
 msgstr ", impressora HP em USB"
 
-#: printer/main.pm:368
+#: printer/main.pm:373
 #, c-format
 msgid ", HP printer on HP JetDirect"
 msgstr ", impressora HP na HP JetDirect"
 
-#: printer/main.pm:370
+#: printer/main.pm:375
 #, c-format
 msgid ", HP printer"
 msgstr ", impressora HP"
 
-#: printer/main.pm:376
+#: printer/main.pm:381
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ", dispositivo multi-funções no porta paralela #%s"
 
-#: printer/main.pm:379
+#: printer/main.pm:384
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr ", dispositivo multi-funções na porta paralela"
 
-#: printer/main.pm:381
+#: printer/main.pm:386
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", dispositivo multi-funções em USB"
 
-#: printer/main.pm:383
+#: printer/main.pm:388
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ", dispositivo multi-funções em HP JetDirect"
 
-#: printer/main.pm:385
+#: printer/main.pm:390
 #, c-format
 msgid ", multi-function device"
 msgstr ", dispositivo multi-funções"
 
-#: printer/main.pm:389
+#: printer/main.pm:394
 #, c-format
 msgid ", printing to %s"
 msgstr ", a imprimir para %s"
 
-#: printer/main.pm:392
+#: printer/main.pm:397
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr " no servidor LPD \"%s\", impressora \"%s\""
 
-#: printer/main.pm:395
+#: printer/main.pm:400
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", endereço TCP/IP \"%s\", porta %s"
 
-#: printer/main.pm:400
+#: printer/main.pm:405
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr " no servidor SMB/Windows \"%s\", partilha \"%s\""
 
-#: printer/main.pm:405
+#: printer/main.pm:410
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr " no servidor Novell \"%s\", impressora \"%s\""
 
-#: printer/main.pm:408
+#: printer/main.pm:413
 #, c-format
 msgid ", using command %s"
 msgstr ", a usar o comando %s"
 
-#: printer/main.pm:423
+#: printer/main.pm:428
 #, c-format
 msgid "Parallel port #%s"
 msgstr "Porta paralela #%s"
 
-#: printer/main.pm:426 printer/printerdrake.pm:1196
-#: printer/printerdrake.pm:1223 printer/printerdrake.pm:1241
+#: printer/main.pm:431 printer/printerdrake.pm:1260
+#: printer/printerdrake.pm:1287 printer/printerdrake.pm:1305
 #, c-format
 msgid "USB printer #%s"
 msgstr "Impressora USB #%s"
 
-#: printer/main.pm:428
+#: printer/main.pm:433
 #, c-format
 msgid "USB printer"
 msgstr "Impressora USB"
 
-#: printer/main.pm:432
+#: printer/main.pm:437
 #, c-format
 msgid "HP printer on a parallel port"
 msgstr "Impressora HP em porta paralela"
 
-#: printer/main.pm:434
+#: printer/main.pm:439
 #, c-format
 msgid "HP printer on USB"
 msgstr "Impressora HP em USB"
 
-#: printer/main.pm:436
+#: printer/main.pm:441
 #, c-format
 msgid "HP printer on HP JetDirect"
 msgstr "Impressora HP em HP JetDirect"
 
-#: printer/main.pm:438
+#: printer/main.pm:443
 #, c-format
 msgid "HP printer"
 msgstr "Impressora HP"
 
-#: printer/main.pm:444
+#: printer/main.pm:449
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "Dispositivo multi-funções na porta paralela #%s"
 
-#: printer/main.pm:447
+#: printer/main.pm:452
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "Dispositivo multi-funções numa porta paralela"
 
-#: printer/main.pm:449
+#: printer/main.pm:454
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "Dispositivo multi-funções em USB"
 
-#: printer/main.pm:451
+#: printer/main.pm:456
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "Dispositivo multi-funções em HP JetDirect"
 
-#: printer/main.pm:453
+#: printer/main.pm:458
 #, c-format
 msgid "Multi-function device"
 msgstr "Dispositivo multi-funções"
 
-#: printer/main.pm:457
+#: printer/main.pm:462
 #, c-format
 msgid "Prints into %s"
 msgstr "A imprimir para %s"
 
-#: printer/main.pm:460
+#: printer/main.pm:465
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "servidor LPD \"%s\", impressora \"%s\""
 
-#: printer/main.pm:463
+#: printer/main.pm:468
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr "Endereço TCP/IP \"%s\", porta %s"
 
-#: printer/main.pm:468
+#: printer/main.pm:473
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "Servidor SMB/Windows \"%s\", partilha \"%s\""
 
-#: printer/main.pm:473
+#: printer/main.pm:478
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "Servidor Novell \"%s\", impressora \"%s\""
 
-#: printer/main.pm:476
+#: printer/main.pm:481
 #, c-format
 msgid "Uses command %s"
 msgstr "Usa o comando %s"
 
-#: printer/main.pm:478
+#: printer/main.pm:483
 #, c-format
 msgid "URI: %s"
 msgstr "URI: %s"
 
-#: printer/main.pm:626 printer/printerdrake.pm:849
-#: printer/printerdrake.pm:2861
+#: printer/main.pm:631 printer/printerdrake.pm:856
+#: printer/printerdrake.pm:2953
 #, c-format
 msgid "Raw printer (No driver)"
 msgstr "Impressora directa (sem driver)"
 
-#: printer/main.pm:1176 printer/printerdrake.pm:205
-#: printer/printerdrake.pm:217
+#: printer/main.pm:1181 printer/printerdrake.pm:211
+#: printer/printerdrake.pm:223
 #, c-format
 msgid "Local network(s)"
 msgstr "Rede(s) local(is)"
 
-#: printer/main.pm:1178 printer/printerdrake.pm:221
+#: printer/main.pm:1183 printer/printerdrake.pm:227
 #, c-format
 msgid "Interface \"%s\""
 msgstr "Interface \"%s\""
 
-#: printer/main.pm:1180
+#: printer/main.pm:1185
 #, c-format
 msgid "Network %s"
 msgstr "Rede %s"
 
-#: printer/main.pm:1182
+#: printer/main.pm:1187
 #, c-format
 msgid "Host %s"
 msgstr "Endereço %s"
 
-#: printer/main.pm:1211
+#: printer/main.pm:1216
 #, c-format
 msgid "%s (Port %s)"
 msgstr "%s (Porta %s)"
 
-#: printer/printerdrake.pm:19
+#: printer/printerdrake.pm:24
 #, c-format
 msgid ""
 "The HP LaserJet 1000 needs its firmware to be uploaded after being turned "
@@ -11813,12 +11920,12 @@ msgstr ""
 "encontrado pelo script automático e depois irá ser carregado sempre que a "
 "impressora for ligada.\n"
 
-#: printer/printerdrake.pm:61
+#: printer/printerdrake.pm:67
 #, c-format
 msgid "CUPS printer configuration"
 msgstr "Configuração de impressoras CUPS"
 
-#: printer/printerdrake.pm:62
+#: printer/printerdrake.pm:68
 #, c-format
 msgid ""
 "Here you can choose whether the printers connected to this machine should be "
@@ -11827,7 +11934,7 @@ msgstr ""
 "Aqui pode escolher se as impressoras ligadas a esta máquina devem ser "
 "acessadas por máquinas remotas e por quais máquinas remotas."
 
-#: printer/printerdrake.pm:63
+#: printer/printerdrake.pm:69
 #, c-format
 msgid ""
 "You can also decide here whether printers on remote machines should be "
@@ -11836,38 +11943,40 @@ msgstr ""
 "Pode também decidir aqui se as impressoras nas máquinas remotas devem ser "
 "disponibilizadas automaticamente nesta máquina."
 
-#: printer/printerdrake.pm:66
+#: printer/printerdrake.pm:72
 #, c-format
 msgid "The printers on this machine are available to other computers"
-msgstr "As impressoras nesta máquina estão disponíveis para outros computadores"
+msgstr ""
+"As impressoras nesta máquina estão disponíveis para outros computadores"
 
-#: printer/printerdrake.pm:71
+#: printer/printerdrake.pm:77
 #, c-format
 msgid "Automatically find available printers on remote machines"
-msgstr "Encontrar automaticamente as impressoras disponíveis em máquinas remotas"
+msgstr ""
+"Encontrar automaticamente as impressoras disponíveis em máquinas remotas"
 
-#: printer/printerdrake.pm:76
+#: printer/printerdrake.pm:82
 #, c-format
 msgid "Printer sharing on hosts/networks: "
 msgstr "Partilha de impressoras nos hosts/redes: "
 
-#: printer/printerdrake.pm:78
+#: printer/printerdrake.pm:84
 #, c-format
 msgid "Custom configuration"
 msgstr "Configuração personalizada"
 
-#: printer/printerdrake.pm:83 standalone/scannerdrake:593
+#: printer/printerdrake.pm:89 standalone/scannerdrake:593
 #: standalone/scannerdrake:610
 #, c-format
 msgid "No remote machines"
 msgstr "Sem máquinas remota"
 
-#: printer/printerdrake.pm:94
+#: printer/printerdrake.pm:100
 #, c-format
 msgid "Additional CUPS servers: "
 msgstr "Servidores CUPS adicionais: "
 
-#: printer/printerdrake.pm:101
+#: printer/printerdrake.pm:107
 #, c-format
 msgid ""
 "To get access to printers on remote CUPS servers in your local network you "
@@ -11888,12 +11997,12 @@ msgstr ""
 "local, deve indicar os endereços IP e opionalmenteção os números das portas "
 "para obter a informação das impressoras dos servidores."
 
-#: printer/printerdrake.pm:109
+#: printer/printerdrake.pm:115
 #, c-format
 msgid "Japanese text printing mode"
 msgstr "Modo de impressão de texto japonês"
 
-#: printer/printerdrake.pm:110
+#: printer/printerdrake.pm:116
 #, c-format
 msgid ""
 "Turning on this allows to print plain text files in Japanese language. Only "
@@ -11912,12 +12021,12 @@ msgstr ""
 "imprimir texto japonês numa impressora configurada numa máquina remota, "
 "deverá activar isto na máquina remota."
 
-#: printer/printerdrake.pm:117
+#: printer/printerdrake.pm:123
 #, c-format
 msgid "Automatic correction of CUPS configuration"
 msgstr "Correcção automática da Configuração do CUPS"
 
-#: printer/printerdrake.pm:119
+#: printer/printerdrake.pm:125
 #, c-format
 msgid ""
 "When this option is turned on, on every startup of CUPS it is automatically "
@@ -11946,24 +12055,24 @@ msgstr ""
 "Se alguma destas medidas levar a problemas, desligue esta opção, mas então "
 "irá ter que tratar desses pontos."
 
-#: printer/printerdrake.pm:132 printer/printerdrake.pm:500
-#: printer/printerdrake.pm:4292
+#: printer/printerdrake.pm:138 printer/printerdrake.pm:506
+#: printer/printerdrake.pm:4397
 #, c-format
 msgid "Remote CUPS server and no local CUPS daemon"
 msgstr "Servidor CUPS remoto e nenhum daemon CUPS local"
 
-#: printer/printerdrake.pm:135
+#: printer/printerdrake.pm:141
 #, c-format
 msgid "On"
 msgstr "Ligado"
 
-#: printer/printerdrake.pm:137 printer/printerdrake.pm:492
-#: printer/printerdrake.pm:519
+#: printer/printerdrake.pm:143 printer/printerdrake.pm:498
+#: printer/printerdrake.pm:525
 #, c-format
 msgid "Off"
 msgstr "Desligado"
 
-#: printer/printerdrake.pm:138 printer/printerdrake.pm:501
+#: printer/printerdrake.pm:144 printer/printerdrake.pm:507
 #, c-format
 msgid ""
 "In this mode the local CUPS daemon will be stopped and all printing requests "
@@ -11976,12 +12085,12 @@ msgstr ""
 "possivel definir filas locais de impressão e se o servidor especificado "
 "estiver em baixo não pode ser imprimido nada desta máquina."
 
-#: printer/printerdrake.pm:155 printer/printerdrake.pm:230
+#: printer/printerdrake.pm:161 printer/printerdrake.pm:236
 #, c-format
 msgid "Sharing of local printers"
 msgstr "Partilha das impressoras locais"
 
-#: printer/printerdrake.pm:156
+#: printer/printerdrake.pm:162
 #, c-format
 msgid ""
 "These are the machines and networks on which the locally connected printer"
@@ -11990,61 +12099,63 @@ msgstr ""
 "Estas são as máquinas e redes nos quais a impressoras locais deveriam estar "
 "disponíveis:"
 
-#: printer/printerdrake.pm:167
+#: printer/printerdrake.pm:173
 #, c-format
 msgid "Add host/network"
 msgstr "Adicionar um endereço/rede"
 
-#: printer/printerdrake.pm:173
+#: printer/printerdrake.pm:179
 #, c-format
 msgid "Edit selected host/network"
 msgstr "Editar endereço/rede seleccionado"
 
-#: printer/printerdrake.pm:182
+#: printer/printerdrake.pm:188
 #, c-format
 msgid "Remove selected host/network"
 msgstr "Remover endereço/rede seleccionado"
 
-#: printer/printerdrake.pm:213 printer/printerdrake.pm:223
-#: printer/printerdrake.pm:235 printer/printerdrake.pm:242
-#: printer/printerdrake.pm:273 printer/printerdrake.pm:291
+#: printer/printerdrake.pm:219 printer/printerdrake.pm:229
+#: printer/printerdrake.pm:241 printer/printerdrake.pm:248
+#: printer/printerdrake.pm:279 printer/printerdrake.pm:297
 #, c-format
 msgid "IP address of host/network:"
 msgstr "Endereço IP do endereço/rede:"
 
-#: printer/printerdrake.pm:231
+#: printer/printerdrake.pm:237
 #, c-format
 msgid ""
 "Choose the network or host on which the local printers should be made "
 "available:"
-msgstr "Escolha a rede ou endereço onde a impressoras locais devem estar disponíveis:"
+msgstr ""
+"Escolha a rede ou endereço onde a impressoras locais devem estar disponíveis:"
 
-#: printer/printerdrake.pm:238
+#: printer/printerdrake.pm:244
 #, c-format
 msgid "Host/network IP address missing."
 msgstr "IP do endereço/rede em falta."
 
-#: printer/printerdrake.pm:246
+#: printer/printerdrake.pm:252
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
 msgstr "O IP do endereço/rede introduzido não está correcto.\n"
 
-#: printer/printerdrake.pm:247 printer/printerdrake.pm:423
+#: printer/printerdrake.pm:253 printer/printerdrake.pm:429
 #, c-format
 msgid "Examples for correct IPs:\n"
 msgstr "Exemplos para IPs correctos:\n"
 
-#: printer/printerdrake.pm:271
+#: printer/printerdrake.pm:277
 #, c-format
 msgid "This host/network is already in the list, it cannot be added again.\n"
-msgstr "Este endereço/rede já está na lista, não pode ser adicionado novamente.\n"
+msgstr ""
+"Este endereço/rede já está na lista, não pode ser adicionado novamente.\n"
 
-#: printer/printerdrake.pm:340 printer/printerdrake.pm:410
+#: printer/printerdrake.pm:346 printer/printerdrake.pm:416
 #, c-format
 msgid "Accessing printers on remote CUPS servers"
 msgstr "A aceder às impressoras num servidor CUPS remoto"
 
-#: printer/printerdrake.pm:341
+#: printer/printerdrake.pm:347
 #, c-format
 msgid ""
 "Add here the CUPS servers whose printers you want to use. You only need to "
@@ -12055,119 +12166,121 @@ msgstr ""
 "de fazer isto se os servidores não enviam as informações de impressão para a "
 "rede local."
 
-#: printer/printerdrake.pm:352
+#: printer/printerdrake.pm:358
 #, c-format
 msgid "Add server"
 msgstr "Adicionar servidor"
 
-#: printer/printerdrake.pm:358
+#: printer/printerdrake.pm:364
 #, c-format
 msgid "Edit selected server"
 msgstr "Editar o servidor seleccionado"
 
-#: printer/printerdrake.pm:367
+#: printer/printerdrake.pm:373
 #, c-format
 msgid "Remove selected server"
 msgstr "Remover o servidor seleccionado"
 
-#: printer/printerdrake.pm:411
+#: printer/printerdrake.pm:417
 #, c-format
 msgid "Enter IP address and port of the host whose printers you want to use."
-msgstr "Insira o endereço IP e a porta do endereço cujas impressoras deseja usar."
+msgstr ""
+"Insira o endereço IP e a porta do endereço cujas impressoras deseja usar."
 
-#: printer/printerdrake.pm:412
+#: printer/printerdrake.pm:418
 #, c-format
 msgid "If no port is given, 631 will be taken as default."
-msgstr "Se nenhuma porta for indicada, a 631 irá ser escolhida como predefinida."
+msgstr ""
+"Se nenhuma porta for indicada, a 631 irá ser escolhida como predefinida."
 
-#: printer/printerdrake.pm:416
+#: printer/printerdrake.pm:422
 #, c-format
 msgid "Server IP missing!"
 msgstr "Falta o IP do servidor!"
 
-#: printer/printerdrake.pm:422
+#: printer/printerdrake.pm:428
 #, c-format
 msgid "The entered IP is not correct.\n"
 msgstr "O IP inserido não está correcto.\n"
 
-#: printer/printerdrake.pm:434 printer/printerdrake.pm:1852
+#: printer/printerdrake.pm:440 printer/printerdrake.pm:1924
 #, c-format
 msgid "The port number should be an integer!"
 msgstr "O número da porta deve ser um inteiro!"
 
-#: printer/printerdrake.pm:445
+#: printer/printerdrake.pm:451
 #, c-format
 msgid "This server is already in the list, it cannot be added again.\n"
 msgstr "Este servidor já existe na lista, não pode ser adicionado outra vez.\n"
 
-#: printer/printerdrake.pm:456 printer/printerdrake.pm:1873
-#: standalone/drakups:247 standalone/harddrake2:50
+#: printer/printerdrake.pm:462 printer/printerdrake.pm:1951
+#: standalone/drakups:251 standalone/harddrake2:51
 #, c-format
 msgid "Port"
 msgstr "Porta"
 
-#: printer/printerdrake.pm:489 printer/printerdrake.pm:505
-#: printer/printerdrake.pm:520 printer/printerdrake.pm:524
-#: printer/printerdrake.pm:530
+#: printer/printerdrake.pm:495 printer/printerdrake.pm:511
+#: printer/printerdrake.pm:526 printer/printerdrake.pm:530
+#: printer/printerdrake.pm:536
 #, c-format
 msgid "On, Name or IP of remote server:"
 msgstr "Ligado, Nome ou IP do servidor remoto:"
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4301
-#: printer/printerdrake.pm:4366
+#: printer/printerdrake.pm:514 printer/printerdrake.pm:4406
+#: printer/printerdrake.pm:4472
 #, c-format
 msgid "CUPS server name or IP address missing."
 msgstr "Nome do servidor CUPS ou endereço IP em falta."
 
-#: printer/printerdrake.pm:560 printer/printerdrake.pm:580
-#: printer/printerdrake.pm:673 printer/printerdrake.pm:739
-#: printer/printerdrake.pm:766 printer/printerdrake.pm:825
-#: printer/printerdrake.pm:867 printer/printerdrake.pm:877
-#: printer/printerdrake.pm:1926 printer/printerdrake.pm:2137
-#: printer/printerdrake.pm:2169 printer/printerdrake.pm:2217
-#: printer/printerdrake.pm:2269 printer/printerdrake.pm:2286
-#: printer/printerdrake.pm:2330 printer/printerdrake.pm:2370
-#: printer/printerdrake.pm:2420 printer/printerdrake.pm:2454
-#: printer/printerdrake.pm:2464 printer/printerdrake.pm:2714
-#: printer/printerdrake.pm:2719 printer/printerdrake.pm:2856
-#: printer/printerdrake.pm:2966 printer/printerdrake.pm:3560
-#: printer/printerdrake.pm:3625 printer/printerdrake.pm:3674
-#: printer/printerdrake.pm:3677 printer/printerdrake.pm:3808
-#: printer/printerdrake.pm:3908 printer/printerdrake.pm:3980
-#: printer/printerdrake.pm:4001 printer/printerdrake.pm:4010
-#: printer/printerdrake.pm:4104 printer/printerdrake.pm:4196
-#: printer/printerdrake.pm:4202 printer/printerdrake.pm:4222
-#: printer/printerdrake.pm:4328 printer/printerdrake.pm:4435
-#: printer/printerdrake.pm:4454 printer/printerdrake.pm:4463
-#: printer/printerdrake.pm:4477 printer/printerdrake.pm:4673
-#: printer/printerdrake.pm:5109 printer/printerdrake.pm:5186
+#: printer/printerdrake.pm:566 printer/printerdrake.pm:586
+#: printer/printerdrake.pm:680 printer/printerdrake.pm:746
+#: printer/printerdrake.pm:773 printer/printerdrake.pm:832
+#: printer/printerdrake.pm:874 printer/printerdrake.pm:884
+#: printer/printerdrake.pm:2011 printer/printerdrake.pm:2225
+#: printer/printerdrake.pm:2257 printer/printerdrake.pm:2305
+#: printer/printerdrake.pm:2357 printer/printerdrake.pm:2374
+#: printer/printerdrake.pm:2418 printer/printerdrake.pm:2458
+#: printer/printerdrake.pm:2508 printer/printerdrake.pm:2542
+#: printer/printerdrake.pm:2552 printer/printerdrake.pm:2804
+#: printer/printerdrake.pm:2809 printer/printerdrake.pm:2948
+#: printer/printerdrake.pm:3059 printer/printerdrake.pm:3656
+#: printer/printerdrake.pm:3722 printer/printerdrake.pm:3771
+#: printer/printerdrake.pm:3774 printer/printerdrake.pm:3906
+#: printer/printerdrake.pm:4007 printer/printerdrake.pm:4079
+#: printer/printerdrake.pm:4100 printer/printerdrake.pm:4110
+#: printer/printerdrake.pm:4205 printer/printerdrake.pm:4300
+#: printer/printerdrake.pm:4306 printer/printerdrake.pm:4326
+#: printer/printerdrake.pm:4433 printer/printerdrake.pm:4542
+#: printer/printerdrake.pm:4562 printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4586 printer/printerdrake.pm:4784
+#: printer/printerdrake.pm:5236 printer/printerdrake.pm:5313
 #: standalone/printerdrake:67 standalone/printerdrake:554
 #, c-format
 msgid "Printerdrake"
 msgstr "Printerdrake"
 
-#: printer/printerdrake.pm:561 printer/printerdrake.pm:3909
-#: printer/printerdrake.pm:4436
+#: printer/printerdrake.pm:567 printer/printerdrake.pm:4008
+#: printer/printerdrake.pm:4543
 #, c-format
 msgid "Reading printer data..."
 msgstr "A ler os dados da impressora..."
 
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:587
 #, c-format
 msgid "Restarting CUPS..."
 msgstr "A relançar o CUPS..."
 
-#: printer/printerdrake.pm:608 printer/printerdrake.pm:628
+#: printer/printerdrake.pm:614 printer/printerdrake.pm:634
 #, c-format
 msgid "Select Printer Connection"
 msgstr "Seleccionar conexão da Impressora"
 
-#: printer/printerdrake.pm:609
+#: printer/printerdrake.pm:615
 #, c-format
 msgid "How is the printer connected?"
 msgstr "Como está a impressora ligada?"
 
-#: printer/printerdrake.pm:611
+#: printer/printerdrake.pm:617
 #, c-format
 msgid ""
 "\n"
@@ -12178,7 +12291,7 @@ msgstr ""
 "As impressoras nos servidores CUPS remotos não precisam de ser configuradas "
 "aqui; elas serão detectadas automaticamente."
 
-#: printer/printerdrake.pm:614 printer/printerdrake.pm:4675
+#: printer/printerdrake.pm:620 printer/printerdrake.pm:4786
 #, c-format
 msgid ""
 "\n"
@@ -12189,26 +12302,28 @@ msgstr ""
 "AVISO: Nenhuma conexão à rede local está activa, as impressoras remotas não "
 "podem ser detectadas nem testadas!"
 
-#: printer/printerdrake.pm:621
+#: printer/printerdrake.pm:627
 #, c-format
-msgid "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
+msgid ""
+"Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
 msgstr ""
 "Auto-detecção de impressora (Local, TCP/Socket, impressoras SMB, e "
 "dispositivo URI)"
 
-#: printer/printerdrake.pm:623
+#: printer/printerdrake.pm:629
 #, c-format
 msgid "Modify timeout for network printer auto-detection"
-msgstr "Modificar o Intervalo de tempo para auto-detecção de impressora em rede"
+msgstr ""
+"Modificar o Intervalo de tempo para auto-detecção de impressora em rede"
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:635
 #, c-format
 msgid "Enter the timeout for network printer auto-detection (in msec) here. "
 msgstr ""
 "Indique o intervalo de tempo para auto-detecção de impressora em rede (em "
 "msec) aqui. "
 
-#: printer/printerdrake.pm:631
+#: printer/printerdrake.pm:637
 #, c-format
 msgid ""
 "The longer you choose the timeout, the more reliable the detections of "
@@ -12219,27 +12334,27 @@ msgstr ""
 "impressoras em rede, mas a pesquisa pode demorar mais, especialmente se "
 "houver muitas máquinas com firewalls locais na rede. "
 
-#: printer/printerdrake.pm:635
+#: printer/printerdrake.pm:641
 #, c-format
 msgid "The timeout must be a positive integer number!"
 msgstr "O intervalo de tempo deve ser um número inteiro positivo!"
 
-#: printer/printerdrake.pm:673
+#: printer/printerdrake.pm:680
 #, c-format
 msgid "Checking your system..."
 msgstr "A verificar o seu sistema..."
 
-#: printer/printerdrake.pm:690
+#: printer/printerdrake.pm:697
 #, c-format
 msgid "and one unknown printer"
 msgstr "e uma impressora desconhecida"
 
-#: printer/printerdrake.pm:692
+#: printer/printerdrake.pm:699
 #, c-format
 msgid "and %d unknown printers"
 msgstr "e %d impressoras desconhecidas"
 
-#: printer/printerdrake.pm:696
+#: printer/printerdrake.pm:703
 #, c-format
 msgid ""
 "The following printers\n"
@@ -12252,7 +12367,7 @@ msgstr ""
 "%s%s\n"
 "estão ligadas directamente ao seu sistema"
 
-#: printer/printerdrake.pm:698
+#: printer/printerdrake.pm:705
 #, c-format
 msgid ""
 "The following printer\n"
@@ -12265,7 +12380,7 @@ msgstr ""
 "%s%s\n"
 "estão ligadas directamente ao seu sistema"
 
-#: printer/printerdrake.pm:699
+#: printer/printerdrake.pm:706
 #, c-format
 msgid ""
 "The following printer\n"
@@ -12278,7 +12393,7 @@ msgstr ""
 "%s%s\n"
 "está ligada directamente ao seu sistema"
 
-#: printer/printerdrake.pm:703
+#: printer/printerdrake.pm:710
 #, c-format
 msgid ""
 "\n"
@@ -12287,7 +12402,7 @@ msgstr ""
 "\n"
 "Há uma impressora desconhecida ligada directamente ao seu sistema"
 
-#: printer/printerdrake.pm:704
+#: printer/printerdrake.pm:711
 #, c-format
 msgid ""
 "\n"
@@ -12296,17 +12411,18 @@ msgstr ""
 "\n"
 "Há %d impressoras desconhecidas ligadas directamente ao seu sistema"
 
-#: printer/printerdrake.pm:707
+#: printer/printerdrake.pm:714
 #, c-format
-msgid "There are no printers found which are directly connected to your machine"
+msgid ""
+"There are no printers found which are directly connected to your machine"
 msgstr "Não encontrei nenhuma impressora ligada directamente à sua máquina"
 
-#: printer/printerdrake.pm:710
+#: printer/printerdrake.pm:717
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr "(Por favor verifique se a sua impressora está conectada e ligada).\n"
 
-#: printer/printerdrake.pm:723
+#: printer/printerdrake.pm:730
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on "
@@ -12315,22 +12431,22 @@ msgstr ""
 "Quer autorizar a impressão nas impressoras indicadas acima ou nas "
 "impressoras da rede local ?\n"
 
-#: printer/printerdrake.pm:724
+#: printer/printerdrake.pm:731
 #, c-format
 msgid "Do you want to enable printing on printers in the local network?\n"
 msgstr "Quer autorizar a impressão nas impressoras da rede local ?\n"
 
-#: printer/printerdrake.pm:726
+#: printer/printerdrake.pm:733
 #, c-format
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr "Quer autorizar a impressão nas impressoras indicadas acima ?\n"
 
-#: printer/printerdrake.pm:727
+#: printer/printerdrake.pm:734
 #, c-format
 msgid "Are you sure that you want to set up printing on this machine?\n"
 msgstr "Tem a certeza que deseja configurar a impressão nesta máquina ?\n"
 
-#: printer/printerdrake.pm:728
+#: printer/printerdrake.pm:735
 #, c-format
 msgid ""
 "NOTE: Depending on the printer model and the printing system up to %d MB of "
@@ -12339,42 +12455,42 @@ msgstr ""
 "NOTA: Dependendo do modelo da impressora e o sistema de impressão, vão ser "
 "instalados até %d MB de programas adicionais."
 
-#: printer/printerdrake.pm:767
+#: printer/printerdrake.pm:774
 #, c-format
 msgid "Searching for new printers..."
 msgstr "A procurar novas impressoras..."
 
-#: printer/printerdrake.pm:826
+#: printer/printerdrake.pm:833
 #, c-format
 msgid "Found printer on %s..."
 msgstr "Impressora encontrada em \"%s\"..."
 
-#: printer/printerdrake.pm:851
+#: printer/printerdrake.pm:858
 #, c-format
 msgid "("
 msgstr "("
 
-#: printer/printerdrake.pm:852
+#: printer/printerdrake.pm:859
 #, c-format
 msgid " on "
 msgstr " em "
 
-#: printer/printerdrake.pm:853 standalone/scannerdrake:137
+#: printer/printerdrake.pm:860 standalone/scannerdrake:137
 #, c-format
 msgid ")"
 msgstr ")"
 
-#: printer/printerdrake.pm:858 printer/printerdrake.pm:2868
+#: printer/printerdrake.pm:865 printer/printerdrake.pm:2960
 #, c-format
 msgid "Printer model selection"
 msgstr "Selecção do modelo da impressora"
 
-#: printer/printerdrake.pm:859 printer/printerdrake.pm:2869
+#: printer/printerdrake.pm:866 printer/printerdrake.pm:2961
 #, c-format
 msgid "Which printer model do you have?"
 msgstr "Que modelo de impressora tem?"
 
-#: printer/printerdrake.pm:860
+#: printer/printerdrake.pm:867
 #, c-format
 msgid ""
 "\n"
@@ -12387,7 +12503,7 @@ msgstr ""
 "O Printerdrake não consegue determinar o modelo da sua impressora %s. Por "
 "favor escolha o modelo correcto da lista."
 
-#: printer/printerdrake.pm:863 printer/printerdrake.pm:2874
+#: printer/printerdrake.pm:870 printer/printerdrake.pm:2966
 #, c-format
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
@@ -12396,25 +12512,25 @@ msgstr ""
 "Se a sua impressora não está na lista, escolha uma compatível (veja o manual "
 "da impressora) ou uma similar."
 
-#: printer/printerdrake.pm:868
+#: printer/printerdrake.pm:875
 #, c-format
 msgid "Configuring printer on %s..."
 msgstr "Configurar Impressora em \"%s\"..."
 
-#: printer/printerdrake.pm:878 printer/printerdrake.pm:4455
+#: printer/printerdrake.pm:885 printer/printerdrake.pm:4563
 #, c-format
 msgid "Configuring printer \"%s\"..."
 msgstr "A configurar Impressora \"%s\"..."
 
-#: printer/printerdrake.pm:1036 printer/printerdrake.pm:1048
-#: printer/printerdrake.pm:1107 printer/printerdrake.pm:2103
-#: printer/printerdrake.pm:2118 printer/printerdrake.pm:2188
-#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4861
+#: printer/printerdrake.pm:1051 printer/printerdrake.pm:1063
+#: printer/printerdrake.pm:1170 printer/printerdrake.pm:2191
+#: printer/printerdrake.pm:2206 printer/printerdrake.pm:2276
+#: printer/printerdrake.pm:4803 printer/printerdrake.pm:4973
 #, c-format
 msgid "Add a new printer"
 msgstr "Adicionar uma nova impressora"
 
-#: printer/printerdrake.pm:1037
+#: printer/printerdrake.pm:1052
 #, c-format
 msgid ""
 "\n"
@@ -12438,7 +12554,7 @@ msgstr ""
 "impressora e dá-lhe acesso a todos os drives de impressoras disponíveis, "
 "opções dos drives, e tipos de conexão de impressoras."
 
-#: printer/printerdrake.pm:1050
+#: printer/printerdrake.pm:1065
 #, c-format
 msgid ""
 "\n"
@@ -12476,7 +12592,7 @@ msgstr ""
 " Clique em \"Seguinte\" quando estiver pronto, ou em \"Cancelar\" se não "
 "quiser configurar agora a(s) sua(s) impressora(s)."
 
-#: printer/printerdrake.pm:1059
+#: printer/printerdrake.pm:1074
 #, c-format
 msgid ""
 "\n"
@@ -12503,7 +12619,7 @@ msgstr ""
 " Clique em \"Seguinte\" quando estiver pronto, ou em \"Cancelar\" se não "
 "quiser configurar agora a(s) sua(s) impressora(s)."
 
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1082
 #, c-format
 msgid ""
 "\n"
@@ -12538,7 +12654,7 @@ msgstr ""
 " Clique em \"Seguinte\" quando estiver pronto, ou em \"Cancelar\" se não "
 "quiser configurar agora a(s) sua(s) impressora(s)."
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1091
 #, c-format
 msgid ""
 "\n"
@@ -12565,27 +12681,28 @@ msgstr ""
 " Clique em \"Seguinte\" quando estiver pronto, ou em \"Cancelar\" se não "
 "quiser configurar agora a(s) sua(s) impressora(s)."
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1142
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Auto-detectar as impressoras ligadas a esta máquina"
 
-#: printer/printerdrake.pm:1088
+#: printer/printerdrake.pm:1145
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "Auto-detectar as impressoras ligadas directamente à rede local"
 
-#: printer/printerdrake.pm:1091
+#: printer/printerdrake.pm:1148
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
-msgstr "Auto-detectar as impressoras ligadas a uma máquina sob Microsoft Windows"
+msgstr ""
+"Auto-detectar as impressoras ligadas a uma máquina sob Microsoft Windows"
 
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1151
 #, c-format
 msgid "No auto-detection"
 msgstr "Sem autodetecção"
 
-#: printer/printerdrake.pm:1173
+#: printer/printerdrake.pm:1171
 #, c-format
 msgid ""
 "\n"
@@ -12601,79 +12718,79 @@ msgstr ""
 "\n"
 "Parabéns, a sua impressora encontra-se instalada e configurada!\n"
 "\n"
-"Pode imprimir usando o comando \"Imprimir\" da sua aplicação (geralmente "
-"no menu \"Ficheiro\").\n"
+"Pode imprimir usando o comando \"Imprimir\" da sua aplicação (geralmente no "
+"menu \"Ficheiro\").\n"
 "\n"
-"Se deseja adicionar, remover, ou mudar o nome de uma impressora, ou "
-"se deseja mudar a opção da configuração predefinida (fonte de papel, "
-"qualidade de impressão, ...), escolha \"Impressora\" na secção \"Hardware\" "
-"do Centro de Controlo %s."
+"Se deseja adicionar, remover, ou mudar o nome de uma impressora, ou se "
+"deseja mudar a opção da configuração predefinida (fonte de papel, qualidade "
+"de impressão, ...), escolha \"Impressora\" na secção \"Hardware\" do Centro "
+"de Controlo %s."
 
-#: printer/printerdrake.pm:1143 printer/printerdrake.pm:1373
-#: printer/printerdrake.pm:1435 printer/printerdrake.pm:1525
-#: printer/printerdrake.pm:1663 printer/printerdrake.pm:1738
-#: printer/printerdrake.pm:1890 printer/printerdrake.pm:1976
-#: printer/printerdrake.pm:1985 printer/printerdrake.pm:1994
-#: printer/printerdrake.pm:2005 printer/printerdrake.pm:2143
-#: printer/printerdrake.pm:2229 printer/printerdrake.pm:2275
-#: printer/printerdrake.pm:2342 printer/printerdrake.pm:2377
+#: printer/printerdrake.pm:1207 printer/printerdrake.pm:1437
+#: printer/printerdrake.pm:1500 printer/printerdrake.pm:1592
+#: printer/printerdrake.pm:1730 printer/printerdrake.pm:1806
+#: printer/printerdrake.pm:1968 printer/printerdrake.pm:2061
+#: printer/printerdrake.pm:2070 printer/printerdrake.pm:2079
+#: printer/printerdrake.pm:2090 printer/printerdrake.pm:2231
+#: printer/printerdrake.pm:2317 printer/printerdrake.pm:2363
+#: printer/printerdrake.pm:2430 printer/printerdrake.pm:2465
 #, c-format
 msgid "Could not install the %s packages!"
 msgstr "Não conseguiu instalar os pacotes %s !"
 
-#: printer/printerdrake.pm:1145
+#: printer/printerdrake.pm:1209
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr "Saltar a auto-detecção do servidor Windows/SMB"
 
-#: printer/printerdrake.pm:1151 printer/printerdrake.pm:1296
-#: printer/printerdrake.pm:1531 printer/printerdrake.pm:1785
+#: printer/printerdrake.pm:1215 printer/printerdrake.pm:1360
+#: printer/printerdrake.pm:1598 printer/printerdrake.pm:1855
 #, c-format
 msgid "Printer auto-detection"
 msgstr "Auto-detecção de impressoras"
 
-#: printer/printerdrake.pm:1151
+#: printer/printerdrake.pm:1215
 #, c-format
 msgid "Detecting devices..."
 msgstr "A detectar dispositivos..."
 
-#: printer/printerdrake.pm:1181
+#: printer/printerdrake.pm:1245
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", impressora de rede \"%s\", porta %s"
 
-#: printer/printerdrake.pm:1184
+#: printer/printerdrake.pm:1248
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", impressora \"%s\" num servidor SMB/Windows \"%s\""
 
-#: printer/printerdrake.pm:1188
+#: printer/printerdrake.pm:1252
 #, c-format
 msgid "Detected %s"
 msgstr "Detectou %s"
 
-#: printer/printerdrake.pm:1193 printer/printerdrake.pm:1220
-#: printer/printerdrake.pm:1238
+#: printer/printerdrake.pm:1257 printer/printerdrake.pm:1284
+#: printer/printerdrake.pm:1302
 #, c-format
 msgid "Printer on parallel port #%s"
 msgstr "Impressora no cabo paralelo #%s"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1263
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Impressora na rede \"%s\", porta %s"
 
-#: printer/printerdrake.pm:1202
+#: printer/printerdrake.pm:1266
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Impressora \"%s\" num servidor SMB/Windows \"%s\""
 
-#: printer/printerdrake.pm:1283
+#: printer/printerdrake.pm:1347
 #, c-format
 msgid "Local Printer"
 msgstr "Impressora local"
 
-#: printer/printerdrake.pm:1284
+#: printer/printerdrake.pm:1348
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -12687,32 +12804,32 @@ msgstr ""
 "Primeira impressora USB : /dev/usb/lp0, segunda impressora USB : /dev/usb/"
 "lp1, ...)."
 
-#: printer/printerdrake.pm:1288
+#: printer/printerdrake.pm:1352
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Deve digitar um nome de periférico ou nome de ficheiro!"
 
-#: printer/printerdrake.pm:1297
+#: printer/printerdrake.pm:1361
 #, c-format
 msgid "No printer found!"
 msgstr "Nenhuma impressora encontrada!"
 
-#: printer/printerdrake.pm:1305
+#: printer/printerdrake.pm:1369
 #, c-format
 msgid "Local Printers"
 msgstr "Impressoras locais"
 
-#: printer/printerdrake.pm:1306
+#: printer/printerdrake.pm:1370
 #, c-format
 msgid "Available printers"
 msgstr "Impressoras disponíveis"
 
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1319
+#: printer/printerdrake.pm:1374 printer/printerdrake.pm:1383
 #, c-format
 msgid "The following printer was auto-detected. "
 msgstr "A impressora seguinte foi detectada automaticamente. "
 
-#: printer/printerdrake.pm:1312
+#: printer/printerdrake.pm:1376
 #, c-format
 msgid ""
 "If it is not the one you want to configure, enter a device name/file name in "
@@ -12721,19 +12838,20 @@ msgstr ""
 "Se não é a que deseja configurar, escreva um nome de dispositivo/ficheiro na "
 "linha de entrada"
 
-#: printer/printerdrake.pm:1313
+#: printer/printerdrake.pm:1377
 #, c-format
-msgid "Alternatively, you can specify a device name/file name in the input line"
+msgid ""
+"Alternatively, you can specify a device name/file name in the input line"
 msgstr ""
 "Alternativamente, pode especificar um nome de dispositivo/ficheiro na linha "
 "de entrada"
 
-#: printer/printerdrake.pm:1314 printer/printerdrake.pm:1323
+#: printer/printerdrake.pm:1378 printer/printerdrake.pm:1387
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
 msgstr "Aqui está a lista de todas as impressoras detectadas automaticamente. "
 
-#: printer/printerdrake.pm:1316
+#: printer/printerdrake.pm:1380
 #, c-format
 msgid ""
 "Please choose the printer you want to set up or enter a device name/file "
@@ -12742,7 +12860,7 @@ msgstr ""
 "Por favor escolha a impressora que deseja configurar ou escreva um nome de "
 "dispositivo/ficheiro na linha de entrada"
 
-#: printer/printerdrake.pm:1317
+#: printer/printerdrake.pm:1381
 #, c-format
 msgid ""
 "Please choose the printer to which the print jobs should go or enter a "
@@ -12752,7 +12870,7 @@ msgstr ""
 "deveriam ser enviados.ou escreva um nome de dispositivo/ficheiro na linha de "
 "entrada"
 
-#: printer/printerdrake.pm:1321
+#: printer/printerdrake.pm:1385
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -12763,12 +12881,12 @@ msgstr ""
 "impressora não foi correctamente detectada ou se prefere personalizar a "
 "configuração, carregue em \"Configuração Manual\"."
 
-#: printer/printerdrake.pm:1322
+#: printer/printerdrake.pm:1386
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "Actualmente, não há nenhuma alternativa disponivel possível"
 
-#: printer/printerdrake.pm:1325
+#: printer/printerdrake.pm:1389
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12781,14 +12899,14 @@ msgstr ""
 "correctamente detectada ou se prefere personalizar a configuração, ligue a "
 "\"Configuração Manual\"."
 
-#: printer/printerdrake.pm:1326
+#: printer/printerdrake.pm:1390
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr ""
 "Por favor escolha a impressora para a qual os trabalhos de impressão devem "
 "ir."
 
-#: printer/printerdrake.pm:1328
+#: printer/printerdrake.pm:1392
 #, c-format
 msgid ""
 "Please choose the port that your printer is connected to or enter a device "
@@ -12797,12 +12915,12 @@ msgstr ""
 "Por favor escolha a ficha em que a sua impressora está ligada ou escreva um "
 "nome de dispositivo/ficheiro na linha de entrada"
 
-#: printer/printerdrake.pm:1329
+#: printer/printerdrake.pm:1393
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "Por favor escolha a ficha em que a sua impressora está ligada."
 
-#: printer/printerdrake.pm:1331
+#: printer/printerdrake.pm:1395
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -12812,26 +12930,26 @@ msgstr ""
 "Primeira impressora USB : /dev/usb/lp0, segunda impressora USB : /dev/usb/"
 "lp1, ...)."
 
-#: printer/printerdrake.pm:1335
+#: printer/printerdrake.pm:1399
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Deve escolher/entrar um dispositivo/impressora!"
 
-#: printer/printerdrake.pm:1375 printer/printerdrake.pm:1437
-#: printer/printerdrake.pm:1527 printer/printerdrake.pm:1665
-#: printer/printerdrake.pm:1740 printer/printerdrake.pm:1892
-#: printer/printerdrake.pm:1978 printer/printerdrake.pm:1987
-#: printer/printerdrake.pm:1996 printer/printerdrake.pm:2007
+#: printer/printerdrake.pm:1439 printer/printerdrake.pm:1502
+#: printer/printerdrake.pm:1594 printer/printerdrake.pm:1732
+#: printer/printerdrake.pm:1808 printer/printerdrake.pm:1970
+#: printer/printerdrake.pm:2063 printer/printerdrake.pm:2072
+#: printer/printerdrake.pm:2081 printer/printerdrake.pm:2092
 #, c-format
 msgid "Aborting"
 msgstr "Abortar"
 
-#: printer/printerdrake.pm:1410
+#: printer/printerdrake.pm:1475
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Opções da impressora lpd Remota"
 
-#: printer/printerdrake.pm:1411
+#: printer/printerdrake.pm:1476
 #, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
@@ -12840,63 +12958,64 @@ msgstr ""
 "Para usar uma fila de impressão lpd remota, precisa indicar o nome do "
 "servidor de impressão e o nome da impressora naquele servidor."
 
-#: printer/printerdrake.pm:1412
+#: printer/printerdrake.pm:1477
 #, c-format
 msgid "Remote host name"
 msgstr "Nome do endereço remoto"
 
-#: printer/printerdrake.pm:1413
+#: printer/printerdrake.pm:1478
 #, c-format
 msgid "Remote printer name"
 msgstr "Nome da impressora remota"
 
-#: printer/printerdrake.pm:1416
+#: printer/printerdrake.pm:1481
 #, c-format
 msgid "Remote host name missing!"
 msgstr "Nome de endereço remoto em falta!"
 
-#: printer/printerdrake.pm:1420
+#: printer/printerdrake.pm:1485
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Falta o nome da impressora remota!"
 
-#: printer/printerdrake.pm:1449 printer/printerdrake.pm:2025
-#: standalone/drakTermServ:445 standalone/drakTermServ:747
-#: standalone/drakTermServ:764 standalone/drakTermServ:1480
-#: standalone/drakTermServ:1488 standalone/drakTermServ:1500
-#: standalone/drakbackup:512 standalone/drakbackup:618
-#: standalone/drakbackup:653 standalone/drakbackup:773
-#: standalone/harddrake2:256
+#: printer/printerdrake.pm:1515 printer/printerdrake.pm:1986
+#: printer/printerdrake.pm:2111 standalone/drakTermServ:445
+#: standalone/drakTermServ:740 standalone/drakTermServ:757
+#: standalone/drakTermServ:1469 standalone/drakTermServ:1477
+#: standalone/drakTermServ:1489 standalone/drakbackup:512
+#: standalone/drakbackup:618 standalone/drakbackup:653
+#: standalone/drakbackup:773 standalone/drakroam:385 standalone/harddrake2:261
 #, c-format
 msgid "Information"
 msgstr "Informação"
 
-#: printer/printerdrake.pm:1449 printer/printerdrake.pm:2025
+#: printer/printerdrake.pm:1515 printer/printerdrake.pm:1986
+#: printer/printerdrake.pm:2111
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Modelo detectado : %s %s"
 
-#: printer/printerdrake.pm:1531 printer/printerdrake.pm:1785
+#: printer/printerdrake.pm:1598 printer/printerdrake.pm:1855
 #, c-format
 msgid "Scanning network..."
 msgstr "A procurar na rede..."
 
-#: printer/printerdrake.pm:1543 printer/printerdrake.pm:1564
+#: printer/printerdrake.pm:1610 printer/printerdrake.pm:1631
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ", impressora \"%s\" no servidor \"%s\""
 
-#: printer/printerdrake.pm:1546 printer/printerdrake.pm:1567
+#: printer/printerdrake.pm:1613 printer/printerdrake.pm:1634
 #, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr "Impressora \"%s\" no servidor \"%s\""
 
-#: printer/printerdrake.pm:1588
+#: printer/printerdrake.pm:1655
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opções de Impressão SMB (Windows 9x/NT)"
 
-#: printer/printerdrake.pm:1589
+#: printer/printerdrake.pm:1656
 #, c-format
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -12904,13 +13023,13 @@ msgid ""
 "the print server, as well as the share name for the printer you wish to "
 "access and any applicable user name, password, and workgroup information."
 msgstr ""
-"Para imprimir numa impressora SMB, precisa indicar o nome do endereço "
-"SMB (Nota! Pode ser diferente do endereço TCP/IP!) e possivelmente o "
-"endereço IP do servidor de impressão, assim como nome de partilha para "
-"a impressora que deseja aceder e qualquer informação aplicável sobre "
-"nome de utilizador, senha e grupo de trabalho."
+"Para imprimir numa impressora SMB, precisa indicar o nome do endereço SMB "
+"(Nota! Pode ser diferente do endereço TCP/IP!) e possivelmente o endereço IP "
+"do servidor de impressão, assim como nome de partilha para a impressora que "
+"deseja aceder e qualquer informação aplicável sobre nome de utilizador, "
+"senha e grupo de trabalho."
 
-#: printer/printerdrake.pm:1590
+#: printer/printerdrake.pm:1657
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -12920,47 +13039,47 @@ msgstr ""
 "e então adicione um nome de utilizador, uma senha e um grupo de trabalho se "
 "necessário."
 
-#: printer/printerdrake.pm:1592
+#: printer/printerdrake.pm:1659
 #, c-format
 msgid "SMB server host"
 msgstr "Endereço do servidor SMB"
 
-#: printer/printerdrake.pm:1593
+#: printer/printerdrake.pm:1660
 #, c-format
 msgid "SMB server IP"
 msgstr "IP do servidor SMB"
 
-#: printer/printerdrake.pm:1594
+#: printer/printerdrake.pm:1661
 #, c-format
 msgid "Share name"
 msgstr "Nome de partilha"
 
-#: printer/printerdrake.pm:1597
+#: printer/printerdrake.pm:1664
 #, c-format
 msgid "Workgroup"
 msgstr "Grupo de trabalho"
 
-#: printer/printerdrake.pm:1599
+#: printer/printerdrake.pm:1666
 #, c-format
 msgid "Auto-detected"
 msgstr "Auto-detectado"
 
-#: printer/printerdrake.pm:1609
+#: printer/printerdrake.pm:1676
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Deve ser dado ou o nome de servidor ou o seu endereço IP!"
 
-#: printer/printerdrake.pm:1613
+#: printer/printerdrake.pm:1680
 #, c-format
 msgid "Samba share name missing!"
 msgstr "Falta o nome da partilha Samba!"
 
-#: printer/printerdrake.pm:1619
+#: printer/printerdrake.pm:1686
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "ALERTA DE SEGURANÇA!"
 
-#: printer/printerdrake.pm:1620
+#: printer/printerdrake.pm:1687
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -13003,7 +13122,7 @@ msgstr ""
 "tipo \"%s\" no Printerdrake.\n"
 "\n"
 
-#: printer/printerdrake.pm:1630
+#: printer/printerdrake.pm:1697
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -13015,7 +13134,7 @@ msgstr ""
 "protocolo IPP e configure a impressão a partir desta máquina com a ligação "
 "do tipo \"%s\" no Printerdrake.\n"
 
-#: printer/printerdrake.pm:1633
+#: printer/printerdrake.pm:1700
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -13028,12 +13147,12 @@ msgstr ""
 "\n"
 "Deseja mesmo continuar a configurar esta impressora como está a fazer agora?"
 
-#: printer/printerdrake.pm:1711
+#: printer/printerdrake.pm:1779
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "Opções de Impressão NetWare"
 
-#: printer/printerdrake.pm:1712
+#: printer/printerdrake.pm:1780
 #, c-format
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
@@ -13046,52 +13165,52 @@ msgstr ""
 "também o nome da fila de impressão para a impressora que deseja aceder e "
 "qualquer nome de utilizador e senha aplicável."
 
-#: printer/printerdrake.pm:1713
+#: printer/printerdrake.pm:1781
 #, c-format
 msgid "Printer Server"
 msgstr "Servidor de Impressão"
 
-#: printer/printerdrake.pm:1714
+#: printer/printerdrake.pm:1782
 #, c-format
 msgid "Print Queue Name"
 msgstr "Nome da Fila de Impressão"
 
-#: printer/printerdrake.pm:1719
+#: printer/printerdrake.pm:1787
 #, c-format
 msgid "NCP server name missing!"
 msgstr "Falta o nome do servidor NCP!"
 
-#: printer/printerdrake.pm:1723
+#: printer/printerdrake.pm:1791
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "Falta o nome da fila NCP!"
 
-#: printer/printerdrake.pm:1797 printer/printerdrake.pm:1817
+#: printer/printerdrake.pm:1867 printer/printerdrake.pm:1888
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", endereço \"%s\", porta %s"
 
-#: printer/printerdrake.pm:1800 printer/printerdrake.pm:1820
+#: printer/printerdrake.pm:1870 printer/printerdrake.pm:1891
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr "Endereço \"%s\", porta %s"
 
-#: printer/printerdrake.pm:1841
+#: printer/printerdrake.pm:1913
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "Opções do TCP/Socket da Impressora"
 
-#: printer/printerdrake.pm:1843
+#: printer/printerdrake.pm:1915
 #, c-format
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
 "or IP and the optional port number (default is 9100) in the input fields."
 msgstr ""
-"Escolha uma das impressoras auto-detectadas na lista ou escreva o nome "
-"de máquina ou o IP e o número da porta opcional (9100 é a predefinida) nos "
+"Escolha uma das impressoras auto-detectadas na lista ou escreva o nome de "
+"máquina ou o IP e o número da porta opcional (9100 é a predefinida) nos "
 "campos de entrada."
 
-#: printer/printerdrake.pm:1844
+#: printer/printerdrake.pm:1916
 #, c-format
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -13104,27 +13223,27 @@ msgstr ""
 "servidores HP JetDirect a porta é normalemente 9100, nos outros servidores "
 "pode ser diferente. Leia o manual do seu hardware."
 
-#: printer/printerdrake.pm:1848
+#: printer/printerdrake.pm:1920
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "Nome do endereço ou IP da impressora em falta!"
 
-#: printer/printerdrake.pm:1871
+#: printer/printerdrake.pm:1949
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Nome do Servidor da impressora ou IP"
 
-#: printer/printerdrake.pm:1927
+#: printer/printerdrake.pm:2012
 #, c-format
 msgid "Refreshing Device URI list..."
 msgstr "A refrescar a lista do Dispositivo URI..."
 
-#: printer/printerdrake.pm:1930 printer/printerdrake.pm:1932
+#: printer/printerdrake.pm:2015 printer/printerdrake.pm:2017
 #, c-format
 msgid "Printer Device URI"
 msgstr "Dispositivo de Impressão URI"
 
-#: printer/printerdrake.pm:1931
+#: printer/printerdrake.pm:2016
 #, c-format
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
@@ -13135,17 +13254,17 @@ msgstr ""
 "conforme às especificações CUPS ou Foomatic. Note que todos os tipos de URI "
 "são suportados por todos as filas de impressão."
 
-#: printer/printerdrake.pm:1957
+#: printer/printerdrake.pm:2042
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "Uma URI válida deve ser entrada!"
 
-#: printer/printerdrake.pm:2060
+#: printer/printerdrake.pm:2147
 #, c-format
 msgid "Pipe into command"
 msgstr "Envia o trabalho para o comando"
 
-#: printer/printerdrake.pm:2061
+#: printer/printerdrake.pm:2148
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
@@ -13155,17 +13274,17 @@ msgstr ""
 "trabalho deve ser canalizado em vez de enviar directamente para uma "
 "impressora."
 
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:2149
 #, c-format
 msgid "Command line"
 msgstr "Linha de comando"
 
-#: printer/printerdrake.pm:2066
+#: printer/printerdrake.pm:2153
 #, c-format
 msgid "A command line must be entered!"
 msgstr "Uma linha de comando deve ser digitada!"
 
-#: printer/printerdrake.pm:2104
+#: printer/printerdrake.pm:2192
 #, c-format
 msgid ""
 "On many HP printers there are special functions available, maintenance (ink "
@@ -13178,7 +13297,7 @@ msgstr ""
 "inkjets não muito antigos, pesquisa em dispositivos multi-funções, e cartões "
 "de memória em impressoras com leitores de cartões."
 
-#: printer/printerdrake.pm:2106
+#: printer/printerdrake.pm:2194
 #, c-format
 msgid ""
 "To access these extra functions on your HP printer, it must be set up with "
@@ -13187,7 +13306,7 @@ msgstr ""
 "Para aceder a estas funções extra na sua impressora HP, deve ser configurada "
 "com o software apropriado: "
 
-#: printer/printerdrake.pm:2107
+#: printer/printerdrake.pm:2195
 #, c-format
 msgid ""
 "Either with the newer HPLIP which allows printer maintenance through the "
@@ -13198,7 +13317,7 @@ msgstr ""
 "aplicação gráfica \"Toolbox\" de fácil uso e de impressão até ao limite nos "
 "quatro cantos da folha nos novos modelos PhotoSmart "
 
-#: printer/printerdrake.pm:2108
+#: printer/printerdrake.pm:2196
 #, c-format
 msgid ""
 "or with the older HPOJ which allows only scanner and memory card access, but "
@@ -13207,26 +13326,26 @@ msgstr ""
 "ou com o antigo HPOJ que permite apenas pesquisar e ter acesso a cartões de "
 "memória, mas pode ajudá-lo no caso de uma falha do HPLIP. "
 
-#: printer/printerdrake.pm:2110
+#: printer/printerdrake.pm:2198
 #, c-format
 msgid "What is your choice (choose \"None\" for non-HP printers)? "
 msgstr "Qual é a sua escolha (escolha \"Nenhum\" para impressoras não-HP)? "
 
-#: printer/printerdrake.pm:2111 printer/printerdrake.pm:2112
-#: printer/printerdrake.pm:2138 printer/printerdrake.pm:2144
-#: printer/printerdrake.pm:2170
+#: printer/printerdrake.pm:2199 printer/printerdrake.pm:2200
+#: printer/printerdrake.pm:2226 printer/printerdrake.pm:2232
+#: printer/printerdrake.pm:2258
 #, c-format
 msgid "HPLIP"
 msgstr "HPLIP"
 
-#: printer/printerdrake.pm:2111 printer/printerdrake.pm:2114
-#: printer/printerdrake.pm:2270 printer/printerdrake.pm:2276
-#: printer/printerdrake.pm:2287
+#: printer/printerdrake.pm:2199 printer/printerdrake.pm:2202
+#: printer/printerdrake.pm:2358 printer/printerdrake.pm:2364
+#: printer/printerdrake.pm:2375
 #, c-format
 msgid "HPOJ"
 msgstr "HPOJ"
 
-#: printer/printerdrake.pm:2119
+#: printer/printerdrake.pm:2207
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -13237,100 +13356,101 @@ msgstr ""
 "1100/1200/1220/3000/3200/3300/4345 com digitalizador, DeskJet 450, Sony IJP-"
 "V100), uma HP PhotoSmart ou uma HP LaserJet 2200?"
 
-#: printer/printerdrake.pm:2138 printer/printerdrake.pm:2270
+#: printer/printerdrake.pm:2226 printer/printerdrake.pm:2358
 #, c-format
 msgid "Installing %s package..."
 msgstr "A instalar o pacote %s..."
 
-#: printer/printerdrake.pm:2145 printer/printerdrake.pm:2277
+#: printer/printerdrake.pm:2233 printer/printerdrake.pm:2365
 #, c-format
 msgid "Only printing will be possible on the %s."
 msgstr "Impressão apenas será possível em %s."
 
-#: printer/printerdrake.pm:2160
+#: printer/printerdrake.pm:2248
 #, c-format
 msgid "Could not remove your old HPOJ configuration file %s for your %s! "
 msgstr ""
 "Não foi possível remover o seu antigo ficheiro de configuração HPOJ %s para "
 "a sua %s! "
 
-#: printer/printerdrake.pm:2162
+#: printer/printerdrake.pm:2250
 #, c-format
 msgid "Please remove the file manually and restart HPOJ."
 msgstr "Por favor remova o ficheiro manualmente e reinicie o HPOJ."
 
-#: printer/printerdrake.pm:2170 printer/printerdrake.pm:2287
+#: printer/printerdrake.pm:2258 printer/printerdrake.pm:2375
 #, c-format
 msgid "Checking device and configuring %s..."
 msgstr "Verificar o dispositivo e configurar %s..."
 
-#: printer/printerdrake.pm:2189
+#: printer/printerdrake.pm:2277
 #, c-format
 msgid "Which printer do you want to set up with HPLIP?"
 msgstr "Que impressora deseja configurar com o HPLIP?"
 
-#: printer/printerdrake.pm:2218 printer/printerdrake.pm:2331
+#: printer/printerdrake.pm:2306 printer/printerdrake.pm:2419
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "A instalar os pacotes SANE..."
 
-#: printer/printerdrake.pm:2231 printer/printerdrake.pm:2344
+#: printer/printerdrake.pm:2319 printer/printerdrake.pm:2432
 #, c-format
 msgid "Scanning on the %s will not be possible."
 msgstr "Não será possivel digitalizar em %s."
 
-#: printer/printerdrake.pm:2246
+#: printer/printerdrake.pm:2334
 #, c-format
 msgid "Using and Maintaining your %s"
 msgstr "A Usar e a Gerir a sua %s"
 
-#: printer/printerdrake.pm:2371
+#: printer/printerdrake.pm:2459
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "A instalar os pacotes mtools..."
 
-#: printer/printerdrake.pm:2379
+#: printer/printerdrake.pm:2467
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr "O acesso ao cartão de memória fotográfico em %s não será possível."
 
-#: printer/printerdrake.pm:2395
+#: printer/printerdrake.pm:2483
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "A digitalizar no seu dispositivo multi-funções HP"
 
-#: printer/printerdrake.pm:2404
+#: printer/printerdrake.pm:2492
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr "Acesso às cartas memorias de fotos no seu dispositivo multi-funções HP"
 
-#: printer/printerdrake.pm:2421
+#: printer/printerdrake.pm:2509
 #, c-format
 msgid "Configuring device..."
 msgstr "Dispositivo de configuração..."
 
-#: printer/printerdrake.pm:2455
+#: printer/printerdrake.pm:2543
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "A tornar disponivel a porta de impressão para CUPS..."
 
-#: printer/printerdrake.pm:2464 printer/printerdrake.pm:2715
-#: printer/printerdrake.pm:2857
+#: printer/printerdrake.pm:2552 printer/printerdrake.pm:2805
+#: printer/printerdrake.pm:2949
 #, c-format
 msgid "Reading printer database..."
 msgstr "A ler base de dados das impressoras..."
 
-#: printer/printerdrake.pm:2674
+#: printer/printerdrake.pm:2763
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Escreva o Nome da Impressora e os Comentarios"
 
-#: printer/printerdrake.pm:2678 printer/printerdrake.pm:3965
+#: printer/printerdrake.pm:2767 printer/printerdrake.pm:4064
 #, c-format
 msgid "Name of printer should contain only letters, numbers and the underscore"
-msgstr "O nome da impressora deve apenas conter letras, números e traços baixos"
+msgstr ""
+"O nome da impressora deve apenas conter letras, números e traços baixos"
 
-#: printer/printerdrake.pm:2684 printer/printerdrake.pm:3970
+#: printer/printerdrake.pm:2773 printer/printerdrake.pm:4069
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
@@ -13339,7 +13459,7 @@ msgstr ""
 "A impressora \"%s\" já existe,\n"
 "deseja realmente sobrepor a sua configuração?"
 
-#: printer/printerdrake.pm:2691
+#: printer/printerdrake.pm:2780
 #, c-format
 msgid ""
 "The printer name \"%s\" has more than 12 characters which can make the "
@@ -13349,7 +13469,7 @@ msgstr ""
 "A impressora chamada \"%s! tem mais de 12 caracteres o que pode pôr a "
 "impressora inacessível para clientes Windows. Quer realmente usar este nome?"
 
-#: printer/printerdrake.pm:2700
+#: printer/printerdrake.pm:2789
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -13359,35 +13479,35 @@ msgstr ""
 "de Descrição e Localização não são obrigatórios. São só comentarios para os "
 "utilizadores."
 
-#: printer/printerdrake.pm:2701
+#: printer/printerdrake.pm:2790
 #, c-format
 msgid "Name of printer"
 msgstr "Nome da impressora"
 
-#: printer/printerdrake.pm:2702 standalone/drakconnect:570
-#: standalone/harddrake2:37 standalone/printerdrake:211
+#: printer/printerdrake.pm:2791 standalone/drakconnect:603
+#: standalone/harddrake2:38 standalone/printerdrake:211
 #: standalone/printerdrake:218
 #, c-format
 msgid "Description"
 msgstr "Descrição"
 
-#: printer/printerdrake.pm:2703 standalone/printerdrake:211
+#: printer/printerdrake.pm:2792 standalone/printerdrake:211
 #: standalone/printerdrake:218
 #, c-format
 msgid "Location"
 msgstr "Localização"
 
-#: printer/printerdrake.pm:2720
+#: printer/printerdrake.pm:2810
 #, c-format
 msgid "Preparing printer database..."
 msgstr "A preparar a base de dados das impressoras..."
 
-#: printer/printerdrake.pm:2836
+#: printer/printerdrake.pm:2927
 #, c-format
 msgid "Your printer model"
 msgstr "O seu modelo de impressora"
 
-#: printer/printerdrake.pm:2837
+#: printer/printerdrake.pm:2928
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -13412,18 +13532,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: printer/printerdrake.pm:2842 printer/printerdrake.pm:2845
+#: printer/printerdrake.pm:2933 printer/printerdrake.pm:2936
 #, c-format
 msgid "The model is correct"
 msgstr "O modelo está correcto"
 
-#: printer/printerdrake.pm:2843 printer/printerdrake.pm:2844
-#: printer/printerdrake.pm:2847
+#: printer/printerdrake.pm:2934 printer/printerdrake.pm:2935
+#: printer/printerdrake.pm:2938
 #, c-format
 msgid "Select model manually"
 msgstr "Escolha o modelo manualmente"
 
-#: printer/printerdrake.pm:2870
+#: printer/printerdrake.pm:2962
 #, c-format
 msgid ""
 "\n"
@@ -13438,12 +13558,12 @@ msgstr ""
 "impressora correctamente. Procure o modelo correcto na lista quando um "
 "modelo errado ou a \"Impressão directa\" é indicado."
 
-#: printer/printerdrake.pm:2889
+#: printer/printerdrake.pm:2981
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr "Instalar um ficheiro PPD fornecido pelo fabricante"
 
-#: printer/printerdrake.pm:2920
+#: printer/printerdrake.pm:3013
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
@@ -13452,7 +13572,7 @@ msgstr ""
 "Todas as impressoras PostScript são entregues com um ficheiro PPD que "
 "descreve as características e as opções da impressora."
 
-#: printer/printerdrake.pm:2921
+#: printer/printerdrake.pm:3014
 #, c-format
 msgid ""
 "This file is usually somewhere on the CD with the Windows and Mac drivers "
@@ -13461,12 +13581,12 @@ msgstr ""
 "Este ficheiro usualmente encontra-se no CD que contém os drivers para "
 "Windows e Mac que acompanha a impressora."
 
-#: printer/printerdrake.pm:2922
+#: printer/printerdrake.pm:3015
 #, c-format
 msgid "You can find the PPD files also on the manufacturer's web sites."
 msgstr "Pode encontrar os ficheiros PPD nos web sites dos fabricantes."
 
-#: printer/printerdrake.pm:2923
+#: printer/printerdrake.pm:3016
 #, c-format
 msgid ""
 "If you have Windows installed on your machine, you can find the PPD file on "
@@ -13475,7 +13595,7 @@ msgstr ""
 "Se tem o Windows instalado na sua máquina, pode igualmente encontrar o "
 "ficheiro PPD na sua partição Windows."
 
-#: printer/printerdrake.pm:2924
+#: printer/printerdrake.pm:3017
 #, c-format
 msgid ""
 "Installing the printer's PPD file and using it when setting up the printer "
@@ -13486,7 +13606,7 @@ msgstr ""
 "impressora torna todas as opções da impressora disponiveis que são "
 "providenciads pelo hardware da impressora"
 
-#: printer/printerdrake.pm:2925
+#: printer/printerdrake.pm:3018
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
@@ -13495,51 +13615,51 @@ msgstr ""
 "Aqui pode escolher o ficheiro PPD a ser instalado na sua máquina, será então "
 "usado para configurar a sua impressora."
 
-#: printer/printerdrake.pm:2927
+#: printer/printerdrake.pm:3020
 #, c-format
 msgid "Install PPD file from"
 msgstr "Instalar ficheiro PPD a partir de"
 
-#: printer/printerdrake.pm:2930 printer/printerdrake.pm:2938
+#: printer/printerdrake.pm:3023 printer/printerdrake.pm:3031
 #: standalone/scannerdrake:183 standalone/scannerdrake:192
 #: standalone/scannerdrake:242 standalone/scannerdrake:250
 #, c-format
 msgid "Floppy Disk"
 msgstr "Disquete"
 
-#: printer/printerdrake.pm:2931 printer/printerdrake.pm:2940
+#: printer/printerdrake.pm:3024 printer/printerdrake.pm:3033
 #: standalone/scannerdrake:184 standalone/scannerdrake:194
 #: standalone/scannerdrake:243 standalone/scannerdrake:252
 #, c-format
 msgid "Other place"
 msgstr "Outro local"
 
-#: printer/printerdrake.pm:2946
+#: printer/printerdrake.pm:3039
 #, c-format
 msgid "Select PPD file"
 msgstr "Seleccione ficheiro PPD"
 
-#: printer/printerdrake.pm:2950
+#: printer/printerdrake.pm:3043
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr "O ficheiro PPD %s não existe ou está ilegível!"
 
-#: printer/printerdrake.pm:2956
+#: printer/printerdrake.pm:3049
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr "O ficheiro PPD %s não está de acordo com as especificações PPD!"
 
-#: printer/printerdrake.pm:2967
+#: printer/printerdrake.pm:3060
 #, c-format
 msgid "Installing PPD file..."
 msgstr "A instalar o ficheiro PPD..."
 
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3178
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "Configuração da OKI winprinter"
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3179
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -13556,12 +13676,12 @@ msgstr ""
 "porta paralela antes do imprimir uma página teste.Senão a impressora não irá "
 "funcionar. A sua definição do tipo de conexão será ignorado pelo driver."
 
-#: printer/printerdrake.pm:3110 printer/printerdrake.pm:3140
+#: printer/printerdrake.pm:3204 printer/printerdrake.pm:3234
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Configuração das Lexmark a jacto de tinta"
 
-#: printer/printerdrake.pm:3111
+#: printer/printerdrake.pm:3205
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -13574,7 +13694,7 @@ msgstr ""
 "de impressão. Por favor conecte a sua impressora localmente ou configure-a "
 "na máquina à qual se encontra ligada."
 
-#: printer/printerdrake.pm:3141
+#: printer/printerdrake.pm:3235
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -13595,12 +13715,12 @@ msgstr ""
 "seguir imprima paginas de controlo alinhadas \"lexmarkmaintain\" e configure "
 "as definições de alinhamento da cabeça de página com este programa."
 
-#: printer/printerdrake.pm:3151
+#: printer/printerdrake.pm:3245
 #, c-format
 msgid "Lexmark X125 configuration"
 msgstr "Configuração da Lexmark X125"
 
-#: printer/printerdrake.pm:3152
+#: printer/printerdrake.pm:3246
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -13613,12 +13733,12 @@ msgstr ""
 "Por favor ligue a sua impressora a uma porta USB local ou configure-a na "
 "máquina à qual está ligada."
 
-#: printer/printerdrake.pm:3174
+#: printer/printerdrake.pm:3268
 #, c-format
 msgid "Samsung ML/QL-85G configuration"
 msgstr "Configuração do Samsung ML/QL-85G"
 
-#: printer/printerdrake.pm:3175 printer/printerdrake.pm:3202
+#: printer/printerdrake.pm:3269 printer/printerdrake.pm:3296
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected on the "
@@ -13632,17 +13752,17 @@ msgstr ""
 "paralela. Por favor conecte a sua impressora na primeira porta paralela ou "
 "configure-a na máquina onde está ligada."
 
-#: printer/printerdrake.pm:3201
+#: printer/printerdrake.pm:3295
 #, c-format
 msgid "Canon LBP-460/660 configuration"
 msgstr "Configuração da Canon LBP-460/660"
 
-#: printer/printerdrake.pm:3220
+#: printer/printerdrake.pm:3314
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "Descarregamento do firmware para HP LaserJet 1000"
 
-#: printer/printerdrake.pm:3369
+#: printer/printerdrake.pm:3464
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -13660,27 +13780,27 @@ msgstr ""
 "impressão muito alta de qualidade/resolução, imprimir pode tornar-se "
 "bastante lento."
 
-#: printer/printerdrake.pm:3494
+#: printer/printerdrake.pm:3589
 #, c-format
 msgid "Printer default settings"
 msgstr "Parâmetros predefinidos da impressora"
 
-#: printer/printerdrake.pm:3501
+#: printer/printerdrake.pm:3596
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "A opção %s deve ser um numero inteiro!"
 
-#: printer/printerdrake.pm:3505
+#: printer/printerdrake.pm:3600
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "A opção %s deve ser um número!"
 
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3604
 #, c-format
 msgid "Option %s out of range!"
 msgstr "A opção %s está fora de alcance!"
 
-#: printer/printerdrake.pm:3560
+#: printer/printerdrake.pm:3656
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -13689,12 +13809,12 @@ msgstr ""
 "Quer definir esta impressora (\"%s\")\n"
 "como impressora padrão?"
 
-#: printer/printerdrake.pm:3575
+#: printer/printerdrake.pm:3672
 #, c-format
 msgid "Test pages"
 msgstr "Páginas de teste"
 
-#: printer/printerdrake.pm:3576
+#: printer/printerdrake.pm:3673
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -13707,52 +13827,52 @@ msgstr ""
 "impressoras laser com pouca memória podem até nem conseguir imprimir. Na "
 "maioria dos casos é suficiente imprimir a página de teste padrão."
 
-#: printer/printerdrake.pm:3580
+#: printer/printerdrake.pm:3677
 #, c-format
 msgid "No test pages"
 msgstr "Sem páginas teste"
 
-#: printer/printerdrake.pm:3581
+#: printer/printerdrake.pm:3678
 #, c-format
 msgid "Print"
 msgstr "Imprimir"
 
-#: printer/printerdrake.pm:3606
+#: printer/printerdrake.pm:3703
 #, c-format
 msgid "Standard test page"
 msgstr "Página de teste padrão"
 
-#: printer/printerdrake.pm:3609
+#: printer/printerdrake.pm:3706
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Página de teste alternativa (Letter)"
 
-#: printer/printerdrake.pm:3612
+#: printer/printerdrake.pm:3709
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Página de teste alternativa (A4)"
 
-#: printer/printerdrake.pm:3614
+#: printer/printerdrake.pm:3711
 #, c-format
 msgid "Photo test page"
 msgstr "Página de teste com fotos"
 
-#: printer/printerdrake.pm:3618
+#: printer/printerdrake.pm:3715
 #, c-format
 msgid "Do not print any test page"
 msgstr "Não imprime nenhuma página de teste"
 
-#: printer/printerdrake.pm:3626 printer/printerdrake.pm:3809
+#: printer/printerdrake.pm:3723 printer/printerdrake.pm:3907
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "A imprimir página(s) teste..."
 
-#: printer/printerdrake.pm:3646
+#: printer/printerdrake.pm:3743
 #, c-format
 msgid "Skipping photo test page."
 msgstr "Saltar a página de teste com fotos"
 
-#: printer/printerdrake.pm:3663
+#: printer/printerdrake.pm:3760
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13767,7 +13887,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3667
+#: printer/printerdrake.pm:3764
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13776,17 +13896,17 @@ msgstr ""
 "A(s) página(s) foram enviada(s) para a impressora.\n"
 "Pode demorar algum tempo antes da impressão começar.\n"
 
-#: printer/printerdrake.pm:3677
+#: printer/printerdrake.pm:3774
 #, c-format
 msgid "Did it work properly?"
 msgstr "Funcionou correctamente?"
 
-#: printer/printerdrake.pm:3700 printer/printerdrake.pm:5049
+#: printer/printerdrake.pm:3798 printer/printerdrake.pm:5175
 #, c-format
 msgid "Raw printer"
 msgstr "Impressora directa"
 
-#: printer/printerdrake.pm:3738
+#: printer/printerdrake.pm:3836
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -13799,7 +13919,7 @@ msgstr ""
 "\"xpp <ficheiro>\". A ferramenta gráfica permite-lhe escolher mais "
 "facilmente a impressora a usar e as opções de configuração.\n"
 
-#: printer/printerdrake.pm:3740
+#: printer/printerdrake.pm:3838
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -13810,8 +13930,8 @@ msgstr ""
 "dosdiálogos de impressão de muitas aplicações, mas não ponha aqui o nome do "
 "ficheiro porque o ficheiro a imprimir é providenciado pela aplicação.\n"
 
-#: printer/printerdrake.pm:3743 printer/printerdrake.pm:3760
-#: printer/printerdrake.pm:3770
+#: printer/printerdrake.pm:3841 printer/printerdrake.pm:3858
+#: printer/printerdrake.pm:3868
 #, c-format
 msgid ""
 "\n"
@@ -13824,7 +13944,7 @@ msgstr ""
 "impressão particular. Basta adicionar os parâmetros desejados na linha de "
 "comando, ex. \"%s <ficheiro>\". "
 
-#: printer/printerdrake.pm:3746 printer/printerdrake.pm:3786
+#: printer/printerdrake.pm:3844 printer/printerdrake.pm:3884
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -13834,7 +13954,7 @@ msgstr ""
 "Para saber acerca das opções disponíveis para a impressora actual, leia a "
 "lista abaixo ou clique no botão \"Imprimir a lista das opções\".%s%s%s\n"
 
-#: printer/printerdrake.pm:3750
+#: printer/printerdrake.pm:3848
 #, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
@@ -13843,7 +13963,7 @@ msgstr ""
 "Aqui tem uma lista das opções disponíveis para a impressora actual :\n"
 "\n"
 
-#: printer/printerdrake.pm:3755 printer/printerdrake.pm:3765
+#: printer/printerdrake.pm:3853 printer/printerdrake.pm:3863
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -13852,8 +13972,8 @@ msgstr ""
 "Para imprimir um ficheiro a partir da linha de comando (janela de sessão) "
 "use o comando \"%s <ficheiro>\".\n"
 
-#: printer/printerdrake.pm:3757 printer/printerdrake.pm:3767
-#: printer/printerdrake.pm:3777
+#: printer/printerdrake.pm:3855 printer/printerdrake.pm:3865
+#: printer/printerdrake.pm:3875
 #, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
@@ -13864,7 +13984,7 @@ msgstr ""
 "de impressão de muitas aplicações. Mas aqui não forneça o nome ficheiro "
 "porque o ficheiro a imprimir é provienciado pela aplicação.\n"
 
-#: printer/printerdrake.pm:3762 printer/printerdrake.pm:3772
+#: printer/printerdrake.pm:3860 printer/printerdrake.pm:3870
 #, c-format
 msgid ""
 "To get a list of the options available for the current printer click on the "
@@ -13873,7 +13993,7 @@ msgstr ""
 "Para obter uma lista das opções disponíveis para a impressora actual clique "
 "no botão \"Imprimir a lista das opções\"."
 
-#: printer/printerdrake.pm:3775
+#: printer/printerdrake.pm:3873
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -13882,7 +14002,7 @@ msgstr ""
 "Para imprimir um ficheiro a partir da linha de comando (janela de terminal) "
 "use o comando \"%s <ficheiro>\" ou \"%s <ficheiro>\".\n"
 
-#: printer/printerdrake.pm:3779
+#: printer/printerdrake.pm:3877
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -13899,7 +14019,7 @@ msgstr ""
 "as tarefas de impressão imediatamente quando clica nele. Isto é por exemplo "
 "útil no caso de faltar o papel.\n"
 
-#: printer/printerdrake.pm:3783
+#: printer/printerdrake.pm:3881
 #, c-format
 msgid ""
 "\n"
@@ -13912,37 +14032,37 @@ msgstr ""
 "tarefa de impressão particular. Basta adicionar os parâmetros desejados na "
 "linha de comando, ex. \"%s <ficheiro>\".\n"
 
-#: printer/printerdrake.pm:3793
+#: printer/printerdrake.pm:3891
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Cartas de impressão/digitalização/fotos em \"%s\""
 
-#: printer/printerdrake.pm:3794
+#: printer/printerdrake.pm:3892
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Impressão/digitalização em \"%s\""
 
-#: printer/printerdrake.pm:3796
+#: printer/printerdrake.pm:3894
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Carta de impressão/fotos acessível em \"%s\""
 
-#: printer/printerdrake.pm:3798
+#: printer/printerdrake.pm:3896
 #, c-format
 msgid "Using/Maintaining the printer \"%s\""
 msgstr "Usar/Gerir a impressora \"%s\""
 
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:3897
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "A imprimir na impressora \"%s\""
 
-#: printer/printerdrake.pm:3805
+#: printer/printerdrake.pm:3903
 #, c-format
 msgid "Print option list"
 msgstr "Lista das opções da impressora"
 
-#: printer/printerdrake.pm:3827
+#: printer/printerdrake.pm:3925
 #, c-format
 msgid ""
 "Your %s is set up with HP's HPLIP driver software. This way many special "
@@ -13953,7 +14073,7 @@ msgstr ""
 "opções especiais da sua impressora são suportadas.\n"
 "\n"
 
-#: printer/printerdrake.pm:3830
+#: printer/printerdrake.pm:3928
 #, c-format
 msgid ""
 "The scanner in your printer can be used with the usual SANE software, for "
@@ -13962,18 +14082,18 @@ msgstr ""
 "O scanner na sua impressora pode ser usado com o usual software SANE, por "
 "exemplo o Kooka ou o XSane (Ambos no menu Multimédia/Gráficos)"
 
-#: printer/printerdrake.pm:3831
-#, c-format
+#: printer/printerdrake.pm:3929
+#, fuzzy, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux 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 ""
-"Execute o Scannerdrake (no Mandrake Linux Control em Hardware/Scanner) para "
+"Execute o Scannerdrake (no Mandriva Linux Control em Hardware/Scanner) para "
 "partilhar o seu scanner na rede.\n"
 "\n"
 
-#: printer/printerdrake.pm:3835
+#: printer/printerdrake.pm:3933
 #, c-format
 msgid ""
 "The memory card readers in your printer can be accessed like a usual USB "
@@ -13982,7 +14102,7 @@ msgstr ""
 "Os leitores de cartões de memória da sua impressora podem ser acedidos como "
 "um normal dispositivo de armazenamento USB. "
 
-#: printer/printerdrake.pm:3836
+#: printer/printerdrake.pm:3934
 #, c-format
 msgid ""
 "After inserting a card a hard disk icon to access the card should appear on "
@@ -13993,7 +14113,7 @@ msgstr ""
 "cartão deverá aparecer nos seu desktop.\n"
 "\n"
 
-#: printer/printerdrake.pm:3838
+#: printer/printerdrake.pm:3936
 #, c-format
 msgid ""
 "The memory card readers in your printer can be accessed using HP's Printer "
@@ -14005,7 +14125,7 @@ msgstr ""
 "de Impressão HP) ao clicar no botão \"Aceder Cartões de Fotografia...\" na "
 "parte das \"Funções\". "
 
-#: printer/printerdrake.pm:3839
+#: printer/printerdrake.pm:3937
 #, c-format
 msgid ""
 "Note that this is very slow, reading the pictures from the camera or a USB "
@@ -14016,7 +14136,7 @@ msgstr ""
 "leitor de cartões USB é normalmente mais rápido.\n"
 "\n"
 
-#: printer/printerdrake.pm:3842
+#: printer/printerdrake.pm:3940
 #, c-format
 msgid ""
 "HP's Printer Toolbox (Menu: System/Monitoring/HP Printer Toolbox) offers a "
@@ -14028,27 +14148,27 @@ msgstr ""
 "manutenção para a sua %s:\n"
 "\n"
 
-#: printer/printerdrake.pm:3843
+#: printer/printerdrake.pm:3941
 #, c-format
 msgid " - Ink level/status info\n"
 msgstr " - nível de tinta/informação do estado\n"
 
-#: printer/printerdrake.pm:3844
+#: printer/printerdrake.pm:3942
 #, c-format
 msgid " - Ink nozzle cleaning\n"
 msgstr " - limpeza do bocal de tinta\n"
 
-#: printer/printerdrake.pm:3845
+#: printer/printerdrake.pm:3943
 #, c-format
 msgid " - Print head alignment\n"
 msgstr " - Alinhamento da cabeça de impressão\n"
 
-#: printer/printerdrake.pm:3846
+#: printer/printerdrake.pm:3944
 #, c-format
 msgid " - Color calibration\n"
 msgstr " - Calibração da cor\n"
 
-#: printer/printerdrake.pm:3861
+#: printer/printerdrake.pm:3959
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -14075,7 +14195,7 @@ msgstr ""
 "dispositivo, só precisa usar o \"scannerdrake\" se quiser partilhar o "
 "scanner na rede."
 
-#: printer/printerdrake.pm:3887
+#: printer/printerdrake.pm:3985
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -14098,13 +14218,13 @@ msgstr ""
 "HP com drivers de cartas de fotos. Em \"MToolsFM\" pode mudar de letra de "
 "dispositivo com a zona no canto direito superior da lista de ficheiros."
 
-#: printer/printerdrake.pm:3929 printer/printerdrake.pm:3956
-#: printer/printerdrake.pm:3991
+#: printer/printerdrake.pm:4028 printer/printerdrake.pm:4055
+#: printer/printerdrake.pm:4090
 #, c-format
 msgid "Transfer printer configuration"
 msgstr "Transferir a configuração da impressora"
 
-#: printer/printerdrake.pm:3930
+#: printer/printerdrake.pm:4029
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -14119,7 +14239,7 @@ msgstr ""
 "tomados, mas a tarefas em fila não serão transferidas.\n"
 "Nem todas as tarefas podem ser transferidas pelas seguintes razões:\n"
 
-#: printer/printerdrake.pm:3933
+#: printer/printerdrake.pm:4032
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -14128,7 +14248,7 @@ msgstr ""
 "CUPS não suporta as impressoras em servidores Novell ou impressoras a enviar "
 "os dados para um comando livremente-escrito.\n"
 
-#: printer/printerdrake.pm:3935
+#: printer/printerdrake.pm:4034
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -14137,12 +14257,12 @@ msgstr ""
 "PDQ só suporta impressoras locais, impressoras LPD remotas, e impressoras "
 "TCP/Socket.\n"
 
-#: printer/printerdrake.pm:3937
+#: printer/printerdrake.pm:4036
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD e LPRng não suportam impressoras IPP.\n"
 
-#: printer/printerdrake.pm:3939
+#: printer/printerdrake.pm:4038
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
@@ -14151,7 +14271,7 @@ msgstr ""
 "Em adição, filas não criadas com este programa ou com definições \"foomatic-"
 "configure\" não podem ser transferidas."
 
-#: printer/printerdrake.pm:3940
+#: printer/printerdrake.pm:4039
 #, c-format
 msgid ""
 "\n"
@@ -14162,7 +14282,7 @@ msgstr ""
 "Também as impressoras configuradas com ficheiros PPD fornecidos pelos "
 "fabricantes ou com drivers CUPS nativos não podem ser transferidas."
 
-#: printer/printerdrake.pm:3941
+#: printer/printerdrake.pm:4040
 #, c-format
 msgid ""
 "\n"
@@ -14173,17 +14293,17 @@ msgstr ""
 "Marque as impressoras que deseja transferir e clique em \n"
 "\"Transferir\"."
 
-#: printer/printerdrake.pm:3944
+#: printer/printerdrake.pm:4043
 #, c-format
 msgid "Do not transfer printers"
 msgstr "Não transferir impressoras"
 
-#: printer/printerdrake.pm:3945 printer/printerdrake.pm:3961
+#: printer/printerdrake.pm:4044 printer/printerdrake.pm:4060
 #, c-format
 msgid "Transfer"
 msgstr "Transferir"
 
-#: printer/printerdrake.pm:3957
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -14194,17 +14314,17 @@ msgstr ""
 "Clique \"Transferir\" para a sobrescrever.\n"
 "Também pode escrever um novo nome ou saltar esta impressora."
 
-#: printer/printerdrake.pm:3978
+#: printer/printerdrake.pm:4077
 #, c-format
 msgid "New printer name"
 msgstr "Novo nome de impressora"
 
-#: printer/printerdrake.pm:3981
+#: printer/printerdrake.pm:4080
 #, c-format
 msgid "Transferring %s..."
 msgstr "A transferir %s ..."
 
-#: printer/printerdrake.pm:3992
+#: printer/printerdrake.pm:4091
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -14213,28 +14333,28 @@ msgstr ""
 "Acabou de transferir a sua anterior impressora padrão (\"%s\"). Deve ser "
 "esta também a impressora padrão no novo sistema de impressão %s?"
 
-#: printer/printerdrake.pm:4002
+#: printer/printerdrake.pm:4101
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "A refrescar os dados da impressora..."
 
-#: printer/printerdrake.pm:4011
+#: printer/printerdrake.pm:4111
 #, c-format
 msgid "Starting network..."
 msgstr "A iniciar a rede..."
 
-#: printer/printerdrake.pm:4054 printer/printerdrake.pm:4058
-#: printer/printerdrake.pm:4060
+#: printer/printerdrake.pm:4155 printer/printerdrake.pm:4159
+#: printer/printerdrake.pm:4161
 #, c-format
 msgid "Configure the network now"
 msgstr "Configurar a rede agora"
 
-#: printer/printerdrake.pm:4055
+#: printer/printerdrake.pm:4156
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Funcionalidade da rede não configurada"
 
-#: printer/printerdrake.pm:4056
+#: printer/printerdrake.pm:4157
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -14247,12 +14367,12 @@ msgstr ""
 "configuração da rede, não irá ser capaz de usar a impressora que está agora "
 "a configurar. Como quer proceder?"
 
-#: printer/printerdrake.pm:4059
+#: printer/printerdrake.pm:4160
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Continuar sem configurar a rede"
 
-#: printer/printerdrake.pm:4094
+#: printer/printerdrake.pm:4195
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -14267,7 +14387,7 @@ msgstr ""
 "\"Rede e Internet\"/\"Conexão\", e depois configure a impressora, também com "
 "o Centro de Controlo %s, na secção \"Hardware\"/\"Impressora\""
 
-#: printer/printerdrake.pm:4095
+#: printer/printerdrake.pm:4196
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -14278,27 +14398,27 @@ msgstr ""
 "verifique a sua configuração e o seu hardware. Tente então configurar a sua "
 "impressora remota outra vez."
 
-#: printer/printerdrake.pm:4105
+#: printer/printerdrake.pm:4206
 #, c-format
 msgid "Restarting printing system..."
 msgstr "A reiniciar o sistema de impressão..."
 
-#: printer/printerdrake.pm:4135
+#: printer/printerdrake.pm:4237
 #, c-format
 msgid "high"
 msgstr "alto"
 
-#: printer/printerdrake.pm:4135
+#: printer/printerdrake.pm:4237
 #, c-format
 msgid "paranoid"
 msgstr "paranóico"
 
-#: printer/printerdrake.pm:4137
+#: printer/printerdrake.pm:4239
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "A instalar um sistema de impressão no nível de segurança %s"
 
-#: printer/printerdrake.pm:4138
+#: printer/printerdrake.pm:4240
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -14312,22 +14432,22 @@ msgid ""
 "\n"
 "Do you really want to configure printing on this machine?"
 msgstr ""
-"Esta prestes a instalar o sistema de impressão %s num sistema a correr "
-"no nível de segurança %s.\n"
-"Este sistema de impressão corre um daemon (processo em 2º plano) que "
-"espera por tarefas de impressão trata destas. Este daemon é também "
-"acessível por máquinas remotas através da rede e então é um possível "
-"ponto para ataques. Então só uns poucos daemons seleccionados são "
-"iniciados por omissão neste nível de segurança.\n"
+"Esta prestes a instalar o sistema de impressão %s num sistema a correr no "
+"nível de segurança %s.\n"
+"Este sistema de impressão corre um daemon (processo em 2º plano) que espera "
+"por tarefas de impressão trata destas. Este daemon é também acessível por "
+"máquinas remotas através da rede e então é um possível ponto para ataques. "
+"Então só uns poucos daemons seleccionados são iniciados por omissão neste "
+"nível de segurança.\n"
 "\n"
 "Deseja realmente configurar a impressão nesta máquina?"
 
-#: printer/printerdrake.pm:4173
+#: printer/printerdrake.pm:4276
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "A iniciar o sistema de impressão no arranque"
 
-#: printer/printerdrake.pm:4174
+#: printer/printerdrake.pm:4277
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -14349,32 +14469,32 @@ msgstr ""
 "\n"
 "Deseja ter um arranque automático do sistema de impressão activado outra vez?"
 
-#: printer/printerdrake.pm:4196
+#: printer/printerdrake.pm:4300
 #, c-format
 msgid "Checking installed software..."
 msgstr "A verificar o software instalado..."
 
-#: printer/printerdrake.pm:4202
+#: printer/printerdrake.pm:4306
 #, c-format
 msgid "Removing %s..."
 msgstr "A remover %s ..."
 
-#: printer/printerdrake.pm:4206
+#: printer/printerdrake.pm:4310
 #, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "Não conseguiu remover o sistema de impressão %s !"
 
-#: printer/printerdrake.pm:4222
+#: printer/printerdrake.pm:4326
 #, c-format
 msgid "Installing %s..."
 msgstr "A instalar %s ..."
 
-#: printer/printerdrake.pm:4226
+#: printer/printerdrake.pm:4330
 #, c-format
 msgid "Could not install the %s printing system!"
 msgstr "Não conseguiiu instalar o sistema de impressão %s !"
 
-#: printer/printerdrake.pm:4293
+#: printer/printerdrake.pm:4398
 #, c-format
 msgid ""
 "In this mode there is no local printing system, all printing requests go "
@@ -14387,41 +14507,41 @@ msgstr ""
 "não é possivel definir filas de impressão locais, então se o servidor "
 "especificado estiver em baixo não pode nada impresso a partir desta máquina."
 
-#: printer/printerdrake.pm:4295
+#: printer/printerdrake.pm:4400
 #, c-format
 msgid ""
 "Enter the host name or IP of your CUPS server and click OK if you want to "
 "use this mode, click \"Quit\" otherwise."
 msgstr ""
-"Se quiser usar este modulo indique o nome do endereço ou IP do seu "
-"servidor CUPS e clique em OK, senão clique em \"Sair\"."
+"Se quiser usar este modulo indique o nome do endereço ou IP do seu servidor "
+"CUPS e clique em OK, senão clique em \"Sair\"."
 
-#: printer/printerdrake.pm:4309
+#: printer/printerdrake.pm:4414
 #, c-format
 msgid "Name or IP of remote server:"
 msgstr "Nome ou IP do servidor remoto:"
 
-#: printer/printerdrake.pm:4329
+#: printer/printerdrake.pm:4434
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "A definir a impressora padrão..."
 
-#: printer/printerdrake.pm:4348
+#: printer/printerdrake.pm:4454
 #, c-format
 msgid "Local CUPS printing system or remote CUPS server?"
 msgstr "Sistema de impressão local CUPS ou servidor remoto CUPS?"
 
-#: printer/printerdrake.pm:4349
+#: printer/printerdrake.pm:4455
 #, c-format
 msgid "The CUPS printing system can be used in two ways: "
 msgstr "O sistema de impressão CUPS pode ser usado de duas maneiras:"
 
-#: printer/printerdrake.pm:4351
+#: printer/printerdrake.pm:4457
 #, c-format
 msgid "1. The CUPS printing system can run locally. "
 msgstr "1. O sistema de impressão CUPS pode ser executado localmente. "
 
-#: printer/printerdrake.pm:4352
+#: printer/printerdrake.pm:4458
 #, c-format
 msgid ""
 "Then locally connected printers can be used and remote printers on other "
@@ -14431,7 +14551,7 @@ msgstr ""
 "remotas noutros servidores CUPS na mesma rede são automáticamente "
 "descobertas. "
 
-#: printer/printerdrake.pm:4353
+#: printer/printerdrake.pm:4459
 #, c-format
 msgid ""
 "Disadvantage of this approach is, that more resources on the local machine "
@@ -14444,14 +14564,14 @@ msgstr ""
 "daemon CUPS tem que ser executado em 2º plano e é necessária mais memória, e "
 "a porta IPP (porta 631) é aberta. "
 
-#: printer/printerdrake.pm:4355
+#: printer/printerdrake.pm:4461
 #, c-format
 msgid "2. All printing requests are immediately sent to a remote CUPS server. "
 msgstr ""
 "2. Todos os pedidos de impressão são imediatamente enviados para um servidor "
 "CUPS remoto. "
 
-#: printer/printerdrake.pm:4356
+#: printer/printerdrake.pm:4462
 #, c-format
 msgid ""
 "Here local resource occupation is reduced to a minimum. No CUPS daemon is "
@@ -14463,7 +14583,7 @@ msgstr ""
 "definir as filas de impressão local é necessária, então menos memória e "
 "espaço em disco é usado. "
 
-#: printer/printerdrake.pm:4357
+#: printer/printerdrake.pm:4463
 #, c-format
 msgid ""
 "Disadvantage is that it is not possible to define local printers then and if "
@@ -14473,48 +14593,48 @@ msgstr ""
 "servidor especificado estiver em baixo não pode ser nada imprimido a partir "
 "deta máquina. "
 
-#: printer/printerdrake.pm:4359
+#: printer/printerdrake.pm:4465
 #, c-format
 msgid "How should CUPS be set up on your machine?"
 msgstr "Como deve o CUPS ser definido na sua máquina?"
 
-#: printer/printerdrake.pm:4363 printer/printerdrake.pm:4378
-#: printer/printerdrake.pm:4382 printer/printerdrake.pm:4388
+#: printer/printerdrake.pm:4469 printer/printerdrake.pm:4484
+#: printer/printerdrake.pm:4488 printer/printerdrake.pm:4494
 #, c-format
 msgid "Remote server, specify Name or IP here:"
 msgstr "Servidor remoto, especifique aqui o Nome ou o IP:"
 
-#: printer/printerdrake.pm:4377
+#: printer/printerdrake.pm:4483
 #, c-format
 msgid "Local CUPS printing system"
 msgstr "Sistema de impressão local CUPS"
 
-#: printer/printerdrake.pm:4415
+#: printer/printerdrake.pm:4522
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Seleccionar a fila da Impressora"
 
-#: printer/printerdrake.pm:4416
+#: printer/printerdrake.pm:4523
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Que sistema de impressão (spooler) deseja usar?"
 
-#: printer/printerdrake.pm:4464
+#: printer/printerdrake.pm:4572
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "Falha ao configurar a impressora \"%s\"!"
 
-#: printer/printerdrake.pm:4478
+#: printer/printerdrake.pm:4587
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "A instalar Foomatic..."
 
-#: printer/printerdrake.pm:4484
+#: printer/printerdrake.pm:4593
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr "Não conseguiu instalar %s pacotes, %s não pode ser iniciado!"
 
-#: printer/printerdrake.pm:4674
+#: printer/printerdrake.pm:4785
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -14525,50 +14645,50 @@ msgstr ""
 "impressora para alterar a sua configuração; para a definir como impressora "
 "padrão; ou para ver informações sobre esta."
 
-#: printer/printerdrake.pm:4704
+#: printer/printerdrake.pm:4815
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "Mostrar todas as impressoras CUPS remotas disponíveis"
 
-#: printer/printerdrake.pm:4705
+#: printer/printerdrake.pm:4816
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 "Refrescar a lista das impressoras (para mostrar todas as impressoras CUPS "
 "remotas disponíveis)"
 
-#: printer/printerdrake.pm:4716
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "CUPS configuration"
 msgstr "Configuração CUPS"
 
-#: printer/printerdrake.pm:4728
+#: printer/printerdrake.pm:4839
 #, c-format
 msgid "Change the printing system"
 msgstr "Mudar de sistema de impressão"
 
-#: printer/printerdrake.pm:4737
+#: printer/printerdrake.pm:4848
 #, c-format
 msgid "Normal Mode"
 msgstr "Modo Normal"
 
-#: printer/printerdrake.pm:4738
+#: printer/printerdrake.pm:4849
 #, c-format
 msgid "Expert Mode"
 msgstr "Modo de Perito"
 
-#: printer/printerdrake.pm:4992 printer/printerdrake.pm:5050
-#: printer/printerdrake.pm:5128 printer/printerdrake.pm:5137
+#: printer/printerdrake.pm:5118 printer/printerdrake.pm:5176
+#: printer/printerdrake.pm:5255 printer/printerdrake.pm:5264
 #, c-format
 msgid "Printer options"
 msgstr "Opções da impressora"
 
-#: printer/printerdrake.pm:5028
+#: printer/printerdrake.pm:5154
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Mudar a configuração da impressora"
 
-#: printer/printerdrake.pm:5030
+#: printer/printerdrake.pm:5156
 #, c-format
 msgid ""
 "Printer %s%s\n"
@@ -14577,99 +14697,99 @@ msgstr ""
 "Impressora %s%s\n"
 "O que deseja modificar nesta impressora?"
 
-#: printer/printerdrake.pm:5035
+#: printer/printerdrake.pm:5161
 #, c-format
 msgid "This printer is disabled"
 msgstr "Esta impressora está desactivada"
 
-#: printer/printerdrake.pm:5037
+#: printer/printerdrake.pm:5163
 #, c-format
 msgid "Do it!"
 msgstr "Fazer!"
 
-#: printer/printerdrake.pm:5042 printer/printerdrake.pm:5097
+#: printer/printerdrake.pm:5168 printer/printerdrake.pm:5223
 #, c-format
 msgid "Printer connection type"
 msgstr "Tipo de conexão da impressora"
 
-#: printer/printerdrake.pm:5043 printer/printerdrake.pm:5103
+#: printer/printerdrake.pm:5169 printer/printerdrake.pm:5229
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Nome da Impressora, descrição, localização"
 
-#: printer/printerdrake.pm:5045 printer/printerdrake.pm:5121
+#: printer/printerdrake.pm:5171 printer/printerdrake.pm:5248
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "Fabricante da impressora, modelo, driver"
 
-#: printer/printerdrake.pm:5046 printer/printerdrake.pm:5122
+#: printer/printerdrake.pm:5172 printer/printerdrake.pm:5249
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Fabricante da impressora, modelo"
 
-#: printer/printerdrake.pm:5052 printer/printerdrake.pm:5132
+#: printer/printerdrake.pm:5178 printer/printerdrake.pm:5259
 #, c-format
 msgid "Set this printer as the default"
 msgstr "Definir esta impressora como a predefinida"
 
-#: printer/printerdrake.pm:5057 printer/printerdrake.pm:5138
-#: printer/printerdrake.pm:5140
+#: printer/printerdrake.pm:5183 printer/printerdrake.pm:5265
+#: printer/printerdrake.pm:5267
 #, c-format
 msgid "Enable Printer"
 msgstr "Activar Impressora"
 
-#: printer/printerdrake.pm:5060 printer/printerdrake.pm:5143
-#: printer/printerdrake.pm:5145
+#: printer/printerdrake.pm:5186 printer/printerdrake.pm:5270
+#: printer/printerdrake.pm:5272
 #, c-format
 msgid "Disable Printer"
 msgstr "Desactivar Impressora"
 
-#: printer/printerdrake.pm:5061 printer/printerdrake.pm:5148
+#: printer/printerdrake.pm:5187 printer/printerdrake.pm:5275
 #, c-format
 msgid "Print test pages"
 msgstr "Imprimir páginas de teste"
 
-#: printer/printerdrake.pm:5062 printer/printerdrake.pm:5150
+#: printer/printerdrake.pm:5188 printer/printerdrake.pm:5277
 #, c-format
 msgid "Learn how to use this printer"
 msgstr "Aprender a usar esta impressora"
 
-#: printer/printerdrake.pm:5063 printer/printerdrake.pm:5152
+#: printer/printerdrake.pm:5189 printer/printerdrake.pm:5279
 #, c-format
 msgid "Remove printer"
 msgstr "Remover impressora"
 
-#: printer/printerdrake.pm:5110
+#: printer/printerdrake.pm:5237
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "A remover antiga impressora \"%s\"..."
 
-#: printer/printerdrake.pm:5141
+#: printer/printerdrake.pm:5268
 #, c-format
 msgid "Printer \"%s\" is now enabled."
 msgstr "A impressora \"%s\" está agora activada."
 
-#: printer/printerdrake.pm:5146
+#: printer/printerdrake.pm:5273
 #, c-format
 msgid "Printer \"%s\" is now disabled."
 msgstr "A impressora \"%s\" está agora desactivada."
 
-#: printer/printerdrake.pm:5183
+#: printer/printerdrake.pm:5310
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Quer mesmo remover a impressora \"%s\"?"
 
-#: printer/printerdrake.pm:5187
+#: printer/printerdrake.pm:5314
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "A sremover a impressora \"%s\"..."
 
-#: printer/printerdrake.pm:5211
+#: printer/printerdrake.pm:5338
 #, c-format
 msgid "Default printer"
 msgstr "Impressora padrão"
 
-#: printer/printerdrake.pm:5212
+#: printer/printerdrake.pm:5339
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "A impressora \"%s\" é agora a impressora predefinida."
@@ -14679,7 +14799,7 @@ msgstr "A impressora \"%s\" é agora a impressora predefinida."
 msgid "Can not add a partition to _formatted_ RAID %s"
 msgstr "Não foi possível adicionar uma partição ao RAID _formatado_ %s"
 
-#: raid.pm:144
+#: raid.pm:145
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Sem partições suficientes para RAID nível %d\n"
@@ -14697,7 +14817,8 @@ msgstr "Não conseguiu criar a ligação /usr/share/sane/%s!"
 #: scanner.pm:114
 #, c-format
 msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
-msgstr "Não conseguiu copiar o ficheiro de firmware %s para /usr/share/sane/firmware!"
+msgstr ""
+"Não conseguiu copiar o ficheiro de firmware %s para /usr/share/sane/firmware!"
 
 #: scanner.pm:121
 #, c-format
@@ -14716,12 +14837,14 @@ msgstr "Scannerdrake"
 #: scanner.pm:201 standalone/scannerdrake:947
 #, c-format
 msgid "Could not install the packages needed to share your scanner(s)."
-msgstr "Não conseguiu instalar os pacotes precisos para partilhar o seu scanner."
+msgstr ""
+"Não conseguiu instalar os pacotes precisos para partilhar o seu scanner."
 
 #: scanner.pm:202
 #, c-format
 msgid "Your scanner(s) will not be available for non-root users."
-msgstr "O(s) seu(s) scanner(s) não irão estar disponíveis para utilizadores não-root."
+msgstr ""
+"O(s) seu(s) scanner(s) não irão estar disponíveis para utilizadores não-root."
 
 #: security/help.pm:11
 #, c-format
@@ -14927,7 +15050,8 @@ msgstr "Activar/Desactivar a verificação msec todas as horas."
 
 #: security/help.pm:90
 #, c-format
-msgid " Enabling su only from members of the wheel group or allow su from any user."
+msgid ""
+" Enabling su only from members of the wheel group or allow su from any user."
 msgstr ""
 "Activa su só para membros do grupo wheel ou permite su a partir de "
 "qualquerutilizador."
@@ -14955,7 +15079,8 @@ msgstr "Activar/Desactivar sulogin(8) em nível único de utilizador."
 #: security/help.pm:100
 #, c-format
 msgid "Add the name as an exception to the handling of password aging by msec."
-msgstr "Adiciona o nome como uma excepção na gestão da idade da senha por msec."
+msgstr ""
+"Adiciona o nome como uma excepção na gestão da idade da senha por msec."
 
 #: security/help.pm:102
 #, c-format
@@ -14967,7 +15092,8 @@ msgstr ""
 #: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
-msgstr "Define o tamanho do histórico da senha para evitar a reutilização das senhas."
+msgstr ""
+"Define o tamanho do histórico da senha para evitar a reutilização das senhas."
 
 #: security/help.pm:106
 #, c-format
@@ -15024,7 +15150,8 @@ msgstr ""
 #: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
-msgstr "se definido para sim, executa diáriamente as verificações de segurança."
+msgstr ""
+"se definido para sim, executa diáriamente as verificações de segurança."
 
 #: security/help.pm:120
 #, c-format
@@ -15044,7 +15171,8 @@ msgstr "se definido para sim, verifica o checksum dos ficheiros suid/sgid."
 #: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
-msgstr "se definido para sim, verifica as adições/remoções dos ficheiros suid root."
+msgstr ""
+"se definido para sim, verifica as adições/remoções dos ficheiros suid root."
 
 #: security/help.pm:124
 #, c-format
@@ -15065,7 +15193,8 @@ msgstr "se definido para sim, executa os testes chkrootkit."
 
 #: security/help.pm:127
 #, c-format
-msgid "if set, send the mail report to this email address else send it to root."
+msgid ""
+"if set, send the mail report to this email address else send it to root."
 msgstr ""
 "se definido, envia o relatório para este endereço de e-mail, caso contrário "
 "envia para root."
@@ -15073,7 +15202,8 @@ msgstr ""
 #: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
-msgstr "se definido para sim, reporta por e-mail os resultados das verificações."
+msgstr ""
+"se definido para sim, reporta por e-mail os resultados das verificações."
 
 #: security/help.pm:129
 #, c-format
@@ -15088,7 +15218,8 @@ msgstr "se definido para sim, executa alguns testes à base de dados rpm."
 #: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
-msgstr "se definido para sim, reporta para syslog os resultados das verificações."
+msgstr ""
+"se definido para sim, reporta para syslog os resultados das verificações."
 
 #: security/help.pm:132
 #, c-format
@@ -15486,7 +15617,8 @@ msgstr "Use libsafe para servidores"
 
 #: security/level.pm:63
 #, c-format
-msgid "A library which defends against buffer overflow and format string attacks."
+msgid ""
+"A library which defends against buffer overflow and format string attacks."
 msgstr ""
 "Uma livraria que protege contra ataques tipo 'buffer overflow' e 'format "
 "string'"
@@ -15574,7 +15706,8 @@ msgstr ""
 
 #: services.pm:35
 #, c-format
-msgid "Apache is a World Wide Web server. It is used to serve HTML files and CGI."
+msgid ""
+"Apache is a World Wide Web server. It is used to serve HTML files and CGI."
 msgstr ""
 "Apache é um servidor World Wide Web. É usado para servir ficheiros HTML e "
 "CGI."
@@ -15892,7 +16025,7 @@ msgstr ""
 "Não há informação adicional\n"
 "sobre este serviço, lamento."
 
-#: services.pm:224 ugtk2.pm:1010
+#: services.pm:224 ugtk2.pm:1019
 #, c-format
 msgid "Info"
 msgstr "Info"
@@ -15907,46 +16040,46 @@ msgstr "Inicia quando pedido"
 msgid "On boot"
 msgstr "Ao arrancar"
 
-#: services.pm:244
+#: services.pm:244 standalone/drakroam:181
 #, c-format
 msgid "Start"
 msgstr "Iniciar"
 
-#: services.pm:244
+#: services.pm:244 standalone/drakroam:182
 #, c-format
 msgid "Stop"
 msgstr "Parar"
 
 #: share/advertising/01.pl:13
-#, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>O que é o Mandrakelinux?</b>"
+#, fuzzy, c-format
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>O que é o Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
-#, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Bem-vindo ao <b>Mandrakelinux</b>!"
+#, fuzzy, c-format
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Bem-vindo ao <b>Mandriva Linux</b>!"
 
 #: share/advertising/01.pl:17
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Mandrakelinux 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 ""
-"O Mandrakelinux é uma <b>distribuição Linux</b>que abrange o núcleo do "
+"O Mandriva Linux é uma <b>distribuição Linux</b>que abrange o núcleo do "
 "sistema, chamado de<b>sistema operativo</b> (baseado no kernel Linux) junto "
 "com <b>muitas aplicalçoes</b> que vão de encontro a todas as vossas "
 "necessidades."
 
 #: share/advertising/01.pl:19
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Mandrakelinux 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 ""
-"O Mandrakelinux é a distribuição Lunix que hoje é a mais <b>user-friendly</"
+"O Mandriva Linux é a distribuição Lunix que hoje é a mais <b>user-friendly</"
 "b>. É também uma das <b>mais usadas</b> distribuições Linux a nível mundial!"
 
 #: share/advertising/02.pl:13
@@ -15960,17 +16093,17 @@ msgid "Welcome to the <b>world of open source</b>!"
 msgstr "Bemvindo ao <b>mundo do Open Source</b>!"
 
 #: share/advertising/02.pl:17
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"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 ""
-"O Mandrakelinux está comprometido com o modelo open source. Isto significa "
+"O Mandriva Linux está comprometido com o modelo open source. Isto significa "
 "que as novas versões são o resultado da <b>colaboração</b> entre a <b> "
-"Equipa de programadores da Mandrakesoft</b> e a <b>comunidade mundial</b> de "
-"contribuidores Mandrakelinux."
+"Equipa de programadores da Mandriva</b> e a <b>comunidade mundial</b> de "
+"contribuidores Mandriva Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -15987,10 +16120,10 @@ msgid "<b>The GPL</b>"
 msgstr "<b>O GPL</b>"
 
 #: share/advertising/03.pl:15
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"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 ""
 "A maior parte do software incluido na distribuição e todas as ferramentas "
 "Mandraelinux são licensiadas sob a licença <b>GPL</b>."
@@ -16021,44 +16154,44 @@ msgid "<b>Join the Community</b>"
 msgstr "<b>Junte-se à Comunidade</b>"
 
 #: share/advertising/04.pl:15
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Mandrakelinux 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 Mandrakelinux world."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
-"O Mandrakelinux tem uma das <b>maiores comunidades</b> de utilizadores e "
+"O Mandriva Linux tem uma das <b>maiores comunidades</b> de utilizadores e "
 "programadores. O papel de tal comunidade é muito variado, indo desde "
 "comunicar um erro, à programação de novas aplicações. A comunidade "
-"desempenha <b>papel chave</b> no mundo Mandrakelinux."
+"desempenha <b>papel chave</b> no mundo 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 ""
 "Para <b>aprender mais</b> acerca da nossa dinâmica comunidade, por favor "
-"visite <b>www.mandrakelinux.com</b> ou directamente em<b>www. mandrakelinux."
+"visite <b>www.mandrivalinux.com</b> ou directamente em<b>www.mandrivalinux."
 "com/en/cookerdevel.php3</b> se se quiser <b>envolver</b> na programação."
 
-#: share/advertising/05.pl:13
+#: share/advertising/05.pl:15
 #, c-format
 msgid "<b>Download Version</b>"
 msgstr "<b>Versão Download</b>"
 
-#: share/advertising/05.pl:15
-#, c-format
+#: share/advertising/05.pl:17
+#, fuzzy, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Está agora a instalar o <b>Mandrakelinux Download</b>. Esta é a versão livre "
-"que o Mandrakesoft quer manter <b>disponivel para toda a gente</b>."
+"Está agora a instalar o <b>Mandriva Linux Download</b>. Esta é a versão "
+"livre que o Mandriva quer manter <b>disponivel para toda a gente</b>."
 
-#: share/advertising/05.pl:17
+#: share/advertising/05.pl:19
 #, c-format
 msgid ""
 "The Download version <b>cannot include</b> all the software that is not open "
@@ -16067,14 +16200,15 @@ msgstr ""
 "A versão Download <b>não pode incluir</b> todo o software que não é open "
 "source. Portanto, não irá encontrar na versão Download:"
 
-#: share/advertising/05.pl:18
+#: share/advertising/05.pl:20
 #, c-format
-msgid "\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
+msgid ""
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
 msgstr ""
 "\t* <b>Proprietários dos drivers</b> (tal como drivers para NVIDIA®, ATI™, "
 "etc.)."
 
-#: share/advertising/05.pl:19
+#: share/advertising/05.pl:21
 #, c-format
 msgid ""
 "\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
@@ -16083,14 +16217,14 @@ msgstr ""
 "\t* <b>Proprietário do software</b> (tal como Acrobat® Reader®, RealPlayer®, "
 "Flash™, etc.)."
 
-#: share/advertising/05.pl:21
-#, c-format
+#: share/advertising/05.pl:23
+#, fuzzy, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Também não irá ter acesso aos <b>serviçõs incluidos</b> nos outros produtos "
-"Mandrakesoft."
+"Mandriva."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16098,9 +16232,9 @@ msgid "<b>Discovery, Your First Linux Desktop</b>"
 msgstr "<b>Discovery, O Seu Primeiro Linux Desktop</b>"
 
 #: share/advertising/06.pl:15
-#, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Está agora a instalar o <b>Mandrakelinux Discovery</b>."
+#, fuzzy, c-format
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Está agora a instalar o <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16121,20 +16255,19 @@ msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
 msgstr "<b>PowerPack, O Último Linux Desktop</b>"
 
 #: share/advertising/07.pl:15
-#, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Está agora a instalar o <b>Mandrakelinux PowerPack</b>."
+#, fuzzy, c-format
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Está agora a instalar o <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack é o <b>premier</b> Linux desktop da Mandrakesoft. O PowerPack "
-"contém <b>milhares de aplicações</b> tudo desde o mais popular ao mais "
-"avançado."
+"PowerPack é o <b>premier</b> Linux desktop da Mandriva. O PowerPack contém "
+"<b>milhares de aplicações</b> tudo desde o mais popular ao mais avançado."
 
 #: share/advertising/08.pl:13
 #, c-format
@@ -16142,9 +16275,9 @@ msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
 msgstr "<b>PowerPack+, A Solução Linux Desktop e Servidores</b>"
 
 #: share/advertising/08.pl:15
-#, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Está agora a instalar o <b>Mandrakelinux PowerPack+</b>."
+#, fuzzy, c-format
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Está agora a instalar o <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16159,23 +16292,22 @@ msgstr ""
 "compreensiva selecção de classe mundial de <b>aplicações para servidores</b>."
 
 #: share/advertising/09.pl:13
-#, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Produtos Mandrakesoft</b>"
+#, fuzzy, c-format
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Produtos Mandriva</b>"
 
 #: share/advertising/09.pl:15
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
-"products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
-"<b>Mandrakesoft</b> desenvolveu uma grande variedade de produtos "
-"<b>Mandrakelinux</b>."
+"<b>Mandriva</b> desenvolveu uma grande variedade de produtos <b>Mandriva "
+"Linux</b>."
 
 #: share/advertising/09.pl:17
-#, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Os produtos Mandrakelinux são:"
+#, fuzzy, c-format
+msgid "The Mandriva Linux products are:"
+msgstr "Os produtos Mandriva Linux são:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16193,75 +16325,77 @@ msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
 msgstr "\t* <b>PowerPack+</b>, A Solução Linux para Desktops e Servidores."
 
 #: share/advertising/09.pl:21
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux 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>Mandrakelinux para x86-64</b>, A solução Mandrakelinux para tirar "
+"\t* <b>Mandriva Linux para x86-64</b>, A solução Mandriva Linux para tirar "
 "melhor partido do seu processador 64-bit."
 
-#: share/advertising/10.pl:13
-#, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Produtos Mandrakesoft (Produtos Nomad)</b>"
-
 #: share/advertising/10.pl:15
-#, c-format
+#, fuzzy, c-format
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Produtos Mandriva (Produtos Nomad)</b>"
+
+#: share/advertising/10.pl:17
+#, fuzzy, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"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 ""
-"A Mandrakesoft desenvolveu dois produtos que lhe permitem usar o "
-"Mandrakelinux<b>em qualquer computer</b> e sem qualquer necessidade de o "
-"instalar:"
+"A Mandriva desenvolveu dois produtos que lhe permitem usar o Mandriva "
+"Linux<b>em qualquer computer</b> e sem qualquer necessidade de o instalar:"
 
-#: share/advertising/10.pl:16
-#, c-format
+#: share/advertising/10.pl:18
+#, fuzzy, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux 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>, uma distribuição Mandrakelinux que corre inteiramente deCD-"
+"\t* <b>Move</b>, uma distribuição Mandriva Linux que corre inteiramente deCD-"
 "Rom de arranque."
 
-#: share/advertising/10.pl:17
-#, c-format
+#: share/advertising/10.pl:19
+#, fuzzy, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux 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>, uma distribuição Mandrakelinux pre-instalada no seu "
-"ultra-compacto “LaCie Mobile Hard Drive”."
+"\t* <b>GlobeTrotter</b>, uma distribuição Mandriva Linux pre-instalada no "
+"seu ultra-compacto “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
-#, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Produtos Mandrakesoft (Soluções Profissionais)</b>"
+#, fuzzy, c-format
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Produtos Mandriva (Soluções Profissionais)</b>"
 
 #: share/advertising/11.pl:15
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
-"needs</b>:"
+"Below are the Mandriva products designed to meet the <b>professional needs</"
+"b>:"
 msgstr ""
-"Em baixo estão os produtos Mandrakesoft feitos para ir de encontro às suas "
+"Em baixo estão os produtos Mandriva feitos para ir de encontro às suas "
 "<b>necessidades profissionais</b>:"
 
 #: share/advertising/11.pl:16
-#, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, O Desktop Mandrakelinux para Negócios."
+#, fuzzy, c-format
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, O Desktop Mandriva Linux para Negócios."
 
 #: share/advertising/11.pl:17
-#, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, A Solução Mandrakelinux para Servidores."
+#, fuzzy, c-format
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, A Solução Mandriva Linux para Servidores."
 
 #: share/advertising/11.pl:18
-#, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b>, A Solução Mandrakelinux de Segurança."
+#, fuzzy, c-format
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr ""
+"\t* <b>Multi-Network Firewall</b>, A Solução Mandriva Linux de Segurança."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16301,13 +16435,13 @@ msgid "<b>Choose your Favorite Desktop Environment</b>"
 msgstr "<b>Escolha o seu Ambiente de Trabalho Gráfico Favorito</b>"
 
 #: share/advertising/13-a.pl:15
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Com o PowerPack, irá ter a escolha do <b>ambiente de trabalho gráfico</b>. A "
-"Mandrakesoft escolheu o <b>KDE</b> como ambiente padrão."
+"Mandriva escolheu o <b>KDE</b> como ambiente padrão."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16328,25 +16462,25 @@ msgstr ""
 "b>, <b>IceWM</b>, etc.) e escolha o seu favorito."
 
 #: share/advertising/13-b.pl:15
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Com o PowerPack+ irá ter a escolher de um <b>ambiente de trabalho gráfico</"
-"b>. A Mandrakesoft escolheu o <b>KDE</b> como ambiente padrão."
+"b>. A Mandriva escolheu o <b>KDE</b> como ambiente padrão."
 
-#: share/advertising/14.pl:13
+#: share/advertising/14.pl:15
 #, c-format
 msgid "<b>OpenOffice.org</b>"
 msgstr "<b>OpenOffice.org</b>"
 
-#: share/advertising/14.pl:15
+#: share/advertising/14.pl:17
 #, c-format
 msgid "With Discovery, you will discover <b>OpenOffice.org</b>."
 msgstr "Com o Discovery, irá descobrir o <b>OpenOffice.org</b>."
 
-#: share/advertising/14.pl:17
+#: share/advertising/14.pl:19
 #, c-format
 msgid ""
 "It is a <b>full-featured office suite</b> that includes word processor, "
@@ -16355,7 +16489,7 @@ msgstr ""
 "É um <b>pacote office completo</b> que contém um processador word, folha de "
 "cálculo,apresentação e aplicações de desenho."
 
-#: share/advertising/14.pl:19
+#: share/advertising/14.pl:21
 #, c-format
 msgid ""
 "OpenOffice.org can read and write most types of <b>Microsoft® Office</b> "
@@ -16371,8 +16505,10 @@ msgstr "<b>Kontact</b>"
 
 #: share/advertising/15.pl:15
 #, c-format
-msgid "Discovery includes <b>Kontact</b>, the new KDE <b>groupware solution</b>."
-msgstr "O Discovery contém <b>Kontact</b>, o novo <b>grupo de soluções</b> KDE."
+msgid ""
+"Discovery includes <b>Kontact</b>, the new KDE <b>groupware solution</b>."
+msgstr ""
+"O Discovery contém <b>Kontact</b>, o novo <b>grupo de soluções</b> KDE."
 
 #: share/advertising/15.pl:17
 #, c-format
@@ -16456,18 +16592,19 @@ msgid "<b>Enjoy the Wide Range of Applications</b>"
 msgstr "<b>Aprecie o Grande Número de Aplicações Disponiveis</b>"
 
 #: share/advertising/18.pl:15
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"In the Mandrakelinux 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 ""
-"No menu Mandrakelinux irá encontrar aplicações <b>fáceis de usar</b>para "
+"No menu Mandriva Linux irá encontrar aplicações <b>fáceis de usar</b>para "
 "todas as suas tarefas:"
 
 #: share/advertising/18.pl:16
 #, c-format
 msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
-msgstr "\t* Crie, edite e partilhe documentos office com o <b>OpenOffice.org</b>"
+msgstr ""
+"\t* Crie, edite e partilhe documentos office com o <b>OpenOffice.org</b>"
 
 #: share/advertising/18.pl:17
 #, c-format
@@ -16507,9 +16644,10 @@ msgstr "\t* Edite e crie imagens com o <b>Gimp</b>."
 msgid "<b>Development Environments</b>"
 msgstr "<b>Ambientes de Programação</b>"
 
-#: share/advertising/19.pl:15 share/advertising/22.pl:15
+#: share/advertising/19.pl:15 share/advertising/22.pl:17
 #, c-format
-msgid "PowerPack gives you the best tools to <b>develop</b> your own applications."
+msgid ""
+"PowerPack gives you the best tools to <b>develop</b> your own applications."
 msgstr ""
 "O PowerPack dá-lhe as melhores ferramentas para <b>desenvolver</b> as suas "
 "aplicações."
@@ -16558,15 +16696,17 @@ msgstr ""
 
 #: share/advertising/20.pl:18
 #, c-format
-msgid "\t* <b>Vim</b>: an advanced text editor with more features than standard Vi."
-msgstr "\t* <b>Vim</b>: um editor de texto avançado com mais funções que o Vi padrão."
+msgid ""
+"\t* <b>Vim</b>: an advanced text editor with more features than standard Vi."
+msgstr ""
+"\t* <b>Vim</b>: um editor de texto avançado com mais funções que o Vi padrão."
 
-#: share/advertising/21.pl:13
+#: share/advertising/21.pl:15
 #, c-format
 msgid "<b>Development Languages</b>"
 msgstr "<b>Linguagens de Programação</b>"
 
-#: share/advertising/21.pl:15
+#: share/advertising/21.pl:17
 #, c-format
 msgid ""
 "With all these <b>powerful tools</b>, you will be able to write applications "
@@ -16575,52 +16715,52 @@ msgstr ""
 "Com todas estas <b>ferramentas poderosas</b>, será capaz de escrever "
 "aplicações em <b>dezenas de linguagens de programação</b>:"
 
-#: share/advertising/21.pl:16
+#: share/advertising/21.pl:18
 #, c-format
 msgid "\t* The famous <b>C language</b>."
 msgstr "\t* A famosa <b>Linguagem C</b>."
 
-#: share/advertising/21.pl:17
+#: share/advertising/21.pl:19
 #, c-format
 msgid "\t* Object oriented languages:"
 msgstr "\t* Objectivos das linguagens:"
 
-#: share/advertising/21.pl:18
+#: share/advertising/21.pl:20
 #, c-format
 msgid "\t\t* <b>C++</b>"
 msgstr "\t\t* <b>C++</b>"
 
-#: share/advertising/21.pl:19
+#: share/advertising/21.pl:21
 #, c-format
 msgid "\t\t* <b>Java™</b>"
 msgstr "\t\t* <b>Java™</b>"
 
-#: share/advertising/21.pl:20
+#: share/advertising/21.pl:22
 #, c-format
 msgid "\t* Scripting languages:"
 msgstr "\t* Linguagens (Script):"
 
-#: share/advertising/21.pl:21
+#: share/advertising/21.pl:23
 #, c-format
 msgid "\t\t* <b>Perl</b>"
 msgstr "\t\t* <b>Perl</b>"
 
-#: share/advertising/21.pl:22
+#: share/advertising/21.pl:24
 #, c-format
 msgid "\t\t* <b>Python</b>"
 msgstr "\t\t* <b>Python</b>"
 
-#: share/advertising/21.pl:23 share/advertising/28.pl:22
+#: share/advertising/21.pl:25 share/advertising/28.pl:24
 #, c-format
 msgid "\t* And many more."
 msgstr "\t* E muitas mais."
 
-#: share/advertising/22.pl:13
+#: share/advertising/22.pl:15
 #, c-format
 msgid "<b>Development Tools</b>"
 msgstr "<b>Ferramentas de Programação</b>"
 
-#: share/advertising/22.pl:17
+#: share/advertising/22.pl:19
 #, c-format
 msgid ""
 "With the powerful integrated development environment <b>KDevelop</b> and the "
@@ -16654,38 +16794,41 @@ msgstr "\t* Envia e recebe os seus <b>e-mails</b>."
 #: share/advertising/23.pl:17
 #, c-format
 msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
-msgstr "\t* Partilha as suas <b>agendas</b> e os seus <b>livros de endereços</b>."
+msgstr ""
+"\t* Partilha as suas <b>agendas</b> e os seus <b>livros de endereços</b>."
 
 #: share/advertising/23.pl:18
 #, c-format
 msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
 msgstr "\t* Gere os seus <b>memos</b> e a sua <b>lista de tarefas</b>."
 
-#: share/advertising/24.pl:13
+#: share/advertising/24.pl:15
 #, c-format
 msgid "<b>Servers</b>"
 msgstr "<b>Servidores</b>"
 
-#: share/advertising/24.pl:15
+#: share/advertising/24.pl:17
 #, c-format
-msgid "Empower your business network with <b>premier server solutions</b> including:"
+msgid ""
+"Empower your business network with <b>premier server solutions</b> including:"
 msgstr ""
 "Enriqueça a rede da sua empresa através de <b>soluções premier de servidor</"
 "b> incluindo:"
 
-#: share/advertising/24.pl:16
+#: share/advertising/24.pl:18
 #, c-format
-msgid "\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
+msgid ""
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
 msgstr ""
 "\t* <b>Samba</b>: Serviços de ficheiros e impressão para clientes Microsoft® "
 "Windows®."
 
-#: share/advertising/24.pl:17
+#: share/advertising/24.pl:19
 #, c-format
 msgid "\t* <b>Apache</b>: The most widely used web server."
 msgstr "\t* <b>Apache</b>: O servidor Web mais usado mundialmente."
 
-#: share/advertising/24.pl:18
+#: share/advertising/24.pl:20
 #, c-format
 msgid ""
 "\t* <b>MySQL</b> and <b>PostgreSQL</b>: The world's most popular open source "
@@ -16694,7 +16837,7 @@ msgstr ""
 "\t- <b>MySQL</b> e <b>PostgreSQL</b>: As bases de dados Open Source mais "
 "populares a nível mundial."
 
-#: share/advertising/24.pl:19
+#: share/advertising/24.pl:21
 #, c-format
 msgid ""
 "\t* <b>CVS</b>: Concurrent Versions System, the dominant open source network-"
@@ -16703,14 +16846,15 @@ msgstr ""
 "\t* <b>CVS</b>: Versões de Sistema Concorrentes, o sistema dominante Open "
 "Source e de rede para controlo de versões de sistema."
 
-#: share/advertising/24.pl:20
+#: share/advertising/24.pl:22
 #, c-format
-msgid "\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
+msgid ""
+"\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
 msgstr ""
 "\t* <b>ProFTPD</b>: o servidor FTP altamente configurável e com licença GPL "
 "para software de servidores FTP."
 
-#: share/advertising/24.pl:21
+#: share/advertising/24.pl:23
 #, c-format
 msgid ""
 "\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
@@ -16720,19 +16864,19 @@ msgstr ""
 "mail."
 
 #: share/advertising/25.pl:13
-#, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Centro de Controlo Mandrakelinux</b>"
+#, fuzzy, c-format
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Centro de Controlo Mandriva Linux</b>"
 
 #: share/advertising/25.pl:15
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"O <b>Centro de Controlo Mandrakelinux</b> é uma colecção essencial de  "
-"utilidades específicas do Mandrakelinux para que simplificar a configuração "
+"O <b>Centro de Controlo Mandriva Linux</b> é uma colecção essencial de  "
+"utilidades específicas do Mandriva Linux para que simplificar a configuração "
 "do seu computador."
 
 #: share/advertising/25.pl:17
@@ -16753,20 +16897,20 @@ msgid "<b>The Open Source Model</b>"
 msgstr "<b>O Modelo Open Source</b>"
 
 #: share/advertising/26.pl:15
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"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 ""
 "Como todos os programas de computador, o software open source <b>requer "
 "tempo e pessoas</b> para programação. Para respeitar a filosofia open "
-"source, as vendas da Mandrakesoft adicionaram valiosos produtos e serviços "
-"para <b>continuar a melhorar o Mandrakelinux</b>. Se quer dar <b>suporte à "
-"filosofia open source</b> e programação do Mandrakelinux, <b>por favor</b> "
+"source, as vendas da Mandriva adicionaram valiosos produtos e serviços para "
+"<b>continuar a melhorar o Mandriva Linux</b>. Se quer dar <b>suporte à "
+"filosofia open source</b> e programação do Mandriva Linux, <b>por favor</b> "
 "considere comprar um dos nossos produtos ou serviços!"
 
 #: share/advertising/27.pl:13
@@ -16775,13 +16919,13 @@ msgid "<b>Online Store</b>"
 msgstr "<b>Loja Online</b>"
 
 #: share/advertising/27.pl:15
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"To learn more about Mandrakesoft 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 ""
-"Para aprender mais acerca dos produtos e serviços Mandrakesoft, pode visitar "
-"a nossa <b>plataforma comercial</b>."
+"Para aprender mais acerca dos produtos e serviços Mandriva, pode visitar a "
+"nossa <b>plataforma comercial</b>."
 
 #: share/advertising/27.pl:17
 #, c-format
@@ -16799,40 +16943,41 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Pare por hoje em <b>store.mandrakesoft.com</b>!"
-
-#: share/advertising/28.pl:13
-#, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Pare por hoje em <b>store.mandriva.com</b>!"
 
 #: share/advertising/28.pl:15
-#, c-format
+#, fuzzy, c-format
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
+
+#: share/advertising/28.pl:17
+#, fuzzy, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> é a <b>companhia perfeita</b> para o seu produto "
-"Mandrakelinux."
+"<b>Mandriva Club</b> é a <b>companhia perfeita</b> para o seu produto "
+"Mandriva Linux."
 
-#: share/advertising/28.pl:17
-#, c-format
-msgid "Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+#: share/advertising/28.pl:19
+#, fuzzy, c-format
+msgid ""
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Tire proveito de <b>valiosos benefícios</b>, juntando-se ao Mandrakeclub, "
+"Tire proveito de <b>valiosos benefícios</b>, juntando-se ao Mandriva club, "
 "tais como:"
 
-#: share/advertising/28.pl:18
+#: 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>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 "\t* <b>Descontos especiais</b> em produtos e serviços da nossa loja online "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 
-#: share/advertising/28.pl:19
+#: share/advertising/28.pl:21
 #, c-format
 msgid ""
 "\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
@@ -16841,42 +16986,42 @@ msgstr ""
 "\t* Aceda a <b>aplicações coomerciais</b> (por exemplo para drivers NVIDIA® "
 "ou ATI™)."
 
-#: share/advertising/28.pl:20
-#, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Participação em <b>foruns para utilizadores</b> Mandrakelinuxe."
+#: share/advertising/28.pl:22
+#, fuzzy, c-format
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Participação em <b>foruns para utilizadores</b> Mandriva Linuxe."
 
-#: share/advertising/28.pl:21
-#, c-format
+#: share/advertising/28.pl:23
+#, fuzzy, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Acesso em primeira mão e priviligeado, antes da saída pública das "
-"<b>imagens ISO</b> Mandrakelinux."
+"<b>imagens ISO</b> Mandriva Linux."
 
 #: share/advertising/29.pl:13
-#, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+#, fuzzy, c-format
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> é um novo serviço premium que a Mandrakesoft está "
+"<b>Mandriva Online</b> é um novo serviço premium que a Mandriva está "
 "orgulhosa de apresentar aos seus clientes!"
 
 #: share/advertising/29.pl:17
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
-"A Mandrakeonline fornece uma grande variadade de valiosos serviçõs para "
-"<b>fácilmente actuaçizar</b> os seus sistemas Mandrakelinux."
+"A Mandriva Online fornece uma grande variadade de valiosos serviçõs para "
+"<b>fácilmente actuaçizar</b> os seus sistemas Mandriva Linux."
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16900,41 +17045,43 @@ msgid "\t* Flexible <b>scheduled</b> updates."
 msgstr "\t* Actualizações flexiveis e <b>programadas</b>."
 
 #: share/advertising/29.pl:21
-#, c-format
-msgid "\t* Management of <b>all your Mandrakelinux systems</b> with one account."
-msgstr "\t* Gerenciamento de <b>todo o seu sistema Mandrakelinux</b> com uma conta."
+#, fuzzy, c-format
+msgid ""
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
+msgstr ""
+"\t* Gerenciamento de <b>todo o seu sistema Mandriva Linux</b> com uma conta."
 
 #: share/advertising/30.pl:13
-#, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+#, fuzzy, c-format
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
-"Requer <b>assitência?</b> Conheça os tecnicos da Mandrakesoft peritos no "
-"suporte tecnico da nossa plataforma</b> www.mandrakeexpert.com."
+"Requer <b>assitência?</b> Conheça os tecnicos da Mandriva peritos no suporte "
+"tecnico da nossa plataforma</b> www.mandrivaexpert.com."
 
 #: share/advertising/30.pl:17
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Obirgado pela ajuda dos <b>peritos qualificados Mandrakelinux</b>, irá "
+"Obirgado pela ajuda dos <b>peritos qualificados Mandriva Linux</b>, irá "
 "poupar muito tempo."
 
 #: share/advertising/30.pl:19
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"For any question related to Mandrakelinux, 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 ""
-"Para qualquer questão relacionada com o Mandrakelinux, tem a possibilidade "
-"de comprar suporte para os incidentes em <b>store.mandrakesoft.com</b>."
+"Para qualquer questão relacionada com o Mandriva Linux, tem a possibilidade "
+"de comprar suporte para os incidentes em <b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17021,7 +17168,8 @@ msgstr "Ferramentas de Consola"
 #: share/compssUsers.pl:60
 #, c-format
 msgid "Editors, shells, file tools, terminals"
-msgstr "Editores, Linha de Comandos (shell), ferramentas de ficheiros, terminais"
+msgstr ""
+"Editores, Linha de Comandos (shell), ferramentas de ficheiros, terminais"
 
 #: share/compssUsers.pl:65 share/compssUsers.pl:165
 #, c-format
@@ -17229,12 +17377,13 @@ msgstr "Utilidades da Rede/Monitarização"
 #: share/compssUsers.pl:192
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
-msgstr "Ferramentas de monitorização, contagem de processos, tcpdump, nmap, ..."
+msgstr ""
+"Ferramentas de monitorização, contagem de processos, tcpdump, nmap, ..."
 
 #: share/compssUsers.pl:196
-#, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Assistentes MandrakeSoft"
+#, fuzzy, c-format
+msgid "Mandriva Wizards"
+msgstr "Assistentes Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17321,15 +17470,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 ""
 "[OPÇOES] [NOME_DO_PROGRAMA]\n"
 "\n"
 "OPÇOES:\n"
 "  --help            - mostra esta mensagem de ajuda.\n"
-"  --report          - o programa deve ser um das ferramentas mandrakelinux\n"
-"  --incident        - o programa deve ser um das ferramentas mandrakelinux"
+"  --report          - o programa deve ser um das ferramentas Mandriva Linux\n"
+"  --incident        - o programa deve ser um das ferramentas Mandriva Linux"
 
 #: standalone.pm:63
 #, c-format
@@ -17381,10 +17530,10 @@ msgstr ""
 "                 : e gs para ghostscript apenas para esta."
 
 #: standalone.pm:84
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17398,7 +17547,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPÇÕES]...\n"
-"Configurador do Servidor de Terminais Mandrakelinux\n"
+"Configurador do Servidor de Terminais Mandriva Linux\n"
 "--enable         : activa o STM\n"
 "--disable        : desactiva o STM\n"
 "--start          : inicia o STM\n"
@@ -17420,7 +17569,8 @@ msgstr "[teclado]"
 #: standalone.pm:97
 #, c-format
 msgid "[--file=myfile] [--word=myword] [--explain=regexp] [--alert]"
-msgstr "[--file=meuficheiro] [--word=minhapalavra] [--explain=regexp] [--alert]"
+msgstr ""
+"[--file=meuficheiro] [--word=minhapalavra] [--explain=regexp] [--alert]"
 
 #: standalone.pm:98
 #, c-format
@@ -17451,19 +17601,19 @@ msgid " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 
 #: standalone.pm:108
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"  --no-confirmation      do not ask first confirmation question in Mandriva "
+"Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPÇÃO]...\n"
-"  --no-confirmation      não pede pela primeira confirmação em modo "
-"MandrakeUpdate\n"
+"  --no-confirmation      não pede pela primeira confirmação em modo Mandriva "
+"Update\n"
 "  --no-verify-rpm        não verifica as assinaturas dos pacotes\n"
 "  --changelog-first      mostra o registo das mudanças antes da lista dos "
 "ficheiros na janela de descrições\n"
@@ -17490,7 +17640,7 @@ msgstr ""
 "       XFdrake [--noauto] ecrã \n"
 "       XFdrake resolução"
 
-#: standalone.pm:133
+#: standalone.pm:146
 #, c-format
 msgid ""
 "\n"
@@ -17498,8 +17648,8 @@ msgid ""
 "testing] [-v|--version] "
 msgstr ""
 "\n"
-"Uso: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
-"testing] [-v|--version] "
+"Uso: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] "
+"[-v|--version] "
 
 #: standalone/XFdrake:61
 #, c-format
@@ -17688,8 +17838,8 @@ msgstr ""
 msgid "Creating net boot images for all kernels"
 msgstr "A criar novas imagens de arranque para todos os kernels"
 
-#: standalone/drakTermServ:445 standalone/drakTermServ:747
-#: standalone/drakTermServ:764
+#: standalone/drakTermServ:445 standalone/drakTermServ:740
+#: standalone/drakTermServ:757
 #, c-format
 msgid "This will take a few minutes."
 msgstr "Isto irá levar alguns minutos."
@@ -17829,8 +17979,8 @@ msgstr ""
 "\t\t\tfuncionalidade de configuração específica por cliente que o ClusterNFS "
 "fornece.\n"
 "\t\t\t\n"
-"\t\t\tNota: A entrada \"#type\" é apenas usada por drakTermServ. Os "
-"clientes podem ser \"thin\"\n"
+"\t\t\tNota: A entrada \"#type\" é apenas usada por drakTermServ. Os clientes "
+"podem ser \"thin\"\n"
 "\t\t\tou 'fat'.  Os clientes Thin correm a maioria do software no servidor "
 "por XDMCP, enquanto os \n"
 "\t\t\tclientes Fat correm a maior parte do software na maquina cliente. Um "
@@ -18051,57 +18201,57 @@ msgstr "ISO de Arranque"
 msgid "PXE Image"
 msgstr "Imagem PXE"
 
-#: standalone/drakTermServ:712
+#: standalone/drakTermServ:705
 #, c-format
 msgid "Default kernel version"
 msgstr "Versão predefinida do kernel"
 
-#: standalone/drakTermServ:715
+#: standalone/drakTermServ:708
 #, c-format
 msgid "Create PXE images."
 msgstr "Criar imagens PXE."
 
-#: standalone/drakTermServ:745
+#: standalone/drakTermServ:738
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "Compilar todo o kernel -->"
 
-#: standalone/drakTermServ:753
+#: standalone/drakTermServ:746
 #, c-format
 msgid "No kernel selected!"
 msgstr "Nenhum kernel seleccionado !"
 
-#: standalone/drakTermServ:756
+#: standalone/drakTermServ:749
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "Compilar um só NIC -->"
 
-#: standalone/drakTermServ:760
+#: standalone/drakTermServ:753
 #, c-format
 msgid "No NIC selected!"
 msgstr "Nenhum NIC seleccionado!"
 
-#: standalone/drakTermServ:763
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "Compilar Todos os Kernels -->"
 
-#: standalone/drakTermServ:774
+#: standalone/drakTermServ:767
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Apagar"
 
-#: standalone/drakTermServ:779
+#: standalone/drakTermServ:772
 #, c-format
 msgid "No image selected!"
 msgstr "Nenhuma imagem seleccionada!"
 
-#: standalone/drakTermServ:782
+#: standalone/drakTermServ:775
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Apagar todos os NBIs"
 
-#: standalone/drakTermServ:908
+#: standalone/drakTermServ:901
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -18113,27 +18263,27 @@ msgstr ""
 "Apague/re-adicione o utilizador para o Servidor de Terminais\n"
 "para permitir a login/inicio de sessão."
 
-#: standalone/drakTermServ:913
+#: standalone/drakTermServ:906
 #, c-format
 msgid "Add User -->"
 msgstr "Adicionar utilizador -->"
 
-#: standalone/drakTermServ:919
+#: standalone/drakTermServ:912
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Apagar Utilizador"
 
-#: standalone/drakTermServ:955
+#: standalone/drakTermServ:948
 #, c-format
 msgid "type: %s"
 msgstr "tipo: %s"
 
-#: standalone/drakTermServ:959
+#: standalone/drakTermServ:952
 #, c-format
 msgid "local config: %s"
 msgstr "configuração local: %s"
 
-#: standalone/drakTermServ:989
+#: standalone/drakTermServ:982
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -18142,22 +18292,22 @@ msgstr ""
 "Permitir a configuração\n"
 "local do hardware."
 
-#: standalone/drakTermServ:998
+#: standalone/drakTermServ:991
 #, c-format
 msgid "No net boot images created!"
 msgstr "Nenhuma imagem de arranque na rede criada!"
 
-#: standalone/drakTermServ:1017
+#: standalone/drakTermServ:1010
 #, c-format
 msgid "Thin Client"
 msgstr "Cliente Magro(thin)"
 
-#: standalone/drakTermServ:1021
+#: standalone/drakTermServ:1014
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "Permitir Clientes Magros(thin)"
 
-#: standalone/drakTermServ:1022
+#: standalone/drakTermServ:1015
 #, c-format
 msgid ""
 "Sync client X keyboard\n"
@@ -18166,52 +18316,52 @@ msgstr ""
 "Sincronizar as definições\n"
 " do teclado do cliente X com o servidor."
 
-#: standalone/drakTermServ:1023
+#: standalone/drakTermServ:1016
 #, c-format
 msgid "Add Client -->"
 msgstr "Adicionar Cliente -->"
 
-#: standalone/drakTermServ:1037
+#: standalone/drakTermServ:1030
 #, c-format
 msgid "type: fat"
 msgstr "tipo: fat"
 
-#: standalone/drakTermServ:1038
+#: standalone/drakTermServ:1031
 #, c-format
 msgid "type: thin"
 msgstr "tipo: magro(thin)"
 
-#: standalone/drakTermServ:1045
+#: standalone/drakTermServ:1038
 #, c-format
 msgid "local config: false"
 msgstr "configuração local: falso"
 
-#: standalone/drakTermServ:1046
+#: standalone/drakTermServ:1039
 #, c-format
 msgid "local config: true"
 msgstr "configuração local: verdadeiro"
 
-#: standalone/drakTermServ:1054
+#: standalone/drakTermServ:1047
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Editar Cliente"
 
-#: standalone/drakTermServ:1080
+#: standalone/drakTermServ:1073
 #, c-format
 msgid "Disable Local Config"
 msgstr "Desactivar Configuração Local"
 
-#: standalone/drakTermServ:1087
+#: standalone/drakTermServ:1080
 #, c-format
 msgid "Delete Client"
 msgstr "Apagar Cliente"
 
-#: standalone/drakTermServ:1096
+#: standalone/drakTermServ:1089
 #, c-format
 msgid "dhcpd Config..."
 msgstr "Configuração dhcpd..."
 
-#: standalone/drakTermServ:1111
+#: standalone/drakTermServ:1104
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -18220,77 +18370,78 @@ msgstr ""
 "É preciso reiniciar o Gestor de Sessões para tomar em conta as mudanças. \n"
 "(service dm restart - na linha de comando)"
 
-#: standalone/drakTermServ:1156
+#: standalone/drakTermServ:1149
 #, c-format
 msgid "Thin clients will not work with autologin. Disable autologin?"
-msgstr "Os clientes thin não irão funcionar com o autologin. Desactivar autologin?"
+msgstr ""
+"Os clientes thin não irão funcionar com o autologin. Desactivar autologin?"
 
-#: standalone/drakTermServ:1172
+#: standalone/drakTermServ:1165
 #, c-format
 msgid "All clients will use %s"
 msgstr "Todos os clientes irão usar %s"
 
-#: standalone/drakTermServ:1204
+#: standalone/drakTermServ:1197
 #, c-format
 msgid "Subnet:"
 msgstr "Subnet:"
 
-#: standalone/drakTermServ:1211
+#: standalone/drakTermServ:1204
 #, c-format
 msgid "Netmask:"
 msgstr "Netmask:"
 
-#: standalone/drakTermServ:1218
+#: standalone/drakTermServ:1211
 #, c-format
 msgid "Routers:"
 msgstr "Routers:"
 
-#: standalone/drakTermServ:1225
+#: standalone/drakTermServ:1218
 #, c-format
 msgid "Subnet Mask:"
 msgstr "Máscara de Subnet"
 
-#: standalone/drakTermServ:1232
+#: standalone/drakTermServ:1225
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Endereço de Transmissão:"
 
-#: standalone/drakTermServ:1239
+#: standalone/drakTermServ:1232
 #, c-format
 msgid "Domain Name:"
 msgstr "Nome do domínio:"
 
-#: standalone/drakTermServ:1247
+#: standalone/drakTermServ:1240
 #, c-format
 msgid "Name Servers:"
 msgstr "Servidores de Nomes:"
 
-#: standalone/drakTermServ:1258
+#: standalone/drakTermServ:1251
 #, c-format
 msgid "IP Range Start:"
 msgstr "Inicio da extensão IP:"
 
-#: standalone/drakTermServ:1259
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "IP Range End:"
 msgstr "Fim da extensão IP:"
 
-#: standalone/drakTermServ:1301
+#: standalone/drakTermServ:1294
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr "Anexar TS Includes à Configuração Existente"
 
-#: standalone/drakTermServ:1303
+#: standalone/drakTermServ:1296
 #, c-format
 msgid "Write Config"
 msgstr "Escrever Configuração"
 
-#: standalone/drakTermServ:1319
+#: standalone/drakTermServ:1312
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "Configuração do Servidor dhcpd"
 
-#: standalone/drakTermServ:1320
+#: standalone/drakTermServ:1313
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -18301,97 +18452,98 @@ msgstr ""
 "do seu sistema actual.\n"
 "Pode modifica-los conforme necessário."
 
-#: standalone/drakTermServ:1323
+#: standalone/drakTermServ:1316
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "Combinação de Endereço IP Dinâmico:"
 
-#: standalone/drakTermServ:1474
+#: standalone/drakTermServ:1463
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Por favor, insira uma disquete:"
 
-#: standalone/drakTermServ:1478
+#: standalone/drakTermServ:1467
 #, c-format
 msgid "Could not access the floppy!"
 msgstr "Não consegui aceder à disquete !"
 
-#: standalone/drakTermServ:1480
+#: standalone/drakTermServ:1469
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "A disquete pode ser removida agora"
 
-#: standalone/drakTermServ:1483
+#: standalone/drakTermServ:1472
 #, c-format
 msgid "No floppy drive available!"
 msgstr "Nenhum drive de disquete disponível !"
 
-#: standalone/drakTermServ:1488
+#: standalone/drakTermServ:1477
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr "A imagem PXE é %s/%s"
 
-#: standalone/drakTermServ:1490
+#: standalone/drakTermServ:1479
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "Erro ao escrever %s/%s"
 
-#: standalone/drakTermServ:1500
+#: standalone/drakTermServ:1489
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "A imagem ISO Etherboot é %s"
 
-#: standalone/drakTermServ:1502
+#: standalone/drakTermServ:1491
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "Algo correu mal! - Os mkisofs estão instalados?"
 
-#: standalone/drakTermServ:1523
+#: standalone/drakTermServ:1512
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "É preciso criar primeiro /etc/dhcpd.conf"
 
-#: standalone/drakTermServ:1683
+#: standalone/drakTermServ:1672
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr "má passwd %s no Servidor de Terminal - reescrever...\n"
 
-#: standalone/drakTermServ:1696
+#: standalone/drakTermServ:1685
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "%s não é um utilizador..\n"
 
-#: standalone/drakTermServ:1697
+#: standalone/drakTermServ:1686
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s é já um utilizador do Servidor de Terminal\n"
 
-#: standalone/drakTermServ:1699
+#: standalone/drakTermServ:1688
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr "A adição de %s ao Servidor de Terminal falhou!\n"
 
-#: standalone/drakTermServ:1701
+#: standalone/drakTermServ:1690
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "%s foi adicionado ao Servidor de Terminal\n"
 
-#: standalone/drakTermServ:1718
+#: standalone/drakTermServ:1707
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "%s apagado...\n"
 
-#: standalone/drakTermServ:1720 standalone/drakTermServ:1793
+#: standalone/drakTermServ:1709 standalone/drakTermServ:1782
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s não encontrado...\n"
 
-#: standalone/drakTermServ:1821
+#: standalone/drakTermServ:1810
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
-msgstr "/etc/hosts.allow e /etc/hosts.deny já estão configurados - não alterados"
+msgstr ""
+"/etc/hosts.allow e /etc/hosts.deny já estão configurados - não alterados"
 
-#: standalone/drakTermServ:1961
+#: standalone/drakTermServ:1950
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "A configuração mudou - reiniciar clusternfs/dhcpd?"
@@ -18665,7 +18817,8 @@ msgstr ""
 #: standalone/drakbackup:475
 #, c-format
 msgid "Valid user list changed, rewriting config file."
-msgstr "A lista dos utilizadores válidos mudou, reescreva o ficheiro de configuração."
+msgstr ""
+"A lista dos utilizadores válidos mudou, reescreva o ficheiro de configuração."
 
 #: standalone/drakbackup:477
 #, c-format
@@ -18819,7 +18972,7 @@ msgstr "Problema de permissões ao aceder o CD."
 msgid "No tape in %s!"
 msgstr "Nenhuma cassete em %s!"
 
-#: standalone/drakbackup:965
+#: standalone/drakbackup:964
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
@@ -18828,37 +18981,37 @@ msgstr ""
 "Quota de backup excedido!\n"
 "%d MB utilizados em %d MB permitidos."
 
-#: standalone/drakbackup:984 standalone/drakbackup:1017
+#: standalone/drakbackup:983 standalone/drakbackup:1016
 #, c-format
 msgid "Backup system files..."
 msgstr "Cópia de segurança dos ficheiros do sistema..."
 
-#: standalone/drakbackup:1018 standalone/drakbackup:1059
+#: standalone/drakbackup:1017 standalone/drakbackup:1058
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "Cópia de segurança dos ficheiros do disco rígido..."
 
-#: standalone/drakbackup:1058
+#: standalone/drakbackup:1057
 #, c-format
 msgid "Backup User files..."
 msgstr "Cópia de segurança dos ficheiros do utilizador..."
 
-#: standalone/drakbackup:1093
+#: standalone/drakbackup:1092
 #, c-format
 msgid "Backup Other files..."
 msgstr "Cópia de segurança de outros ficheiros..."
 
-#: standalone/drakbackup:1094
+#: standalone/drakbackup:1093
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "Cópia de segunrança do disco em progresso..."
 
-#: standalone/drakbackup:1099
+#: standalone/drakbackup:1098
 #, c-format
 msgid "No changes to backup!"
 msgstr "Nenhuma alteração para backup!"
 
-#: standalone/drakbackup:1117 standalone/drakbackup:1141
+#: standalone/drakbackup:1116 standalone/drakbackup:1140
 #, c-format
 msgid ""
 "\n"
@@ -18869,7 +19022,7 @@ msgstr ""
 "Actividades do Drakbackup via %s:\n"
 "\n"
 
-#: standalone/drakbackup:1126
+#: standalone/drakbackup:1125
 #, c-format
 msgid ""
 "\n"
@@ -18880,19 +19033,20 @@ msgstr ""
 " Problema na conexão FTP : Não foi possível enviar o seus ficheiros backup "
 "por FTP.\n"
 
-#: standalone/drakbackup:1127
+#: standalone/drakbackup:1126
 #, c-format
-msgid "Error during sending file via FTP. Please correct your FTP configuration."
+msgid ""
+"Error during sending file via FTP. Please correct your FTP configuration."
 msgstr ""
 "Erro ao enviar os ficheiros por FTP. Por favor corrija a sua configuração "
 "FTP."
 
-#: standalone/drakbackup:1129
+#: standalone/drakbackup:1128
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr "lista dos ficheiros enviada por FTP: %s\n"
 
-#: standalone/drakbackup:1146
+#: standalone/drakbackup:1145
 #, c-format
 msgid ""
 "\n"
@@ -18903,7 +19057,7 @@ msgstr ""
 "Actividades Drakbackup via CD:\n"
 "\n"
 
-#: standalone/drakbackup:1151
+#: standalone/drakbackup:1150
 #, c-format
 msgid ""
 "\n"
@@ -18914,22 +19068,23 @@ msgstr ""
 "Actividades Drakbackup via cassete:\n"
 "\n"
 
-#: standalone/drakbackup:1160
+#: standalone/drakbackup:1159
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
-msgstr "Erro ao enviar correio eletrônico. O e-mail do seu relatório não foi enviado."
+msgstr ""
+"Erro ao enviar correio eletrônico. O e-mail do seu relatório não foi enviado."
 
-#: standalone/drakbackup:1161
+#: standalone/drakbackup:1160
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " Erro enquanto a enviar correio eletrônico. \n"
 
-#: standalone/drakbackup:1191
+#: standalone/drakbackup:1190
 #, c-format
 msgid "Can not create catalog!"
 msgstr "Não consigo criar o catalogo!"
 
-#: standalone/drakbackup:1420
+#: standalone/drakbackup:1423
 #, c-format
 msgid ""
 "\n"
@@ -18938,42 +19093,43 @@ msgstr ""
 "\n"
 "Por favor marque todas as opções que precise.\n"
 
-#: standalone/drakbackup:1421
+#: standalone/drakbackup:1424
 #, c-format
-msgid "These options can backup and restore all files in your /etc directory.\n"
+msgid ""
+"These options can backup and restore all files in your /etc directory.\n"
 msgstr ""
 "Estas opções podem arquivar (backup) e restaurar todos os ficheiros na "
 "directoria /etc.\n"
 
-#: standalone/drakbackup:1422
+#: standalone/drakbackup:1425
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "Arquive (backup) os ficheiros do sistema. (directoria /etc)"
 
-#: standalone/drakbackup:1423 standalone/drakbackup:1487
-#: standalone/drakbackup:1553
+#: standalone/drakbackup:1426 standalone/drakbackup:1490
+#: standalone/drakbackup:1556
 #, c-format
 msgid "Use Incremental/Differential Backups  (do not replace old backups)"
 msgstr "Usar backups com Diferencial (não substitui os backups antigos)"
 
-#: standalone/drakbackup:1425 standalone/drakbackup:1489
-#: standalone/drakbackup:1555
+#: standalone/drakbackup:1428 standalone/drakbackup:1492
+#: standalone/drakbackup:1558
 #, c-format
 msgid "Use Incremental Backups"
 msgstr "Usar Backups com Incrementação"
 
-#: standalone/drakbackup:1425 standalone/drakbackup:1489
-#: standalone/drakbackup:1555
+#: standalone/drakbackup:1428 standalone/drakbackup:1492
+#: standalone/drakbackup:1558
 #, c-format
 msgid "Use Differential Backups"
 msgstr "Usar backups com Diferencial"
 
-#: standalone/drakbackup:1427
+#: standalone/drakbackup:1430
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "Não incluir ficheiros criticos (senhas, grupos, fstab)"
 
-#: standalone/drakbackup:1428
+#: standalone/drakbackup:1431
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -18982,179 +19138,179 @@ msgstr ""
 "Com esta opção vai poder restaurar qualquer versão\n"
 " da sua directoria /etc."
 
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1462
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr ""
 "Por favor marque todos os utilizadores que quer incluir na sua cópia de "
 "segurança(backup)."
 
-#: standalone/drakbackup:1486
+#: standalone/drakbackup:1489
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "Não inclua a cache do browser"
 
-#: standalone/drakbackup:1540
+#: standalone/drakbackup:1543
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "Escolha os ficheiros ou directorias e clique em 'OK'"
 
-#: standalone/drakbackup:1541 standalone/drakfont:661
+#: standalone/drakbackup:1544 standalone/drakfont:657
 #, c-format
 msgid "Remove Selected"
 msgstr "Remover Seleccionados"
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1607
 #, c-format
 msgid "Users"
 msgstr "Utilizadores"
 
-#: standalone/drakbackup:1624
+#: standalone/drakbackup:1627
 #, c-format
 msgid "Use network connection to backup"
 msgstr "Usar uma conexão à rede para arquivar(backup)"
 
-#: standalone/drakbackup:1626
+#: standalone/drakbackup:1629
 #, c-format
 msgid "Net Method:"
 msgstr "Método Rede:"
 
-#: standalone/drakbackup:1630
+#: standalone/drakbackup:1633
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "Usar Expect para SSH"
 
-#: standalone/drakbackup:1631
+#: standalone/drakbackup:1634
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "Criar/Transferir senhas de backup para SSH"
 
-#: standalone/drakbackup:1633
+#: standalone/drakbackup:1636
 #, c-format
 msgid "Transfer Now"
 msgstr "Transferir Agora"
 
-#: standalone/drakbackup:1635
+#: standalone/drakbackup:1638
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "Outras chaves (não drakbackup) já estão no sítio"
 
-#: standalone/drakbackup:1638
+#: standalone/drakbackup:1641
 #, c-format
 msgid "Host name or IP."
 msgstr "Nome de endereço ou IP"
 
-#: standalone/drakbackup:1643
+#: standalone/drakbackup:1646
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr "Directório (ou modulo) para colocar backup neste endereço."
 
-#: standalone/drakbackup:1655
+#: standalone/drakbackup:1658
 #, c-format
 msgid "Remember this password"
 msgstr "Lembrar esta senha"
 
-#: standalone/drakbackup:1671
+#: standalone/drakbackup:1674
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "É necessário o nome de endereço, do nome do utilizador e senha!"
 
-#: standalone/drakbackup:1762
+#: standalone/drakbackup:1765
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "Usar CD/DVDROM para arquivar(backup)"
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1768
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "Escolha o dispositivo CD/DVD"
 
-#: standalone/drakbackup:1770
+#: standalone/drakbackup:1773
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Escolha o tamanho da media do CD/DVD"
 
-#: standalone/drakbackup:1777
+#: standalone/drakbackup:1780
 #, c-format
 msgid "Multisession CD"
 msgstr "CD multi-sessão"
 
-#: standalone/drakbackup:1779
+#: standalone/drakbackup:1782
 #, c-format
 msgid "CDRW media"
 msgstr "média CDRW"
 
-#: standalone/drakbackup:1785
+#: standalone/drakbackup:1788
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "Apagar o média RW (1ª Sessão)"
 
-#: standalone/drakbackup:1786
+#: standalone/drakbackup:1789
 #, c-format
 msgid " Erase Now "
 msgstr " Apagar Agora "
 
-#: standalone/drakbackup:1792
+#: standalone/drakbackup:1795
 #, c-format
 msgid "DVD+RW media"
 msgstr "media DVD+RW"
 
-#: standalone/drakbackup:1794
+#: standalone/drakbackup:1797
 #, c-format
 msgid "DVD-R media"
 msgstr "media DVD-R"
 
-#: standalone/drakbackup:1796
+#: standalone/drakbackup:1799
 #, c-format
 msgid "DVDRAM device"
 msgstr "Dispositivo DVDRAM"
 
-#: standalone/drakbackup:1827
+#: standalone/drakbackup:1830
 #, c-format
 msgid "No CD device defined!"
 msgstr "Nenhum dispositivo CD definido !"
 
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1872
 #, c-format
 msgid "Use tape to backup"
 msgstr "Usar um leitor de cassetes para arquivar(backup)"
 
-#: standalone/drakbackup:1872
+#: standalone/drakbackup:1875
 #, c-format
 msgid "Device name to use for backup"
 msgstr "Nome do dispositivo a usar para arquivar(backup)"
 
-#: standalone/drakbackup:1878
+#: standalone/drakbackup:1881
 #, c-format
 msgid "Backup directly to tape"
 msgstr "Efectuar o backup directamente para a fita"
 
-#: standalone/drakbackup:1884
+#: standalone/drakbackup:1887
 #, c-format
 msgid "Do not rewind tape after backup"
 msgstr "Não rebobinar a cassete depois do backup"
 
-#: standalone/drakbackup:1890
+#: standalone/drakbackup:1893
 #, c-format
 msgid "Erase tape before backup"
 msgstr "Apagar cassete antes de arquivar(backup)"
 
-#: standalone/drakbackup:1896
+#: standalone/drakbackup:1899
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "Ejectar cassete depois de arquivar(backup)"
 
-#: standalone/drakbackup:1968
+#: standalone/drakbackup:1973
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Indique a pasta para onde gravar:"
 
-#: standalone/drakbackup:1972
+#: standalone/drakbackup:1977
 #, c-format
 msgid "Directory to save to"
 msgstr "Directoria onde gravar"
 
-#: standalone/drakbackup:1977
+#: standalone/drakbackup:1983
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -19163,314 +19319,316 @@ msgstr ""
 "Tamanho máximo\n"
 " permitido para Drakbackup (MB)"
 
-#: standalone/drakbackup:2041
+#: standalone/drakbackup:2049
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CD-R / DVD-R"
 
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2054
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "Disco Rígido / NFS"
 
-#: standalone/drakbackup:2061 standalone/drakbackup:2062
-#: standalone/drakbackup:2067
+#: standalone/drakbackup:2069 standalone/drakbackup:2070
+#: standalone/drakbackup:2075
 #, c-format
 msgid "hourly"
 msgstr "horáriamente"
 
-#: standalone/drakbackup:2061 standalone/drakbackup:2063
-#: standalone/drakbackup:2068
+#: standalone/drakbackup:2069 standalone/drakbackup:2071
+#: standalone/drakbackup:2076
 #, c-format
 msgid "daily"
 msgstr "diáriamente"
 
-#: standalone/drakbackup:2061 standalone/drakbackup:2064
-#: standalone/drakbackup:2069
+#: standalone/drakbackup:2069 standalone/drakbackup:2072
+#: standalone/drakbackup:2077
 #, c-format
 msgid "weekly"
 msgstr "semanalmente"
 
-#: standalone/drakbackup:2061 standalone/drakbackup:2065
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2069 standalone/drakbackup:2073
+#: standalone/drakbackup:2078
 #, c-format
 msgid "monthly"
 msgstr "mensalmente"
 
-#: standalone/drakbackup:2061 standalone/drakbackup:2066
-#: standalone/drakbackup:2071
+#: standalone/drakbackup:2069 standalone/drakbackup:2074
+#: standalone/drakbackup:2079
 #, c-format
 msgid "custom"
 msgstr "personalizado"
 
-#: standalone/drakbackup:2075
+#: standalone/drakbackup:2083
 #, c-format
 msgid "January"
 msgstr "Janeiro"
 
-#: standalone/drakbackup:2075
+#: standalone/drakbackup:2083
 #, c-format
 msgid "February"
 msgstr "Fevereiro"
 
-#: standalone/drakbackup:2075
+#: standalone/drakbackup:2083
 #, c-format
 msgid "March"
 msgstr "Março"
 
-#: standalone/drakbackup:2076
+#: standalone/drakbackup:2084
 #, c-format
 msgid "April"
 msgstr "Abril"
 
-#: standalone/drakbackup:2076
+#: standalone/drakbackup:2084
 #, c-format
 msgid "May"
 msgstr "Maio"
 
-#: standalone/drakbackup:2076
+#: standalone/drakbackup:2084
 #, c-format
 msgid "June"
 msgstr "Junho"
 
-#: standalone/drakbackup:2076
+#: standalone/drakbackup:2084
 #, c-format
 msgid "July"
 msgstr "Julho"
 
-#: standalone/drakbackup:2076
+#: standalone/drakbackup:2084
 #, c-format
 msgid "August"
 msgstr "Agosto"
 
-#: standalone/drakbackup:2076
+#: standalone/drakbackup:2084
 #, c-format
 msgid "September"
 msgstr "Setembro"
 
-#: standalone/drakbackup:2077
+#: standalone/drakbackup:2085
 #, c-format
 msgid "October"
 msgstr "Outubro"
 
-#: standalone/drakbackup:2077
+#: standalone/drakbackup:2085
 #, c-format
 msgid "November"
 msgstr "Novembro"
 
-#: standalone/drakbackup:2077
+#: standalone/drakbackup:2085
 #, c-format
 msgid "December"
 msgstr "Dezembro"
 
-#: standalone/drakbackup:2080
+#: standalone/drakbackup:2088
 #, c-format
 msgid "Sunday"
 msgstr "Domingo"
 
-#: standalone/drakbackup:2080
+#: standalone/drakbackup:2088
 #, c-format
 msgid "Monday"
 msgstr "Segunda"
 
-#: standalone/drakbackup:2080
+#: standalone/drakbackup:2088
 #, c-format
 msgid "Tuesday"
 msgstr "Terça"
 
-#: standalone/drakbackup:2081
+#: standalone/drakbackup:2089
 #, c-format
 msgid "Wednesday"
 msgstr "Quarta"
 
-#: standalone/drakbackup:2081
+#: standalone/drakbackup:2089
 #, c-format
 msgid "Thursday"
 msgstr "Quinta"
 
-#: standalone/drakbackup:2081
+#: standalone/drakbackup:2089
 #, c-format
 msgid "Friday"
 msgstr "Sexta"
 
-#: standalone/drakbackup:2081
+#: standalone/drakbackup:2089
 #, c-format
 msgid "Saturday"
 msgstr "Sábado"
 
-#: standalone/drakbackup:2113
+#: standalone/drakbackup:2121
 #, c-format
 msgid "Use daemon"
 msgstr "Usar um daemon"
 
-#: standalone/drakbackup:2117
+#: standalone/drakbackup:2125
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "Por favor escolha o intervalo de tempo entre cada cópia de segurança"
 
-#: standalone/drakbackup:2123
+#: standalone/drakbackup:2131
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "Entrada crontab personalizada:"
 
-#: standalone/drakbackup:2128
+#: standalone/drakbackup:2136
 #, c-format
 msgid "Minute"
 msgstr "Minuto"
 
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2140
 #, c-format
 msgid "Hour"
 msgstr "Hora"
 
-#: standalone/drakbackup:2136
+#: standalone/drakbackup:2144
 #, c-format
 msgid "Day"
 msgstr "Dia"
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2148
 #, c-format
 msgid "Month"
 msgstr "Mês"
 
-#: standalone/drakbackup:2144
+#: standalone/drakbackup:2152
 #, c-format
 msgid "Weekday"
 msgstr "Dia da Semana"
 
-#: standalone/drakbackup:2150
+#: standalone/drakbackup:2158
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "Por favor escolha a media a usar para arquivar(backup)."
 
-#: standalone/drakbackup:2156
+#: standalone/drakbackup:2164
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "Assegure-se que o daemon cron está incluído nos seus serviços."
 
-#: standalone/drakbackup:2157
+#: standalone/drakbackup:2165
 #, c-format
-msgid "If your machine is not on all the time, you might want to install anacron."
-msgstr "Se a sua máquina não está sempre ligada, pode querer instalar o anacron."
+msgid ""
+"If your machine is not on all the time, you might want to install anacron."
+msgstr ""
+"Se a sua máquina não está sempre ligada, pode querer instalar o anacron."
 
-#: standalone/drakbackup:2158
+#: standalone/drakbackup:2166
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr "Note que por agora todos os médias 'rede' também usam o disco rígido."
 
-#: standalone/drakbackup:2205
+#: standalone/drakbackup:2213
 #, c-format
 msgid "Please choose the compression type"
 msgstr "Por favor escolha o tipo de compressão"
 
-#: standalone/drakbackup:2209
+#: standalone/drakbackup:2217
 #, c-format
 msgid "Use .backupignore files"
 msgstr "Usar os ficheiros .backupignore"
 
-#: standalone/drakbackup:2211
+#: standalone/drakbackup:2219
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "Enviar por correio eletrônico o relatório após cada backup para:"
 
-#: standalone/drakbackup:2217
+#: standalone/drakbackup:2225
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "Servidor SMTP para correio eletrônico:"
 
-#: standalone/drakbackup:2222
+#: standalone/drakbackup:2230
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr ""
 "Apagar os ficheiros tar no disco rígido depois de arquivar(backup) a outra "
 "media."
 
-#: standalone/drakbackup:2262
+#: standalone/drakbackup:2270
 #, c-format
 msgid "What"
 msgstr "O quê"
 
-#: standalone/drakbackup:2267
+#: standalone/drakbackup:2275
 #, c-format
 msgid "Where"
 msgstr "Onde"
 
-#: standalone/drakbackup:2272
+#: standalone/drakbackup:2280
 #, c-format
 msgid "When"
 msgstr "Quando"
 
-#: standalone/drakbackup:2277
+#: standalone/drakbackup:2285
 #, c-format
 msgid "More Options"
 msgstr "Mais Opções"
 
-#: standalone/drakbackup:2290
+#: standalone/drakbackup:2298
 #, c-format
 msgid "Backup destination not configured..."
 msgstr "Destino do backup não configurado..."
 
-#: standalone/drakbackup:2310 standalone/drakbackup:4234
+#: standalone/drakbackup:2318 standalone/drakbackup:4241
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Configuração de Drakbackup"
 
-#: standalone/drakbackup:2326
+#: standalone/drakbackup:2334
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "Por favor escolha onde quer fazer a cópia de segurança (backup)"
 
-#: standalone/drakbackup:2329
+#: standalone/drakbackup:2337
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr "Disco Rígido usado para preparar backups para todas as medias."
 
-#: standalone/drakbackup:2329
+#: standalone/drakbackup:2337
 #, c-format
 msgid "Across Network"
 msgstr "Através da Rede"
 
-#: standalone/drakbackup:2329
+#: standalone/drakbackup:2337
 #, c-format
 msgid "On CD-R"
 msgstr "No CD-R"
 
-#: standalone/drakbackup:2329
+#: standalone/drakbackup:2337
 #, c-format
 msgid "On Tape Device"
 msgstr "No Dispositivo de Cassetes"
 
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2383
 #, c-format
 msgid "Backup Users"
 msgstr "Backup dos Utilizadores"
 
-#: standalone/drakbackup:2376
+#: standalone/drakbackup:2384
 #, c-format
 msgid " (Default is all users)"
 msgstr " (O predefinido é todos os utilizadores)"
 
-#: standalone/drakbackup:2389
+#: standalone/drakbackup:2397
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "Por favor escolha o que quer arquivar(backup)"
 
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2398
 #, c-format
 msgid "Backup System"
 msgstr "Backup do sistema"
 
-#: standalone/drakbackup:2392
+#: standalone/drakbackup:2400
 #, c-format
 msgid "Select user manually"
 msgstr "Escolher o utilizador manualmente"
 
-#: standalone/drakbackup:2421
+#: standalone/drakbackup:2429
 #, c-format
 msgid "Please select data to backup..."
 msgstr "Por favor escolha que dados quer arquivar(backup)..."
 
-#: standalone/drakbackup:2493
+#: standalone/drakbackup:2501
 #, c-format
 msgid ""
 "\n"
@@ -19479,7 +19637,7 @@ msgstr ""
 "\n"
 "Backup das Fontes (Sources): \n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2502
 #, c-format
 msgid ""
 "\n"
@@ -19488,7 +19646,7 @@ msgstr ""
 "\n"
 "- Ficheiros do Sistema :\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
@@ -19497,7 +19655,7 @@ msgstr ""
 "\n"
 "- Ficheiros dos Utilizadores :\n"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2506
 #, c-format
 msgid ""
 "\n"
@@ -19506,7 +19664,7 @@ msgstr ""
 "\n"
 "- Outros Ficheiros:\n"
 
-#: standalone/drakbackup:2500
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
@@ -19515,12 +19673,12 @@ msgstr ""
 "\n"
 "- Grava no Disco Rígido no caminho : %s\n"
 
-#: standalone/drakbackup:2501
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tLimitar a utilização do disco em %s MB\n"
 
-#: standalone/drakbackup:2504
+#: standalone/drakbackup:2512
 #, c-format
 msgid ""
 "\n"
@@ -19529,7 +19687,7 @@ msgstr ""
 "\n"
 "- Apagar os ficheiros tar no disco rígido depois de arquivar(backup).\n"
 
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2517
 #, c-format
 msgid ""
 "\n"
@@ -19538,22 +19696,22 @@ msgstr ""
 "\n"
 "- Gravar no CD"
 
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2518
 #, c-format
 msgid "RW"
 msgstr "RW"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2519
 #, c-format
 msgid " on device: %s"
 msgstr " no dispositivo: %s"
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2520
 #, c-format
 msgid " (multi-session)"
 msgstr " (multi-sessão)"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2521
 #, c-format
 msgid ""
 "\n"
@@ -19562,17 +19720,17 @@ msgstr ""
 "\n"
 "- Grava para a cassete no dispositivo : %s"
 
-#: standalone/drakbackup:2514
+#: standalone/drakbackup:2522
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tApaga=%s"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2524
 #, c-format
 msgid "\tBackup directly to Tape\n"
 msgstr "\t Arquivar/Backup directamente para a fita\n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2526
 #, c-format
 msgid ""
 "\n"
@@ -19581,7 +19739,7 @@ msgstr ""
 "\n"
 "- Grava por %s no endereço: %s\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2527
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -19590,7 +19748,7 @@ msgstr ""
 "\t\t nome do utilizador : %s\n"
 "\t\t no caminho : %s \n"
 
-#: standalone/drakbackup:2520
+#: standalone/drakbackup:2528
 #, c-format
 msgid ""
 "\n"
@@ -19599,42 +19757,42 @@ msgstr ""
 "\n"
 "- Opções:\n"
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2529
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tNão incluir os ficheiros do sistema\n"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\tOs arquivos/backups usam tar e bzip2\n"
 
-#: standalone/drakbackup:2524
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tOs arquivos/backup usam tar e gzip\n"
 
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\tBackups use tar only\n"
 msgstr "\tOs arquivos/backups apenas usam tar\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2535
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\tUsar os ficheiros .backupignore\n"
 
-#: standalone/drakbackup:2528
+#: standalone/drakbackup:2536
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\tEnviar correio eletrônico para %s\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2537
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\tUsando servidor SMTP %s\n"
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2539
 #, c-format
 msgid ""
 "\n"
@@ -19643,47 +19801,47 @@ msgstr ""
 "\n"
 "- Daemon, %s por :\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2540
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-Disco Rígido.\n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2541
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-CD-R.\n"
 
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2542
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-Cassete \n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2543
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-Rede por FTP.\n"
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2544
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-Rede por SSH.\n"
 
-#: standalone/drakbackup:2537
+#: standalone/drakbackup:2545
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-Rede por rsync.\n"
 
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2546
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-Rede por webdav.\n"
 
-#: standalone/drakbackup:2540
+#: standalone/drakbackup:2548
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "Nenhuma configuração, por favor clique em Assistente ou Avançado.\n"
 
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2553
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -19692,27 +19850,27 @@ msgstr ""
 "Lista dos dados a restaurar :\n"
 "\n"
 
-#: standalone/drakbackup:2547
+#: standalone/drakbackup:2555
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "- Restaurar Ficheiros do Sistema.\n"
 
-#: standalone/drakbackup:2549 standalone/drakbackup:2559
+#: standalone/drakbackup:2557 standalone/drakbackup:2567
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr "   - da data: %s %s\n"
 
-#: standalone/drakbackup:2552
+#: standalone/drakbackup:2560
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- Restaurar Ficheiros dos Utilizadores: \n"
 
-#: standalone/drakbackup:2557
+#: standalone/drakbackup:2565
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- Restaurar Outros Ficheiros: \n"
 
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2744
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -19721,133 +19879,133 @@ msgstr ""
 "Lista dos dados danificados:\n"
 "\n"
 
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2746
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "Por favor desmarque ou remova-o na próxima vez."
 
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2756
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "Os ficheiros arquivados/backup estão danificados"
 
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2777
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "          Todos os dados seleccionados foram          "
 
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2778
 #, c-format
 msgid "          Successfully Restored on %s       "
 msgstr "          Restaurado com Sucesso em %s       "
 
-#: standalone/drakbackup:2890
+#: standalone/drakbackup:2898
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         Restaurar Configuração       "
 
-#: standalone/drakbackup:2918
+#: standalone/drakbackup:2926
 #, c-format
 msgid "OK to restore the other files."
 msgstr "OK para restaurar os outros ficheiros."
 
-#: standalone/drakbackup:2934
+#: standalone/drakbackup:2942
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
 "Lista dos utilizadores a restaurar (só os dados mais recentes por utilizador "
 "são importantes)"
 
-#: standalone/drakbackup:2999
+#: standalone/drakbackup:3007
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "Por favor escolha os dados a restaurar:"
 
-#: standalone/drakbackup:3036
+#: standalone/drakbackup:3044
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Restaurar a partir do Disco Rígido."
 
-#: standalone/drakbackup:3038
+#: standalone/drakbackup:3046
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "Indique a pasta onde os arquivos/backups são gravados"
 
-#: standalone/drakbackup:3042
+#: standalone/drakbackup:3050
 #, c-format
 msgid "Directory with backups"
 msgstr "Pasta com backups"
 
-#: standalone/drakbackup:3096
+#: standalone/drakbackup:3104
 #, c-format
 msgid "Select another media to restore from"
 msgstr "Escolha outra media para onde restaurar"
 
-#: standalone/drakbackup:3098
+#: standalone/drakbackup:3106
 #, c-format
 msgid "Other Media"
 msgstr "Outra Media"
 
-#: standalone/drakbackup:3103
+#: standalone/drakbackup:3111
 #, c-format
 msgid "Restore system"
 msgstr "Restaurar Sistema"
 
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3112
 #, c-format
 msgid "Restore Users"
 msgstr "Restaurar Utilizadores"
 
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3113
 #, c-format
 msgid "Restore Other"
 msgstr "Restaurar Outros"
 
-#: standalone/drakbackup:3107
+#: standalone/drakbackup:3115
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "Escolha o caminho onde restaurar (em vez de /)"
 
-#: standalone/drakbackup:3111 standalone/drakbackup:3393
+#: standalone/drakbackup:3119 standalone/drakbackup:3401
 #, c-format
 msgid "Path To Restore To"
 msgstr "Camicho para onde Restaurar"
 
-#: standalone/drakbackup:3114
+#: standalone/drakbackup:3122
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
 "Faça novo arquiv/backup antes de restaurar (apenas para os arquivos por "
 "incrementação)"
 
-#: standalone/drakbackup:3116
+#: standalone/drakbackup:3124
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Remover as pastas do utilizador de restaurar."
 
-#: standalone/drakbackup:3201
+#: standalone/drakbackup:3209
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr ""
 "String do texto do nome do fiehciro a procurar por (string vazia combina com "
 "tudo):"
 
-#: standalone/drakbackup:3204
+#: standalone/drakbackup:3212
 #, c-format
 msgid "Search Backups"
 msgstr "Procurar Arquivos/Backups"
 
-#: standalone/drakbackup:3222
+#: standalone/drakbackup:3230
 #, c-format
 msgid "No matches found..."
 msgstr "Nenhum resultado encontrado..."
 
-#: standalone/drakbackup:3226
+#: standalone/drakbackup:3234
 #, c-format
 msgid "Restore Selected"
 msgstr "Restaurar Seleccionados"
 
-#: standalone/drakbackup:3361
+#: standalone/drakbackup:3369
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
@@ -19856,7 +20014,7 @@ msgstr ""
 "Clique em data/hora para ver os ficheiros backup.\n"
 "Ctrl-Clique nos ficheiros para selecionar vários ficheiros."
 
-#: standalone/drakbackup:3367
+#: standalone/drakbackup:3375
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -19865,7 +20023,7 @@ msgstr ""
 "Restaurar Entrada de\n"
 "Catalogo Seleccionada"
 
-#: standalone/drakbackup:3376
+#: standalone/drakbackup:3384
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -19874,17 +20032,17 @@ msgstr ""
 "Restaurar Ficheiros\n"
 "Seleccionados"
 
-#: standalone/drakbackup:3453
+#: standalone/drakbackup:3461
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "Arquivar/BAckup ficheiros não encontrados em %s"
 
-#: standalone/drakbackup:3466
+#: standalone/drakbackup:3474
 #, c-format
 msgid "Restore From CD"
 msgstr "Restaurar do CD"
 
-#: standalone/drakbackup:3466
+#: standalone/drakbackup:3474
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -19893,17 +20051,17 @@ msgstr ""
 "Insira o CD com a etiqueta %s\n"
 " no drive de CD no ponto de montagem /mnt/cdrom"
 
-#: standalone/drakbackup:3468
+#: standalone/drakbackup:3476
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "Não é a etiqueta de CD correcta. O disco é rotulado de %s."
 
-#: standalone/drakbackup:3478
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore From Tape"
 msgstr "Restaurar da Cassete"
 
-#: standalone/drakbackup:3478
+#: standalone/drakbackup:3486
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -19912,212 +20070,212 @@ msgstr ""
 "Insira a cassete com a etiqueta %s\n"
 " no drive leitor de cassetes %s"
 
-#: standalone/drakbackup:3480
+#: standalone/drakbackup:3488
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "Não é a etiqueta/cassete correcta. A cassete está etiquetada por %s."
 
-#: standalone/drakbackup:3491
+#: standalone/drakbackup:3499
 #, c-format
 msgid "Restore Via Network"
 msgstr "Restaurar Via Rede"
 
-#: standalone/drakbackup:3491
+#: standalone/drakbackup:3499
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Restaurar Via Protocolo de Rede: %s"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3500
 #, c-format
 msgid "Host Name"
 msgstr "Nome de Endereço"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Host Path or Module"
 msgstr "Localização do Endereço ou Modulo"
 
-#: standalone/drakbackup:3500
+#: standalone/drakbackup:3508
 #, c-format
 msgid "Password required"
 msgstr "Requer Senha"
 
-#: standalone/drakbackup:3506
+#: standalone/drakbackup:3514
 #, c-format
 msgid "Username required"
 msgstr "Requer Nome de utilizador"
 
-#: standalone/drakbackup:3509
+#: standalone/drakbackup:3517
 #, c-format
 msgid "Hostname required"
 msgstr "Requer Nome de Endereço"
 
-#: standalone/drakbackup:3514
+#: standalone/drakbackup:3522
 #, c-format
 msgid "Path or Module required"
 msgstr "Requer Caminho ou Modulo"
 
-#: standalone/drakbackup:3527
+#: standalone/drakbackup:3535
 #, c-format
 msgid "Files Restored..."
 msgstr "Ficheiros Restaurados..."
 
-#: standalone/drakbackup:3530
+#: standalone/drakbackup:3538
 #, c-format
 msgid "Restore Failed..."
 msgstr "Restauração Falhada"
 
-#: standalone/drakbackup:3548
+#: standalone/drakbackup:3556
 #, c-format
 msgid "%s not retrieved..."
 msgstr "%s não encontrado..."
 
-#: standalone/drakbackup:3770 standalone/drakbackup:3839
+#: standalone/drakbackup:3777 standalone/drakbackup:3846
 #, c-format
 msgid "Search for files to restore"
 msgstr "Procurar os ficheiros para restaurar"
 
-#: standalone/drakbackup:3774
+#: standalone/drakbackup:3781
 #, c-format
 msgid "Restore all backups"
 msgstr "Restaurar todos os arquivos/backups"
 
-#: standalone/drakbackup:3782
+#: standalone/drakbackup:3789
 #, c-format
 msgid "Custom Restore"
 msgstr "Restauração Personalizada"
 
-#: standalone/drakbackup:3786 standalone/drakbackup:3835
+#: standalone/drakbackup:3793 standalone/drakbackup:3842
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Restaurar a partir do Catálogo"
 
-#: standalone/drakbackup:3807
+#: standalone/drakbackup:3814
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "Não consegue encontrar os backups para restaurar...\n"
 
-#: standalone/drakbackup:3808
+#: standalone/drakbackup:3815
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "Verifique que %s é o caminho correcto"
 
-#: standalone/drakbackup:3809
+#: standalone/drakbackup:3816
 #, c-format
 msgid " and the CD is in the drive"
 msgstr " e o CD está no drive"
 
-#: standalone/drakbackup:3811
+#: standalone/drakbackup:3818
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr "Backups em média não montável. - Use o catálogo para restaurar"
 
-#: standalone/drakbackup:3827
+#: standalone/drakbackup:3834
 #, c-format
 msgid "CD in place - continue."
 msgstr "CD no sitio - continue."
 
-#: standalone/drakbackup:3832
+#: standalone/drakbackup:3839
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "Procure um novo repositório de restauração."
 
-#: standalone/drakbackup:3833
+#: standalone/drakbackup:3840
 #, c-format
 msgid "Directory To Restore From"
 msgstr "Pasta de onde Restaurar"
 
-#: standalone/drakbackup:3869
+#: standalone/drakbackup:3876
 #, c-format
 msgid "Restore Progress"
 msgstr "Progressão da Restauração"
 
-#: standalone/drakbackup:3980
+#: standalone/drakbackup:3987
 #, c-format
 msgid "Build Backup"
 msgstr "Construir arquivo/backup"
 
-#: standalone/drakbackup:4013 standalone/drakbackup:4333
+#: standalone/drakbackup:4020 standalone/drakbackup:4340
 #, c-format
 msgid "Restore"
 msgstr "Restaurar"
 
-#: standalone/drakbackup:4101
+#: standalone/drakbackup:4108 standalone/harddrake2:481
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "Os seguintes pacotes precisam ser instalados:\n"
 
-#: standalone/drakbackup:4128
+#: standalone/drakbackup:4135
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Por favor escolha os dados a restaurar..."
 
-#: standalone/drakbackup:4168
+#: standalone/drakbackup:4175
 #, c-format
 msgid "Backup system files"
 msgstr "Arquivar/Backup os ficheiros do sistema"
 
-#: standalone/drakbackup:4171
+#: standalone/drakbackup:4178
 #, c-format
 msgid "Backup user files"
 msgstr "Arquivo/Backup dos ficheiros dos utilizadores"
 
-#: standalone/drakbackup:4174
+#: standalone/drakbackup:4181
 #, c-format
 msgid "Backup other files"
 msgstr "Arquivo/Backup dos outros ficheiros"
 
-#: standalone/drakbackup:4177 standalone/drakbackup:4211
+#: standalone/drakbackup:4184 standalone/drakbackup:4218
 #, c-format
 msgid "Total Progress"
 msgstr "Progressão Total"
 
-#: standalone/drakbackup:4203
+#: standalone/drakbackup:4210
 #, c-format
 msgid "Sending files by FTP"
 msgstr "A enviar ficheiros por FTP"
 
-#: standalone/drakbackup:4206
+#: standalone/drakbackup:4213
 #, c-format
 msgid "Sending files..."
 msgstr "A enviar ficheiros..."
 
-#: standalone/drakbackup:4276
+#: standalone/drakbackup:4283
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "Arquivar/Backup agora a partir do ficheiro de configuração"
 
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4288
 #, c-format
 msgid "View Backup Configuration."
 msgstr "Ver Configuração do Arquivo/Backup"
 
-#: standalone/drakbackup:4307
+#: standalone/drakbackup:4314
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Assistente de Configuração"
 
-#: standalone/drakbackup:4312
+#: standalone/drakbackup:4319
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Configuração Avançada"
 
-#: standalone/drakbackup:4317
+#: standalone/drakbackup:4324
 #, c-format
 msgid "View Configuration"
 msgstr "Ver Configuração"
 
-#: standalone/drakbackup:4321
+#: standalone/drakbackup:4328
 #, c-format
 msgid "View Last Log"
 msgstr "Ver Último Registo"
 
-#: standalone/drakbackup:4326
+#: standalone/drakbackup:4333
 #, c-format
 msgid "Backup Now"
 msgstr "Arquivar agora"
 
-#: standalone/drakbackup:4330
+#: standalone/drakbackup:4337
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -20126,7 +20284,7 @@ msgstr ""
 "Nenhum ficheiro de configuração encontrado \n"
 "Por favor clique em Assistente ou Avançado."
 
-#: standalone/drakbackup:4350 standalone/drakbackup:4353
+#: standalone/drakbackup:4357 standalone/drakbackup:4360
 #, c-format
 msgid "Drakbackup"
 msgstr "Drakbackup"
@@ -20141,8 +20299,8 @@ msgstr "Selecção do tema de arranque gráfico"
 msgid "System mode"
 msgstr "Modo do sistema"
 
-#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:187
-#: standalone/harddrake2:188 standalone/logdrake:70
+#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:189
+#: standalone/harddrake2:190 standalone/harddrake2:191 standalone/logdrake:70
 #: standalone/printerdrake:138 standalone/printerdrake:139
 #: standalone/printerdrake:140
 #, c-format
@@ -20154,7 +20312,7 @@ msgstr "/_Ficheiro"
 msgid "/File/_Quit"
 msgstr "/Ficheiro/_Sair"
 
-#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:188
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:191
 #: standalone/logdrake:76 standalone/printerdrake:140
 #, c-format
 msgid "<control>Q"
@@ -20242,14 +20400,14 @@ msgstr ""
 "Certifique-se que a sua placa de video suporta o modo escolhido."
 
 #: standalone/drakbug:41
-#, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Ferramenta Mandrakelinux para Comunicar Erros"
+#, fuzzy, c-format
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Ferramenta Mandriva Linux para Comunicar Erros"
 
 #: standalone/drakbug:46
-#, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Centro de Controlo Mandrakelinux"
+#, fuzzy, c-format
+msgid "Mandriva Linux Control Center"
+msgstr "Centro de Controlo Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20268,9 +20426,9 @@ msgid "HardDrake"
 msgstr "HardDrake"
 
 #: standalone/drakbug:51
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+#, fuzzy, c-format
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20313,9 +20471,9 @@ msgid "Configuration Wizards"
 msgstr "Assistentes de Configuração"
 
 #: standalone/drakbug:81
-#, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Seleccione a Ferramenta Mandrakesoft:"
+#, fuzzy, c-format
+msgid "Select Mandriva Tool:"
+msgstr "Seleccione a Ferramenta Mandriva:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20448,175 +20606,171 @@ msgstr ""
 "\n"
 "Deseja instalar o pacote ntp ?"
 
-#: standalone/drakconnect:85
+#: standalone/drakconnect:86
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Configuração de Rede (%d adaptadores)"
 
-#: standalone/drakconnect:96 standalone/drakconnect:786
+#: standalone/drakconnect:97 standalone/drakconnect:822
+#: standalone/drakroam:159
 #, c-format
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: standalone/drakconnect:96 standalone/drakconnect:786
+#: standalone/drakconnect:97 standalone/drakconnect:822
 #, c-format
 msgid "Interface:"
 msgstr "Interface:"
 
-#: standalone/drakconnect:100 standalone/net_monitor:122
+#: standalone/drakconnect:101 standalone/net_monitor:122
 #, c-format
 msgid "Wait please"
 msgstr "Espere por favor"
 
-#: standalone/drakconnect:116
+#: standalone/drakconnect:117
 #, c-format
 msgid "Interface"
 msgstr "Interface"
 
-#: standalone/drakconnect:116 standalone/printerdrake:211
+#: standalone/drakconnect:117 standalone/printerdrake:211
 #: standalone/printerdrake:218
 #, c-format
 msgid "State"
 msgstr "Estado"
 
-#: standalone/drakconnect:133
+#: standalone/drakconnect:134
 #, c-format
 msgid "Hostname: "
 msgstr "Nome de endereço: "
 
-#: standalone/drakconnect:135
+#: standalone/drakconnect:136
 #, c-format
 msgid "Configure hostname..."
 msgstr "Configurar nome de endereço.."
 
-#: standalone/drakconnect:149 standalone/drakconnect:842
+#: standalone/drakconnect:150 standalone/drakconnect:878
 #, c-format
 msgid "LAN configuration"
 msgstr "Configuração LAN"
 
-#: standalone/drakconnect:154
+#: standalone/drakconnect:155
 #, c-format
 msgid "Configure Local Area Network..."
 msgstr "Configurar Rede de Área Local..."
 
-#: standalone/drakconnect:162 standalone/drakconnect:246
-#: standalone/drakconnect:250
+#: standalone/drakconnect:163 standalone/drakconnect:247
+#: standalone/drakconnect:251
 #, c-format
 msgid "Apply"
 msgstr "Aplicar"
 
-#: standalone/drakconnect:197
+#: standalone/drakconnect:198
 #, c-format
 msgid "Manage connections"
 msgstr "Gerir conexões"
 
-#: standalone/drakconnect:224
+#: standalone/drakconnect:225
 #, c-format
 msgid "Device selected"
 msgstr "Dispositivo seleccionado"
 
-#: standalone/drakconnect:305
+#: standalone/drakconnect:307
 #, c-format
 msgid "IP configuration"
 msgstr "Configuração do IP"
 
-#: standalone/drakconnect:344
+#: standalone/drakconnect:346
 #, c-format
 msgid "DNS servers"
 msgstr "Servidores DNS"
 
-#: standalone/drakconnect:352
+#: standalone/drakconnect:354
 #, c-format
 msgid "Search Domain"
 msgstr "Procurar Domínio"
 
-#: standalone/drakconnect:360
+#: standalone/drakconnect:362
 #, c-format
 msgid "static"
 msgstr "estático"
 
-#: standalone/drakconnect:360
+#: standalone/drakconnect:362 standalone/drakroam:140
 #, c-format
 msgid "DHCP"
 msgstr "DHCP"
 
-#: standalone/drakconnect:470
-#, c-format
-msgid "Metric"
-msgstr "Metrico"
-
-#: standalone/drakconnect:493
+#: standalone/drakconnect:526
 #, c-format
 msgid "Flow control"
 msgstr "Controle do fluxo"
 
-#: standalone/drakconnect:494
+#: standalone/drakconnect:527
 #, c-format
 msgid "Line termination"
 msgstr "Términação da linha"
 
-#: standalone/drakconnect:505
+#: standalone/drakconnect:538
 #, c-format
 msgid "Modem timeout"
 msgstr "Intervalo de tempo do modem"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:542
 #, c-format
 msgid "Use lock file"
 msgstr "Usar ficheiro lock"
 
-#: standalone/drakconnect:511
+#: standalone/drakconnect:544
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr "Aguardar pelo tom de chamada antes de marcar"
 
-#: standalone/drakconnect:514
+#: standalone/drakconnect:547
 #, c-format
 msgid "Busy wait"
 msgstr "Espera ocupada"
 
-#: standalone/drakconnect:519
+#: standalone/drakconnect:552
 #, c-format
 msgid "Modem sound"
 msgstr "Som do modem"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:553
 #, c-format
 msgid "Enable"
 msgstr "Activar"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:553
 #, c-format
 msgid "Disable"
 msgstr "Desactivar"
 
-#: standalone/drakconnect:571 standalone/harddrake2:48
+#: standalone/drakconnect:604 standalone/harddrake2:49
 #, c-format
 msgid "Media class"
 msgstr "Classe Média"
 
-#: standalone/drakconnect:572 standalone/drakfloppy:136
+#: standalone/drakconnect:605 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "Nome do Módulo"
 
-#: standalone/drakconnect:573
+#: standalone/drakconnect:606
 #, c-format
 msgid "Mac Address"
 msgstr "Endereço MAC"
 
-#: standalone/drakconnect:574 standalone/harddrake2:26
-#: standalone/harddrake2:118
+#: standalone/drakconnect:607 standalone/harddrake2:27
+#: standalone/harddrake2:119
 #, c-format
 msgid "Bus"
 msgstr "Bus"
 
-#: standalone/drakconnect:575 standalone/harddrake2:32
+#: standalone/drakconnect:608 standalone/harddrake2:33
 #, c-format
 msgid "Location on the bus"
 msgstr "Posição no bus"
 
-#: standalone/drakconnect:671 standalone/drakgw:247 standalone/drakpxe:138
+#: standalone/drakconnect:707 standalone/drakgw:247 standalone/drakpxe:138
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -20625,17 +20779,17 @@ msgstr ""
 "Nenhum adaptador de rede ethernet foi detectado no seu sistema. Por favor "
 "execute a ferramenta de configuração de hardware."
 
-#: standalone/drakconnect:679
+#: standalone/drakconnect:715
 #, c-format
 msgid "Remove a network interface"
 msgstr "Remova um interface de rede"
 
-#: standalone/drakconnect:683
+#: standalone/drakconnect:719
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "Escolha o interface de rede a remover:"
 
-#: standalone/drakconnect:715
+#: standalone/drakconnect:751
 #, c-format
 msgid ""
 "An error occurred while deleting the \"%s\" network interface:\n"
@@ -20646,69 +20800,71 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:716
+#: standalone/drakconnect:752
 #, c-format
-msgid "Congratulations, the \"%s\" network interface has been successfully deleted"
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "Parabéns, o interface de rede \"%s\" foi apagado com sucesso"
 
-#: standalone/drakconnect:732
+#: standalone/drakconnect:768
 #, c-format
 msgid "No IP"
 msgstr "Nenhum IP"
 
-#: standalone/drakconnect:733
+#: standalone/drakconnect:769
 #, c-format
 msgid "No Mask"
 msgstr "Nenhuma máscara"
 
-#: standalone/drakconnect:734 standalone/drakconnect:913
+#: standalone/drakconnect:770 standalone/drakconnect:949
 #, c-format
 msgid "up"
 msgstr "cima"
 
-#: standalone/drakconnect:734 standalone/drakconnect:913
+#: standalone/drakconnect:770 standalone/drakconnect:949
 #, c-format
 msgid "down"
 msgstr "baixo"
 
-#: standalone/drakconnect:776 standalone/net_monitor:470
+#: standalone/drakconnect:812 standalone/net_monitor:471
 #, c-format
 msgid "Connected"
 msgstr "Conectado"
 
-#: standalone/drakconnect:776 standalone/net_monitor:470
+#: standalone/drakconnect:812 standalone/net_monitor:471
 #, c-format
 msgid "Not connected"
 msgstr "Não conectado"
 
-#: standalone/drakconnect:778
+#: standalone/drakconnect:814
 #, c-format
 msgid "Disconnect..."
 msgstr "Desconectar..."
 
-#: standalone/drakconnect:778
+#: standalone/drakconnect:814
 #, c-format
 msgid "Connect..."
 msgstr "Conectar..."
 
-#: standalone/drakconnect:807
+#: standalone/drakconnect:843
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
 "network"
-msgstr "Cuidado, foi detectada outra conexão Internet, talvez a usar a sua rede"
+msgstr ""
+"Cuidado, foi detectada outra conexão Internet, talvez a usar a sua rede"
 
-#: standalone/drakconnect:838
+#: standalone/drakconnect:874
 #, c-format
 msgid "Deactivate now"
 msgstr "Desactivar agora"
 
-#: standalone/drakconnect:838
+#: standalone/drakconnect:874
 #, c-format
 msgid "Activate now"
 msgstr "Activar agora"
 
-#: standalone/drakconnect:846
+#: standalone/drakconnect:882
 #, c-format
 msgid ""
 "You do not have any configured interface.\n"
@@ -20717,77 +20873,77 @@ msgstr ""
 "Não tem nenhum interface configurado.\n"
 "Configure-os primeiro ao clicar em 'Configurar'"
 
-#: standalone/drakconnect:860
+#: standalone/drakconnect:896
 #, c-format
 msgid "LAN Configuration"
 msgstr "Configuração LAN"
 
-#: standalone/drakconnect:872
+#: standalone/drakconnect:908
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adaptador %s: %s"
 
-#: standalone/drakconnect:881
+#: standalone/drakconnect:917
 #, c-format
 msgid "Boot Protocol"
 msgstr "Protocolo de Arranque"
 
-#: standalone/drakconnect:882
+#: standalone/drakconnect:918
 #, c-format
 msgid "Started on boot"
 msgstr "Iniciado no arranque"
 
-#: standalone/drakconnect:918
-#, c-format
+#: standalone/drakconnect:954
+#, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Este interface ainda não foi configurado.\n"
 "Use o assistente \"Adicionar um interface\" a partir do Centro de Controlo "
-"Mandrakelinux"
+"Mandriva Linux"
 
-#. -PO: here "Add Connection" should be translated the same was as in control-center
-#: standalone/drakconnect:973 standalone/net_applet:50
-#, c-format
+#: standalone/drakconnect:1009 standalone/net_applet:61
+#, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Não tem qualquer conexão Internet configurada.\n"
-"Execute o assistente \"%s\" a partir do Centro de Controlo Mandrakelinux"
+"Execute o assistente \"%s\" a partir do Centro de Controlo Mandriva Linux"
 
-#: standalone/drakconnect:974 standalone/net_applet:51
+#. -PO: here "Add Connection" should be translated the same was as in control-center
+#: standalone/drakconnect:1010 standalone/net_applet:62
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Configurar um novo interface de rede (LAN, ISDN, ADSL, ...)"
 
-#: standalone/drakconnect:981
+#: standalone/drakconnect:1017
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Configuração da conexão internet"
 
-#: standalone/drakconnect:999
+#: standalone/drakconnect:1035
 #, c-format
 msgid "Third DNS server (optional)"
 msgstr "Terceiro Servidor DNS (opcional)"
 
-#: standalone/drakconnect:1021
+#: standalone/drakconnect:1057
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Configuração da Conexão Internet"
 
-#: standalone/drakconnect:1022
+#: standalone/drakconnect:1058
 #, c-format
 msgid "Internet access"
 msgstr "Acesso Internet"
 
-#: standalone/drakconnect:1024 standalone/net_monitor:101
+#: standalone/drakconnect:1060 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "Tipo de conexão:"
 
-#: standalone/drakconnect:1027
+#: standalone/drakconnect:1063
 #, c-format
 msgid "Status:"
 msgstr "Estado:"
@@ -20803,9 +20959,9 @@ msgid "KDM (KDE Display Manager)"
 msgstr "KDM (KDE Display Manager)"
 
 #: standalone/drakedm:36
-#, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (Mandrakelinux Display Manager)"
+#, fuzzy, c-format
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Mandriva Linux Display Manager)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -20857,7 +21013,7 @@ msgstr "Criação de disquete de arranque"
 msgid "General"
 msgstr "Geral"
 
-#: standalone/drakfloppy:82 standalone/harddrake2:145
+#: standalone/drakfloppy:82 standalone/harddrake2:146
 #, c-format
 msgid "Device"
 msgstr "Dispositivo"
@@ -20979,9 +21135,9 @@ msgstr "analisar todos os tipos de letra"
 msgid "No fonts found"
 msgstr "Nenhum tipo de letra encontrado"
 
-#: standalone/drakfont:217 standalone/drakfont:257 standalone/drakfont:324
-#: standalone/drakfont:357 standalone/drakfont:365 standalone/drakfont:391
-#: standalone/drakfont:409 standalone/drakfont:423
+#: standalone/drakfont:217 standalone/drakfont:259 standalone/drakfont:326
+#: standalone/drakfont:359 standalone/drakfont:367 standalone/drakfont:393
+#: standalone/drakfont:411 standalone/drakfont:425
 #, c-format
 msgid "done"
 msgstr "pronto"
@@ -20989,79 +21145,80 @@ msgstr "pronto"
 #: standalone/drakfont:222
 #, c-format
 msgid "Could not find any font in your mounted partitions"
-msgstr "Não conseguiu encontrar nenhum tipo de letra nas suas partições montadas"
+msgstr ""
+"Não conseguiu encontrar nenhum tipo de letra nas suas partições montadas"
 
-#: standalone/drakfont:255
+#: standalone/drakfont:257
 #, c-format
 msgid "Reselect correct fonts"
 msgstr "Re-seleccionar os correctos tipos de letra"
 
-#: standalone/drakfont:258
+#: standalone/drakfont:260
 #, c-format
 msgid "Could not find any font.\n"
 msgstr "Não conseguiu encontrar nenhum tipo de letra.\n"
 
-#: standalone/drakfont:268
+#: standalone/drakfont:270
 #, c-format
 msgid "Search for fonts in installed list"
 msgstr "Procura tipos de letra na lista instalada"
 
-#: standalone/drakfont:293
+#: standalone/drakfont:295
 #, c-format
 msgid "%s fonts conversion"
 msgstr "conversão dos tipos de letra %s"
 
-#: standalone/drakfont:322
+#: standalone/drakfont:324
 #, c-format
 msgid "Fonts copy"
 msgstr "Cópia dos tipos de letra"
 
-#: standalone/drakfont:325
+#: standalone/drakfont:327
 #, c-format
 msgid "True Type fonts installation"
 msgstr "Instalação de tipos de letra True Type"
 
-#: standalone/drakfont:332
+#: standalone/drakfont:334
 #, c-format
 msgid "please wait during ttmkfdir..."
 msgstr "por favor aguarde enquanto ttmkfdir..."
 
-#: standalone/drakfont:333
+#: standalone/drakfont:335
 #, c-format
 msgid "True Type install done"
 msgstr "Instalação do tipo de letra True Type feita"
 
-#: standalone/drakfont:339 standalone/drakfont:354
+#: standalone/drakfont:341 standalone/drakfont:356
 #, c-format
 msgid "type1inst building"
 msgstr "compilar de type1inst"
 
-#: standalone/drakfont:348
+#: standalone/drakfont:350
 #, c-format
 msgid "Ghostscript referencing"
 msgstr "Referencia Ghostscript"
 
-#: standalone/drakfont:358
+#: standalone/drakfont:360
 #, c-format
 msgid "Suppress Temporary Files"
 msgstr "Suprimir Ficheiros Temporários"
 
-#: standalone/drakfont:361
+#: standalone/drakfont:363
 #, c-format
 msgid "Restart XFS"
 msgstr "Reiniciar XFS"
 
-#: standalone/drakfont:407 standalone/drakfont:417
+#: standalone/drakfont:409 standalone/drakfont:419
 #, c-format
 msgid "Suppress Fonts Files"
 msgstr "Suprimir os Ficheiros dos Tipos de Letra"
 
-#: standalone/drakfont:419
+#: standalone/drakfont:421
 #, c-format
 msgid "xfs restart"
 msgstr "reiniciar xfs"
 
-#: standalone/drakfont:427
+#: standalone/drakfont:429
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -21076,54 +21233,54 @@ msgstr ""
 "-Pode instalar os tipos de letra de maneira normal. Em raros casos, tipos de "
 "letras falsas podem bloquear o servidor do X."
 
-#: standalone/drakfont:476 standalone/drakfont:485
+#: standalone/drakfont:474 standalone/drakfont:483
 #, c-format
 msgid "DrakFont"
 msgstr "DrakFont"
 
-#: standalone/drakfont:486
+#: standalone/drakfont:484
 #, c-format
 msgid "Font List"
 msgstr "Lista dos Tipos de Letra"
 
-#: standalone/drakfont:492
+#: standalone/drakfont:490
 #, c-format
 msgid "About"
 msgstr "Acerca de"
 
-#: standalone/drakfont:494 standalone/drakfont:692 standalone/drakfont:730
+#: standalone/drakfont:492 standalone/drakfont:688 standalone/drakfont:726
 #, c-format
 msgid "Uninstall"
 msgstr "Desinstalar"
 
-#: standalone/drakfont:495
+#: standalone/drakfont:493
 #, c-format
 msgid "Import"
 msgstr "Importar"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: standalone/drakfont:513
-#, c-format
+#: standalone/drakfont:511
+#, fuzzy, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"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>"
 msgstr ""
-"Copyright © 2001-2002 por Mandrakesoft \n"
+"Copyright © 2001-2002 por Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versão 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:522
+#: standalone/drakfont:520
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -21158,7 +21315,7 @@ msgstr ""
 " se não, escreva para Free Software Foundation, Inc.,\n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: standalone/drakfont:538
+#: standalone/drakfont:536
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -21190,12 +21347,12 @@ msgstr ""
 "\t  por Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
 "             Converte ficheiros de tipos de letra ttf para afm e pfb\n"
 
-#: standalone/drakfont:557
+#: standalone/drakfont:555
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "Escolha as aplicações que irão suportar os tipos de letra:"
 
-#: standalone/drakfont:558
+#: standalone/drakfont:556
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -21210,107 +21367,107 @@ msgstr ""
 "Pode instalar os tipos de letra de uma maneira normal. Em raros casos tipos "
 "de letra falsos podem bloquear o servidor do X."
 
-#: standalone/drakfont:568
+#: standalone/drakfont:566
 #, c-format
 msgid "Ghostscript"
 msgstr "Ghostscript"
 
-#: standalone/drakfont:569
+#: standalone/drakfont:567
 #, c-format
 msgid "StarOffice"
 msgstr "StarOffice"
 
-#: standalone/drakfont:570
+#: standalone/drakfont:568
 #, c-format
 msgid "Abiword"
 msgstr "Abiword"
 
-#: standalone/drakfont:571
+#: standalone/drakfont:569
 #, c-format
 msgid "Generic Printers"
 msgstr "Impressoras Genéricas"
 
-#: standalone/drakfont:587
+#: standalone/drakfont:585
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "Escolha o ficheiro dos tipos de letra e clique em 'Adicionar'"
 
-#: standalone/drakfont:588
+#: standalone/drakfont:586
 #, c-format
 msgid "File Selection"
 msgstr "Selecção de Ficheiros"
 
-#: standalone/drakfont:604
-#, c-format
-msgid "You've not selected any font"
-msgstr "Não escolheu qualquer tipo de letra"
+#: standalone/drakfont:590
+#, fuzzy, c-format
+msgid "Fonts"
+msgstr "Lista dos Tipos de Letra"
 
-#: standalone/drakfont:657
+#: standalone/drakfont:653
 #, c-format
 msgid "Import fonts"
 msgstr "Importar tipos de letra"
 
-#: standalone/drakfont:662
+#: standalone/drakfont:658
 #, c-format
 msgid "Install fonts"
 msgstr "Instalar tipos de letra"
 
-#: standalone/drakfont:697
+#: standalone/drakfont:693
 #, c-format
 msgid "click here if you are sure."
 msgstr "clique aqui se tem certeza."
 
-#: standalone/drakfont:699
+#: standalone/drakfont:695
 #, c-format
 msgid "here if no."
 msgstr "aqui se não."
 
-#: standalone/drakfont:738
+#: standalone/drakfont:734
 #, c-format
 msgid "Unselected All"
 msgstr "Desmarcar Tudo"
 
-#: standalone/drakfont:741
+#: standalone/drakfont:737
 #, c-format
 msgid "Selected All"
 msgstr "Seleccionar Tudo"
 
-#: standalone/drakfont:744
+#: standalone/drakfont:740
 #, c-format
 msgid "Remove List"
 msgstr "Remover Lista"
 
-#: standalone/drakfont:755 standalone/drakfont:774
+#: standalone/drakfont:751 standalone/drakfont:770
 #, c-format
 msgid "Importing fonts"
 msgstr "Importar tipos de letra"
 
-#: standalone/drakfont:759 standalone/drakfont:779
+#: standalone/drakfont:755 standalone/drakfont:775
 #, c-format
 msgid "Initial tests"
 msgstr "Testes iniciais"
 
-#: standalone/drakfont:760
+#: standalone/drakfont:756
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Copiar tipos de letra no seu sistema"
 
-#: standalone/drakfont:761
+#: standalone/drakfont:757
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Instalar & converter tipos de letra"
 
-#: standalone/drakfont:762
+#: standalone/drakfont:758
 #, c-format
 msgid "Post Install"
 msgstr "Pós-instalação"
 
-#: standalone/drakfont:780
+#: standalone/drakfont:776
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "Remover tipos de letra no seu sistema"
 
-#: standalone/drakfont:781
+#: standalone/drakfont:777
 #, c-format
 msgid "Post Uninstall"
 msgstr "Pós Desinstalação"
@@ -21658,17 +21815,17 @@ msgstr ""
 "Transparente Proxy Cache (SQUID)."
 
 #: standalone/drakhelp:17
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright © 2003-2004 Mandrakesoft.\n"
+"Copyright © 2003-2004 Mandriva.\n"
 "Iste é software livre e pode ser redistribuido sob a licença GNU GPL.\n"
 "\n"
 "Uso: \n"
@@ -21680,7 +21837,8 @@ msgstr " --help                - mostra esta ajuda   \n"
 
 #: standalone/drakhelp:23
 #, c-format
-msgid " --id <id_label>       - load the html help page which refers to id_label\n"
+msgid ""
+" --id <id_label>       - load the html help page which refers to id_label\n"
 msgstr ""
 " --id <id_label>       - carrega a página html de ajuda que se referem ao "
 "id_label\n"
@@ -21695,9 +21853,9 @@ msgstr ""
 "bem-vindo )\n"
 
 #: standalone/drakhelp:36
-#, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Centro de Ajuda Mandrakelinux"
+#, fuzzy, c-format
+msgid "Mandriva Linux Help Center"
+msgstr "Centro de Ajuda Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -21728,26 +21886,36 @@ msgstr "Definições do sistema & personalizadas"
 msgid "Editable"
 msgstr "Editavel"
 
-#: standalone/drakperm:49 standalone/drakperm:321
+#: standalone/drakperm:49 standalone/drakperm:329
 #, c-format
 msgid "Path"
 msgstr "Path"
 
-#: standalone/drakperm:49 standalone/drakperm:250
+#: standalone/drakperm:49 standalone/drakperm:251
 #, c-format
 msgid "User"
 msgstr "Utilizador"
 
-#: standalone/drakperm:49 standalone/drakperm:250
+#: standalone/drakperm:49 standalone/drakperm:251
 #, c-format
 msgid "Group"
 msgstr "Grupo"
 
-#: standalone/drakperm:49 standalone/drakperm:333
+#: standalone/drakperm:49 standalone/drakperm:341
 #, c-format
 msgid "Permissions"
 msgstr "Permissões"
 
+#: standalone/drakperm:58
+#, fuzzy, c-format
+msgid "Add a new rule"
+msgstr "Adicionar uma regra"
+
+#: standalone/drakperm:65 standalone/drakperm:100 standalone/drakperm:125
+#, c-format
+msgid "Edit current rule"
+msgstr "Editar regra actual"
+
 #: standalone/drakperm:107
 #, c-format
 msgid ""
@@ -21805,77 +21973,72 @@ msgid "Delete selected rule"
 msgstr "Apagar a regra selecionada"
 
 #. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakperm:125 standalone/drakups:298 standalone/drakups:358
-#: standalone/drakups:378 standalone/drakvpn:333 standalone/drakvpn:694
+#: standalone/drakperm:125 standalone/drakups:302 standalone/drakups:362
+#: standalone/drakups:382 standalone/drakvpn:333 standalone/drakvpn:694
 #: standalone/printerdrake:232
 #, c-format
 msgid "Edit"
 msgstr "Editar"
 
-#: standalone/drakperm:125
-#, c-format
-msgid "Edit current rule"
-msgstr "Editar regra actual"
-
-#: standalone/drakperm:242
+#: standalone/drakperm:243
 #, c-format
 msgid "browse"
 msgstr "procurar"
 
-#: standalone/drakperm:247
+#: standalone/drakperm:248
 #, c-format
 msgid "user"
 msgstr "utilizador"
 
-#: standalone/drakperm:247
+#: standalone/drakperm:248
 #, c-format
 msgid "group"
 msgstr "grupo"
 
-#: standalone/drakperm:247
+#: standalone/drakperm:248
 #, c-format
 msgid "other"
 msgstr "outro"
 
-#: standalone/drakperm:252
+#: standalone/drakperm:253
 #, c-format
 msgid "Read"
 msgstr "Ler"
 
 #. -PO: here %s will be either "user", "group" or "other"
-#: standalone/drakperm:255
+#: standalone/drakperm:256
 #, c-format
 msgid "Enable \"%s\" to read the file"
 msgstr "Permita \"%s\" a ler o ficheiro"
 
-#: standalone/drakperm:259
+#: standalone/drakperm:260
 #, c-format
 msgid "Write"
 msgstr "Escrever"
 
 #. -PO: here %s will be either "user", "group" or "other"
-#: standalone/drakperm:262
+#: standalone/drakperm:263
 #, c-format
 msgid "Enable \"%s\" to write the file"
 msgstr "Permita \"%s\" para escrever o ficheiro"
 
-#: standalone/drakperm:266
+#: standalone/drakperm:267
 #, c-format
 msgid "Execute"
 msgstr "Execute"
 
 #. -PO: here %s will be either "user", "group" or "other"
-#: standalone/drakperm:269
+#: standalone/drakperm:270
 #, c-format
 msgid "Enable \"%s\" to execute the file"
 msgstr "Permita \"%s\" a executar o ficheiro"
 
-#: standalone/drakperm:272
+#: standalone/drakperm:273
 #, c-format
 msgid "Sticky-bit"
 msgstr "Sticky-bit"
 
-#: standalone/drakperm:272
+#: standalone/drakperm:273
 #, c-format
 msgid ""
 "Used for directory:\n"
@@ -21884,52 +22047,52 @@ msgstr ""
 "Usado para a pasta:\n"
 " apenas o dono da pasta ou ficheiro nesta pasta pode apagar"
 
-#: standalone/drakperm:273
+#: standalone/drakperm:274
 #, c-format
 msgid "Set-UID"
 msgstr "Definir UID"
 
-#: standalone/drakperm:273
+#: standalone/drakperm:274
 #, c-format
 msgid "Use owner id for execution"
 msgstr "Usar o id do dono para a execução"
 
-#: standalone/drakperm:274
+#: standalone/drakperm:275
 #, c-format
 msgid "Set-GID"
 msgstr "Definir GID"
 
-#: standalone/drakperm:274
+#: standalone/drakperm:275
 #, c-format
 msgid "Use group id for execution"
 msgstr "Usar id do grupo para execução"
 
-#: standalone/drakperm:290 standalone/drakxtv:89
+#: standalone/drakperm:293 standalone/drakxtv:89
 #, c-format
 msgid "User:"
 msgstr "Utilizador:"
 
-#: standalone/drakperm:292
+#: standalone/drakperm:295
 #, c-format
 msgid "Group:"
 msgstr "Grupo:"
 
-#: standalone/drakperm:296
+#: standalone/drakperm:299
 #, c-format
 msgid "Current user"
 msgstr "Utilizador actual"
 
-#: standalone/drakperm:297
+#: standalone/drakperm:300
 #, c-format
 msgid "When checked, owner and group will not be changed"
 msgstr "Quando marcado, o dono e o grupo não serão mudados"
 
-#: standalone/drakperm:307
+#: standalone/drakperm:310
 #, c-format
 msgid "Path selection"
 msgstr "Selecção da localização"
 
-#: standalone/drakperm:327
+#: standalone/drakperm:335
 #, c-format
 msgid "Property"
 msgstr "Propriedades"
@@ -21974,7 +22137,8 @@ msgstr ""
 #: standalone/drakpxe:143
 #, c-format
 msgid "Please choose which network interface will be used for the dhcp server."
-msgstr "Por favor escolha que adaptador de rede será usado para o servidor dhcp."
+msgstr ""
+"Por favor escolha que adaptador de rede será usado para o servidor dhcp."
 
 #: standalone/drakpxe:144
 #, c-format
@@ -22032,7 +22196,8 @@ msgstr "Nenhuma imagem encontrada"
 
 #: standalone/drakpxe:197
 #, c-format
-msgid "No CD or DVD image found, please copy the installation program and rpm files."
+msgid ""
+"No CD or DVD image found, please copy the installation program and rpm files."
 msgstr ""
 "Nenhuma imagem de CD ou DVD encontrada, por favor copie o programa de "
 "instalação e os ficheiros rpm."
@@ -22060,95 +22225,114 @@ msgstr "Localização do ficheiro auto_install.cfg"
 msgid "ESSID"
 msgstr "ESSID"
 
+#: standalone/drakroam:138 standalone/drakvpn:1143
+#, c-format
+msgid "Mode"
+msgstr "Modo"
+
+#: standalone/drakroam:139 standalone/harddrake2:96
+#, c-format
+msgid "Channel"
+msgstr "Canal"
+
 #: standalone/drakroam:141
 #, c-format
 msgid "Key"
 msgstr "Chave"
 
-#: standalone/drakroam:167
-#, c-format
-msgid "Status"
-msgstr "Estado"
+#: standalone/drakroam:157
+#, fuzzy, c-format
+msgid "Network:"
+msgstr "Rede"
 
-#: standalone/drakroam:174
-#, c-format
-msgid "Disconnect"
-msgstr "Desligar"
+#: standalone/drakroam:158
+#, fuzzy, c-format
+msgid "IP:"
+msgstr "IP: %s"
+
+#: standalone/drakroam:160
+#, fuzzy, c-format
+msgid "Mode:"
+msgstr "Modo"
+
+#: standalone/drakroam:161
+#, fuzzy, c-format
+msgid "Encryption:"
+msgstr "Encriptação"
+
+#: standalone/drakroam:162
+#, fuzzy, c-format
+msgid "Signal:"
+msgstr "Sinal: %s"
 
-#: standalone/drakroam:179
+#: standalone/drakroam:176
 #, c-format
 msgid "Roaming"
 msgstr "Roaming"
 
-#: standalone/drakroam:182 standalone/drakroam:256
+#: standalone/drakroam:179 standalone/drakroam:258
 #, c-format
 msgid "Roaming: %s"
 msgstr "Roaming: %s"
 
-#: standalone/drakroam:189
+#: standalone/drakroam:179 standalone/drakroam:257 standalone/drakvpn:1061
+#: standalone/drakvpn:1077 standalone/drakvpn:1090
+#, c-format
+msgid "off"
+msgstr "desligado"
+
+#: standalone/drakroam:186
 #, c-format
 msgid "Scan interval (sec): "
 msgstr "Intervalo de verificação (seg):"
 
-#: standalone/drakroam:192
+#: standalone/drakroam:189
 #, c-format
 msgid "Set"
 msgstr "Definir"
 
-#: standalone/drakroam:197
+#: standalone/drakroam:194
 #, c-format
 msgid "Known Networks (Drag up/down or edit)"
 msgstr "Redes Conhecidas (Arrastar para cima/baixo ou editar)"
 
-#: standalone/drakroam:205
+#: standalone/drakroam:202
 #, c-format
 msgid "Connect"
 msgstr "Conectar"
 
-#: standalone/drakroam:213
+#: standalone/drakroam:210
 #, c-format
 msgid "Available Networks"
 msgstr "Redes Disponíveis"
 
-#: standalone/drakroam:224
+#: standalone/drakroam:221
 #, c-format
 msgid "Rescan"
 msgstr "Reverificar"
 
-#: standalone/drakroam:231
-#, c-format
-msgid "Save and close"
-msgstr "Gravar e fechar"
-
-#: standalone/drakroam:281
-#, c-format
-msgid "Network: %s"
-msgstr "Rede: %s"
-
-#: standalone/drakroam:282
-#, c-format
-msgid "Mode: %s"
-msgstr "Modo: %s"
-
-#: standalone/drakroam:283
+#: standalone/drakroam:225
 #, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+msgid "Status"
+msgstr "Estado"
 
-#: standalone/drakroam:284
+#: standalone/drakroam:232
 #, c-format
-msgid "Encryption: %s"
-msgstr "Encriptação: %s"
+msgid "Disconnect"
+msgstr "Desligar"
 
-#: standalone/drakroam:285
+#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
+#: standalone/drakroam:233 standalone/net_applet:90
+#: standalone/printerdrake:238
 #, c-format
-msgid "Gateway: %s"
-msgstr "Gateway: %s"
+msgid "Refresh"
+msgstr "Refrescar"
 
-#: standalone/drakroam:286
+#: standalone/drakroam:257 standalone/drakvpn:1061 standalone/drakvpn:1077
+#: standalone/drakvpn:1090
 #, c-format
-msgid "Signal: %s"
-msgstr "Sinal: %s"
+msgid "on"
+msgstr "ligado"
 
 #: standalone/draksec:49
 #, c-format
@@ -22269,7 +22453,7 @@ msgstr ""
 "mas o sistema é inteiramente fechado e as opções de segurança estão ao\n"
 "seu máximo."
 
-#: standalone/draksec:154 standalone/harddrake2:202
+#: standalone/draksec:154 standalone/harddrake2:207
 #, c-format
 msgid ""
 "Description of the fields:\n"
@@ -22339,7 +22523,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 ""
 "Nenhuma placa de som foi detectada na sua máquina. Por favor verifique se a "
 "placa de som suportada pelo Linux está bem ligada.\n"
@@ -22348,7 +22532,7 @@ msgstr ""
 "Pode visitar a nossa base de dados de hardware em:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -22490,13 +22674,13 @@ msgstr "Mostrar o logo na consola"
 msgid "Make kernel message quiet by default"
 msgstr "Tornar a mensagem do kernel silenciosa por omissão"
 
-#: standalone/draksplash:161 standalone/draksplash:309
-#: standalone/draksplash:454
+#: standalone/draksplash:161 standalone/draksplash:316
+#: standalone/draksplash:460
 #, c-format
 msgid "Notice"
 msgstr "Notificar"
 
-#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:161 standalone/draksplash:316
 #, c-format
 msgid "This theme does not yet have a bootsplash in %s!"
 msgstr "Este tema ainda não tem nenhuma imagem de arranque em %s !"
@@ -22506,34 +22690,34 @@ msgstr "Este tema ainda não tem nenhuma imagem de arranque em %s !"
 msgid "choose image"
 msgstr "escolher imagem"
 
-#: standalone/draksplash:209
+#: standalone/draksplash:217
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr "a gravar o tema Bootsplash..."
 
-#: standalone/draksplash:435
+#: standalone/draksplash:441
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "Selecção da cor da Barra de Progresso"
 
-#: standalone/draksplash:454
+#: standalone/draksplash:460
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "Deve escolher um ficheiro de imagem primeiro!"
 
-#: standalone/draksplash:459
+#: standalone/draksplash:465
 #, c-format
 msgid "Generating preview..."
 msgstr "A gerar previsão..."
 
 #. -PO:  First %s is theme name, second %s (in parenthesis) is resolution
-#: standalone/draksplash:497
+#: standalone/draksplash:503
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "%s Previsão (%s) BootSplash"
 
 #. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/draksplash:503
+#: standalone/draksplash:509
 #, c-format
 msgid ""
 "The image \"%s\" cannot be load due to the following issue:\n"
@@ -22583,12 +22767,12 @@ msgstr ""
 msgid "Autodetection"
 msgstr "Autodetecção"
 
-#: standalone/drakups:101 standalone/harddrake2:231
+#: standalone/drakups:101 standalone/harddrake2:236
 #, c-format
 msgid "Detection in progress"
 msgstr "Detecção em progresso"
 
-#: standalone/drakups:120 standalone/drakups:156 standalone/logdrake:449
+#: standalone/drakups:120 standalone/drakups:159 standalone/logdrake:449
 #: standalone/logdrake:455
 #, c-format
 msgid "Congratulations"
@@ -22653,64 +22837,64 @@ msgstr "Porta:"
 msgid "The port on which is connected your ups"
 msgstr "A porta onde está conectado o seu ups"
 
-#: standalone/drakups:156
+#: standalone/drakups:159
 #, c-format
 msgid "The wizard successfully configured the new \"%s\" UPS device."
 msgstr "O assistente configurou com sucesso o novo dispositivo UPS \"%s\"."
 
-#: standalone/drakups:246
+#: standalone/drakups:250
 #, c-format
 msgid "UPS devices"
 msgstr "Dispositivos UPS"
 
-#: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282
-#: standalone/harddrake2:83 standalone/harddrake2:109
-#: standalone/harddrake2:116
+#: standalone/drakups:251 standalone/drakups:270 standalone/drakups:286
+#: standalone/harddrake2:84 standalone/harddrake2:110
+#: standalone/harddrake2:117
 #, c-format
 msgid "Name"
 msgstr "Nome"
 
-#: standalone/drakups:265
+#: standalone/drakups:269
 #, c-format
 msgid "UPS users"
 msgstr "Utilizadores UPS"
 
-#: standalone/drakups:281
+#: standalone/drakups:285
 #, c-format
 msgid "Access Control Lists"
 msgstr "Listas de Controlo de Acesso"
 
-#: standalone/drakups:282
+#: standalone/drakups:286
 #, c-format
 msgid "IP mask"
 msgstr "Mascara IP"
 
-#: standalone/drakups:294
+#: standalone/drakups:298
 #, c-format
 msgid "Rules"
 msgstr "Regras"
 
-#: standalone/drakups:295
+#: standalone/drakups:299
 #, c-format
 msgid "Action"
 msgstr "Acção"
 
-#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:80
+#: standalone/drakups:299 standalone/drakvpn:1146 standalone/harddrake2:81
 #, c-format
 msgid "Level"
 msgstr "Nível"
 
-#: standalone/drakups:295
+#: standalone/drakups:299
 #, c-format
 msgid "ACL name"
 msgstr "Nome ACL"
 
-#: standalone/drakups:325 standalone/drakups:329 standalone/drakups:338
+#: standalone/drakups:329 standalone/drakups:333 standalone/drakups:342
 #, c-format
 msgid "DrakUPS"
 msgstr "DrakUPS"
 
-#: standalone/drakups:335
+#: standalone/drakups:339
 #, c-format
 msgid "Welcome to the UPS configuration tools"
 msgstr "Bem-vindo às ferramentas de configuração UPS"
@@ -23900,11 +24084,6 @@ msgstr ""
 "Então, aqui, as unidades do tempo de vida são 'min', 'min', 'seg', 'seg', "
 "'seg' e 'hora'.\n"
 
-#: standalone/drakvpn:1031 standalone/drakvpn:1116
-#, c-format
-msgid "Encryption algorithm"
-msgstr "Algoritmo de encriptação"
-
 #: standalone/drakvpn:1033
 #, c-format
 msgid "Authentication algorithm"
@@ -23976,16 +24155,6 @@ msgstr ""
 msgid "Generate policy"
 msgstr "Gerar política"
 
-#: standalone/drakvpn:1061 standalone/drakvpn:1077 standalone/drakvpn:1090
-#, c-format
-msgid "off"
-msgstr "desligado"
-
-#: standalone/drakvpn:1061 standalone/drakvpn:1077 standalone/drakvpn:1090
-#, c-format
-msgid "on"
-msgstr "ligado"
-
 #: standalone/drakvpn:1062
 #, c-format
 msgid ""
@@ -24229,11 +24398,6 @@ msgstr "descartar"
 
 #: standalone/drakvpn:1143
 #, c-format
-msgid "Mode"
-msgstr "Modo"
-
-#: standalone/drakvpn:1143
-#, c-format
 msgid "tunnel"
 msgstr "túnel"
 
@@ -24387,7 +24551,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 ""
 "Nenhuma placa TV foi detectada na sua máquina. Por favor verifique que a "
 "placa de Video/TV suportada pelo Linux está bem conectada.\n"
@@ -24396,29 +24560,31 @@ msgstr ""
 "Pode visitar a nossa base de dados de hardware em :\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
-#: standalone/harddrake2:23
+#: standalone/harddrake2:24
 #, c-format
 msgid "Alternative drivers"
 msgstr "Drivers alternativos"
 
-#: standalone/harddrake2:24
+#: standalone/harddrake2:25
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr "a lista dos drivers alternativos para esta placa de som"
 
-#: standalone/harddrake2:27
+#: standalone/harddrake2:28
 #, c-format
-msgid "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
-msgstr "este é o bus físico no qual o disposito está conectado (ex: PCI, USB, ...)"
+msgid ""
+"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
+msgstr ""
+"este é o bus físico no qual o disposito está conectado (ex: PCI, USB, ...)"
 
-#: standalone/harddrake2:29 standalone/harddrake2:144
+#: standalone/harddrake2:30 standalone/harddrake2:145
 #, c-format
 msgid "Bus identification"
 msgstr "Identificação do Bus"
 
-#: standalone/harddrake2:30
+#: standalone/harddrake2:31
 #, c-format
 msgid ""
 "- PCI and USB devices: this lists the vendor, device, subvendor and "
@@ -24427,7 +24593,7 @@ msgstr ""
 "- dispositivos PCI e USB : isto lista  os ids PCI/USB do vendedor, do "
 "dispositivo, e os ids sub PCI/USB corespondentes"
 
-#: standalone/harddrake2:33
+#: standalone/harddrake2:34
 #, c-format
 msgid ""
 "- pci devices: this gives the PCI slot, device and function of this card\n"
@@ -24438,204 +24604,204 @@ msgstr ""
 "- dispositivos EIDE : o dispositivo ou é slave ou master\n"
 "- dispositivos SCSI : o bus scsi o os ids do dispositivo scsi"
 
-#: standalone/harddrake2:36
+#: standalone/harddrake2:37
 #, c-format
 msgid "Drive capacity"
 msgstr "Capacidade do disco"
 
-#: standalone/harddrake2:36
+#: standalone/harddrake2:37
 #, c-format
 msgid "special capacities of the driver (burning ability and or DVD support)"
 msgstr "capacidades especiais do driver (capacidade de gravar e/ou sporte DVD)"
 
-#: standalone/harddrake2:37
+#: standalone/harddrake2:38
 #, c-format
 msgid "this field describes the device"
 msgstr "este campo descreve o dispositivo"
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:39
 #, c-format
 msgid "Old device file"
 msgstr "Antigo ficheiro do dispositivo"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:40
 #, c-format
 msgid "old static device name used in dev package"
 msgstr "nome de dispositivo estático antigo usado no pacote dev"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:41
 #, c-format
 msgid "New devfs device"
 msgstr "Novo dispositivo devfs"
 
-#: standalone/harddrake2:41
+#: standalone/harddrake2:42
 #, c-format
 msgid "new dynamic device name generated by core kernel devfs"
 msgstr "novo nome dinâmico do dispositivo gerado pelo núcleo devfs do kernel"
 
 #. -PO: here "module" is the "jargon term" for a kernel driver
-#: standalone/harddrake2:44
+#: standalone/harddrake2:45
 #, c-format
 msgid "Module"
 msgstr "Módulo"
 
-#: standalone/harddrake2:44
+#: standalone/harddrake2:45
 #, c-format
 msgid "the module of the GNU/Linux kernel that handles the device"
 msgstr "o módulo do kernel GNU/Linux que gere o dispositivo"
 
-#: standalone/harddrake2:45
+#: standalone/harddrake2:46
 #, c-format
 msgid "Extended partitions"
 msgstr "Partições extendidas"
 
-#: standalone/harddrake2:45
+#: standalone/harddrake2:46
 #, c-format
 msgid "the number of extended partitions"
 msgstr "o número de partições extendidas"
 
-#: standalone/harddrake2:46
+#: standalone/harddrake2:47
 #, c-format
 msgid "Geometry"
 msgstr "Geometria"
 
-#: standalone/harddrake2:46
+#: standalone/harddrake2:47
 #, c-format
 msgid "Cylinder/head/sectors geometry of the disk"
 msgstr "Cilindros/cabeças/sectores geometria do disco"
 
-#: standalone/harddrake2:47
+#: standalone/harddrake2:48
 #, c-format
 msgid "Disk controller"
 msgstr "Controlador do Disco"
 
-#: standalone/harddrake2:47
+#: standalone/harddrake2:48
 #, c-format
 msgid "the disk controller on the host side"
 msgstr "o controlador do disco na parte do endereço"
 
-#: standalone/harddrake2:48
+#: standalone/harddrake2:49
 #, c-format
 msgid "class of hardware device"
 msgstr "classe do hardware do dispositivo"
 
-#: standalone/harddrake2:49 standalone/harddrake2:81
+#: standalone/harddrake2:50 standalone/harddrake2:82
 #: standalone/printerdrake:211
 #, c-format
 msgid "Model"
 msgstr "Modelo"
 
-#: standalone/harddrake2:49
+#: standalone/harddrake2:50
 #, c-format
 msgid "hard disk model"
 msgstr "Modelo de disco rígido"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:51
 #, c-format
 msgid "network printer port"
 msgstr "porta da impressora na rede"
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:52
 #, c-format
 msgid "Primary partitions"
 msgstr "Partições primárias"
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:52
 #, c-format
 msgid "the number of the primary partitions"
 msgstr "o número de partições primárias"
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:53
 #, c-format
 msgid "the vendor name of the device"
 msgstr "o nome do vendedor do dispositivo"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:54
 #, c-format
 msgid "Bus PCI #"
 msgstr "Bus PCI #"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:54
 #, c-format
 msgid "the PCI bus on which the device is plugged"
 msgstr "a bus PCI onde o dispositivo está conectado"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:55
 #, c-format
 msgid "PCI device #"
 msgstr "Dispositivo PCI #"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:55
 #, c-format
 msgid "PCI device number"
 msgstr "Número do dispositivo PCI"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:56
 #, c-format
 msgid "PCI function #"
 msgstr "Função PCI #"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:56
 #, c-format
 msgid "PCI function number"
 msgstr "Número da função PCI"
 
-#: standalone/harddrake2:56
+#: standalone/harddrake2:57
 #, c-format
 msgid "Vendor ID"
 msgstr "ID do vendedor"
 
-#: standalone/harddrake2:56
+#: standalone/harddrake2:57
 #, c-format
 msgid "this is the standard numerical identifier of the vendor"
 msgstr "este é o identificador númerico standard do vendedor"
 
-#: standalone/harddrake2:57
+#: standalone/harddrake2:58
 #, c-format
 msgid "Device ID"
 msgstr "ID do dispositivo"
 
-#: standalone/harddrake2:57
+#: standalone/harddrake2:58
 #, c-format
 msgid "this is the numerical identifier of the device"
 msgstr "este é o identificador númerico do dispositivo"
 
-#: standalone/harddrake2:58
+#: standalone/harddrake2:59
 #, c-format
 msgid "Sub vendor ID"
 msgstr "ID do sub-vendedor"
 
-#: standalone/harddrake2:58
+#: standalone/harddrake2:59
 #, c-format
 msgid "this is the minor numerical identifier of the vendor"
 msgstr "este é o menor identificador númerico do vendedor"
 
-#: standalone/harddrake2:59
+#: standalone/harddrake2:60
 #, c-format
 msgid "Sub device ID"
 msgstr "ID do sub dispositivo"
 
-#: standalone/harddrake2:59
+#: standalone/harddrake2:60
 #, c-format
 msgid "this is the minor numerical identifier of the device"
 msgstr "este é o menor identificador númerico do dispositivo"
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:61
 #, c-format
 msgid "Device USB ID"
 msgstr "ID do dispositivo USB"
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:61
 #, c-format
 msgid ".."
 msgstr ".."
 
-#: standalone/harddrake2:64
+#: standalone/harddrake2:65
 #, c-format
 msgid "Bogomips"
 msgstr "Bogomips"
 
-#: standalone/harddrake2:64
+#: standalone/harddrake2:65
 #, c-format
 msgid ""
 "the GNU/Linux kernel needs to run a calculation loop at boot time to "
@@ -24647,53 +24813,53 @@ msgstr ""
 "gravados como bogomips como uma maneira de \"benchmark\" (referência "
 "comparativa) do processador (cpu)."
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:66
 #, c-format
 msgid "Cache size"
 msgstr "Tamanho da cache"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:66
 #, c-format
 msgid "size of the (second level) cpu cache"
 msgstr "tamanho da (segundo nível) cache do cpu"
 
 #. -PO: here "comas" is the medical coma, not the lexical coma!!
-#: standalone/harddrake2:68
+#: standalone/harddrake2:69
 #, c-format
 msgid "Coma bug"
 msgstr "Erro do coma"
 
-#: standalone/harddrake2:68
+#: standalone/harddrake2:69
 #, c-format
 msgid "whether this cpu has the Cyrix 6x86 Coma bug"
 msgstr "se este cpu tem o erro Coma dos Cyrix 6x86"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:70
 #, c-format
 msgid "Cpuid family"
 msgstr "Família cpuid"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:70
 #, c-format
 msgid "family of the cpu (eg: 6 for i686 class)"
 msgstr "Família do cpu (ex: 6 para a classe i686)"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:71
 #, c-format
 msgid "Cpuid level"
 msgstr "Nível do cpuid"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:71
 #, c-format
 msgid "information level that can be obtained through the cpuid instruction"
 msgstr "nível de informação que pode ser obtido atravez da instrução cpuid"
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:72
 #, c-format
 msgid "Frequency (MHz)"
 msgstr "Frequência (MHz)"
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:72
 #, c-format
 msgid ""
 "the CPU frequency in MHz (Megahertz which in first approximation may be "
@@ -24704,22 +24870,22 @@ msgstr ""
 "assimilada grosseiramente para o número de instruções que o cpu é capaz de "
 "executar por segundo)"
 
-#: standalone/harddrake2:72
+#: standalone/harddrake2:73
 #, c-format
 msgid "Flags"
 msgstr "Flags"
 
-#: standalone/harddrake2:72
+#: standalone/harddrake2:73
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr "flags do processador comunicadas pelo kernel"
 
-#: standalone/harddrake2:73
+#: standalone/harddrake2:74
 #, c-format
 msgid "Fdiv bug"
 msgstr "Erro Fdiv"
 
-#: standalone/harddrake2:74
+#: standalone/harddrake2:75
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -24730,46 +24896,46 @@ msgstr ""
 "'floating point' que não permite a precisão esperada quando a executar uma "
 "'Floating point DIVision (FDIV)'"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:76
 #, c-format
 msgid "Is FPU present"
 msgstr "FPU está presente"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:76
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
 msgstr "sim significa que o processador tem um coprocessador aritmético"
 
-#: standalone/harddrake2:76
+#: standalone/harddrake2:77
 #, c-format
 msgid "Whether the FPU has an irq vector"
 msgstr "Se o FPU tem um vector irq"
 
-#: standalone/harddrake2:76
+#: standalone/harddrake2:77
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr ""
 "sim significa que o coprocessador aritmético tem um vector de excepção "
 "anexado"
 
-#: standalone/harddrake2:77
+#: standalone/harddrake2:78
 #, c-format
 msgid "F00f bug"
 msgstr "Erro F00f"
 
-#: standalone/harddrake2:77
+#: standalone/harddrake2:78
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 "os primeiros Pentium não eram fiáveis (buggy) e bloqueavam quando a "
 "descodificar o bytecode F00F"
 
-#: standalone/harddrake2:78
+#: standalone/harddrake2:79
 #, c-format
 msgid "Halt bug"
 msgstr "Erro halt"
 
-#: standalone/harddrake2:79
+#: standalone/harddrake2:80
 #, c-format
 msgid ""
 "Some of the early i486DX-100 chips cannot reliably return to operating mode "
@@ -24778,62 +24944,62 @@ msgstr ""
 "Alguns dos primeiros chips i486DX-100 não podem voltar ao modo operacional "
 "de maneira segura depois de ter usado a instrução \"halt\"."
 
-#: standalone/harddrake2:80
+#: standalone/harddrake2:81
 #, c-format
 msgid "sub generation of the cpu"
 msgstr "sub geração do cpu"
 
-#: standalone/harddrake2:81
+#: standalone/harddrake2:82
 #, c-format
 msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
 msgstr "geração do processador (ex: 8 para os Pentium III, ...)"
 
-#: standalone/harddrake2:82
+#: standalone/harddrake2:83
 #, c-format
 msgid "Model name"
 msgstr "Nome do modelo"
 
-#: standalone/harddrake2:82
+#: standalone/harddrake2:83
 #, c-format
 msgid "official vendor name of the cpu"
 msgstr "nome oficial do vendedor do processador"
 
-#: standalone/harddrake2:83
+#: standalone/harddrake2:84
 #, c-format
 msgid "the name of the CPU"
 msgstr "o nome do processador"
 
-#: standalone/harddrake2:84
+#: standalone/harddrake2:85
 #, c-format
 msgid "Processor ID"
 msgstr "ID Processador"
 
-#: standalone/harddrake2:84
+#: standalone/harddrake2:85
 #, c-format
 msgid "the number of the processor"
 msgstr "o numero do processador"
 
-#: standalone/harddrake2:85
+#: standalone/harddrake2:86
 #, c-format
 msgid "Model stepping"
 msgstr "Passo do modelo"
 
-#: standalone/harddrake2:85
+#: standalone/harddrake2:86
 #, c-format
 msgid "stepping of the cpu (sub model (generation) number)"
 msgstr "passo do processador (numero de sub-modelo (geração))"
 
-#: standalone/harddrake2:86
+#: standalone/harddrake2:87
 #, c-format
 msgid "the vendor name of the processor"
 msgstr "o nome do vendedor do processador"
 
-#: standalone/harddrake2:87
+#: standalone/harddrake2:88
 #, c-format
 msgid "Write protection"
 msgstr "Protecção de escrita"
 
-#: standalone/harddrake2:87
+#: standalone/harddrake2:88
 #, c-format
 msgid ""
 "the WP flag in the CR0 register of the cpu enforce write protection at the "
@@ -24844,218 +25010,214 @@ msgstr ""
 "nível da página da memória, permitindo assim o processador de evitar acessos "
 "desmarcados no kernel à memória do utilizador (é uma protecção contra erros)"
 
-#: standalone/harddrake2:91
+#: standalone/harddrake2:92
 #, c-format
 msgid "Floppy format"
 msgstr "Formatos de disquete"
 
-#: standalone/harddrake2:91
+#: standalone/harddrake2:92
 #, c-format
 msgid "format of floppies supported by the drive"
 msgstr "formatos de disquetes suportados pelo drive"
 
-#: standalone/harddrake2:95
-#, c-format
-msgid "Channel"
-msgstr "Canal"
-
-#: standalone/harddrake2:95
+#: standalone/harddrake2:96
 #, c-format
 msgid "EIDE/SCSI channel"
 msgstr "Canal EIDE/SCSI"
 
-#: standalone/harddrake2:96
+#: standalone/harddrake2:97
 #, c-format
 msgid "Disk identifier"
 msgstr "Identificador do disco"
 
-#: standalone/harddrake2:96
+#: standalone/harddrake2:97
 #, c-format
 msgid "usually the disk serial number"
 msgstr "usualmente o número série do disco"
 
-#: standalone/harddrake2:97
+#: standalone/harddrake2:98
 #, c-format
 msgid "Logical unit number"
 msgstr "Número da unidade lógica"
 
-#: standalone/harddrake2:97
+#: standalone/harddrake2:98
 #, c-format
 msgid ""
 "the SCSI target number (LUN). SCSI devices connected to a host are uniquely "
 "identified by a\n"
 "channel number, a target id and a logical unit number"
 msgstr ""
-"o número da marca SCSI (LUN). Os dispositivos SCSI conectados a um endereço"
-"são\n"
+"o número da marca SCSI (LUN). Os dispositivos SCSI conectados a um "
+"endereçosão\n"
 "únicamente identificados por um número de canal, uma marca id e um número de "
 "unidade lógica"
 
 #. -PO: here, "size" is the size of the ram chip (eg: 128Mo, 256Mo, ...)
-#: standalone/harddrake2:104
+#: standalone/harddrake2:105
 #, c-format
 msgid "Installed size"
 msgstr "Tamanho instalado"
 
-#: standalone/harddrake2:104
+#: standalone/harddrake2:105
 #, c-format
 msgid "Installed size of the memory bank"
 msgstr "Tamanho instalado da memória bank"
 
-#: standalone/harddrake2:105
+#: standalone/harddrake2:106
 #, c-format
 msgid "Enabled Size"
 msgstr "Tamanho activado"
 
-#: standalone/harddrake2:105
+#: standalone/harddrake2:106
 #, c-format
 msgid "Enabled size of the memory bank"
 msgstr "Tamanho activado da memória bank"
 
-#: standalone/harddrake2:106
+#: standalone/harddrake2:107
 #, c-format
 msgid "type of the memory device"
 msgstr "tipo de memória do dispositivo"
 
-#: standalone/harddrake2:107
+#: standalone/harddrake2:108
 #, c-format
 msgid "Speed"
 msgstr "Velocidade"
 
-#: standalone/harddrake2:107
+#: standalone/harddrake2:108
 #, c-format
 msgid "Speed of the memory bank"
 msgstr "Velocidade da memória bank"
 
-#: standalone/harddrake2:108
+#: standalone/harddrake2:109
 #, c-format
 msgid "Bank connections"
 msgstr "Conexões Bank"
 
-#: standalone/harddrake2:109
+#: standalone/harddrake2:110
 #, c-format
 msgid "Socket designation of the memory bank"
 msgstr "Designação do socket da memória bank"
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:114
 #, c-format
 msgid "Device file"
 msgstr "Ficheiro de dispositivo"
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:114
 #, c-format
-msgid "the device file used to communicate with the kernel driver for the mouse"
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
 msgstr ""
 "o ficheiro do dispositivo usado para comunicar com o driver do kernel para o "
 "rato"
 
-#: standalone/harddrake2:114
+#: standalone/harddrake2:115
 #, c-format
 msgid "Emulated wheel"
 msgstr "Roda emulada"
 
-#: standalone/harddrake2:114
+#: standalone/harddrake2:115
 #, c-format
 msgid "whether the wheel is emulated or not"
 msgstr "se a roda está emulada ou não"
 
-#: standalone/harddrake2:115
+#: standalone/harddrake2:116
 #, c-format
 msgid "the type of the mouse"
 msgstr "o tipo do rato"
 
-#: standalone/harddrake2:116
+#: standalone/harddrake2:117
 #, c-format
 msgid "the name of the mouse"
 msgstr "o nome do rato"
 
-#: standalone/harddrake2:117
+#: standalone/harddrake2:118
 #, c-format
 msgid "Number of buttons"
 msgstr "Número de botões"
 
-#: standalone/harddrake2:117
+#: standalone/harddrake2:118
 #, c-format
 msgid "the number of buttons the mouse has"
 msgstr "o número de botões que o rato tem"
 
-#: standalone/harddrake2:118
+#: standalone/harddrake2:119
 #, c-format
 msgid "the type of bus on which the mouse is connected"
 msgstr "o tipo de bus no qual o rato está conectado"
 
-#: standalone/harddrake2:119
+#: standalone/harddrake2:120
 #, c-format
 msgid "Mouse protocol used by X11"
 msgstr "Protocolo de rato usado pelo X11"
 
-#: standalone/harddrake2:119
+#: standalone/harddrake2:120
 #, c-format
 msgid "the protocol that the graphical desktop use with the mouse"
 msgstr "o protocolo que o desktop gráfico usa com o rato"
 
-#: standalone/harddrake2:126 standalone/harddrake2:135
-#: standalone/harddrake2:142 standalone/harddrake2:150
-#: standalone/harddrake2:316
+#: standalone/harddrake2:127 standalone/harddrake2:136
+#: standalone/harddrake2:143 standalone/harddrake2:151
+#: standalone/harddrake2:321
 #, c-format
 msgid "Identification"
 msgstr "Identificação"
 
-#: standalone/harddrake2:127 standalone/harddrake2:143
+#: standalone/harddrake2:128 standalone/harddrake2:144
 #, c-format
 msgid "Connection"
 msgstr "Conexão"
 
-#: standalone/harddrake2:136
+#: standalone/harddrake2:137
 #, c-format
 msgid "Performances"
 msgstr "Performances"
 
-#: standalone/harddrake2:137
+#: standalone/harddrake2:138
 #, c-format
 msgid "Bugs"
 msgstr "Erros"
 
-#: standalone/harddrake2:138
+#: standalone/harddrake2:139
 #, c-format
 msgid "FPU"
 msgstr "FPU"
 
-#: standalone/harddrake2:146
+#: standalone/harddrake2:147
 #, c-format
 msgid "Partitions"
 msgstr "Partições"
 
-#: standalone/harddrake2:151
+#: standalone/harddrake2:152
 #, c-format
 msgid "Features"
 msgstr "Características"
 
 #. -PO: please keep all "/" characters !!!
-#: standalone/harddrake2:174 standalone/logdrake:77
+#: standalone/harddrake2:175 standalone/logdrake:77
 #: standalone/printerdrake:134 standalone/printerdrake:147
 #, c-format
 msgid "/_Options"
 msgstr "/_Opções"
 
-#: standalone/harddrake2:175 standalone/harddrake2:197 standalone/logdrake:79
+#: standalone/harddrake2:176 standalone/harddrake2:202 standalone/logdrake:79
 #: standalone/printerdrake:159 standalone/printerdrake:161
 #: standalone/printerdrake:164 standalone/printerdrake:166
 #, c-format
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: standalone/harddrake2:179
+#: standalone/harddrake2:180
 #, c-format
 msgid "/Autodetect _printers"
 msgstr "/Auto-detectar _impressoras"
 
-#: standalone/harddrake2:180
+#: standalone/harddrake2:181
 #, c-format
 msgid "/Autodetect _modems"
 msgstr "/Auto-detectar _modems"
 
-#: standalone/harddrake2:181
+#: standalone/harddrake2:182
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "/Auto-detectar drives _jaz"
@@ -25065,27 +25227,27 @@ msgstr "/Auto-detectar drives _jaz"
 msgid "/Autodetect parallel _zip drives"
 msgstr "/Autodetectar drives _zip parallelos"
 
-#: standalone/harddrake2:188
+#: standalone/harddrake2:190
 #, c-format
 msgid "/_Upload the hardware list"
 msgstr "/_Enviar a lista do hardware"
 
-#: standalone/harddrake2:188 standalone/printerdrake:140
+#: standalone/harddrake2:191 standalone/printerdrake:140
 #, c-format
 msgid "/_Quit"
 msgstr "/_Sair"
 
-#: standalone/harddrake2:199
+#: standalone/harddrake2:204
 #, c-format
 msgid "/_Fields description"
 msgstr "/_Descrição dos campos"
 
-#: standalone/harddrake2:201
+#: standalone/harddrake2:206
 #, c-format
 msgid "Harddrake help"
 msgstr "Ajuda Harddrake"
 
-#: standalone/harddrake2:210
+#: standalone/harddrake2:215
 #, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
@@ -25094,122 +25256,123 @@ msgstr ""
 "Assim que tiver escolhido um dispositivo, irá ser capaz de ver a informação "
 "do dispositivo em campos exibidos no frame correcto (\"Informação\")"
 
-#: standalone/harddrake2:216 standalone/printerdrake:164
+#: standalone/harddrake2:221 standalone/printerdrake:164
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Comunicar Erro"
 
-#: standalone/harddrake2:218 standalone/printerdrake:166
+#: standalone/harddrake2:223 standalone/printerdrake:166
 #, c-format
 msgid "/_About..."
 msgstr "/_Acerca..."
 
-#: standalone/harddrake2:219
+#: standalone/harddrake2:224
 #, c-format
 msgid "About Harddrake"
 msgstr "Acerca do Harddrake"
 
 #. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/harddrake2:221
+#: standalone/harddrake2:226
 #, c-format
 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 ""
 "Isto é o Harddrake, uma ferramenta %s para configurar o hardware.\n"
 "<span foreground=\"royalblue3\">Versão:</span> %s\n"
 "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:238
+#: standalone/harddrake2:243
 #, c-format
 msgid "Harddrake2"
 msgstr "Harddrake2"
 
-#: standalone/harddrake2:253
+#: standalone/harddrake2:258
 #, c-format
 msgid "Detected hardware"
 msgstr "Hardware detectado"
 
-#: standalone/harddrake2:258
+#: standalone/harddrake2:263
 #, c-format
 msgid "Configure module"
 msgstr "Configurar modulo"
 
-#: standalone/harddrake2:265
+#: standalone/harddrake2:270
 #, c-format
 msgid "Run config tool"
 msgstr "Executar ferramenta de configuração"
 
-#: standalone/harddrake2:303 standalone/net_monitor:108
+#: standalone/harddrake2:308 standalone/net_monitor:108
 #: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "desconhecido"
 
-#: standalone/harddrake2:304 standalone/printerdrake:298
+#: standalone/harddrake2:309 standalone/printerdrake:298
 #: standalone/printerdrake:336
 #, c-format
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: standalone/harddrake2:324
+#: standalone/harddrake2:329
 #, c-format
 msgid "Misc"
 msgstr "Misc"
 
-#: standalone/harddrake2:339
+#: standalone/harddrake2:344
 #, c-format
-msgid "Click on a device in the left tree in order to display its information here."
+msgid ""
+"Click on a device in the left tree in order to display its information here."
 msgstr ""
 "Clique num dispositivo na árvore à esquerda para mostrar a sua informação "
 "aqui."
 
-#: standalone/harddrake2:391
+#: standalone/harddrake2:396
 #, c-format
 msgid "secondary"
 msgstr "secundario"
 
-#: standalone/harddrake2:391
+#: standalone/harddrake2:396
 #, c-format
 msgid "primary"
 msgstr "primário"
 
-#: standalone/harddrake2:395
+#: standalone/harddrake2:400
 #, c-format
 msgid "burner"
 msgstr "gravador"
 
-#: standalone/harddrake2:395
+#: standalone/harddrake2:400
 #, c-format
 msgid "DVD"
 msgstr "DVD"
 
-#: standalone/harddrake2:525
+#: standalone/harddrake2:546 standalone/harddrake2:549
 #, c-format
 msgid "Upload the hardware list"
 msgstr "Enviar a lista do hardware"
 
-#: standalone/harddrake2:530
+#: standalone/harddrake2:551
 #, c-format
 msgid "Account:"
 msgstr "Conta:"
 
-#: standalone/harddrake2:531
+#: standalone/harddrake2:552
 #, c-format
 msgid "Password:"
 msgstr "Senha:"
 
-#: standalone/harddrake2:532
+#: standalone/harddrake2:553
 #, c-format
 msgid "Hostname:"
 msgstr "Máquina:"
 
-#: standalone/keyboarddrake:29
+#: standalone/keyboarddrake:30
 #, c-format
 msgid "Please, choose your keyboard layout."
 msgstr "Por favor, escolha a disposição do seu teclado."
@@ -25230,9 +25393,9 @@ msgid "The change is done, but to be effective you must logout"
 msgstr "A mudança está feita, mas para ser efectiva é preciso sair/logout"
 
 #: standalone/logdrake:50
-#, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Registos das Ferramentas Mandrakelinux"
+#, fuzzy, c-format
+msgid "Mandriva Linux Tools Logs"
+msgstr "Registos das Ferramentas Mandriva Linux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25524,144 +25687,138 @@ msgstr "Teste do Rato"
 msgid "Please test your mouse:"
 msgstr "Por favor teste o seu rato:"
 
-#: standalone/net_applet:34
+#: standalone/net_applet:45
 #, c-format
 msgid "Network is up on interface %s"
 msgstr "A rede está activa no interface %s"
 
 #. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
-#: standalone/net_applet:42
+#: standalone/net_applet:53
 #, c-format
 msgid "Network is down on interface %s. Click on \"Configure Network\""
 msgstr "A rede está em baixo no interface %s. Clique em \"Configurar Rede\""
 
-#: standalone/net_applet:57 standalone/net_monitor:473
+#: standalone/net_applet:68 standalone/net_monitor:474
 #, c-format
 msgid "Connect %s"
 msgstr "Conectar %s"
 
-#: standalone/net_applet:58 standalone/net_monitor:473
+#: standalone/net_applet:69 standalone/net_monitor:474
 #, c-format
 msgid "Disconnect %s"
 msgstr "Desconectar %s"
 
-#: standalone/net_applet:59
+#: standalone/net_applet:70
 #, c-format
 msgid "Monitor Network"
 msgstr "Monitorizar Rede"
 
-#: standalone/net_applet:60
+#: standalone/net_applet:71
 #, c-format
 msgid "Configure Network"
 msgstr "Configurar Rede"
 
-#: standalone/net_applet:69
+#: standalone/net_applet:73
 #, c-format
 msgid "Watched interface"
 msgstr "Interface monitorizado"
 
-#: standalone/net_applet:78
+#: standalone/net_applet:82
 #, c-format
 msgid "Profiles"
 msgstr "Perfis"
 
-#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/net_applet:61 standalone/printerdrake:238
-#, c-format
-msgid "Refresh"
-msgstr "Refrescar"
-
-#: standalone/net_applet:62
+#: standalone/net_applet:91
 #, c-format
 msgid "Get Online Help"
 msgstr "Ajuda Online"
 
-#: standalone/net_applet:177
+#: standalone/net_applet:223
 #, c-format
 msgid "Interactive intrusion detection"
 msgstr "Detecção interactiva de intrusão"
 
-#: standalone/net_applet:181
+#: standalone/net_applet:227
 #, c-format
 msgid "Always launch on startup"
 msgstr "Lançar sempre no arranque"
 
-#: standalone/net_applet:230
+#: standalone/net_applet:280
 #, c-format
 msgid "A port scanning attack has been attempted by %s."
 msgstr "Um ataque de pesquisa à porta foi tentado por %s."
 
-#: standalone/net_applet:231
+#: standalone/net_applet:281
 #, c-format
 msgid "The %s service has been attacked by %s."
 msgstr "O serviço %s foi atacado por %s."
 
-#: standalone/net_applet:232
+#: standalone/net_applet:282
 #, c-format
 msgid "A password cracking attack has been attempted by %s."
 msgstr "Um ataque para crackar a senha foi tentado por %s."
 
-#: standalone/net_applet:240
+#: standalone/net_applet:290
 #, c-format
 msgid "Active Firewall: intrusion detected"
 msgstr "Firewall Activa: intrusão detectada"
 
-#: standalone/net_applet:251
+#: standalone/net_applet:301
 #, c-format
 msgid "Do you want to blacklist the attacker?"
 msgstr "Deseja colocar na lista negra o atacante?"
 
-#: standalone/net_applet:265
+#: standalone/net_applet:315
 #, c-format
 msgid "Always blacklist (do not ask again)"
 msgstr "Colocar sempre em lista negra (não perguntar outra vez)"
 
-#: standalone/net_applet:268
+#: standalone/net_applet:318
 #, c-format
 msgid "Attack details"
 msgstr "Detalhes do ataque"
 
-#: standalone/net_applet:272
+#: standalone/net_applet:322
 #, c-format
 msgid "Attack time: %s"
 msgstr "Hora do ataque: %s"
 
-#: standalone/net_applet:273
+#: standalone/net_applet:323
 #, c-format
 msgid "Network interface: %s"
 msgstr "Interface de rede: %s"
 
-#: standalone/net_applet:274
+#: standalone/net_applet:324
 #, c-format
 msgid "Attack type: %s"
 msgstr "Tipo de ataque: %s"
 
-#: standalone/net_applet:275
+#: standalone/net_applet:325
 #, c-format
 msgid "Protocol: %s"
 msgstr "Protocolo: %s"
 
-#: standalone/net_applet:276
+#: standalone/net_applet:326
 #, c-format
 msgid "Attacker IP address: %s"
 msgstr "Endereço IP do atacante: %s"
 
-#: standalone/net_applet:277
+#: standalone/net_applet:327
 #, c-format
 msgid "Attacker hostname: %s"
 msgstr "Nome do endereço do atacante: %s"
 
-#: standalone/net_applet:278
+#: standalone/net_applet:328
 #, c-format
 msgid "Service attacked: %s"
 msgstr "Serviço atacado: %s"
 
-#: standalone/net_applet:279
+#: standalone/net_applet:329
 #, c-format
 msgid "Port attacked: %s"
 msgstr "Porta atacada: %s"
 
-#: standalone/net_applet:280
+#: standalone/net_applet:330
 #, c-format
 msgid "Type of ICMP attack: %s"
 msgstr "Tipo de ataque ICMP: %s"
@@ -25749,47 +25906,48 @@ msgid "Connection complete."
 msgstr "Conexão completa"
 
 #: standalone/net_monitor:236
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "A conexão falhou.\n"
-"Verifique a sua configuração no Centro de Controlo Mandrakelinux."
+"Verifique a sua configuração no Centro de Controlo Mandriva Linux."
 
-#: standalone/net_monitor:340
+#: standalone/net_monitor:341
 #, c-format
 msgid "Color configuration"
 msgstr "Configuração das cores"
 
-#: standalone/net_monitor:388 standalone/net_monitor:408
+#: standalone/net_monitor:389 standalone/net_monitor:409
 #, c-format
 msgid "sent: "
 msgstr "enviado: "
 
-#: standalone/net_monitor:395 standalone/net_monitor:412
+#: standalone/net_monitor:396 standalone/net_monitor:413
 #, c-format
 msgid "received: "
 msgstr "recebido: "
 
-#: standalone/net_monitor:402
+#: standalone/net_monitor:403
 #, c-format
 msgid "average"
 msgstr "média"
 
-#: standalone/net_monitor:405
+#: standalone/net_monitor:406
 #, c-format
 msgid "Local measure"
 msgstr "Medidas locais"
 
-#: standalone/net_monitor:466
+#: standalone/net_monitor:467
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
 "network"
-msgstr "Aviso, outra conexão à Internet foi detectada, talvez usando a sua rede"
+msgstr ""
+"Aviso, outra conexão à Internet foi detectada, talvez usando a sua rede"
 
-#: standalone/net_monitor:477
+#: standalone/net_monitor:478
 #, c-format
 msgid "No internet connection configured"
 msgstr "Não foi configurada nenhuma conexão internet"
@@ -25964,7 +26122,8 @@ msgstr "Abortar o Scannerdrake."
 
 #: standalone/scannerdrake:60
 #, c-format
-msgid "Could not install the packages needed to set up a scanner with Scannerdrake."
+msgid ""
+"Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr ""
 "Não pude instalar os pacotes necessários para configurar um scanner com o "
 "Scannerdrake."
@@ -26002,7 +26161,8 @@ msgstr "%s encontrado em %s, configurar automaticamente?"
 #: standalone/scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
-msgstr "%s não está na lista na base de dados do scanner, configurar manualmente?"
+msgstr ""
+"%s não está na lista na base de dados do scanner, configurar manualmente?"
 
 #: standalone/scannerdrake:131
 #, c-format
@@ -26389,7 +26549,8 @@ msgstr "Nome/Endereço IP do endereço:"
 #: standalone/scannerdrake:705 standalone/scannerdrake:855
 #, c-format
 msgid "Choose the host on which the local scanners should be made available:"
-msgstr "Escolha o endereço onde os digitalizadores locais devem estar disponíveis:"
+msgstr ""
+"Escolha o endereço onde os digitalizadores locais devem estar disponíveis:"
 
 #: standalone/scannerdrake:716 standalone/scannerdrake:866
 #, c-format
@@ -26552,52 +26713,52 @@ msgstr "Instalar actualizações"
 msgid "Exit install"
 msgstr "Sair da instalação"
 
-#: ugtk2.pm:900
+#: ugtk2.pm:909
 #, c-format
 msgid "Is this correct?"
 msgstr "Isto está correcto?"
 
-#: ugtk2.pm:960
+#: ugtk2.pm:969
 #, c-format
 msgid "No file chosen"
 msgstr "Nenhum ficheiro escolhido"
 
-#: ugtk2.pm:962
+#: ugtk2.pm:971
 #, c-format
 msgid "You have chosen a file, not a directory"
 msgstr "Escolheu um ficheiro, não um directório"
 
-#: ugtk2.pm:964
+#: ugtk2.pm:973
 #, c-format
 msgid "You have chosen a directory, not a file"
 msgstr "Escolheu um directório, não um ficheiro"
 
-#: ugtk2.pm:966
+#: ugtk2.pm:975
 #, c-format
 msgid "No such directory"
 msgstr "Nenhum directório encontrado"
 
-#: ugtk2.pm:966
+#: ugtk2.pm:975
 #, c-format
 msgid "No such file"
 msgstr "Nenhum ficheiro encontrado"
 
-#: ugtk2.pm:1045
+#: ugtk2.pm:1056
 #, c-format
 msgid "Expand Tree"
 msgstr "Expandir Árvore"
 
-#: ugtk2.pm:1046
+#: ugtk2.pm:1057
 #, c-format
 msgid "Collapse Tree"
 msgstr "Encolher Árvore"
 
-#: ugtk2.pm:1047
+#: ugtk2.pm:1058
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "Alternar entre ordenação por grupo e directa"
 
-#: wizards.pm:95
+#: wizards.pm:95 wizards2.pm:95
 #, c-format
 msgid ""
 "%s is not installed\n"
@@ -26606,8 +26767,37 @@ msgstr ""
 "%s não está instalado\n"
 "Clique em \"Seguinte\"para instalar ou em \"Cancelar\" para sair"
 
-#: wizards.pm:99
+#: wizards.pm:99 wizards2.pm:99
 #, c-format
 msgid "Installation failed"
 msgstr "Instalação falhada"
 
+#~ msgid "No floppy drive available"
+#~ msgstr "Nenhum drive de disquete disponível"
+
+#~ msgid "No network card"
+#~ msgstr "Nenhuma placa de rede"
+
+#~ msgid "Use already installed driver (%s)"
+#~ msgstr "Usar o driver já instalado (%s)"
+
+#~ msgid "Use Wi-Fi Protected Access (WPA)"
+#~ msgstr "Usar Acesso Protegido Wi-Fi (WPA)"
+
+#~ msgid "You've not selected any font"
+#~ msgstr "Não escolheu qualquer tipo de letra"
+
+#~ msgid "Save and close"
+#~ msgstr "Gravar e fechar"
+
+#~ msgid "Network: %s"
+#~ msgstr "Rede: %s"
+
+#~ msgid "Mode: %s"
+#~ msgstr "Modo: %s"
+
+#~ msgid "Encryption: %s"
+#~ msgstr "Encriptação: %s"
+
+#~ msgid "Gateway: %s"
+#~ msgstr "Gateway: %s"
diff --git a/perl-install/share/po/pt_BR.po b/perl-install/share/po/pt_BR.po
index 00b567bf5..870be21ae 100644
--- a/perl-install/share/po/pt_BR.po
+++ b/perl-install/share/po/pt_BR.po
@@ -13,15 +13,15 @@
 # Carlinhos Cecconi <carlinux@terra.com.br>, 2003, 2004.
 # Deivi Lopes Kuhn <deivikuhn@yahoo.com.br>, 2003, 2004.
 # Tiago Cruz <tiagocruz@forumgdh.net>, 2004.
-# Cris <cris@mandrakesoft.com>, 2005.
-# Cristiano Otto Von Trompczynski <cris@mandrakesoft.com>, 2005.
+# Cris <cris@mandriva.com>, 2005.
+# Cristiano Otto Von Trompczynski <cris@mandriva.com>, 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-pt_BR-orig\n"
 "POT-Creation-Date: 2005-04-21 14:27+0200\n"
 "PO-Revision-Date: 2005-03-23 23:19-0300\n"
-"Last-Translator: Cristiano Otto Von Trompczynski <cris@mandrakesoft.com>\n"
+"Last-Translator: Cristiano Otto Von Trompczynski <cris@mandriva.com>\n"
 "Language-Team: Português <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -114,8 +114,8 @@ msgstr ""
 "comum (FAT), você poderá mover e trabalhar com seus arquivos em\n"
 "máquinas que rodam Windows.\n"
 "\n"
-"Você pode também continuar sem uma chave USB e usar o Mandrake\n"
-"Move como um sistema operacional Live CD do Mandrivalinux."
+"Você pode também continuar sem uma chave USB e usar o Mandriva\n"
+"Move como um sistema operacional Live CD do Mandriva Linux."
 
 #: ../move/move.pm:483
 #, c-format
@@ -140,8 +140,8 @@ msgstr ""
 "Nota: se você conectar uma chave USB agora, aguarde alguns\n"
 "segundos para detectar novamente.\n"
 "\n"
-"Você pode também continuar sem uma chave USB e usar o Mandrake\n"
-"Move como um sistema operacional Live CD do Mandrivalinux."
+"Você pode também continuar sem uma chave USB e usar o Mandriva\n"
+"Move como um sistema operacional Live CD do Mandriva Linux."
 
 #: ../move/move.pm:494
 #, c-format
@@ -1327,11 +1327,11 @@ msgstr "Escolha de linguagem"
 #: 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 tem suporte a múltiplos idiomas. Selecione\n"
+"Mandriva Linux tem suporte a múltiplos idiomas. Selecione\n"
 "os que você deseja instalar. Eles estarão disponíveis após a\n"
 "instalação e quando você reiniciar o seu sistema"
 
@@ -3757,12 +3757,12 @@ msgstr "habilita o suporte a rádio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
 "Antes de continuar você deve ler com atenção os termos da Licença. Ela \n"
-"cobre a distribuição Mandrivalinux. Se você concorda com todos os termos,\n"
+"cobre a distribuição Mandriva Linux. Se você concorda com todos os termos,\n"
 "clique em \"%s\". Se não concordar, clique no botão \"%s\"\n"
 "para reiniciar seu computador."
 
@@ -3949,13 +3949,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The 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 ""
-"O instalador do Mandrivalinux está espalhado em diferentes CD-ROMS.\n"
+"O instalador do Mandriva Linux está espalhado em diferentes CD-ROMS.\n"
 "Se o pacote selecionado estiver localizado em outro CD-ROM, O DrakX irá\n"
 "ejetar o CD atual e pedir para você inserir o CD necessário. Se você não "
 "tiver\n"
@@ -3966,11 +3966,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"
@@ -4022,11 +4023,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "Agora você deverá especificar quais programas deseja instalar no seu\n"
-"sistema. Existem centenas de pacotes disponíveis para o Mandrivalinux, e\n"
+"sistema. Existem centenas de pacotes disponíveis para o Mandriva Linux, e\n"
 "para facilitar sua escolha eles foram agrupados em grupos de aplicações\n"
 "similares.\n"
 "\n"
-"Mandrivalinux separou os pacotes em quatro categorias. Você pode\n"
+"Mandriva Linux separou os pacotes em quatro categorias. Você pode\n"
 "misturar as aplicações de vários grupos, assim a \"Estação de Trabalho\" "
 "pode ter aplicações do grupo \"Servidor\".\n"
 "\n"
@@ -4134,10 +4135,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"
@@ -4168,11 +4169,11 @@ msgstr ""
 "!! Quando um pacote de servidor foi selecionado, intencionalmente ou por\n"
 "ser parte de um grupo, você será solicitado para confirmar se realmente "
 "deseja\n"
-"estes servidores instalados. Por padrão, no Mandrivalinux qualquer\n"
+"estes servidores instalados. Por padrão, no Mandriva Linux qualquer\n"
 "serviço instalado será iniciado no boot.\n"
 "Mesmo que sejam seguros e não possuam quaisquer dúvidas a respeito\n"
 "quando da distribuição do pacote, é possível que brechas de segurança\n"
-"sejam descobertas depois que esta versão do Mandrivalinux foi concluída.\n"
+"sejam descobertas depois que esta versão do Mandriva Linux foi concluída.\n"
 "Se você não sabe o que um determinado serviço faz ou porque está sendo\n"
 "instalado, clique em \"%s\". Clicando em \"%s\", os serviços listados\n"
 "serão instalados e serão iniciados automaticamente por Padrão quando o\n"
@@ -4328,7 +4329,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"
@@ -4384,7 +4385,7 @@ msgid ""
 msgstr ""
 "X (para Sistema X Window) é o coração da interface gráfica do GNU/Linux\n"
 "no qual todos os ambientes gráficos (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) fornecidos com o Mandrivalinux funcionam.\n"
+"WindowMaker, etc.) fornecidos com o Mandriva Linux funcionam.\n"
 "\n"
 "Você será apresentado a uma lista de parâmetros que pode alterar para\n"
 "obter uma ótima resolução gráfica. \n"
@@ -4501,12 +4502,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"
@@ -4533,7 +4534,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"
@@ -4542,7 +4543,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"
@@ -4563,11 +4565,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Neste ponto, você precisa escolher onde você quer instalar o seu sistema\n"
-"Mandrivalinux no seu disco rígido. Se seu disco estiver vazio ou se um\n"
+"Mandriva Linux no seu disco rígido. Se seu disco estiver vazio ou se um\n"
 "sistema operacional existente usa todo o espaço disponível, você terá que\n"
 "particioná-lo. Basicamente, particionar um disco rígido consiste em\n"
-"dividi-lo logicamente para criar espaço para o seu novo sistema "
-"Mandrivalinux.\n"
+"dividi-lo logicamente para criar espaço para o seu novo sistema Mandriva "
+"Linux.\n"
 "\n"
 "Como os efeitos de um processo de particionamento são normalmente\n"
 "irreversíveis, podendo levar à perda de dados do sistema operacional atual,\n"
@@ -4595,7 +4597,7 @@ msgstr ""
 "Windows. O redimensionamento pode ser feito sem a perda de dados, desde\n"
 "que você tenha desfragmentado previamente sua partição e a mesma esteja\n"
 "formatada em FAT ou NTFS. Recomendamos veementemente fazer backup de seus\n"
-"dados. Essa solução é útil se você quiser usar o Mandrivalinux e o\n"
+"dados. Essa solução é útil se você quiser usar o Mandriva Linux e o\n"
 "Microsoft Windows no mesmo computador.\n"
 "\n"
 "Antes de escolher essa solução, compreenda que o tamanho de sua partição\n"
@@ -4604,8 +4606,8 @@ msgstr ""
 "instalar novos programas.\n"
 "\n"
 "* \"%s\": se você quiser apagar todos os dados e todas as partições\n"
-"existentes no disco rígido e substituí-las pelo seu novo sistema "
-"Mandrivalinux, você pode escolher essa opção. Tenha cuidado\n"
+"existentes no disco rígido e substituí-las pelo seu novo sistema Mandriva "
+"Linux, você pode escolher essa opção. Tenha cuidado\n"
 "você não pode reverter sua escolha após a confirmação.\n"
 "\n"
 "!! Se você escolher essa opção, todos seus dados atuais serão perdidos. !!\n"
@@ -4770,7 +4772,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."
@@ -4791,7 +4793,7 @@ msgstr ""
 "Clique em \"%s\" quando estiver pronto para formatar as partições.\n"
 "\n"
 "Clique em \"%s\" se você desejar escolher outras partições para instalar\n"
-"o seu novo sistema operacional Mandrivalinux.\n"
+"o seu novo sistema operacional Mandriva Linux.\n"
 "\n"
 "Clique em \"%s\" se você quiser selecionar partições para serem\n"
 "verificadas por bad blocks no disco."
@@ -4808,7 +4810,7 @@ msgstr "Anterior"
 #: 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"
@@ -4820,7 +4822,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Neste momento em que você está instalando o Mandrivalinux é possível que\n"
+"Neste momento em que você está instalando o Mandriva Linux é possível que\n"
 "alguns pacotes tenham sido atualizados após o lançamento inicial. Alguns\n"
 "erros e falhas de seguranças podem ter sido corrigidos. Para poder se\n"
 "beneficiar destas atualizações, você pode fazer o download destes pacotes\n"
@@ -4850,7 +4852,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"
@@ -4865,7 +4867,7 @@ msgstr ""
 "\n"
 "Se você não souber o que escolher, fique com a opção padrão. Você poderá\n"
 "trocar o nível de segurança depois usando a ferramenta draksec no Centro\n"
-"de Controle Mandrivalinux.\n"
+"de Controle Mandriva Linux.\n"
 "\n"
 "O campo \"%s\" pode informar ao sistema qual usuário será responsável\n"
 "pela segurança. Mensagens de segurança serão enviadas para esse endereço."
@@ -4879,7 +4881,7 @@ msgstr "Administrador de Segurança"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4950,7 +4952,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Agora você precisa escolher qual(is) partição(ões) usará para instalar o\n"
-"seu novo sistema Mandrivalinux. Se as partições já estiverem definidas \n"
+"seu novo sistema Mandriva Linux. Se as partições já estiverem definidas \n"
 "(através de uma instalação anterior do GNU/Linux ou outro software\n"
 "particionador), você pode utilizá-las. Caso contrário, as partições\n"
 "devem ser definidas.\n"
@@ -5035,7 +5037,7 @@ msgstr "Mudar para modo normal/ expert"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5065,7 +5067,7 @@ msgid ""
 msgstr ""
 "Mais de uma partição Microsoft Windows foi detectada em seu disco\n"
 "rígido. Favor escolher a que você quer redimensionar para instalar o seu\n"
-"novo sistema operacional Mandrivalinux.\n"
+"novo sistema operacional Mandriva Linux.\n"
 "\n"
 "Cada partição é listada da seguinte forma: \"Nome Linux\", \"Nome\n"
 "Windows\" \"Capacidade\".\n"
@@ -5113,7 +5115,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing 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"
@@ -5122,19 +5124,20 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your 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 ""
 "Este passo só é mostrado se uma partição antiga do GNU/Linux foi\n"
 "encontrada em seu computador.\n"
 "\n"
 "O DrakX precisa saber agora se você quer executar uma nova instalação\n"
-"ou fazer um upgrade no Mandrivalinux existente no seu sistema:\n"
+"ou fazer um upgrade no Mandriva Linux existente no seu sistema:\n"
 "\n"
 " * \"%s\": A maioria das vezes, isto remove completamente o sistema antigo.\n"
 "Porém, dependendo do seu modo de particionamento, você pode prevenir que\n"
@@ -5143,14 +5146,14 @@ msgstr ""
 "sistema de arquivos, você deveria usar esta opção.\n"
 "\n"
 " * \"%s\": este método de instalação lhe permite atualizar os pacotes\n"
-"atualmente instalado em seu sistema Mandrivalinux. Seu esquema\n"
+"atualmente instalado em seu sistema Mandriva Linux. Seu esquema\n"
 "atual de particionamento e dados de usuário não serão alterados. A maioria\n"
 "dos outro passos de configuração permanecem disponíveis, semelhantes a uma "
 "instalação normal.\n"
 "\n"
-"Usando a opção 'Upgrade' deve funcionar bem em sistemas Mandrivalinux da\n"
+"Usando a opção 'Upgrade' deve funcionar bem em sistemas Mandriva Linux da\n"
 "versão \"8.1\" ou superior. Executar um Upgrade para versões anteriores\n"
-"ao Mandrivalinux \"8.1\" não é recomendado."
+"ao Mandriva Linux \"8.1\" não é recomendado."
 
 #: help.pm:591
 #, c-format
@@ -5207,7 +5210,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"
@@ -5248,7 +5252,7 @@ msgstr ""
 "\n"
 "Sobre o suporte a UTF-8 (unicode): Unicode é o novo conjunto de caracteres\n"
 "para todas as linguagens existentes. O suporte completo em GNU/Linux ainda\n"
-"está em desenvolvimento. Por essa razão, Mandrivalinux irá usá-lo ou não\n"
+"está em desenvolvimento. Por essa razão, Mandriva Linux irá usá-lo ou não\n"
 "dependendo da escolha do usuário:\n"
 "\n"
 "* Se você escolher linguagens legadas com uma forte codificação (linguagens\n"
@@ -5501,7 +5505,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"
@@ -5522,11 +5526,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 ""
 "Aqui você seleciona o sistema de impressão para o seu computador.\n"
-"Outros S.O.s podem oferecer-lhe apenas um, mas o Mandrivalinux \n"
+"Outros S.O.s podem oferecer-lhe apenas um, mas o Mandriva Linux \n"
 "oferece dois.\n"
 "\n"
 " * \"%s\" -- que significa 'print, do not queue', é a escolha caso você\n"
@@ -5551,7 +5555,8 @@ msgstr ""
 "gerenciar a impressão.\n"
 "\n"
 "Você poderá mudar a sua escolha após a instalação utilizando o\n"
-"PrinterDrake no Centro de Controle Mandrivalinux, e clicando no botão \"%s\"."
+"PrinterDrake no Centro de Controle Mandriva Linux, e clicando no botão \"%s"
+"\"."
 
 #: help.pm:765
 #, c-format
@@ -5674,7 +5679,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"
@@ -5691,7 +5697,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"
@@ -5738,7 +5744,7 @@ msgstr ""
 "\n"
 " * \"%s\": se você deseja configurar a Internet ou o acesso a uma rede\n"
 "local, você pode fazê-lo agora. Verifique documentação impressa ou use\n"
-"o Centro de Controle Mandrivalinux após a instalação ter terminado para "
+"o Centro de Controle Mandriva Linux após a instalação ter terminado para "
 "utilizar\n"
 "total help in-line.\n"
 "\n"
@@ -5756,7 +5762,7 @@ msgstr ""
 " * \"%s\": se você deseja mudar sua configuração do gerenciador de\n"
 "inicialização, clique no botão. Recomendado apenas aos usuários avançados.\n"
 "Veja documentação impressa ou help in-line sobre configuração de bootloader\n"
-"no Centro de Controle do Mandrivalinux.\n"
+"no Centro de Controle do Mandriva Linux.\n"
 "\n"
 " * \"%s\": você poderá escolher aqui quais serviços que serão iniciados\n"
 "em sua máquina. Se você pretende usar sua máquina como servidor, é uma\n"
@@ -5817,11 +5823,11 @@ msgstr "Serviços"
 #, 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 ""
 "Escolha o disco rígido que você quer apagar para instalar sua nova\n"
-"partição Mandrivalinux. Tenha cuidado, pois todos os dados existentes\n"
+"partição Mandriva Linux. Tenha cuidado, pois todos os dados existentes\n"
 "serão perdidos e não poderão ser recuperados!"
 
 #: help.pm:863
@@ -6176,12 +6182,12 @@ msgstr "Calculando o tamanho da partição Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Sua partição Windows está muito fragmentada. Por favor reinicie seu "
 "computador no modo Windows, execute o utilitário 'defrag' e então reinicie a "
-"instalação do Mandrivalinux."
+"instalação do Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6297,13 +6303,13 @@ msgstr "Fechando (desconectando) a rede"
 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"
@@ -6357,7 +6363,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"
@@ -6394,7 +6400,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"
@@ -6416,12 +6422,12 @@ msgstr ""
 "Introdução\n"
 "\n"
 "O sistema operacional e os diferentes elementos disponíveis na distribuição "
-"Mandrivalinux \n"
+"Mandriva Linux \n"
 "deveriam ser chamados os \"Softwares\" a partir daqui. Os softwares "
 "incluem, \n"
 "mas não se limitam a eles, o grupo de programas, métodos, regras e "
 "documentações relativos ao sistema operacional \n"
-"assim como os diferentes elementos da distribuição Mandrivalinux.\n"
+"assim como os diferentes elementos da distribuição Mandriva Linux.\n"
 "\n"
 "\n"
 "1. Termo de licença\n"
@@ -6470,7 +6476,7 @@ msgstr ""
 "ou qualquer ou perca conseqüente) \n"
 "decorrentes da posse, do uso ou do descarregamento dos Programas  a partir "
 "dum dos servidores da \n"
-"Mandrivalinux que sejam proibidos ou limitados pela lei em certos países "
+"Mandriva Linux que sejam proibidos ou limitados pela lei em certos países "
 "pelas leis locais.\n"
 "Esta limitação de responsabilidade inclui, mas não se limita aos elementos "
 "de codificação inclusos nos \n"
@@ -6507,7 +6513,7 @@ msgstr ""
 "Mandriva S.A. reserva os seus direitos de modificar ou adaptar os Programas "
 "de informática, como um \n"
 "tudo ou por partes, em qualquer sentido e para todos fins.\n"
-"\"Mandriva\", \"Mandrivalinux\" e os logotipos associados são marcas "
+"\"Mandriva\", \"Mandriva Linux\" e os logotipos associados são marcas "
 "registradas da Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6613,8 +6619,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"
@@ -6622,13 +6628,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 ""
 "Parabéns, a instalação foi completada.\n"
 "Remova a mídia de inicialização e pressione enter para reiniciar.\n"
 "\n"
-"Para informações sobre correções disponíveis para essa versão do "
-"Mandrivalinux,\n"
+"Para informações sobre correções disponíveis para essa versão do Mandriva "
+"Linux,\n"
 "consulte a Errata disponível em:.\n"
 "\n"
 "\n"
@@ -6636,13 +6642,13 @@ msgstr ""
 "\n"
 "\n"
 "Informações sobre a configuração do sistema estão disponíveis no\n"
-"capítulo pós-instalação do Guia Oficial de Usuário Mandrivalinux."
+"capítulo pós-instalação do Guia Oficial de Usuário 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
@@ -6670,12 +6676,12 @@ msgstr "Entrando no passo `%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 ""
 "Seu sistema está com poucos recursos. Você pode ter algum problema na\n"
-"instalação do Mandrivalinux. Se isso ocorrer, você pode tentar instalar "
+"instalação do Mandriva Linux. Se isso ocorrer, você pode tentar instalar "
 "usando o\n"
 "modo texto. Para isso, aperte 'F1' na tela de inicialização e escreva 'text'."
 
@@ -7221,9 +7227,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 ""
-"Contatando o site da Mandrivalinux para pegar a lista de mirrors (espelhos) "
+"Contatando o site da Mandriva Linux para pegar a lista de mirrors (espelhos) "
 "disponíveis..."
 
 #: install_steps_interactive.pm:840
@@ -7448,8 +7454,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Instalação do Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Instalação do Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10066,13 +10072,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 ""
 "Configurador do DrakFirewall\n"
 "\n"
-"Isso configura um firewall pessoal para essa máquina Mandrivalinux.\n"
+"Isso configura um firewall pessoal para essa máquina Mandriva Linux.\n"
 "Para um firewall dedicado potente, favor procurar a distribuição\n"
 "especializada MandrakeSecurity Firewall."
 
@@ -14145,11 +14151,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 ""
-"Execute Scannerdrake (Hardware/Scanner no Centro de Controle Mandrivalinux) "
+"Execute Scannerdrake (Hardware/Scanner no Centro de Controle Mandriva Linux) "
 "para compartilhar seu scanner na rede.\n"
 "\n"
 
@@ -16106,23 +16112,23 @@ msgstr "Parar"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>O que é Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>O que é Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Bem-vindo ao <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Bem-vindo ao <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 é uma <b>Distribuição Linux</b> que compreende o core do "
+"Mandriva Linux é uma <b>Distribuição Linux</b> que compreende o core do "
 "sistema, chamado de <b>sistema operacional</b> (baseado no kernel Linux) "
 "junto com <b> uma série de aplicações</b> envolvendo todas as necessidades "
 "que você poderia imaginar."
@@ -16130,11 +16136,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 é a mais importante distribuição Linux <b>amigável</b>de hoje. "
-"Ela é também uma das distribuições <b>mais usadas</b> no mundo!"
+"Mandriva Linux é a mais importante distribuição Linux <b>amigável</b>de "
+"hoje. Ela é também uma das distribuições <b>mais usadas</b> no mundo!"
 
 #: share/advertising/02.pl:13
 #, c-format
@@ -16149,15 +16155,15 @@ msgstr "Seja bem-vindo ao <b>mundo do código aberto</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 é comprometida com o Modelo de Código Aberto e respeita "
+"Mandriva Linux é comprometida com o Modelo de Código Aberto e respeita "
 "integralmente a General Public License (GPL). Esta nova versão é o resultado "
 "da <b>colaboração</b> entre a <b>equipe de desenvolvedores da Mandriva</b> e "
-"a <b>comunidade mundial</b> de colaboradores do Mandrivalinux."
+"a <b>comunidade mundial</b> de colaboradores do Mandriva Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16176,11 +16182,11 @@ msgstr "<b>A 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 ""
 "A maior parte do software inclusa na distribuição e todas as ferramentas "
-"Mandrivalinux são licenciadas pela <b>General Public License</b>."
+"Mandriva Linux são licenciadas pela <b>General Public License</b>."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16210,25 +16216,25 @@ msgstr "<b>Junte-se à Comunidade</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 possui uma das <b>maiores comunidades</b> de usuários e "
+"Mandriva Linux possui uma das <b>maiores comunidades</b> de usuários e "
 "desenvolvedores. O seu papel como comunidade é bastante amplo, envolvendo "
 "desde reports de bugs ao desenvolvimento de novas aplicações. A comunidade "
-"participa como <b>papel chave</b> no mundo Mandrivalinux."
+"participa como <b>papel chave</b> no mundo 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 ""
 "Para <b>ler mais</b> sobre nossa comunidade dinâmica, por favor acesse "
-"<b>www.mandrakelinux.com</b> ou diretamente <b>www.mandrakelinux.com/en/"
+"<b>www.mandrivalinux.com</b> ou diretamente <b>www.mandrivalinux.com/en/"
 "cookerdevel.php3</b> se você desejar estar <b>informações</b> relativas ao "
 "desenvolvimento."
 
@@ -16240,10 +16246,10 @@ msgstr "<b>Versão Download</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 ""
-"Você esta instalando agora <b>Mandrivalinux Download<b/>. Esta é a versão "
+"Você esta instalando agora <b>Mandriva Linux Download<b/>. Esta é a versão "
 "gratuíta que a Mandriva quer manter <b>disponível para todo mundo</b>."
 
 #: share/advertising/05.pl:19
@@ -16287,8 +16293,8 @@ msgstr "<b>Discovery, Seu Primeiro Desktop Linux</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Você agora esta instalando <b>Mandrivalinux Discovery</b>"
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Você agora esta instalando <b>Mandriva Linux Discovery</b>"
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16309,8 +16315,8 @@ msgstr "<b>PowerPack, O Máximo em Desktop Linux</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Você esta instalando agora <b> Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Você esta instalando agora <b> Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16331,8 +16337,8 @@ msgstr "<b>PowerPack+, A Solução Linux para Desktops e Servidores</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Você esta instalando agora <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Você esta instalando agora <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16354,15 +16360,15 @@ msgstr "<b>Produtos 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> tem desenvolvido uma larga série de produtos "
-"<b>Mandrivalinux</b>."
+"<b>Mandriva</b> tem desenvolvido uma larga série de produtos <b>Mandriva "
+"Linux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Os produtos Mandrivalinux são:"
+msgid "The Mandriva Linux products are:"
+msgstr "Os produtos Mandriva Linux são:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16382,10 +16388,10 @@ msgstr "\t* <b>PowerPack+</b>, A Solução Linux para Desktops e Servidores."
 #: 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 para x86-64</b>, A solução Mandrivalinux para usar ao "
+"\t* <b>Mandriva Linux para x86-64</b>, A solução Mandriva Linux para usar ao "
 "máximo seu processador de 64-bit."
 
 #: share/advertising/10.pl:15
@@ -16396,28 +16402,28 @@ msgstr "<b>Produtos Mandriva (Nomad Products)</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 tem desenvolvido dois produtos que permitem a você utilizar "
-"Mandrivalinux <b>em qualquer computador</b> sem precisar instalá-lo:"
+"Mandriva Linux <b>em qualquer computador</b> sem precisar instalá-lo:"
 
 #: 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>, uma distribuição Mandrivalinux que roda totalmente a partir "
-"de um CD-ROM bootável."
+"\t* <b>Move</b>, uma distribuição Mandriva Linux que roda totalmente a "
+"partir de um CD-ROM bootável."
 
 #: 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>, uma distribuição Mandrivalinux pré-instalada em um "
+"\t* <b>GlobeTrotter</b>, uma distribuição Mandriva Linux pré-instalada em um "
 "ultra-compacto disco rígido móvel LaCie."
 
 #: share/advertising/11.pl:13
@@ -16436,20 +16442,23 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
-msgstr "\t* <b>Desktop Corporativo</b>, O Desktop Mandrivalinux para negócios."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
+msgstr ""
+"\t* <b>Desktop Corporativo</b>, O Desktop Mandriva Linux para negócios."
 
 #: 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>Servidor Corporativo</b>, A Solução Mandrivalinux para Servidor."
+"\t* <b>Servidor Corporativo</b>, A Solução Mandriva Linux para Servidor."
 
 #: 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>Firewall Multi-Network</b>, A solução de Segurança Mandrivalinux."
+"\t* <b>Firewall Multi-Network</b>, A solução de Segurança Mandriva Linux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16650,10 +16659,10 @@ msgstr "<b>Divirta-se com sua larga extensão de Aplicações</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 ""
-"No menu do Mandrivalinux você encontrará aplicações <b>fácil de usar</b> "
+"No menu do Mandriva Linux você encontrará aplicações <b>fácil de usar</b> "
 "para <b>todas as suas necessidades</b>:"
 
 #: share/advertising/18.pl:16
@@ -16922,18 +16931,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Centro de Controle Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Centro de Controle 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 ""
-"O <b>Centro de Controle Mandrivalinux</b> é uma coleção essencial de "
-"utilitários específicos da Mandrivalinux elaborados para simplificar a "
+"O <b>Centro de Controle Mandriva Linux</b> é uma coleção essencial de "
+"utilitários específicos da Mandriva Linux elaborados para simplificar a "
 "configuração de seu computador."
 
 #: share/advertising/25.pl:17
@@ -16959,16 +16968,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 ""
 "Como qualquer outro programa de computador, software open source (software "
 "de código aberto) <b>requer tempo e pessoal</b> para seu desenvolvimento. "
 "Com o objetivo de respeitar a filosofia open source, os vendedores da "
 "Mandriva adicionaram importantes produtos e serviços para <b>continuar "
-"melhorando o Mandrivalinux</b>. Se você deseja <b>adotar a filosofia open "
-"source</b> e o desenvolvimento do Mandrivalinux, <b>por favor</b> considere "
+"melhorando o Mandriva Linux</b>. Se você deseja <b>adotar a filosofia open "
+"source</b> e o desenvolvimento do Mandriva Linux, <b>por favor</b> considere "
 "comprar um de nossos produtos ou serviços."
 
 #: share/advertising/27.pl:13
@@ -17002,8 +17011,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Passe na <b>store.mandrakesoft.com</b>"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Passe na <b>store.mandriva.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -17013,11 +17022,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> é a <b>companhia perfeita</b> para seu produto "
-"Mandrivalinux."
+"<b>Mandriva Club</b> é a <b>companhia perfeita</b> para seu produto Mandriva "
+"Linux."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -17031,10 +17040,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>Descontos especiais</b> nos produtos e serviços da nossa loja online "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -17047,17 +17056,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Participação nos <b>fóruns para usuários</b> Mandrivalinux."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Participação nos <b>fóruns para usuários</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>Acesso com antecedência e privilegiado</b>, antes mesmo de seu "
-"lançamento público, às <b>imagens ISO</b> do Mandrivalinux. "
+"lançamento público, às <b>imagens ISO</b> do Mandriva Linux. "
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -17077,10 +17086,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 provê uma grande quantidade de serviços importantes para "
-"<b>fácil atualização</b> de seus sistema Mandrivalinux:"
+"<b>fácil atualização</b> de seus sistema Mandriva Linux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17106,9 +17115,9 @@ msgstr "\t* Atualização <b>programada</b> flexível."
 #: 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* Gerenciamento de <b>todo o seu sistema Mandrivalinux</b> com uma conta."
+"\t* Gerenciamento de <b>todo o seu sistema Mandriva Linux</b> com uma conta."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -17119,28 +17128,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 ""
 "Você precisa de <b>ajuda</b>? Conheça os experientes técnicos da Mandriva em "
-"<b>nossa plataforma de suporte técnico</b> www.mandrakeexpert.com"
+"<b>nossa plataforma de suporte técnico</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 ""
-"Recorra a ajuda dos <b>qualificados experts Mandrivalinux</b>, você irá "
+"Recorra a ajuda dos <b>qualificados experts Mandriva Linux</b>, você irá "
 "economizar mais tempo."
 
 #: 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 ""
-"Para qualquer questão relacionada ao Mandrivalinux, você tem a possibilidade "
-"de comprar suporte em <b>store.mandrakesoft.com</b>."
+"Para qualquer questão relacionada ao Mandriva Linux, você tem a "
+"possibilidade de comprar suporte em <b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17530,15 +17539,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 ""
 "[OPÇÕES] [NOME_DO_PROGRAMA]\n"
 "\n"
 "OPÇÕES:\n"
 "  --help            - exibe esta mensagem de ajuda.\n"
-"  --report          - programa deve ser uma das ferramentas mandrakelinux\n"
-"  --incident        - programa deve ser uma das ferramentas mandrakelinux"
+"  --report          - programa deve ser uma das ferramentas Mandriva Linux\n"
+"  --incident        - programa deve ser uma das ferramentas Mandriva Linux"
 
 #: standalone.pm:63
 #, c-format
@@ -17593,7 +17602,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"
@@ -17607,7 +17616,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPÇÕES]...\n"
-"Configurador do Mandrivalinux Terminal Server (MTS)\n"
+"Configurador do Mandriva Linux Terminal Server (MTS)\n"
 "--enable         : ativa MTS\n"
 "--disable        : desativa MTS\n"
 "--start          : inicia MTS\n"
@@ -17755,7 +17764,7 @@ msgstr "%s: %s requer nome do host...\n"
 #: standalone/drakTermServ:211 standalone/drakTermServ:214
 #, c-format
 msgid "Terminal Server Configuration"
-msgstr "Configuração do Mandrivalinux Terminal Server"
+msgstr "Configuração do Mandriva Linux Terminal Server"
 
 #: standalone/drakTermServ:220
 #, c-format
@@ -20443,13 +20452,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Ferramenta de Relatório de Erro Mandrivalinux"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Ferramenta de Relatório de Erro Mandriva Linux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Centro de Controle Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Centro de Controle Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20475,7 +20484,7 @@ msgstr "Mandriva Online"
 #: standalone/drakbug:52
 #, c-format
 msgid "Menudrake"
-msgstr "Mandrake"
+msgstr "Menudrake"
 
 #: standalone/drakbug:53
 #, c-format
@@ -20940,20 +20949,20 @@ msgstr "Iniciado na inicialização"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Esta interface ainda não foi configurada.\n"
 "Execute o assistente \"Adicionar uma interface\" no Centro de Controle "
-"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 ""
 "Você não possui nenhuma conexão de Internet configurada.\n"
-"Execute o assistente \"%s\" no Centro de Controle Mandrivalinux"
+"Execute o assistente \"%s\" no Centro de Controle Mandriva Linux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21003,8 +21012,8 @@ msgstr "KDM (gerenciador de display do KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (gerenciador de display do Mandrivalinux)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (gerenciador de display do Mandriva Linux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21307,18 +21316,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 (versão 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
@@ -21890,8 +21899,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Centro de Ajuda Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Centro de Ajuda Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22550,7 +22559,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 ""
 "Nenhuma Placa de Som foi detectada em sua máquina. Favor verificar se uma "
 "Placa de Som suportada pelo Linux está conectada corretamente.\n"
@@ -22559,7 +22568,7 @@ msgstr ""
 "Você pode visitar o banco de dados de hardware em:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24522,7 +24531,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 ""
 "Nenhuma placa de TV foi detectada em sua máquina. Favor verificar se uma "
 "placa de vídeo/TV suportada pelo Linux está conectada corretamente.\n"
@@ -24531,7 +24540,7 @@ msgstr ""
 "Você pode visitar o banco de dados de hardware em:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25246,13 +25255,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 ""
 "Este é o Harddrake, uma ferramente de configuração de hardware %s.\n"
 "<span foreground=\"royalblue3\">Versão:</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
@@ -25362,8 +25371,8 @@ msgstr "A alteração foi feita, mas para ser efetivada você deve fazer logout.
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Logs das ferramentas Mandrivalinux"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Logs das ferramentas Mandriva Linux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25884,10 +25893,10 @@ msgstr "Conexão 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 ""
 "Conexão falhou.\n"
-"Verifique sua configuração no Centro de Controle Mandrivalinux."
+"Verifique sua configuração no Centro de Controle Mandriva Linux."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/ro.po b/perl-install/share/po/ro.po
index d77dd64bc..1fd636856 100644
--- a/perl-install/share/po/ro.po
+++ b/perl-install/share/po/ro.po
@@ -1,6 +1,6 @@
-# Translation file of Mandrivalinux graphic install
+# Translation file of Mandriva Linux graphic install
 # Copyright (c) 2000 Mandriva
-# Florin Grad <florin@mandrakesoft.com>, 1999-2000
+# Florin Grad <florin@mandriva.com>, 1999-2000
 # Dragos Marian Barbu <dragosb@softhome.net>, 2000
 # Ovidiu Constantin <ovidiu.constantin@gmx.net>, 2002, 2003
 # Harald Ersch <harald@ersch.ro>,2003
@@ -1247,11 +1247,11 @@ msgstr "Myanmar"
 #: 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 permite folosirea mai multor limbi.\n"
+"Mandriva Linux permite folosirea mai multor limbi.\n"
 "Selectaţi limbile pe care doriţi să le instalaţi. Ele vor fi disponibile\n"
 "după terminarea instalării şi repornirea sistemului."
 
@@ -3565,7 +3565,7 @@ msgstr "activare sprijin radio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
@@ -3675,7 +3675,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"
@@ -3686,11 +3686,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"
@@ -3797,10 +3798,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"
@@ -3909,7 +3910,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"
@@ -4007,12 +4008,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"
@@ -4039,7 +4040,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"
@@ -4048,7 +4049,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"
@@ -4177,7 +4179,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."
@@ -4195,7 +4197,7 @@ msgstr "Precedentul"
 #: 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"
@@ -4224,7 +4226,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"
@@ -4240,7 +4242,7 @@ msgstr "Administrator de securitate:"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4326,7 +4328,7 @@ msgstr "Schimbă între modul normal/expert"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4371,7 +4373,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"
@@ -4380,13 +4382,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
@@ -4427,7 +4430,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"
@@ -4586,7 +4590,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"
@@ -4607,7 +4611,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 ""
 
@@ -4707,7 +4711,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"
@@ -4724,7 +4729,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"
@@ -4786,7 +4791,7 @@ msgstr "Servicii"
 #, 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 ""
 "Alegeţi discul fix pe care doriţi să îl ştergeţi pentru a instala noua "
@@ -5129,7 +5134,7 @@ msgstr "Calculez dimensiunea partiţiei Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 
@@ -5245,13 +5250,13 @@ msgstr "Oprire reţea"
 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"
@@ -5280,8 +5285,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 "
@@ -5295,8 +5300,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 "
@@ -5305,7 +5310,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"
@@ -5339,10 +5344,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"
@@ -5415,8 +5420,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"
@@ -5424,14 +5429,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 ""
 "Felicitări, instalarea e completă.\n"
 "Scoateţi media de demaraj şi apăsaţi Enter pentru redemaraj.\n"
 "\n"
 "\n"
 "Pentru informaţii asupra corecţiilor disponibile pentru aceasta versiune\n"
-"Mandrivalinux, consultaţi Erata disponibilă la \n"
+"Mandriva Linux, consultaţi Erata disponibilă la \n"
 "\n"
 "\n"
 "%s\n"
@@ -5439,13 +5444,13 @@ msgstr ""
 "\n"
 "Informaţiile asupra configurării sistemului sunt disponibile în \n"
 "capitolul referitor la post instalare din \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
@@ -5475,7 +5480,7 @@ msgstr "Începe etapa `%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 ""
@@ -5992,9 +5997,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 ""
-"Contactez situl Mandrivalinux pentru obţinerea listei oglinzilor "
+"Contactez situl Mandriva Linux pentru obţinerea listei oglinzilor "
 "disponibile..."
 
 #: install_steps_interactive.pm:840
@@ -6206,8 +6211,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Instalare Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Instalare Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8780,7 +8785,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 ""
@@ -12412,8 +12417,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 ""
 
@@ -14157,18 +14162,18 @@ msgstr "Opreşte"
 
 #: 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 "Bun venit la <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Bun venit la <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."
@@ -14177,7 +14182,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 ""
 
@@ -14194,9 +14199,9 @@ msgstr "Bine aţi venit în lumea Open Source (surse deschise)"
 #: 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 ""
 
@@ -14215,8 +14220,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
@@ -14242,17 +14247,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 ""
 
@@ -14264,7 +14269,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 ""
 
@@ -14302,7 +14307,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
@@ -14321,7 +14326,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
@@ -14339,7 +14344,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
@@ -14354,19 +14359,18 @@ msgstr ""
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
 msgid "<b>Mandriva Products</b>"
-msgstr "Centrul de control Mandrivalinux"
+msgstr "Centrul de control 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
 #, 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
@@ -14386,7 +14390,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 ""
 
@@ -14398,21 +14402,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 ""
 
@@ -14424,23 +14428,25 @@ msgstr ""
 #: 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 ""
 
 #: 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
@@ -14616,7 +14622,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 ""
 
@@ -14851,14 +14857,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Centrul de control Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Centrul 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 ""
 
@@ -14881,21 +14887,21 @@ 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 "Centrul de control Mandrivalinux"
+msgstr "Centrul de control Mandriva Linux"
 
 #: 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 ""
 
 #: share/advertising/27.pl:17
@@ -14912,7 +14918,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
@@ -14923,7 +14929,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 ""
 
@@ -14937,7 +14943,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
@@ -14949,14 +14955,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
@@ -14975,7 +14981,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
@@ -14998,7 +15004,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
@@ -15010,21 +15016,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
@@ -15308,7 +15314,7 @@ msgstr "Webcam-uri"
 #: share/compssUsers.pl:187
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "Configurare Mandrivalinux Terminal Server"
+msgstr "Configurare Mandriva Linux Terminal Server"
 
 #: share/compssUsers.pl:191
 #, fuzzy, c-format
@@ -15323,7 +15329,7 @@ msgstr ""
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
-msgstr "Centrul de control Mandrivalinux"
+msgstr "Centrul de control Mandriva Linux"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -15381,8 +15387,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
@@ -15418,7 +15424,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"
@@ -15465,8 +15471,8 @@ msgstr ""
 #, 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"
@@ -15539,7 +15545,7 @@ msgstr ""
 #: standalone/drakTermServ:211 standalone/drakTermServ:214
 #, fuzzy, c-format
 msgid "Terminal Server Configuration"
-msgstr "Configurare Mandrivalinux Terminal Server"
+msgstr "Configurare Mandriva Linux Terminal Server"
 
 #: standalone/drakTermServ:220
 #, c-format
@@ -15684,7 +15690,7 @@ msgstr ""
 #: standalone/drakTermServ:509
 #, fuzzy, c-format
 msgid "Terminal Server Overview"
-msgstr "Configurare Mandrivalinux Terminal Server"
+msgstr "Configurare Mandriva Linux Terminal Server"
 
 #: standalone/drakTermServ:510
 #, c-format
@@ -17933,13 +17939,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Centrul de control Mandrivalinux"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Centrul de control Mandriva Linux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Centrul de control Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Centrul de control Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18413,7 +18419,7 @@ msgstr "Pornit la demaraj"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Această interfaţă nu a fost configurată încă.\n"
 "Lansaţi asistentul de configurare în fereastra principală"
@@ -18422,7 +18428,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 ""
 "Această interfaţă nu a fost configurată încă.\n"
 "Lansaţi asistentul de configurare în fereastra principală"
@@ -18475,7 +18481,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18771,9 +18777,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
@@ -19267,8 +19273,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Centrul de control Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Centrul de control Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -19864,7 +19870,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
@@ -21480,7 +21486,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 ""
 "Nu a fost detectată nici o placă TV în calculatorul dvs. Vă rog să "
 "verificaţi dacă placa TV cu susţinere în Linux este introdusă corect.\n"
@@ -21489,7 +21495,7 @@ msgstr ""
 "Puteţi vizita baza de date de echipamente la:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -22174,18 +22180,18 @@ msgstr "Despre HardDrake"
 
 #. -PO: Do not alter the <span ..> and </span> tags
 #: standalone/harddrake2:226
-#, fuzzy, c-format
+#, c-format
 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 ""
-"Acesta este HardDrake, o unealtă Mandrake de configurare a echipamentelor.\n"
+"Acesta este HardDrake, o unealtă %s de configurare a echipamentelor.\n"
 "<span foreground=\"royalblue3\">Versiune:</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
@@ -22297,8 +22303,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Explicaţii utilitare Mandrivalinux"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Explicaţii utilitare Mandriva Linux"
 
 #: standalone/logdrake:51
 #, fuzzy, c-format
@@ -22806,10 +22812,10 @@ msgstr "Conectare reuşită."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Conectare eşuată.\n"
-"Verificaţi configurarea în Centrul de control Mandrivalinux."
+"Verificaţi configurarea în Centrul de control Mandriva Linux."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -23042,7 +23048,7 @@ msgstr "Re-generez lista de scannere configurate ..."
 #: standalone/scannerdrake:101
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "%s nu are susţinere în această versiune a Mandrivalinux."
+msgstr "%s nu are susţinere în această versiune a Mandriva Linux."
 
 #: standalone/scannerdrake:104
 #, c-format
@@ -23082,7 +23088,7 @@ msgstr ""
 #: standalone/scannerdrake:144
 #, fuzzy, c-format
 msgid "The %s is not supported under Linux."
-msgstr "%s nu are susţinere în această versiune a Mandrivalinux."
+msgstr "%s nu are susţinere în această versiune a Mandriva Linux."
 
 #: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
@@ -23184,7 +23190,7 @@ msgid ""
 msgstr ""
 "Scanner-ul %s trebuie configurat de către PrinterDrake.\n"
 "Puteţi lansa PrinterDrake în secţiunea Echipamente a Centrului de control "
-"Mandrivalinux."
+"Mandriva Linux."
 
 #: standalone/scannerdrake:308 standalone/scannerdrake:315
 #: standalone/scannerdrake:345
@@ -23653,7 +23659,6 @@ msgstr "Instalarea a eşuat"
 #~ msgid "You've not selected any font"
 #~ msgstr "Nu aţi selectat nici un font"
 
-
 #~ msgid ""
 #~ "No browser is installed on your system, Please install one if you want to "
 #~ "browse the help system"
@@ -23761,17 +23766,17 @@ msgstr "Instalarea a eşuat"
 #~ msgstr "Eroare la citirea  %s pentru a scrie: %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 ""
-#~ "Acesta este HardDrake, o unealtă Mandrivalinux de configurare a "
+#~ "Acesta este HardDrake, o unealtă Mandriva Linux de configurare a "
 #~ "echipamentelor.\n"
 #~ "<span foreground=\"royalblue3\">Versiune:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 
 #~ msgid "OK"
@@ -24105,15 +24110,12 @@ msgstr "Instalarea a eşuat"
 #~ msgid "mkraid failed"
 #~ msgstr "mkraid a eşuat"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid ""
 #~ "Connection failed.\n"
 #~ "Verify your configuration in the Mandrake Control Center."
 #~ msgstr ""
 #~ "Conectare eşuată.\n"
-#~ "Verificaţi configurarea în Centrul de control Mandrake."
+#~ "Verificaţi configurarea în Centrul de control Mandriva."
 
 #~ msgid "The package %s is needed. Install it?"
 #~ msgstr "Pachetul %s este necesar. Doriţi instalarea lui?"
diff --git a/perl-install/share/po/ru.po b/perl-install/share/po/ru.po
index 95eca5bae..9b8783696 100644
--- a/perl-install/share/po/ru.po
+++ b/perl-install/share/po/ru.po
@@ -1,6 +1,3 @@
-# translation of DrakX-ru.po to
-# translation of DrakX-ru.po to
-# translation of DrakX-ru.po to
 # Translation of DrakX-ru.po to Russian
 # Russian translation of drakX messages
 # Copyright (C) 1999-2003 Mandriva
@@ -137,7 +134,7 @@ msgstr ""
 "\n"
 "Вы также можете продолжить и без ключа USB - вы все еще будете\n"
 "в состоянии использовать Mandriva Move как обычную операционную\n"
-"систему Mandrake."
+"систему Mandriva."
 
 #: ../move/move.pm:494
 #, c-format
@@ -1331,11 +1328,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"
 "завершится установка и вы перезапустите свою систему."
 
@@ -3761,12 +3758,12 @@ 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 ""
 "Прежде чем продолжить, вы должны внимательно прочитать условия лицензии.\n"
-"Лицензия распространяется на весь дистрибутив Mandrivalinux. Если вы\n"
+"Лицензия распространяется на весь дистрибутив Mandriva Linux. Если вы\n"
 "согласны со всеми условиями лицензии, отметьте пункт \"%s\". Если нет -\n"
 "нажатие на кнопку \"%s\" приведет к перезагрузке вашего компьютера."
 
@@ -3875,7 +3872,7 @@ msgid "Advanced"
 msgstr "Дополнительно"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:54
 #, c-format
 msgid ""
@@ -3941,33 +3938,34 @@ msgstr ""
 "означает \"second lowest SCSI ID\", и т.д."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/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 ""
-"Инсталляция Mandrivalinux размещена на нескольких CD-ROMах. Если выбранный\n"
+"Инсталляция Mandriva Linux размещена на нескольких CD-ROMах. Если выбранный\n"
 "пакет находится на другом CD-ROM, DrakX будет отдавать текущий CD и просить\n"
 "вас вставить другой по мере надобности. Если у вас нет требуемого CD под "
 "руками,\n"
 "просто нажмите \"%s\", тогда соответствующие пакеты не будут устанавливаться."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/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"
@@ -4019,11 +4017,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "Теперь настало время определить, какие программы вы хотите установить в\n"
-"вашу систему. С Mandrivalinux поставляются тысячи пакетов и, для упрощения\n"
+"вашу систему. С Mandriva Linux поставляются тысячи пакетов и, для упрощения\n"
 "выбора, они разбиты на группы.\n"
 "\n"
 "Пакеты сортированы по группам, которые соответствуют специфике\n"
-"использования вашей машины. В Mandrivalinux пакеты сортируются по четырем\n"
+"использования вашей машины. В Mandriva Linux пакеты сортируются по четырем\n"
 "категориям. Вы можете смешивать и сочетать приложения из различных\n"
 "категорий, например, вариант установки ``Рабочая станция'' может иметь\n"
 "приложения из категории ``Разработка''.\n"
@@ -4109,7 +4107,7 @@ msgid "Truly minimal install"
 msgstr "Самая минимальная установка"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:149
 #, c-format
 msgid ""
@@ -4124,10 +4122,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"
@@ -4157,10 +4155,10 @@ msgstr ""
 "\n"
 "!! Если был выбран какой-либо серверный пакет, специально или он был частью\n"
 "какой-либо группы, вас попросят подтвердить, действительно ли вы желаете\n"
-"установить эти сервера. Под Mandrivalinux все установленные сервера\n"
+"установить эти сервера. Под Mandriva Linux все установленные сервера\n"
 "запускаются по умолчанию в процессе загрузки. Даже если они безопасны и не\n"
 "имеют известных проблем на момент выпуска дистрибутива, в них могут быть\n"
-"обнаружены дыры в безопасности после выпуска данной версии Mandrivalinux.\n"
+"обнаружены дыры в безопасности после выпуска данной версии Mandriva Linux.\n"
 "Если вы не знаете, зачем нужен данная служба и что она делает, нажмите\n"
 "\"%s\". Если вы нажмете \"%s\", тогда все службы из списка будут\n"
 "установлены и автоматически запущены при загрузке системы. !!\n"
@@ -4184,7 +4182,7 @@ msgid "Automatic dependencies"
 msgstr "Автоматические зависимости"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:183
 #, c-format
 msgid ""
@@ -4206,7 +4204,7 @@ msgid "Configure"
 msgstr "Настройка"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:189
 #, c-format
 msgid ""
@@ -4244,7 +4242,7 @@ msgstr ""
 "В общем, оставьте только те службы, которые вам действительно нужны. !!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:206
 #, c-format
 msgid ""
@@ -4286,7 +4284,7 @@ msgid "Automatic time synchronization"
 msgstr "Автоматическая синхронизация времени"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:220
 #, c-format
 msgid ""
@@ -4311,13 +4309,13 @@ msgstr ""
 "вашим потребностям."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/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"
@@ -4373,7 +4371,7 @@ msgid ""
 msgstr ""
 "X (для системы X Window) это сердце графического интерфейса GNU/Linux, на\n"
 "базе которого работают все графические среды (KDE, GNOME, AfterStep,\n"
-"WindowMaker, и т.д..), входящие в Mandrivalinux.\n"
+"WindowMaker, и т.д..), входящие в Mandriva Linux.\n"
 "\n"
 "Вам будет представлен список различных параметров для получения\n"
 "оптимального графического отображения: Видеокарта\n"
@@ -4460,7 +4458,7 @@ msgstr ""
 "на мониторе."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:303
 #, c-format
 msgid ""
@@ -4473,7 +4471,7 @@ msgstr ""
 "потребностям."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:308
 #, c-format
 msgid ""
@@ -4492,16 +4490,16 @@ msgstr ""
 "графический режим."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/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"
@@ -4528,7 +4526,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both 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"
@@ -4537,7 +4535,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"
@@ -4558,11 +4557,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "На этом шаге вам прийдется решить, куда вы хотите установить операционную\n"
-"систему Mandrivalinux на вашем жестком диске. Если ваш жесткий диск пуст,\n"
+"систему Mandriva Linux на вашем жестком диске. Если ваш жесткий диск пуст,\n"
 "или существующая операционная система на нем занимает все дисковое\n"
 "пространство, вам прийдется диск переразбить (partition). Разделение диска\n"
 "в основном состоит в том, чтобы логически выделить на нем свободное\n"
-"пространство для установки вашей новой системы Mandrivalinux.\n"
+"пространство для установки вашей новой системы Mandriva Linux.\n"
 "\n"
 "Поскольку разделение диска - это обычно необратимый процесс и может\n"
 "привести к потере данных, если на диске уже есть установленная операционная\n"
@@ -4589,7 +4588,7 @@ msgstr ""
 "потери данных, особенно если вы предварительно провели дефрагментацию\n"
 "раздела Windows. Резервное копирование ваших данных настойчиво\n"
 "рекомендуется.. Рекомендуем выбрать эту опцию, если вы собираетесь\n"
-"использовать Mandrivalinux и Microsoft Windows на одном компьютере.\n"
+"использовать Mandriva Linux и Microsoft Windows на одном компьютере.\n"
 "\n"
 "   Перед тем, как выбрать эту опцию, вы должны осознать, что размер вашего\n"
 "раздела Microsoft Windows станет меньше, чем был. У вас будет меньше\n"
@@ -4597,7 +4596,7 @@ msgstr ""
 "новых программ.\n"
 "\n"
 " * \"%s\" выберите эту опцию, если вы хотите удалить все данные на всех\n"
-"разделах вашего жесткого диска и заменить их новой системой Mandrivalinux.\n"
+"разделах вашего жесткого диска и заменить их новой системой Mandriva Linux.\n"
 "Будьте осторожны в этом решении, потому что после подтверждения вы не\n"
 "сможете вернуть обратно все как было.\n"
 "\n"
@@ -4650,7 +4649,7 @@ msgid "Custom disk partitioning"
 msgstr "Ручная разметка диска"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:377
 #, c-format
 msgid ""
@@ -4739,7 +4738,7 @@ msgid "Save packages selection"
 msgstr "Сохранить выбор пакетов"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:412
 #, c-format
 msgid ""
@@ -4760,7 +4759,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."
@@ -4785,7 +4784,7 @@ msgstr ""
 "Нажмите \"%s\", когда будете готовы начать форматирование разделов.\n"
 "\n"
 "Нажмите \"%s\", если вы хотите выбрать другой раздел для установки\n"
-"Mandrivalinux.\n"
+"Mandriva Linux.\n"
 "\n"
 "Нажмите \"%s\", если хотите выбрать разделы, которые следует проверить на\n"
 "сбойные блоки (bad blocks)."
@@ -4800,11 +4799,11 @@ msgid "Previous"
 msgstr "Назад"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/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"
@@ -4816,7 +4815,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"
@@ -4835,7 +4834,7 @@ msgid "Install"
 msgstr "Установить"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:447
 #, c-format
 msgid ""
@@ -4846,7 +4845,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"
@@ -4860,7 +4859,7 @@ msgstr ""
 "\n"
 "Если вы не знаете что выбрать, оставьте выбор по умолчанию. Вы сможете\n"
 "изменить этот уровень безопасности потом с помощью утилиты draksec из\n"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
 "\n"
 "В поле \"%s\" системе указывается пользователь, который будет отвечать за\n"
 "безопасность. На этот адрес будут посылаться сообщения по безопасности."
@@ -4871,12 +4870,12 @@ msgid "Security Administrator"
 msgstr "Администратор по безопасности"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/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"
@@ -4947,7 +4946,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Здесь вам предложат выбрать, какие разделы будут использоваться для\n"
-"установки вашей системы Mandrivalinux. Если разделы были уже определены\n"
+"установки вашей системы Mandriva Linux. Если разделы были уже определены\n"
 "ранее, например, предыдущей инсталляцией GNU/Linux или другой утилитой\n"
 "разбиения дисков, вы можете воспользоваться существующими разделами. В\n"
 "противном случае, разделы жесткого диска должны быть определены.\n"
@@ -5029,13 +5028,13 @@ msgid "Toggle between normal/expert mode"
 msgstr "Переключение между нормальным/экспертным режимами"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/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"
@@ -5065,7 +5064,7 @@ msgid ""
 msgstr ""
 "На вашем жестом диске обнаружено несколько разделов Microsoft. Выберите\n"
 "необходимый раздел для изменения его размера с целью установки вашей новой\n"
-"операционной системы Mandrivalinux.\n"
+"операционной системы Mandriva Linux.\n"
 "\n"
 "Каждый раздел перечислен так: \"Linux имя\", \"Windows имя\" \"Размер\".\n"
 "\n"
@@ -5093,7 +5092,7 @@ msgstr ""
 "раздел называется \"C:\")."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:564
 #, c-format
 msgid ""
@@ -5108,7 +5107,7 @@ msgstr ""
 "увидеть полный список."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:569
 #, c-format
 msgid ""
@@ -5116,7 +5115,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing 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"
@@ -5125,19 +5124,20 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your 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"
 "раздел GNU/Linux.\n"
 "\n"
 "DrakX теперь должен узнать, хотите ли вы провести новую установку или\n"
-"обновление существующей системы Mandrivalinux:\n"
+"обновление существующей системы Mandriva Linux:\n"
 "\n"
 " * \"%s\": в большинстве случаев этот вариант приведет к уничтожению старой\n"
 "системы. Если вы желаете изменить разделы вашего жесткого диска или\n"
@@ -5146,16 +5146,16 @@ msgstr ""
 "от перезаписи некоторые свои данные.\n"
 "\n"
 " * \"%s\": этот класс установки позволит вам обновить пакеты, установленные\n"
-"в вашей системе Mandrivalinux. Текущая схема разделов диска и\n"
+"в вашей системе Mandriva Linux. Текущая схема разделов диска и\n"
 "пользовательские данные останутся нетронутыми. Большинство других шагов\n"
 "будут доступны, как и при стандартной установке.\n"
 "\n"
-"``Обновление'' будет неплохо работать на системах Mandrivalinux начиная с\n"
-"\"8.1\" и выше. Проведение обновления на системах Mandrivalinux старше\n"
+"``Обновление'' будет неплохо работать на системах Mandriva Linux начиная с\n"
+"\"8.1\" и выше. Проведение обновления на системах Mandriva Linux старше\n"
 "\"8.1\" не рекомендуется."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:591
 #, c-format
 msgid ""
@@ -5195,7 +5195,7 @@ msgstr ""
 "для переключения между латинской и не-латинской раскладками."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:609
 #, c-format
 msgid ""
@@ -5213,7 +5213,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"
@@ -5251,7 +5252,7 @@ msgstr ""
 "\n"
 "О поддержке UTF-8 (unicode): Unicode это новая кодировка, которая включает\n"
 "в себя все существующие языки. Однако ее полная поддержка в GNU/Linux пока\n"
-"находится в стадии разработки. Поэтому Mandrivalinux будет определять\n"
+"находится в стадии разработки. Поэтому Mandriva Linux будет определять\n"
 "использовать ее или нет в зависимости от выбора пользователя:\n"
 "\n"
 " * Если вы выбираете языки, которые имеют свою традиционную устоявшуюся\n"
@@ -5284,7 +5285,7 @@ msgid "Espanol"
 msgstr "Испанский"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:650
 #, c-format
 msgid ""
@@ -5366,7 +5367,7 @@ msgid "Universal | Any PS/2 & USB mice"
 msgstr "Универсальный |Любая PS/2 & USB мышь"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:684
 #, c-format
 msgid ""
@@ -5377,7 +5378,7 @@ msgstr ""
 "называется \"ttyS0\" под GNU/Linux."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:688
 #, c-format
 msgid ""
@@ -5460,7 +5461,7 @@ msgid "authentication"
 msgstr "аутентификация"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:725
 #, c-format
 msgid ""
@@ -5497,12 +5498,12 @@ msgstr ""
 "только если вы знаете, что вы делаете."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/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"
@@ -5523,11 +5524,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 ""
 "Теперь пришло время выбрать систему печати для вашего компьютера. Другие OS\n"
-"могут предложить вам одну, а Mandrivalinux предлагает две. Каждая из систем\n"
+"могут предложить вам одну, а Mandriva Linux предлагает две. Каждая из "
+"систем\n"
 "является лучшей для определенной конфигурации.\n"
 "\n"
 " * \"%s\" -- что означает ``печатать, не ставить в очередь'' (``print,\n"
@@ -5550,7 +5552,7 @@ msgstr ""
 "\n"
 "Если вы сделаете свой выбор сейчас, а позже обнаружите, что система печати\n"
 "вам не подходит, вы сможете изменить ее, запустив PrinterDrake из Центра\n"
-"Управления Mandrivalinux и нажав на кнопку  \"%s\"."
+"Управления Mandriva Linux и нажав на кнопку  \"%s\"."
 
 #: help.pm:765
 #, c-format
@@ -5568,7 +5570,7 @@ msgid "Expert"
 msgstr "Эксперт"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:768
 #, c-format
 msgid ""
@@ -5607,7 +5609,7 @@ msgstr ""
 "оборудованию, вам прийдется вручную настроить драйвер."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:786
 #, c-format
 msgid ""
@@ -5627,7 +5629,7 @@ msgid "Sound card"
 msgstr "Звуковая карта"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:791
 #, c-format
 msgid ""
@@ -5674,7 +5676,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"
@@ -5691,7 +5694,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"
@@ -5743,7 +5746,7 @@ msgstr ""
 "\n"
 " * \"%s\": если вы хотите настроить доступ в Интернет или локальную сеть\n"
 "прямо сейчас. Обратитесь к печатной документации или используйте\n"
-"Центр управления Mandrivalinux после установки чтобы почитать\n"
+"Центр управления Mandriva Linux после установки чтобы почитать\n"
 "встроенную справку.\n"
 "\n"
 " * \"%s\": позволяет настроить адреса HTTP и FTP прокси если машина,\n"
@@ -5760,7 +5763,7 @@ msgstr ""
 " * \"%s\": если вы желаете изменить конфигурацию начального загрузчика,\n"
 "нажмите эту кнопку. Эта опция предназначена для опытных пользователей.\n"
 "Обратитесь к печатной документации или встроенной справке о настройке\n"
-"загрузчика в Центре управления Mandrivalinux.\n"
+"загрузчика в Центре управления Mandriva Linux.\n"
 " * \"%s\": здесь вы сможете проконтролировать какие службы будут запущены\n"
 "на вашей машине. Если ваша машина будет сервером, вам стоит проверить эти\n"
 "установки."
@@ -5817,20 +5820,20 @@ msgid "Services"
 msgstr "Службы"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/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 ""
 "Выберите жесткий диск, который нужно очистить для инсталляции вашего нового\n"
-"раздела Mandrivalinux. Будьте осторожны, все данные на нем будут потеряны\n"
+"раздела Mandriva Linux. Будьте осторожны, все данные на нем будут потеряны\n"
 "и их нельзя будет восстановить!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
+# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: help.pm:863
 #, c-format
 msgid ""
@@ -6185,12 +6188,12 @@ msgstr "Вычисляется размер раздела Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Ваш раздел Windows слишком фрагментирован. Пожалуйста, перезагрузите свой "
 "компьютер под Windows, запустите утилиту ``defrag'', а затем повторно "
-"запустите установку Mandrivalinux."
+"запустите установку Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6306,13 +6309,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"
@@ -6341,8 +6344,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 "
@@ -6356,8 +6359,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 "
@@ -6366,7 +6369,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of 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"
@@ -6400,10 +6403,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"
@@ -6425,10 +6428,10 @@ msgstr ""
 "Введение\n"
 "\n"
 "Операционная система и различные компоненты, доступные в дистрибутиве\n"
-"Mandrivalinux далее будут называться \"Программными Продуктами\".\n"
+"Mandriva Linux далее будут называться \"Программными Продуктами\".\n"
 "Программные Продукты включают, но не ограничиваются, набор программ, \n"
 "методы, правила и документацию, связанную с операционной системой\n"
-"и различными компонентами дистрибутива Mandrivalinux.\n"
+"и различными компонентами дистрибутива Mandriva Linux.\n"
 "\n"
 "\n"
 "1. Лицензионное соглашение\n"
@@ -6478,7 +6481,7 @@ msgstr ""
 "разбирательств, или любых других косвенных потерь), являющихся результатом\n"
 "владения и использования компонентов программного обеспечения,\n"
 "или являющихся результатом скачивания компонентов программного обеспечения\n"
-"с одного из сайтов Mandrivalinux, запрещенных или ограниченных в некоторых\n"
+"с одного из сайтов Mandriva Linux, запрещенных или ограниченных в некоторых\n"
 "странах местными законами.\n"
 "Ограниченная ответственность применяется, но не ограничивается,\n"
 "к компонентам сильной криптографии, включаемых в Программные Продукты.\n"
@@ -6495,8 +6498,7 @@ msgstr ""
 "лицензионного соглашения для каждого из компонент перед использованием\n"
 "любого компонента. Любые вопросы по лицензии компонента должны быть\n"
 "адресованы автору компонента, а не Mandriva.\n"
-"Программы, разработанные Mandriva S.A., находятся под действием "
-"лицензии\n"
+"Программы, разработанные Mandriva S.A., находятся под действием лицензии\n"
 "GPL. Документация, написанная Mandriva S.A., находится под действием\n"
 "особой лицензии. Пожалуйста, обратитесь к документации за дополнительной\n"
 "информацией.\n"
@@ -6510,7 +6512,7 @@ msgstr ""
 "Mandriva S.A. сохраняет за собой право изменять или адаптировать\n"
 "Программные Продукты, как целиком, так и по частям, любым способом и для\n"
 "любых целей.\n"
-"\"Mandriva\", \"Mandrivalinux\" и соответствующие логотипы являются "
+"\"Mandriva\", \"Mandriva Linux\" и соответствующие логотипы являются "
 "торговыми марками Mandriva S.A.\n"
 "\n"
 "\n"
@@ -6619,8 +6621,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"
@@ -6628,13 +6630,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"
@@ -6642,13 +6644,13 @@ msgstr ""
 "\n"
 "\n"
 "Информация о настройке вашей системы доступна в главе post install\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
@@ -6677,12 +6679,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"
 "CDROM'а, и затем наберите `text'."
 
@@ -7229,9 +7231,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 для получения списка "
+"Выполняется подключение к веб-сайту Mandriva Linux для получения списка "
 "доступных пакетов..."
 
 #: install_steps_interactive.pm:840
@@ -7458,8 +7460,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
@@ -10046,13 +10048,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\n"
 "\n"
-"Он настраивает персональный файервол для этой машины Mandrivalinux.\n"
+"Он настраивает персональный файервол для этой машины Mandriva Linux.\n"
 "Для создания специализированного мощного файервола, пожалуйста, загляните\n"
 "в специализированный дистрибутив MandrakeSecurity Firewall."
 
@@ -14125,12 +14127,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 ""
-"Запустите Scannerdrake (Оборудование/Сканер в Центре управления "
-"Mandrivalinux) чтобы раздать ваш сканер на сеть.\n"
+"Запустите Scannerdrake (Оборудование/Сканер в Центре управления Mandriva "
+"Linux) чтобы раздать ваш сканер на сеть.\n"
 "\n"
 
 #: printer/printerdrake.pm:3933
@@ -16098,33 +16100,33 @@ msgstr "Остановить"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Что такое Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Что такое Mandriva Linux?</b>"
 
 #: 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."
 msgstr ""
-"Mandrivalinux это <b>дистрибутив Linux</b>, который содержит ядро системы,"
+"Mandriva Linux это <b>дистрибутив Linux</b>, который содержит ядро системы,"
 "именуемой <b>операционная система</b> (основана на ядре Linux) вместе со "
 "<b>множеством приложений</b>, отвечающих всем вашим потребностям."
 
 #: 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> дистрибутив "
+"Mandriva Linux это самый <b>дружественный к пользователю </b> дистрибутив "
 "Linux на сегодняшний день. Он также является одним из <b>самых используемых</"
 "b> дистрибутивов Linux в мире!"
 
@@ -16141,15 +16143,15 @@ msgstr "Добро пожаловать в мир <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 придерживается модели open source. Это означает что данный "
+"Mandriva Linux придерживается модели open source. Это означает что данный "
 "новый релиз есть результат <b>сотрудничества</b> команды <b>разработчиков "
-"Mandriva</b> и <b>международного сообщества</b> контрибьюторов "
-"Mandrivalinux."
+"Mandriva</b> и <b>международного сообщества</b> контрибьюторов Mandriva "
+"Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16168,11 +16170,11 @@ 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 ""
 "Большинство программного обеспечения, входящего в дистрибутив и все "
-"утилитыMandrivalinux поставляются по лицензии <b>General Public License</b>."
+"утилитыMandriva Linux поставляются по лицензии <b>General Public License</b>."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16204,25 +16206,25 @@ 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> пользователей и "
+"У Mandriva Linux <b>самое большое сообщество</b> пользователей и "
 "разработчиков. Роль этого сообщества очень широка, от сообщений об ошибках "
 "до разработки новых приложений. Сообщество играет <b>ключевую роль</b> в "
-"мире Mandrivalinux ."
+"мире 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/"
+"mandrivalinux.com</b> или непосредственно <b>www.mandrivalinux.com/en/"
 "cookerdevel.php3</b>, если вы хотите <b>присоединиться</b> к разработке."
 
 #: share/advertising/05.pl:15
@@ -16233,10 +16235,10 @@ msgstr "<b>Download версия</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>. Это свободная "
 "версия, которую Mandriva делает <b>доступной всем</b>."
 
 #: share/advertising/05.pl:19
@@ -16281,8 +16283,8 @@ msgstr "<b>Discovery, Ваш первый Linux Desktop</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
@@ -16305,8 +16307,8 @@ msgstr "<b>PowerPack, The Ultimate Linux Desktop</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
@@ -16315,8 +16317,8 @@ msgid ""
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack это <b>главный десктопный продукт</b> Mandriva. PowerPack "
-"включает <b>тысячи приложений </b>  все от наиболее популярных до наиболее "
+"PowerPack это <b>главный десктопный продукт</b> Mandriva. PowerPack включает "
+"<b>тысячи приложений </b>  все от наиболее популярных до наиболее "
 "расширенных."
 
 #: share/advertising/08.pl:13
@@ -16326,8 +16328,8 @@ msgstr "<b>PowerPack+, Решение Linux для рабочих столов �
 
 #: 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
@@ -16349,15 +16351,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>Mandriva</b> разработал широкий круг продуктов <b>Mandrivalinux</b>."
+"<b>Mandriva</b> разработал широкий круг продуктов <b>Mandriva Linux</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
@@ -16377,10 +16378,10 @@ msgstr "\t* <b>PowerPack+</b>, Решение Linux для рабочих сто
 #: 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 для x86-64</b>, Решение Mandrivalinux для успешной "
+"\t* <b>Mandriva Linux для x86-64</b>, Решение Mandriva Linux для успешной "
 "работы на вашем 64-битном процессоре."
 
 #: share/advertising/10.pl:15
@@ -16391,28 +16392,28 @@ 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 разработал два продукта, которые позволяют вам использовать "
-"Mandrivalinux <b>на любом компьютере</b> не прибегая к установке:"
+"Mandriva Linux <b>на любом компьютере</b> не прибегая к установке:"
 
 #: 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, который запускается "
+"\t* <b>Move</b>, это дистрибутив Mandriva Linux, который запускается "
 "непосредственно с загрузочного CD-диска."
 
 #: 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 Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
@@ -16423,28 +16424,30 @@ msgstr "<b>Продукты Mandriva (профессиональные реше�
 #: 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 ""
 "Ниже представлены продукты Mandriva, разработанные для удовлетворения "
 "<b>нужд профессионалов</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 для предприятий."
+"\t* <b>Corporate Desktop</b>, Рабочий стол Mandriva Linux для предприятий."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Серверное решение Mandrivalinux."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Серверное решение Mandriva Linux."
 
 #: 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 для безопасности."
+"\t* <b>Multi-Network Firewall</b>, Решение Mandriva Linux для безопасности."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16645,10 +16648,10 @@ 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 ""
-"В меню Mandrivalinux вы найдете <b>простые в использовании</b> приложения "
+"В меню Mandriva Linux вы найдете <b>простые в использовании</b> приложения "
 "для <b>всех ваших задач</b>:"
 
 #: share/advertising/18.pl:16
@@ -16920,18 +16923,18 @@ 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 ""
-"<b>Центр управления Mandrivalinux</b> это особый набор утилит Mandrivalinux "
-"для упрощения настройки вашего компьютера."
+"<b>Центр управления Mandriva Linux</b> это особый набор утилит Mandriva "
+"Linux для упрощения настройки вашего компьютера."
 
 #: share/advertising/25.pl:17
 #, c-format
@@ -16956,17 +16959,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 ""
 "Как и все компьютерное программирование, программное обеспечение с открытыми "
 "исходниками <b>требует время и людские ресурсы</b> для разработки. Чтобы "
 "сохранить философию открытых исходников, Mandriva продает дополнительные "
-"продукты и услуги, что дает возможность поддерживать<b>развитие "
-"Mandrivalinux</b>. Если вы желаете <b>поддержать философию открытых "
-"исходников</b> и разработку Mandrivalinux, <b>пожалуйста</b> приобретите что-"
-"нибудь из наших продуктов или услуг!"
+"продукты и услуги, что дает возможность поддерживать<b>развитие Mandriva "
+"Linux</b>. Если вы желаете <b>поддержать философию открытых исходников</b> и "
+"разработку Mandriva Linux, <b>пожалуйста</b> приобретите что-нибудь из наших "
+"продуктов или услуг!"
 
 #: share/advertising/27.pl:13
 #, c-format
@@ -16976,8 +16979,8 @@ msgstr "<b>Интернет-магазин</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 ""
 "Чтобы узнать больше о продуктах и услугах Mandriva, посетите нашу "
 "<b>платформу электронной коммерции</b>."
@@ -17000,8 +17003,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
@@ -17011,11 +17014,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> это <b>отличный помощник</b> для ваших продуктов "
-"Mandrivalinux.."
+"Mandriva Linux.."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -17029,10 +17032,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>Специальные скидки</b>  на продукты и услуги в нашем интернет-"
-"магазине <b>store.mandrakesoft.com</b>."
+"магазине <b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -17045,17 +17048,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Участие в <b>форумах пользователей</b> Mandrivalinux."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Участие в <b>форумах пользователей</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>Ранний и привилегированный доступ</b>, перед общедоступным релизом к  "
-"<b>ISO образам</b>Mandrivalinux."
+"<b>ISO образам</b>Mandriva Linux."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -17075,10 +17078,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 предоставляет множество отличных услуг для <b>легкого "
-"обновления</b> ваших систем Mandrivalinux:"
+"обновления</b> ваших систем Mandriva Linux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17102,9 +17105,10 @@ 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>всеми вашими системами Mandrivalinux</b> с одного аккаунта."
+"\t* Управление <b>всеми вашими системами Mandriva Linux</b> с одного "
+"аккаунта."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -17115,29 +17119,29 @@ 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> Пообщайтесь с техническими экспертами "
-"Mandriva с помощью <b>нашей платформы тех-поддержки</b> www."
-"mandrakeexpert.com."
+"Mandriva с помощью <b>нашей платформы тех-поддержки</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>квалифицированных экспертов Mandrivalinux</b>, вы "
+"Благодаря помощи <b>квалифицированных экспертов Mandriva Linux</b>, вы "
 "сэкономите уйму времени."
 
 #: 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 ""
-"По любым вопросам в отношении Mandrivalinux вы можете приобрести инциденты "
-"поддержки в <b>store.mandrakesoft.com</b>."
+"По любым вопросам в отношении Mandriva Linux вы можете приобрести инциденты "
+"поддержки в <b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17524,15 +17528,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 ""
 "[ОПЦИИ] [ИМЯ_ПРОГРАММЫ]\n"
 "\n"
 "ОПЦИИ:\n"
 "  --help            - вывести это справочное сообщение.\n"
-"  --report          - программа должна быть из пакета утилит mandrakelinux\n"
-"  --incident        - программа должна быть из пакета утилит mandrakelinux"
+"  --report          - программа должна быть из пакета утилит Mandriva Linux\n"
+"  --incident        - программа должна быть из пакета утилит Mandriva Linux"
 
 #: standalone.pm:63
 #, c-format
@@ -17586,7 +17590,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"
@@ -17600,7 +17604,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[ОПЦИИ]...\n"
-"Конфигуратор Сервера терминалов Mandrivalinux\n"
+"Конфигуратор Сервера терминалов Mandriva Linux\n"
 "--enable         : включить MTS\n"
 "--disable        : выключить MTS\n"
 "--start          : запустить MTS\n"
@@ -17658,16 +17662,16 @@ 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"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[ОПЦИЯ]...\n"
-"  --no-confirmation      не просить первого подтверждения в режиме "
-"Mandriva Update\n"
+"  --no-confirmation      не просить первого подтверждения в режиме Mandriva "
+"Update\n"
 "  --no-verify-rpm        не проверять подписи пакетов\n"
 "  --changelog-first      показывать журнал изменений перед списком файлов в "
 "окне описания\n"
@@ -20460,13 +20464,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, 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
@@ -20956,19 +20960,20 @@ 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"
-"Запустите помощника \"Добавить интерфейс\" из Центра Управления 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 ""
 "У вас еще нет ни одного настроенного соединения с Интернет.\n"
-"Запустите помощника \"%s\" из Центра Управления Mandrivalinux"
+"Запустите помощника \"%s\" из Центра Управления Mandriva Linux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21018,8 +21023,8 @@ msgstr "KDM (менеджер экрана KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Менеджер экрана Mandrivalinux)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Менеджер экрана Mandriva Linux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21323,18 +21328,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 (оригинальная версия)\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
@@ -21916,8 +21921,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Центр справки Mandrake"
+msgid "Mandriva Linux Help Center"
+msgstr "Центр справки Mandriva"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22584,7 +22589,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 ""
 "На вашей машине не обнаружена звуковая карта. Пожалуйста, проверьте, чтобы "
 "поддерживаемая Linux'ом звуковая карта была хорошо вставлена в слот.\n"
@@ -22593,7 +22598,7 @@ msgstr ""
 "Вы можете заглянуть в нашу базу данных аппаратного обеспечения на:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/ru/hardware.php3"
+"http://www.mandrivalinux.com/ru/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24611,7 +24616,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 ""
 "На вашей машине не обнаружена ТВ-карта. Пожалуйста, проверьте, чтобы Linux-"
 "совместимая Видео/ТВ-карта была хорошо вставлена.\n"
@@ -24620,7 +24625,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
@@ -25333,13 +25338,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
@@ -25449,8 +25454,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Журналы утилит Mandrivalinux"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Журналы утилит Mandriva Linux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25963,10 +25968,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
diff --git a/perl-install/share/po/sc.po b/perl-install/share/po/sc.po
index fa4ceac7e..d3e5380f9 100644
--- a/perl-install/share/po/sc.po
+++ b/perl-install/share/po/sc.po
@@ -102,7 +102,7 @@ msgstr ""
 "\n"
 "\n"
 "Podis sighiri finas sentza de crai USB - as a podi ancora\n"
-"imprea Mandriva Move ke unu Sistema Obradori Mandrake\n"
+"imprea Mandriva Move ke unu Sistema Obradori Mandriva\n"
 "normali live."
 
 #: ../move/move.pm:483
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "\n"
 "Podis sighiri finas sentza de crai USB - as a podi ancora\n"
-"imprea Mandriva Move ke unu Sistema Obradori Mandrake\n"
+"imprea Mandriva Move ke unu Sistema Obradori Mandriva\n"
 "normali live."
 
 #: ../move/move.pm:494
@@ -1262,11 +1262,11 @@ msgstr "Sçoberu de sa lìngua"
 #: 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 podit suportai prus lìnguas a sa borta. Sçobera\n"
+"Mandriva Linux podit suportai prus lìnguas a sa borta. Sçobera\n"
 "is lìnguas ki bolis aposentai. Ndi as a podi disponni candu as a\n"
 "essi acabau s'aposentadura e torrau a allui su sistema."
 
@@ -3532,7 +3532,7 @@ msgstr "abiva su suportu arràdiu"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
@@ -3642,7 +3642,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"
@@ -3653,11 +3653,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"
@@ -3764,10 +3765,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"
@@ -3876,7 +3877,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"
@@ -3974,12 +3975,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"
@@ -4006,7 +4007,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"
@@ -4015,7 +4016,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"
@@ -4144,7 +4146,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."
@@ -4162,7 +4164,7 @@ msgstr "Agoa"
 #: 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"
@@ -4191,7 +4193,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"
@@ -4207,7 +4209,7 @@ msgstr "Aministradori de Siguresa"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4293,7 +4295,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"
@@ -4338,7 +4340,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"
@@ -4347,13 +4349,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
@@ -4394,7 +4397,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"
@@ -4551,7 +4555,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"
@@ -4572,7 +4576,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 ""
 
@@ -4672,7 +4676,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"
@@ -4689,7 +4694,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"
@@ -4751,7 +4756,7 @@ msgstr "Serbìtzius"
 #, 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 ""
 
@@ -5072,7 +5077,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 ""
 
@@ -5176,13 +5181,13 @@ msgstr "Studu s'arretza"
 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"
@@ -5211,8 +5216,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 "
@@ -5226,8 +5231,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 "
@@ -5236,7 +5241,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"
@@ -5270,10 +5275,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"
@@ -5346,8 +5351,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"
@@ -5355,13 +5360,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 ""
 "Cumprimentus, s'aposentadura est acabada.\n"
 "Boga su mèdiu de alluidura e craca return po torrai a allui.\n"
 "\n"
 "\n"
-"Po sciri de ajorronus disponiditzus po custa versioni de Mandrivalinux,\n"
+"Po sciri de ajorronus disponiditzus po custa versioni de Mandriva Linux,\n"
 "ligi is Errata a disposta de:\n"
 "\n"
 "\n"
@@ -5369,13 +5374,13 @@ msgstr ""
 "\n"
 "\n"
 "Imparus po assetiai su sistema funt a disposta in su cabìtulu\n"
-"post install de sa Official Mandrivalinux User's Guide."
+"post install de sa 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
@@ -5400,7 +5405,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 ""
@@ -5910,9 +5915,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 ""
-"Cuntatu su jassu web de Mandrivalinux po tenni sa lista de is sprigus..."
+"Cuntatu su jassu web de Mandriva Linux po tenni sa lista de is sprigus..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -6116,8 +6121,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Aposentadura de Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Aposentadura de Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8678,7 +8683,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 ""
@@ -12233,8 +12238,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 ""
 
@@ -13897,18 +13902,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>!"
+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 "
+"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."
@@ -13917,7 +13922,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 ""
 
@@ -13934,9 +13939,9 @@ 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 "
+"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 ""
 
@@ -13955,8 +13960,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
@@ -13982,17 +13987,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 ""
 
@@ -14004,7 +14009,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 ""
 
@@ -14042,7 +14047,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
@@ -14061,7 +14066,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
@@ -14079,7 +14084,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
@@ -14099,13 +14104,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
@@ -14126,7 +14130,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 ""
 
@@ -14138,21 +14142,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 ""
 
@@ -14164,23 +14168,25 @@ msgstr ""
 #: 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 ""
 
 #: 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
@@ -14356,7 +14362,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 ""
 
@@ -14591,14 +14597,14 @@ 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 "
+"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 ""
 
@@ -14621,8 +14627,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 ""
 
@@ -14634,8 +14640,8 @@ msgstr ""
 #: 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 ""
 
 #: share/advertising/27.pl:17
@@ -14652,7 +14658,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
@@ -14663,7 +14669,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 ""
 
@@ -14677,7 +14683,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
@@ -14689,14 +14695,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
@@ -14715,7 +14721,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
@@ -14738,7 +14744,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
@@ -14750,21 +14756,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
@@ -15113,8 +15119,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
@@ -15150,7 +15156,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"
@@ -15197,8 +15203,8 @@ msgstr ""
 #, 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"
@@ -17648,12 +17654,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
@@ -18123,14 +18129,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
@@ -18181,7 +18187,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -18471,9 +18477,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
@@ -18951,7 +18957,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
+msgid "Mandriva Linux Help Center"
 msgstr ""
 
 #: standalone/drakhelp:36
@@ -19532,7 +19538,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
@@ -21130,7 +21136,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
@@ -21816,7 +21822,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 ""
 
@@ -21925,7 +21931,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
 msgstr ""
 
 #: standalone/logdrake:51
@@ -22429,7 +22435,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/sk.po b/perl-install/share/po/sk.po
index d8758600e..bbe621252 100644
--- a/perl-install/share/po/sk.po
+++ b/perl-install/share/po/sk.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: DrakX\n"
 "POT-Creation-Date: 2005-04-21 14:27+0200\n"
 "PO-Revision-Date: 2005-04-04 13:22+0100\n"
-"Last-Translator: Tibor Pittich <Tibor.Pittich@mandrake.org>\n"
+"Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
 "Language-Team:  <i18n@mandrake.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1310,7 +1310,7 @@ msgstr "Výber 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 "Môžete zvoliť ďalšie jazyky použiteľné po inštalácii"
@@ -3725,12 +3725,12 @@ msgstr "povoliť podporu pre rádia"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
 "Pred tým než budete pokračovať, mali by ste si pozorne prečítať\n"
-"licenčné podmienky. Pokrývajú celú distribúciu Mandrivalinux\n"
+"licenčné podmienky. Pokrývajú celú distribúciu Mandriva Linux\n"
 "Ak súhlasíte so všetkými jej bodmi kliknite na tlačidlo \"%s\".\n"
 "Ak nesúhlasíte kliknite na tlačidlo \"%s\" a váš počítač bude reštartovaný."
 
@@ -3912,13 +3912,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The 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 ""
-"Inštalácia Mandrivalinuxu je distribuovaná na viacerých CD-ROM diskoch. "
+"Inštalácia Mandriva Linuxu je distribuovaná na viacerých CD-ROM diskoch. "
 "DrakX\n"
 "vie zistiť, ak je vybraný balík umiestnený na inom CD-ROM disku, vysunie\n"
 "aktuálne CD a vypýta si od vás to ktoré je práve potrebné. Ak toto CD "
@@ -3928,11 +3928,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"
@@ -3984,7 +3985,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Teraz je možné vybrať, ktoré programy chcete nainštalovať na váš systém.\n"
-"Mandrivalinux obsahuje tisíce balčkov s programami. Pre jednoduchšiu "
+"Mandriva Linux obsahuje tisíce balčkov s programami. Pre jednoduchšiu "
 "orientáciu\n"
 "boly rozdelené do skupín, ktoré združujú podobné aplikácie.\n"
 "\n"
@@ -4095,10 +4096,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"
@@ -4128,12 +4129,12 @@ msgstr ""
 "\n"
 "!! Ak boli vybrané balíky, ktoré sú určené pre server, buď zámerne alebo\n"
 "preto že sú súčasťou celej skupiny, budete musieť potvrdiť, či skutočne\n"
-"chcete tieto služby nainštalovať. V prípade Mandrivalinuxu, sú štandardne "
+"chcete tieto služby nainštalovať. V prípade Mandriva Linuxu, sú štandardne "
 "všetky\n"
 "nainštalované služby spúšťané pri štarte systému. Aj keď sú bezpečné\n"
 "a v čase keď bola distribúcia vydaná neobsahovali žiadne známe problémy\n"
 "je možné, že tieto bezpečnostné problémy budú odhalené až po dokončení\n"
-"tejto verzie Mandrivalinuxu. Ak neviete čo jednotlivé servisy znamenajú, "
+"tejto verzie Mandriva Linuxu. Ak neviete čo jednotlivé servisy znamenajú, "
 "alebo\n"
 "prečo boli nainštalované tak kliknite na \"%s\". Kliknutím na \"%s\" budú\n"
 "vypísané služby nainštalované a automaticky naštartované pri spustení\n"
@@ -4294,7 +4295,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with 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"
@@ -4350,7 +4351,7 @@ msgid ""
 msgstr ""
 "X (X Window System) je srdcom grafického rozhrania GNU/Linux systému\n"
 "spolu so všetkými grafickými prostrediami (KDE, GNOME, AfterStep,\n"
-"WindowMaked, atď.) distribuovanými s Mandrivalinux systémom.\n"
+"WindowMaked, atď.) distribuovanými s Mandriva Linux systémom.\n"
 "\n"
 "Zmenou nasledovných parametrov môžete dosiahnuť optimálne nastavenie\n"
 "vášho grafického systému.\n"
@@ -4474,12 +4475,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"
@@ -4506,7 +4507,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"
@@ -4515,7 +4516,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"
@@ -4535,11 +4537,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 ""
-"Teraz si môžete zvoliť, kam si želáte nainštalovať Mandrivalinux\n"
+"Teraz si môžete zvoliť, kam si želáte nainštalovať Mandriva Linux\n"
 "na váš disk. Ak je váš disk prázdny alebo ak na ňom\n"
 "už existuje operačný systém, ktorý zaberá všetko dostupné miesto, bude\n"
 "potrebné ho prerozdeliť. Prerozdeľovanie pozostáva z logického\n"
-"rozdelenia disku a vytvorenia priestoru pre novú inštaláciu Mandrake\n"
+"rozdelenia disku a vytvorenia priestoru pre novú inštaláciu Mandriva\n"
 "Linux systému.\n"
 "\n"
 "Pretože proces rozdeľovania je nezvratný a môže dôjsť k strate údajov, ak\n"
@@ -4574,7 +4576,7 @@ msgstr ""
 "po predchádzajúcom defragmentovaní Windows oblasti, ak obsahuje FAT "
 "súborový\n"
 "systém. Je veľmi odporúčané si najprv odzálohovať údaje. Toto riešenie je\n"
-"odporúčané použiť ak si chcete používať spoločne Mandrivalinux aj Microsoft "
+"odporúčané použiť ak si chcete používať spoločne Mandriva Linux aj Microsoft "
 "Windows\n"
 "na jednom počítači.\n"
 "\n"
@@ -4586,7 +4588,7 @@ msgstr ""
 "Vaším Microsoft Windows systémom.\n"
 "\n"
 " * \"%s\": ak si želáte vymazať všetky údaje a všetky oddiely\n"
-"prítomné na vašom pevnom disku a nahradiť ich vašim novým Mandrivalinux\n"
+"prítomné na vašom pevnom disku a nahradiť ich vašim novým Mandriva Linux\n"
 "systémom, zvoľte si túto voľbu. Buďte opatrní pri tejto možnosti, pretože "
 "nebude\n"
 "žiadna možnosť zvrátiť vaše rozhodnutie keď ho potvrdíte.\n"
@@ -4755,7 +4757,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"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."
@@ -4780,7 +4782,7 @@ msgstr ""
 "Kliknite na \"%s\" ak ste pripravený formátovať vybrané oddiely.\n"
 "\n"
 "Kliknite na \"%s\" ak si chcete zvoliť iné oddiely pre inštaláciu vášho\n"
-"nového Mandrivalinux systému.\n"
+"nového Mandriva Linux systému.\n"
 "\n"
 "Kliknite na \"%s\" ak si chcete vybrať oddiely, ktoré budú kontrolované\n"
 "na prítomnosť chybných blokov na disku."
@@ -4797,7 +4799,7 @@ msgstr "Späť"
 #: 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"
@@ -4809,7 +4811,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Po nainštalovaní Mandrivalinux systému je pravdepodobné, že niektoré\n"
+"Po nainštalovaní Mandriva Linux systému je pravdepodobné, že niektoré\n"
 "balíky ktoré sa nachádzali v distribúcii, nezodpovedajú ich aktuálnym\n"
 "verziám. Môžu v nich byť opravené chyby alebo bezpečnostné nedostatky.\n"
 "Aby ste mohli tieto opravy aplikovať, budete si ich teraz môcť stiahnuť\n"
@@ -4838,7 +4840,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"
@@ -4853,7 +4855,7 @@ msgstr ""
 "\n"
 "Ak si neviete vybrať, ponechajte štandardné nastavenie.Budete ju však\n"
 "mať možnosť zmeniť pomocou programu drakcec, ktorý je súčasťou\n"
-"Kontrolného Centra Mandrivalinuxu\n"
+"Kontrolného Centra Mandriva Linuxu\n"
 "\n"
 "Do políčka \"%s\" zadajte e-mailovú adresu osoby zodpovednej za\n"
 "bezpečnosť vášho PC. Na túto adresu budú zasielané\n"
@@ -4868,7 +4870,7 @@ msgstr "Bezpečnostný administrátor"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4939,7 +4941,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Na tomto mieste je potrebné aby ste si vybrali oblasti, ktoré budú použité\n"
-"na inštaláciu Mandrivalinuxu. Ak už boli oddiely definované,\n"
+"na inštaláciu Mandriva Linuxu. Ak už boli oddiely definované,\n"
 "napríklad pri predchádzajúcej inštalácii GNU/Linux-u alebo iným nástrojom\n"
 "pre správu oblastí, môžete použiť už existujúce oblasti. Inak musia byť\n"
 "oblasti teraz definované.\n"
@@ -5036,7 +5038,7 @@ msgstr "Prepnúť medzi normálnym/expertným režimom"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5066,7 +5068,7 @@ msgid ""
 msgstr ""
 "Bol nájdený viac ako jeden Microsoft oddiel na vašom pevnom disku.\n"
 "Vyberte si prosím jeden, ktorý chcete nastaviť pre inštaláciu vášho\n"
-"nového Mandrivalinux operačného systému.\n"
+"nového Mandriva Linux operačného systému.\n"
 "\n"
 "Všetky oddiely sú zobrazené nasledovne: \"Linux meno\", \"Windows meno\",\n"
 "\"Kapacita\".\n"
@@ -5115,7 +5117,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"
@@ -5124,20 +5126,21 @@ 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 sa aktivuje iba vtedy, ak sú na vašom systéme nájdené staršie\n"
 "GNU/Linux oddiely.\n"
 "\n"
 "DrakX teraz potrebuje vedieť či si želáte vykonať novú inštaláciu alebo "
 "aktualizáciu\n"
-"existujúceho Mandrivalinux systému:\n"
+"existujúceho Mandriva Linux systému:\n"
 "\n"
 " * \"%s\": Pomocou tejto voľby môžete kompletne zrušiť váš predchádzajúci\n"
 "operačný systém. Ak si želáte zmeniť rozloženie oddielov na vašich diskoch "
@@ -5148,13 +5151,13 @@ msgstr ""
 "údajov.\n"
 "\n"
 " * \"%s\": táto trieda inštalácie vám umožňuje aktualizovať balíky, ktoré\n"
-"sú momentálne nainštalované vo vašom Mandrivalinux systéme. Aktuálne\n"
+"sú momentálne nainštalované vo vašom Mandriva Linux systéme. Aktuálne\n"
 "rozdelenie oddielov a používateľské údaje nebudú prepísané. Mnohé ostatné "
 "kroky\n"
 "inštalácie ostanú dostupné, podobne ako pri štandardnej inštalácii.\n"
 "\n"
 "Použitie voľby ``Aktualizácia'' by malo fungovať správne pre systémy\n"
-"Mandrivalinux \"8.1\" a novšie. Vykonanie Aktualizácie pre staršie verzie "
+"Mandriva Linux \"8.1\" a novšie. Vykonanie Aktualizácie pre staršie verzie "
 "ako\n"
 "\"8.1\" nie je odporúčané.\""
 
@@ -5211,7 +5214,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"
@@ -5507,7 +5511,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but 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"
@@ -5528,11 +5532,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 ""
 "Teraz nastal čas výberu tlačového systému pre váš počítač. Iné operačné\n"
-"systémy vám poskytujú zvyčajne iba jediný, Mandrivalinux vám poskytuje dva.\n"
+"systémy vám poskytujú zvyčajne iba jediný, Mandriva Linux vám poskytuje "
+"dva.\n"
 "Kazdý z nich je vhodný pre iný typ konfigurácie.\n"
 "\n"
 " * \"%s\" - čo znamená ``tlačiť, neukladať do fronty'', je vhodný výber ak\n"
@@ -5555,7 +5560,7 @@ msgstr ""
 "nástroje na tlačenie, pre výber tlačiarní alebo ich manažovanie.\n"
 "\n"
 "Ak neskôr budete chciet svoju voľbu zmeniť alebo budete chcieť odstrániť\n"
-"tlačový systém môžete tak spraviť za pomoci PrinterDrake z Mandrivalinux\n"
+"tlačový systém môžete tak spraviť za pomoci PrinterDrake z Mandriva Linux\n"
 "Kontrolného centra kliknutím na tlačidlo \"%s\"."
 
 #: help.pm:765
@@ -5673,7 +5678,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"
@@ -5690,7 +5696,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"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"
@@ -5743,7 +5749,8 @@ msgstr ""
 " * \"%s\": ak si teraz želáte nastaviť vaše Internetové pripojenie\n"
 "alebo prístup do lokálnej siete. Prezrite si tlačenú dokumentáciu alebo "
 "použite\n"
-"Kontrolné centrum Mandrivalinux ak už bude inštalácia ukončená aby ste mali\n"
+"Kontrolné centrum Mandriva Linux ak už bude inštalácia ukončená aby ste "
+"mali\n"
 "prístup k dokumentácii.\n"
 " * \"%s\": vám umožní nastaviť HTTP alebo FTP proxy ak je počítač\n"
 "umiestnený za proxy serverom.\n"
@@ -5759,7 +5766,7 @@ msgstr ""
 " * \"%s\": ak si želáte zmeniť konfiguráciu zavádzača, kliknite na toto\n"
 "tlačidlo. Táto možnosť je rezervovaná pre skúsených používateľov. Prezrite\n"
 "si tlačenú dokumentáciu alebo internú dokumentáciu vrámci Kontrolného\n"
-"centra Mandrivalinux.\n"
+"centra Mandriva Linux.\n"
 "\n"
 " * \"%s\": máte možnosť definitívne nastaviť služby, ktoré budú\n"
 "spúšťané na vašom počítači. Ak plánujete používať tento počítač ako\n"
@@ -5820,11 +5827,11 @@ 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 si pevný disk, ktorý chcete vymazať aby ste mohli vytvoriť\n"
-"nový oddiel pre Mandrivalinux. Buďte opatrní, všetky údaje ktoré sa\n"
+"nový oddiel pre Mandriva Linux. Buďte opatrní, všetky údaje ktoré sa\n"
 "na disku nachádzajú budú odstránené a nebude možné ich obnoviť!"
 
 #: help.pm:863
@@ -6179,7 +6186,7 @@ msgstr "Použiť voľné miesto z Windows oddielu"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Váš oddiel s Windows je veľmi fragmentovaný, prosím spustite najprv  "
@@ -6298,13 +6305,13 @@ msgstr "Ukončuje sa prácu so sieťou"
 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"
@@ -6333,8 +6340,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 "
@@ -6348,8 +6355,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 "
@@ -6358,7 +6365,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"
@@ -6392,10 +6399,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"
@@ -6422,13 +6429,13 @@ msgstr ""
 "\n"
 "Úvod\n"
 "\n"
-"Operačný systém a rôzne iné súčasti dostupné v distribúcii Mandrivalinux, "
+"Operačný systém a rôzne iné súčasti dostupné v distribúcii Mandriva Linux, "
 "budú ďalej\n"
 "nazvané \"softvérové produkty\". Softvérové produkty, ktoré obvykle  "
 "obsahujú, ale\n"
 "nie sú obmedzené len na súbor programov, metód, pravidiel a dokumentácie, "
 "vzťahujúcej sa\n"
-"k operačnému systému a rôznych súčastí distribúcie Mandrivalinux.\n"
+"k operačnému systému a rôznych súčastí distribúcie Mandriva Linux.\n"
 "\n"
 "\n"
 "1. Licenčná zmluva\n"
@@ -6456,8 +6463,8 @@ msgstr ""
 "Softvérové produkty a priložená dokumentácia sú poskytovaná \"tak ako je\", "
 "bez akejkoľvek\n"
 "záruky v medziach umožnených zákonom.\n"
-"Mandriva S.A. nebude za žiadnych okolností a v medziach umožnených "
-"zákonom zodpovedať\n"
+"Mandriva S.A. nebude za žiadnych okolností a v medziach umožnených zákonom "
+"zodpovedať\n"
 "za žiadne zvláštne, náhodné, priame alebo nepriame škody (vrátane straty "
 "obchodných pohľadávok,\n"
 "prerušenie obchodnej činnosti, finančnej straty, zákonných poplatkov a pokút "
@@ -6470,8 +6477,8 @@ msgstr ""
 "\n"
 "OBMEDZENÁ ZODPOVEDNOSŤ SPOJENÁ S VLASTNÍCTVOM ALEBO POUŽITÍM ZAKÁZANÉHO "
 "SOFTVÉRU V NIEKTORÝCH KRAJINÁCH\n"
-"Mandriva S.A. alebo jeho distribútori, v medziach umožnených zákonom, "
-"nie sú zodpovedný\n"
+"Mandriva S.A. alebo jeho distribútori, v medziach umožnených zákonom, nie sú "
+"zodpovedný\n"
 "za žiadne zvláštne, náhodné, priame alebo nepriame škody (vrátane straty "
 "obchodných pohľadávok,\n"
 "prerušenia obchodnej činnosti, finančnej straty, zákonných poplatkov a pokút "
@@ -6480,7 +6487,7 @@ msgstr ""
 "vlastneniu alebo\n"
 "používaniu softvérových komponentov alebo vzniknuté stiahnutím softvérových "
 "komponentov z niektorého\n"
-"servera Mandrivalinux, ktoré sú zakázané alebo obmedzené v niektorých "
+"servera Mandriva Linux, ktoré sú zakázané alebo obmedzené v niektorých "
 "krajinách miernymi zákonmi.\n"
 "Táto obmedzená zodpovednosť sa vzťahuje ale nie je obmedzená len na "
 "komponenty obsahujúce\n"
@@ -6503,8 +6510,8 @@ msgstr ""
 "Programy vyvinuté\n"
 "Mandriva S.A. sú poskytované pod podmienkami GPL Licencie. Dokumentácia "
 "napísaná\n"
-"Mandriva S.A. je poskytovaná pod špecifickou licenciou. Prosíme, "
-"preštudujte si dokumentáciu\n"
+"Mandriva S.A. je poskytovaná pod špecifickou licenciou. Prosíme, preštudujte "
+"si dokumentáciu\n"
 "pre ďalšie detaily.\n"
 "\n"
 "\n"
@@ -6517,7 +6524,7 @@ msgstr ""
 "Mandriva S.A. si vyhradzuje právo upraviť alebo prispôsobiť Softvérové "
 "produkty ako celok\n"
 "alebo jednotlivé časti, akýmkoľvek spôsobom a za akýmikoľvek účelmi. "
-"\"Mandriva\", \"Mandrake\n"
+"\"Mandriva\", \"Mandriva\n"
 "Linux\" a pridružené logá sú chránenými obchodnými značkami spoločnosti "
 "Mandriva S.A.\n"
 "\n"
@@ -6628,8 +6635,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"
@@ -6637,13 +6644,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, inštalácia je ukončená.\n"
 "Vyberte spúšťacie médium a stačte Enter pre reštart.\n"
 "\n"
 "\n"
-"Informácie o aktuálnych opravách pre túto verziu Mandrivalinuxu,\n"
+"Informácie o aktuálnych opravách pre túto verziu Mandriva Linuxu,\n"
 "sú dostupné na:\n"
 "\n"
 "\n"
@@ -6651,7 +6658,7 @@ msgstr ""
 "\n"
 "\n"
 "Informácie o konfigurovaní vášho systému sa\n"
-"nachádzajú v oficiálnej Mandrivalinux používateľskej príručke.\n"
+"nachádzajú v oficiálnej Mandriva Linux používateľskej príručke.\n"
 "\n"
 "\n"
 "Ak ste našli chybu (alebo nájdete neskôr) v preklade, kontaktujte prosím\n"
@@ -6660,8 +6667,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
@@ -6689,12 +6696,12 @@ msgstr "Spúšťam krok %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á nedostatok prostriedkov. Možno budete mať problémy s\n"
-"inštaláciou Mandrivalinux. Ak sa tak stane, skúste textovú inštaláciu. Pre "
+"inštaláciou Mandriva Linux. Ak sa tak stane, skúste textovú inštaláciu. Pre "
 "jej\n"
 "spustenie stlačte `F1' po naštartovaní z CDROMky a zadajte `text'."
 
@@ -7235,9 +7242,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 ""
-"Pripájam sa k web stránke Mandrivalinux pre stiahnutie zoznamu zrkadiel..."
+"Pripájam sa k web stránke Mandriva Linux pre stiahnutie zoznamu zrkadiel..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7457,8 +7464,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Inštalácia Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Inštalácia Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10044,13 +10051,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 ""
 "tinyfirewall konfigurátor\n"
 "\n"
-"Nastavuje osobný firewall pre váš Linux Mandrake systém na tomto\n"
+"Nastavuje osobný firewall pre váš Mandriva Linux systém na tomto\n"
 "počítači. "
 
 #: network/drakfirewall.pm:164
@@ -14093,8 +14100,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 ""
 "Spustite Scannerdrake (Hardvér/Skener v Kontrolnom centre Mandralinux) ak si "
@@ -16034,33 +16041,33 @@ msgstr "Zastaviť"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Čo je to Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Čo je to Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Vitajte v <b>Mandrivalinux</b>-e!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Vitajte v <b>Mandriva Linux</b>-e!"
 
 #: 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 distribúcia</b> ktorá pozostáva z jadra systému, "
+"Mandriva Linux je <b>Linux distribúcia</b> ktorá pozostáva z jadra systému, "
 "nazývaného <b>operačný systém</b> (založený na jadre Linux), spolu s "
 "<b>množstvom aplikácií</b> poskytujúcich všetko čo by ste si mohli želať."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"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 jedna z najviac <b>používateľsky prívetivých</b> Linux "
+"Mandriva Linux je jedna z najviac <b>používateľsky prívetivých</b> Linux "
 "distribúcií v súčastnosti. Je taktiež jedna z celosvetovo <b>najviac "
 "používaných</b> Linux distribúcií!"
 
@@ -16077,14 +16084,14 @@ msgstr "Vitajte vo <b>svete open source</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 je príspevok do modelu open source. Znamená to, že táto nová "
-"verzia je výsledkom <b>spolupráce</b> medzi <b>týmom vývojárov Mandriva</"
-"b> a <b>celosvetovou komunitou</b> prispievateľov do projektu Mandrivalinux."
+"Mandriva Linux je príspevok do modelu open source. Znamená to, že táto nová "
+"verzia je výsledkom <b>spolupráce</b> medzi <b>týmom vývojárov Mandriva</b> "
+"a <b>celosvetovou komunitou</b> prispievateľov do projektu Mandriva Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16103,10 +16110,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 ""
-"Množstvo softvéru zahrnutého v tejto distribúcii a všetky Mandrivalinux "
+"Množstvo softvéru zahrnutého v tejto distribúcii a všetky Mandriva Linux "
 "špecifické nástroje sú pokryté licenciou <b>GPL</b>."
 
 #: share/advertising/03.pl:17
@@ -16137,24 +16144,25 @@ msgstr "<b>Pridajte sa ku komunite</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 má jednu z <b>najväčších komunít</b> používateľov a vývojárov. "
-"Rola komunity je veľmi široká, od hlásenia problémov a chých až po vývoj "
-"nových aplikácií. Komunita hrá <b>kľúčovú rolu</b> vo svete Mandrivalinux."
+"Mandriva Linux má jednu z <b>najväčších komunít</b> používateľov a "
+"vývojárov. Rola komunity je veľmi široká, od hlásenia problémov a chých až "
+"po vývoj nových aplikácií. Komunita hrá <b>kľúčovú rolu</b> vo svete "
+"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 ""
 "Pre <b>získanie viac informácií</b> o našej dynamickej komunite, navštívte "
-"prosím <b>www.mandrakelinux.com</b> alebo priamo <b>www.mandrakelinux.com/en/"
+"prosím <b>www.mandrivalinux.com</b> alebo priamo <b>www.mandrivalinux.com/en/"
 "cookerdevel.php3</b> ak by ste sa chceli <b>zapojiť</b> do vývoja."
 
 #: share/advertising/05.pl:15
@@ -16165,10 +16173,10 @@ msgstr "<b>Download verzia</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áve inštalujete <b>Mandrivalinux download verziu</b>. Toto je voľne "
+"Práve inštalujete <b>Mandriva Linux download verziu</b>. Toto je voľne "
 "dostupná verzia ktorú Mandriva dáva k <b>dispozízii každému</b>."
 
 #: share/advertising/05.pl:19
@@ -16212,7 +16220,7 @@ msgstr "<b>Discovery, vaša prvá Linux pracovná stanica</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 "Práve inštalujete <b>Mandralinux Discovery</b>."
 
 #: share/advertising/06.pl:17
@@ -16235,7 +16243,7 @@ msgstr "<b>PowerPack, skvelý Linux pre pracovnú stanicu</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 "Práve inštalujete <b>Mandralinux PowerPack</b>."
 
 #: share/advertising/07.pl:17
@@ -16256,8 +16264,8 @@ msgstr "<b>PowerPack+, Linuxové riešenie pre pracovné stanice a servery</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Práve inštalujete <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Práve inštalujete <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16279,15 +16287,14 @@ msgstr "<b>Mandriva produkty</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> vyvíja široké spektrum <b>Mandrivalinux</b> produktov."
+"<b>Mandriva</b> vyvíja široké spektrum <b>Mandriva Linux</b> produktov."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Produkty rady Mandrivalinux sú:"
+msgid "The Mandriva Linux products are:"
+msgstr "Produkty rady Mandriva Linux sú:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16308,11 +16315,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 pre x86-64</b>, Mandrivalinux riešenie pre váš 64bitový "
-"procesor."
+"\t* <b>Mandriva Linux pre x86-64</b>, Mandriva Linux riešenie pre váš "
+"64bitový procesor."
 
 #: share/advertising/10.pl:15
 #, c-format
@@ -16322,28 +16329,28 @@ msgstr "<b>Mandriva produkty (bežné produkty)</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 vyvíja dva produkty ktoré umožňujú použiť Mandrivalinux <b>na "
+"Mandriva vyvíja dva produkty ktoré umožňujú použiť Mandriva Linux <b>na "
 "akomkoľvek počítači</b> bez potreby inštalácie."
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a 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 distribúcia kompletne bežiaca z bootovacieho "
+"\t* <b>Move</b>, Mandriva Linux distribúcia kompletne bežiaca z bootovacieho "
 "CD-ROM média."
 
 #: 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 distribúcia predinštalovaná na "
+"\t* <b>GlobeTrotter</b>, Mandriva Linux distribúcia predinštalovaná na "
 "kompaktnom prenosnom pevnom disku."
 
 #: share/advertising/11.pl:13
@@ -16354,27 +16361,30 @@ msgstr "<b>Mandriva produkty (profesionálne služby)</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 ""
-"Nasleduje zoznam produktov Mandriva určených pre <b>profesionálne "
-"potreby</b>:"
+"Nasleduje zoznam produktov Mandriva určených pre <b>profesionálne potreby</"
+"b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
-"\t* <b>Corporate Desktop</b>, Mandrivalinux Desktop pre firemné nasadenie."
+"\t* <b>Corporate Desktop</b>, Mandriva Linux Desktop pre firemné nasadenie."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, serverové riešenie Mandrivalinux."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, serverové riešenie 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é riešenie Mandrivalinux"
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr ""
+"\t* <b>Multi-Network Firewall</b>, bezpečnostné riešenie Mandriva Linux"
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16575,10 +16585,10 @@ msgstr "<b>Tešiť sa z širokého množstva aplikácií</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 ""
-"Pomocou Mandrivalinux menu dokážete <b>ľahko používať</b> aplikáce pre "
+"Pomocou Mandriva Linux menu dokážete <b>ľahko používať</b> aplikáce pre "
 "<b>správu vašich úloh</b>:"
 
 #: share/advertising/18.pl:16
@@ -16846,18 +16856,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Kontrolné centrum Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Kontrolné 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>Kontrolné centrum Mandrivalinux</b> je zbierka základných nástrojov "
-"vytvorených pre Mandrivalinux k uľahčeniu nastavovania vášho počítača."
+"<b>Kontrolné centrum Mandriva Linux</b> je zbierka základných nástrojov "
+"vytvorených pre Mandriva Linux k uľahčeniu nastavovania vášho počítača."
 
 #: share/advertising/25.pl:17
 #, c-format
@@ -16882,15 +16892,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 ""
 "Podobne ako písanie programov, otvorený softvér <b>vyžaduje čas a ľudí</b> "
 "pre vývoj. Aby zostala zachovaná koncepcia otvoreného softvéru, Mandriva "
 "predáva pridanú hodnotu produktov a služby pre <b>trvalé vylepšovanie "
-"Mandrivalinux</b>. Ak chcete <b>podporiť koncepciu otvoreného softvéru</b> a "
-"podporiť vývoj Mandrivalinux, <b>prosíme</b> zvážte nákup niektorého z "
+"Mandriva Linux</b>. Ak chcete <b>podporiť koncepciu otvoreného softvéru</b> "
+"a podporiť vývoj Mandriva Linux, <b>prosíme</b> zvážte nákup niektorého z "
 "našich produktov alebo služieb!"
 
 #: share/advertising/27.pl:13
@@ -16901,8 +16911,8 @@ msgstr "<b>Online obchod</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 ""
 "Pre informácie o produktoch a službách Mandriva navštívte náš "
 "<b>elektronický obchod</b>."
@@ -16923,8 +16933,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Zastavte sa ešte dnes na <b>store.mandrakesoft.com</b>"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Zastavte sa ešte dnes na <b>store.mandriva.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16934,11 +16944,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>skvelá možnosť</b> prezentovať vaše produkty pre "
-"Mandrivalinux."
+"Mandriva Linux."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -16951,10 +16961,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>Špeciálne zľavy</b> na produkty a služby v našom obchode <b>store."
-"mandrakesoft.com</b>."
+"mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -16967,14 +16977,14 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Zúčastňovať sa <b>používateľských fór</b> Mandrivalinux."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Zúčastňovať sa <b>používateľských fór</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>Skorý a privilegovaný prístup</b> k ISO obrazom, ešte pred ich "
 "verejnou dostupnosťou."
@@ -16997,10 +17007,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 ponúka široké možnosti pre <b>jednoduchú aktualizáciu</b> "
-"vášho Mandrivalinux systému:"
+"vášho Mandriva Linux systému:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17026,9 +17036,9 @@ msgstr "\t* Flexibilné <b>naplánované</b> aktualizácie."
 #: 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* Menežment <b>všetkých vašich Mandrivalinux systémov</b> pomocou jedného "
+"\t* Menežment <b>všetkých vašich Mandriva Linux systémov</b> pomocou jedného "
 "účtu."
 
 #: share/advertising/30.pl:13
@@ -17040,28 +17050,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 ""
-"Požadujete <b>asistenciu?</b>. Stretnite technických expertov Mandriva "
-"na <b>našej platforme pre technickú pomoc</b> www.mandrakeexpert.com."
+"Požadujete <b>asistenciu?</b>. Stretnite technických expertov Mandriva na "
+"<b>našej platforme pre technickú pomoc</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 ""
-"Vďaka pomoci <b>kvalifikovaných expertov na Mandrivalinux</b> si môžete "
+"Vďaka pomoci <b>kvalifikovaných expertov na Mandriva Linux</b> si môžete "
 "ušetriť množstvo času."
 
 #: 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 ""
-"Ak chcete vedieť odpoveď na akúkoľvek otázku o Mandrivalinuxe, môžete si "
-"zakúpiť podporu na <b>store.mandrakesoft.com</b>."
+"Ak chcete vedieť odpoveď na akúkoľvek otázku o Mandriva Linuxe, môžete si "
+"zakúpiť podporu na <b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17449,15 +17459,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 ""
 "[NASTAVENIA] [MENO_PROGRAMU]\n"
 "\n"
 "NASTAVENIA:\n"
 "  --help            - zobraziť túto správu.\n"
-"  --report          - program by mal byť jedným z mandrakelinux nástrojov\n"
-"  --incident        - program by mal byť jedným z mandrakelinux nástrojov"
+"  --report          - program by mal byť jedným z Mandriva Linux nástrojov\n"
+"  --incident        - program by mal byť jedným z Mandriva Linux nástrojov"
 
 #: standalone.pm:63
 #, c-format
@@ -17514,7 +17524,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"
@@ -17528,7 +17538,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[VOĽBY]...\n"
-"Konfigurácia Mandrivalinux Terminal Servera\n"
+"Konfigurácia Mandriva Linux Terminal Servera\n"
 "--enable         : povoliť MTS\n"
 "--disable        : zakázať MTS\n"
 "--start          : spustiť MTS\n"
@@ -17584,16 +17594,16 @@ 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"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[VOĽBY]...\n"
-"  --no-confirmation      nepýtať sa na prvú potvrdzujúcu optázku v "
-"Mandriva Update režime\n"
+"  --no-confirmation      nepýtať sa na prvú potvrdzujúcu optázku v Mandriva "
+"Update režime\n"
 "  --no-verify-rpm        nekontrolovať podpisy balíkov\n"
 "  --changelog-first      zobraziť changelog pred zobrazením súborov v okne s "
 "popisom\n"
@@ -20364,13 +20374,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Nástroj pre oznámenie chýb Mandrivalinuxu"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Nástroj pre oznámenie chýb Mandriva Linuxu"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Kontrolné centrum Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Kontrolné centrum Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20861,19 +20871,19 @@ msgstr "Spustené pri štarte"
 #, 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 rozhranie ešte nebolo nastavené.\n"
-"Spustite sprievodcu \"Pridanie rozhrania\" z Mandrake kontrolného centra"
+"Spustite sprievodcu \"Pridanie rozhrania\" z Mandriva kontrolného 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 ""
 "Nemáte nakonfigurované žiadne pripojenie k Internetu.\n"
-"Spustite sprievodcu \"%s\" z Mandrivalinux kontrolného centra"
+"Spustite sprievodcu \"%s\" z Mandriva Linux kontrolného centra"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20923,8 +20933,8 @@ msgstr "KDM (KDE správca prihlásenia)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Mandrivalinux správca prihlásenia)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Mandriva Linux správca prihlásenia)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21228,18 +21238,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
@@ -21813,8 +21823,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Centrum pomoci Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Centrum pomoci Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22482,7 +22492,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 ""
 "Vo vašom stroji nebola nájdena zvuková karta. Prosím overte si či máte "
 "zvukovú kartu podporovanú Linux-om a či je správne zapojená.\n"
@@ -22491,7 +22501,7 @@ msgstr ""
 "Môžete sa pozrieť do našej databázy hardvéru:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24512,7 +24522,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 ""
 "Vo vašom stroji nebola nájdena TV karta. Prosím overte si či máte Video/TV "
 "kartu podporovanú Linuxom a či je správne zapojená.\n"
@@ -24521,7 +24531,7 @@ msgstr ""
 "Môžete sa pozrieť do našej databázy hardvéru:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25231,13 +25241,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, %s konfiguračný nástroj pre konfiguráciu hardvéru.\n"
 "<span foreground=\"royalblue3\">Verzia:</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
@@ -25347,8 +25357,8 @@ msgstr "Táto zmena je v poriadku, ale pre jej uplatnenie sa musíte odhlásiť"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Logy Mandrivalinux nástrojov"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Logy Mandriva Linux nástrojov"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25868,10 +25878,10 @@ msgstr "Pripojenie je ukončené."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Chyba pri spojení.\n"
-"Skontrolujte konfiguráciu v Mandrivalinux Kontrolnom Centre."
+"Skontrolujte konfiguráciu v Mandriva Linux Kontrolnom Centre."
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/sl.po b/perl-install/share/po/sl.po
index a039e4090..e01f0b56d 100644
--- a/perl-install/share/po/sl.po
+++ b/perl-install/share/po/sl.po
@@ -108,7 +108,7 @@ msgstr ""
 "\n"
 "Nadaljujete lahko tudi brez USB ključa. Še vedno boste lahko\n"
 "Mandriva Move uporabljali kot normalno živo distribucijo\n"
-"operacijskega sistema Mandrivalinux."
+"operacijskega sistema Mandriva Linux."
 
 #: ../move/move.pm:483
 #, c-format
@@ -135,7 +135,7 @@ msgstr ""
 "\n"
 "Nadaljujete lahko tudi brez USB ključa. Še vedno boste lahko\n"
 "Mandriva Move uporabljali kot normalno živo distribucijo\n"
-"operacijskega sistema Mandrivalinux."
+"operacijskega sistema Mandriva Linux."
 
 #: ../move/move.pm:494
 #, c-format
@@ -1309,11 +1309,11 @@ msgstr "Izbira 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 omogoča večjezično podporo. Izberite\n"
+"Mandriva Linux omogoča večjezično podporo. Izberite\n"
 "jezike, ki jih želite namestiti. Nameščeni jeziki bodo dosegljivi,\n"
 "ko boste dokončali namestitev in znova zagnali računalnik."
 
@@ -3731,12 +3731,13 @@ msgstr "omogoči radio podporo"
 #, 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 ""
 "Preden nadaljujete, pozorno preberite pogoje licenčne pogodbe,\n"
-"ki se nanaša na celotno distribucijo Mandrivalinux. Če se strinjate z vsemi\n"
+"ki se nanaša na celotno distribucijo Mandriva Linux. Če se strinjate z "
+"vsemi\n"
 "pogoji licenčne pogodbe, označite okence \"%s\". Če se s pogoji pogodbe\n"
 "ne strinjate, pa označite okence \"%s\" in vaš računalnik se bo ponovno "
 "zagnal."
@@ -3918,13 +3919,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 ""
-"Namestitev za Mandrivalinux je shranjena na več zgoščenkah.\n"
+"Namestitev za Mandriva Linux je shranjena na več zgoščenkah.\n"
 "Če je izbrani paket shranjen na drugi zgoščeniki, bo DrakX izvrgel\n"
 "trenutno in vas pozval, da v pogon vstavite pravo zgoščenko.\n"
 "če prave zgoščenke nimate, kliknite \"%s\" in željeni paketi ne\n"
@@ -3934,11 +3935,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"
@@ -3989,7 +3991,7 @@ msgid ""
 "command-line interface. The total size of this installation is about 65\n"
 "megabytes."
 msgstr ""
-"Za Mandrivalinux je dostopnih na tisoče različnih programskih paketov.\n"
+"Za Mandriva Linux je dostopnih na tisoče različnih programskih paketov.\n"
 "Da bi bilo upravljanje s paketi bolj preprosto, so razvrščeni v skupine\n"
 "vsebinsko povezanih paketov.\n"
 "\n"
@@ -4104,10 +4106,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default 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"
@@ -4138,9 +4140,9 @@ msgstr ""
 "\n"
 "!! Če izberete paket ali skupino paketov, ki vsebuje strežnik,\n"
 "boste morali namestitev takšnega paketa na izrecno vprašanje\n"
-"potrditi. Mandrivalinux namreč kot privzeto vključi vse\n"
+"potrditi. Mandriva Linux namreč kot privzeto vključi vse\n"
 " nameščene storitve ob zagonu sistema. Čeprav ob izdaji\n"
-"te različice Mandrivalinuxa ni bilo znanih težav v zvezi z varnostjo,\n"
+"te različice Mandriva Linuxa ni bilo znanih težav v zvezi z varnostjo,\n"
 "je mogoče, da so bile odkrite varnostne luknje kasneje. Če za \n"
 "določeno storitev ne veste, kaj je njena naloga, kliknite \"%s\" S klikom\n"
 "na \"%s\"bodo nameščene naštete storitve, sistem pa jih bo samodejno\n"
@@ -4299,7 +4301,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with 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"
@@ -4354,7 +4356,7 @@ msgid ""
 "not successful in getting the display configured."
 msgstr ""
 "X (X okenski sistem) je srce grafičnega vmesnika za GNU/Linux\n"
-"na katerem so zgrajeni vsa v Mandraklinux vključena grafična\n"
+"na katerem so zgrajeni vsa v Mandriva Linux vključena grafična\n"
 "okolja. (KDE,GNOME, AfterStep, WindowMaker. itd)\n"
 "\n"
 "Predočen vam bo seznam različnih vrednosti, ki jih lahko spreminjate,\n"
@@ -4466,12 +4468,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"
@@ -4498,7 +4500,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"
@@ -4507,7 +4509,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"
@@ -4528,11 +4531,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Določite, na katerem delu trdega diska naj bo nameščen operacijski\n"
-"sistem Mandrivalinux. Če je trdi disk prazen ali če na njem nameščeni\n"
+"sistem Mandriva Linux. Če je trdi disk prazen ali če na njem nameščeni\n"
 "operacijski sistem zaseda celoten prostor, boste morali disk razdeliti na\n"
 "posamezne razdelke. Razdeljevanje trdega diska izvede logično\n"
 "razdelitev, ki zagotovi potrebni prostor za namestitev operacijskega\n"
-"sistema Mandrivalinux.\n"
+"sistema Mandriva Linux.\n"
 "\n"
 "Trdega diska po izvršenem razdeljevanju običajno ni mogoče povrniti v "
 "prejšnje stanje.\n"
@@ -4564,8 +4567,8 @@ msgstr ""
 "FAT ali NTFS z nameščenimi Okni spremenite velikost. Pri tem podatkov na\n"
 "razdelku ne boste izgubili, če najprej v Oknih defragmentirate disk.\n"
 "Vsekakor pa priporočamo, da pred nadaljevanjem napravite varnostno\n"
-"kopijo podatkov. Če želite uporabljati oba operacijska sistema, "
-"Mandrivalinux\n"
+"kopijo podatkov. Če želite uporabljati oba operacijska sistema, Mandriva "
+"Linux\n"
 "in Okna (Windows™), vam priporočamo, da izberete to možnost.\n"
 "\n"
 "   Če se odločite za to možnost, morate vedeti, da bo po končanem postopku\n"
@@ -4575,7 +4578,7 @@ msgstr ""
 "\n"
 " * \"%s\": Če želite izbrisati vse obstoječe razdelke z vsemi podatki in "
 "jih \n"
-"nadomestiti s sistemom Mandrivalinux, izberite to možnost.\n"
+"nadomestiti s sistemom Mandriva Linux, izberite to možnost.\n"
 "Bodite previdni, ko boste potrdili to izbiro, prejšnjega stanja ne bo več "
 "mogoče vzpostaviti.\n"
 "\n"
@@ -4730,7 +4733,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"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 +4752,7 @@ msgstr ""
 "\n"
 "Kliknite na \"%s\",ko boste pripravljeni na razdeljevanje.\n"
 "\n"
-"Kliknite na \"%s\", če želite za namestitev sistema Mandrivalinux\n"
+"Kliknite na \"%s\", če želite za namestitev sistema Mandriva Linux\n"
 "izbrati drug razdelek.\n"
 "\n"
 "Kliknite na \"%s\", če želite določiti razdelke, na katerih naj sistem\n"
@@ -4767,7 +4770,7 @@ msgstr "Nazaj"
 #: 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"
@@ -4780,7 +4783,7 @@ msgid ""
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
 "Verjetno so bili od njegove izdaje pa do časa, ko nameščate\n"
-"Mandrivalinux na svoj računalnik, nekateri paketi popravljeni\n"
+"Mandriva Linux na svoj računalnik, nekateri paketi popravljeni\n"
 "ali nadgrajeni z varnostnimi popravki ali z odstranitvijo hroščev.\n"
 "Te popravke lahko prenesete z interneta. Če imate vzpostavljeno\n"
 "internetno povezavo, označite \"%s\", če pa želite namestiti\n"
@@ -4807,7 +4810,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of 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 +4838,7 @@ msgstr "Upravitelj varnostnih nastavitev"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4906,7 +4909,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Izbrati morate razdelke, na katere boste namestitli sistem\n"
-"Mandrivalinux. Če ste razdelke že izbrali ob kakšni predhodni\n"
+"Mandriva Linux. Če ste razdelke že izbrali ob kakšni predhodni\n"
 "namestitvi GNU/Linux sistema s kakim drugim orodjem za\n"
 "razdeljevanje, lahko uporabite obstoječe razdelke, sicer pa morate\n"
 "razdelke trdega diska za namestitev določiti sedaj.\n"
@@ -4969,7 +4972,7 @@ msgstr ""
 "Vse nadaljnje informacije o datotečnih sistemih boste našli v\n"
 "dokumentaciji.\n"
 "\n"
-"Če Mandrivalinux nameščate na PPC računalnik, morate ustvariti\n"
+"Če Mandriva Linux nameščate na PPC računalnik, morate ustvariti\n"
 "zagonski \"bootstrap'\" razdelek z velikostjo najmanj 1MB, ki ga\n"
 "uporablja zagonski nalagalnik yaboot. Če ta razdelek nekoliko\n"
 "povečate in mu namenite vsaj 50MB, boste nanj lahko shranjevali\n"
@@ -4990,7 +4993,7 @@ msgstr "Preklapljanje med normalnim in izvedenskim načinom"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5020,7 +5023,7 @@ msgid ""
 msgstr ""
 "Na vašem trdem disku je več kot en razdelek za Okna (Windows™).\n"
 "Izberite razdelek, ki ga želite zmanjšati, da bi pridobili prostor za\n"
-"namestitev sistema Mandrivalinux.\n"
+"namestitev sistema Mandriva Linux.\n"
 "\n"
 "Na seznamu so razdelki s podatki: \"Ime v Linuxu\", \"Ime v Oknih\"\n"
 "\"Velikost\" \n"
@@ -5067,7 +5070,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"
@@ -5076,19 +5079,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 ""
 "Ta korak se zažene samo v primeru, da na vašem računalniku že obstaja\n"
 "razdelek  zaGNU/Linux.\n"
 "\n"
 "Lahko izbirate med novo namestitvijo in med posodobitvijo obstoječega\n"
-"sistema Mandrivalinux.\n"
+"sistema Mandriva Linux.\n"
 "\n"
 " * \"%s\": S tem boste obstoječi sistem povsem odstranili. Če želite\n"
 "spremeniti razdelitev trdega diska ali datotečni sistem, izberite to\n"
@@ -5101,7 +5105,7 @@ msgstr ""
 "podobno kot pri običajni novi namestitvi.\n"
 "\n"
 "Možnost \"Posodobitev\" deluje, če imate nameščeno različico\n"
-"sistema Mandrivalinux  \"8.1\" ali novejšo. Posodobitve starejših\n"
+"sistema Mandriva Linux  \"8.1\" ali novejšo. Posodobitve starejših\n"
 "različic od \"8.1\" ne priporočamo."
 
 #: help.pm:591
@@ -5157,7 +5161,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"
@@ -5436,7 +5441,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"
@@ -5457,11 +5462,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 ""
 "Izberite sistem za tiskanje. Drugi operacijski sistemi navadno nudijo\n"
-"en sistem, Mandrivalinux pa vam daje na izbiro dva.\n"
+"en sistem, Mandriva Linux pa vam daje na izbiro dva.\n"
 "Od obeh sistemov je vsak primeren za svojo vrsto namestitve.\n"
 "\n"
 " * \"%s\"--je kratica za ``print, do not queue\" (tiskaj, ne vnesi v čakalno "
@@ -5604,7 +5609,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"
@@ -5621,7 +5627,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"
@@ -5744,12 +5750,12 @@ msgstr "Storitve"
 #, 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 ""
 "Izberite trdi disk, ki ga želite izbrisati, da bi dobili prostor za "
 "razdelek\n"
-"za Mandrivalinux.\n"
+"za Mandriva Linux.\n"
 "Vsi podatki na izbranem disku bodo izbrisani in jih ne bo mogoče\n"
 "obnoviti!"
 
@@ -6102,7 +6108,7 @@ msgstr "Preračunavam velikost razdelka za Okna (Windows)."
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Vaš razdelek za Okna (Windows) je preveč razdrobljen. Poženite ``defrag'' v "
@@ -6219,13 +6225,13 @@ msgstr "Izklapljanje omrežja"
 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"
@@ -6254,8 +6260,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 "
@@ -6269,8 +6275,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 "
@@ -6279,7 +6285,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"
@@ -6313,10 +6319,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"
@@ -6337,11 +6343,11 @@ msgid ""
 msgstr ""
 "PREDSTAVITEV\n"
 "\n"
-"Operacijski sistem in druge sestavine distribucije Mandrivalinux \n"
+"Operacijski sistem in druge sestavine distribucije Mandriva Linux \n"
 "bomo v nadaljnjem besedilu imenovali \"Programje\".  Programje vsebuje "
 "programe, metode, pravila in dokumentacijo, \n"
 "ki se nanašajo na operacijski sistem in na različne sestavine distribucije "
-"Mandrivalinux.\n"
+"Mandriva Linux.\n"
 "\n"
 "\n"
 "1. LICENČNA POGODBA\n"
@@ -6365,30 +6371,28 @@ msgstr ""
 "Programje in priložena dokumentacija sta na voljo v obliki, v kakršni sta, "
 "brez jamstva,\n"
 "ki presega z zakonom določeno odgovornost.\n"
-"Mandriva d.d. v nobenem primeru, razen kadar to izrecno določa pravni "
-"red,\n"
+"Mandriva d.d. v nobenem primeru, razen kadar to izrecno določa pravni red,\n"
 "ne prevzema odgovornosti za kakršnokoli naključno, posredno ali neposredno "
 "škodo,\n"
 "vključno s škodo zaradi izgube zaslužka, motenj v poslovanju, finančnih "
 "izgub, sodnih taks\n"
 "in izrečenih kazni ali drugih oblik posredne škode, ki bi nastala zaradi "
 "uporabe ali\n"
-"nezmožnosti uporabe programja, tudi če je bila Mandriva d.d. opozorjena "
-"na možnost nastanka takšne škode.\n"
+"nezmožnosti uporabe programja, tudi če je bila Mandriva d.d. opozorjena na "
+"možnost nastanka takšne škode.\n"
 "\n"
 "\n"
 "OMEJENA ODGOVORNOST ZA POSEDOVANJE ALI UPORABO PROGRAMJA, KI JE V NEKATERIH "
 "DRŽAVAH PREPOVEDANO\n"
 "\n"
-"Mandriva d.d. v nobenem primeru, razen kadar to izrecno določa pravni "
-"red,\n"
+"Mandriva d.d. v nobenem primeru, razen kadar to izrecno določa pravni red,\n"
 "ne prevzema odgovornosti za kakršnokoli naključno, posredno ali neposredno "
 "škodo,\n"
 "vključno s škodo zaradi izgube zaslužka, motenj v poslovanju, finančnih "
 "izgub, sodnih taks\n"
 "in izrečenih kazni ali drugih oblik posredne škode, ki bi nastala zaradi "
 "posedovanja\n"
-"ali uporabe programja oziroma zardi pridobivanja programja z Mandrivalinux "
+"ali uporabe programja oziroma zardi pridobivanja programja z Mandriva Linux "
 "spletnih strani,\n"
 "če je to v nasprotju z veljavnim pravnim redom države, v kateri bivate.\n"
 "Navedena omejitev odgovornosti se nanaša tudi, vendar ne izključno, na "
@@ -6425,10 +6429,10 @@ msgstr ""
 "Avtorske in druge pravice intelektualne lastnine, ki se nanašajo na "
 "programje, pripadaj avtorjem\n"
 " programja in so zaščitene z zakonom.\n"
-"Mandriva d.d. si pridržuje pravico do spreminjanja programja v celoti "
-"ali deloma\n"
+"Mandriva d.d. si pridržuje pravico do spreminjanja programja v celoti ali "
+"deloma\n"
 "v kakršnem koli smislu in za kakršen koli namen.\n"
-"\"Mandriva\", \"Mandrivalinux\" in pripadajoči logotipi so blagovne znamke "
+"\"Mandriva\", \"Mandriva Linux\" in pripadajoči logotipi so blagovne znamke "
 "Mandriva d.d.\n"
 "\n"
 "\n"
@@ -6536,8 +6540,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"
@@ -6545,7 +6549,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 ""
 "Čestitamo!\n"
 "Uspešno ste dokončali namestitev.\n"
@@ -6557,14 +6561,14 @@ msgstr ""
 "\n"
 "\n"
 "Navodila za nastavljanje sistema po namestitvi boste našli v poglavju\n"
-"\"post install\" uradnih navodil za uporabnike. (Official Mandrivalinux "
+"\"post install\" uradnih navodil za uporabnike. (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
@@ -6593,12 +6597,12 @@ msgstr "Pričenjam s korakom `%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š sistem ni dovolj zmogljiv. Lahko, da boste imeli pri namestitvi\n"
-"Mandrivalinux težave. V tem primeru lahko poskusite z namestitvijo v "
+"Mandriva Linux težave. V tem primeru lahko poskusite z namestitvijo v "
 "besedilnem načinu. \n"
 "Po zagonu z zgoščenke pritisnite `F1' in vpišite `text'."
 
@@ -7139,9 +7143,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 ""
-"Vzpostavljam povezavo s spletno stranjo Mandrivalinux, in pridobivanje "
+"Vzpostavljam povezavo s spletno stranjo Mandriva Linux, in pridobivanje "
 "seznama dosegljivih strežnikov...."
 
 #: install_steps_interactive.pm:840
@@ -7369,8 +7373,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Namestitev Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Namestitev Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9959,7 +9963,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 ""
@@ -11303,7 +11307,7 @@ msgid ""
 "work, you might want to relaunch the configuration."
 msgstr ""
 "Med nastavljanjem se je pojavila napaka.\n"
-"Preizkusite povezavo v Mandrivalinux nadzornem središču. Če povezava ne "
+"Preizkusite povezavo v Mandriva Linux nadzornem središču. Če povezava ne "
 "deluje, ponovno zaženite nastavitve."
 
 #: network/netconnect.pm:1537
@@ -14002,8 +14006,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 ""
 "Zaženite Scannerdrake (Nastavite svoj računalnik/Stronja oprema/Nastavite "
@@ -15928,33 +15932,33 @@ msgstr "Ustavi"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Kaj je Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Kaj je Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Dobrodošli v <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Dobrodošli v <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>distribucija Linuxa</b>, ki združuje jedro, imenovano "
+"Mandriva Linux je <b>distribucija Linuxa</b>, ki združuje jedro, imenovano "
 "<b>operacijski sistem</b>, skupaj z <b>mnogimi programi</b>, ki vam služijo "
 "pri vsakodnevnih opravilih."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"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 trenutno <b>uporabniku najprijaznejša</b>distribucija "
+"Mandriva Linux je trenutno <b>uporabniku najprijaznejša</b>distribucija "
 "Linuxa.  Obenem je ena od <b>najbolj razširjenih</b> distribucij."
 
 #: share/advertising/02.pl:13
@@ -15970,14 +15974,14 @@ msgstr "Pozdravljeni v <b>svetu odprte kode</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 temelji na odprtokodnem modelu, kar pomeni, da je nova "
-"različica plod <b>sodelovanja</b> med <b>razvojnim oddelkom Mandrivaa</"
-"b> in <b>skupnostjo razvijalcev</b> z vsega sveta."
+"Mandriva Linux temelji na odprtokodnem modelu, kar pomeni, da je nova "
+"različica plod <b>sodelovanja</b> med <b>razvojnim oddelkom Mandrivaa</b> in "
+"<b>skupnostjo razvijalcev</b> z vsega sveta."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -15996,10 +16000,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 ""
-"Večina programov, ki so del distribucije, in vsa orodja Mandrivalinuxa so "
+"Večina programov, ki so del distribucije, in vsa orodja Mandriva Linuxa so "
 "zajeta v <b>licenci GPL</b>"
 
 #: share/advertising/03.pl:17
@@ -16029,25 +16033,25 @@ msgstr "<b>Pridruži se skupnosti</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 eno <b>največjih skupnosti</b> uporabnikov in razvijalcev. "
-"Vloga te skupnosti je izjemno velika, saj sega od prijavljanja napak do "
-"razvoja novih programov. Skupnost igra <b>ključno vlogo</b> v svetu "
-"Mandrivalinuxa. "
+"Mandriva Linux ima eno <b>največjih skupnosti</b> uporabnikov in "
+"razvijalcev. Vloga te skupnosti je izjemno velika, saj sega od prijavljanja "
+"napak do razvoja novih programov. Skupnost igra <b>ključno vlogo</b> v svetu "
+"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 ""
 "<b>Če bi radi izvedeli kaj več</<b> o naši skupnosti, obiščite <b>www."
-"mandrakelinux.com</b> ali neposredno <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> ali neposredno <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b>, če želite <b>sodelovati</b> pri razvoju. "
 
 #: share/advertising/05.pl:15
@@ -16058,10 +16062,10 @@ msgstr "<b>Različica Download</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 se namešča <b>Mandrivalinux Download</b>. To je brezplačna "
+"Trenutno se namešča <b>Mandriva Linux Download</b>. To je brezplačna "
 "različica, ki jo želi Mandriva obdržati <b>prosto dostopno</b> vsakomur."
 
 #: share/advertising/05.pl:19
@@ -16105,8 +16109,8 @@ msgstr "<b>Discovery, vaše prvo Linux namizje</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Trenutno se namešča <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Trenutno se namešča <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16128,8 +16132,8 @@ msgstr "<b>PowerPack, najpopolnejše Linux namizje</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Trenutno se namešča <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Trenutno se namešča <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16149,8 +16153,8 @@ msgstr "<b>PowerPack+, Linux rešitve za namizja in strežnike</b> "
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Trenutno se namešča <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Trenutno se namešča <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16172,15 +16176,14 @@ msgstr "<b>Mandrivaovi izdelki</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> je razvil široko paleto <b>Mandrivalinux</b> izdelkov."
+"<b>Mandriva</b> je razvil široko paleto <b>Mandriva Linux</b> izdelkov."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Izdelki Mandrivalinux:"
+msgid "The Mandriva Linux products are:"
+msgstr "Izdelki Mandriva Linux:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16200,10 +16203,10 @@ msgstr "\t* <b>PowerPack+</b>, Linux rešitev za namizja in strežnike."
 #: 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>, Mandrivalinuxova rešitev za 64-bitne "
+"\t* <b>Mandriva Linux za x86-64</b>, Mandriva Linuxova rešitev za 64-bitne "
 "procesorje."
 
 #: share/advertising/10.pl:15
@@ -16214,27 +16217,27 @@ msgstr "<b>Mandrivaovi izdelki</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 razvil dva izdelka, ki omogočata uporabo Mandrivalinuxa "
-"<b>na kateremkoli računalniku</b> brez potrebe po namestitvi:"
+"Mandriva je razvil dva izdelka, ki omogočata uporabo Mandriva Linuxa <b>na "
+"kateremkoli računalniku</b> brez potrebe po namestitvi:"
 
 #: 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>, distribucija Mandrivalinuxa, ki jo poženete s CD-ROM-a."
+"\t* <b>Move</b>, distribucija Mandriva Linuxa, ki jo poženete s CD-ROM-a."
 
 #: 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>, distribucija Mandrivalinuxa, prednameščena na "
+"\t* <b>GlobeTrotter</b>, distribucija Mandriva Linuxa, prednameščena na "
 "zunanjem disku “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
@@ -16245,25 +16248,27 @@ msgstr "<b>Mandrivaovi izdelki (Profesionalne rešitve)</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 "Mandrivaovi izdelki, ki zadoščajo <b>profesionalnim potrebam</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 namizje, namenjeno podjetjem."
+"\t* <b>Corporate Desktop</b>, Mandriva Linux namizje, namenjeno podjetjem."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Mandrivalinux strežniške rešitve."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandriva Linux strežniške rešitve."
 
 #: 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 varnostne rešitve."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, Mandriva Linux varnostne rešitve."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16335,8 +16340,8 @@ msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
 "environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"PowerPack+ omogoča izbiro <b>namizja</b>. Mandriva je kot privzeto "
-"izbral <b>KDE</b>. "
+"PowerPack+ omogoča izbiro <b>namizja</b>. Mandriva je kot privzeto izbral "
+"<b>KDE</b>. "
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16461,10 +16466,10 @@ msgstr "<b>Uživajte v široki paleti programov</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 meniju Mandrivalinuxa boste našli programe <b>za vsa vaše potrebe</b>:"
+"V meniju Mandriva Linuxa boste našli programe <b>za vsa vaše potrebe</b>:"
 
 #: share/advertising/18.pl:16
 #, c-format
@@ -16716,17 +16721,17 @@ msgstr "\t* <b>Postfix</b> in <b>Sendmail</b>: zmogljiva mail strežnika."
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinuxov nadzorni center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linuxov nadzorni center</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>Mandrivalinuxov nadzorni center</b> je zbirko nepogrešljivih programov, "
+"<b>Mandriva Linuxov nadzorni center</b> je zbirko nepogrešljivih programov, "
 "ki omogočajo upravljanje s sistemom."
 
 #: share/advertising/25.pl:17
@@ -16751,15 +16756,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 ""
 "Kot vsako programiranje tudi odprta koda <b>zahteva čas in ljudi</b> za "
-"razvoj. S spoštovanjem do te filozofije Mandriva trži dodatno "
-"izpopolnjene izdelke in nenehno <b>izboljšuje Mandrivalinux.</b> Če "
-"<b>podpirate</b> filozofijo odprte kode in razvoj Mandrivalinuxa, premislite "
-"o nakupu naših izdelkov in storitev."
+"razvoj. S spoštovanjem do te filozofije Mandriva trži dodatno izpopolnjene "
+"izdelke in nenehno <b>izboljšuje Mandriva Linux.</b> Če <b>podpirate</b> "
+"filozofijo odprte kode in razvoj Mandriva Linuxa, premislite o nakupu naših "
+"izdelkov in storitev."
 
 #: share/advertising/27.pl:13
 #, c-format
@@ -16769,8 +16774,8 @@ msgstr "<b>Spletna prodajalna</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 ""
 "Če želite izvedeti več o Mandrivaovih izdelkih obiščite našo <b>spletno "
 "prodajalno</b>."
@@ -16791,8 +16796,8 @@ msgstr "Nadgradnja spletne prodajalne je povečala učinkovitost in uporabnost."
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Še danes obiščite <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Še danes obiščite <b>store.mandriva.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16802,9 +16807,9 @@ 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>dopolnitev</b> vašega Mandrivalinuxa."
+msgstr "<b>Mandriva Club</b> je <b>dopolnitev</b> vašega Mandriva Linuxa."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -16816,10 +16821,10 @@ msgstr "Izkoristite <b>prednosti</b>, ki vam jih nudi Mandriva Club:"
 #, 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>Popusti</b> na izdelke in storitve v spletni prodajalni <b>store."
-"mandrakesoft.com</b>."
+"mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -16831,16 +16836,16 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Sodelovanje v Mandrivalinuxovih <b>uporabniških forumih</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Sodelovanje v Mandriva Linuxovih <b>uporabniških forumih</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>Predčasen dostop</b> do Mandrivalinuxovih ISO datotek, še pred "
+"\t* <b>Predčasen dostop</b> do Mandriva Linuxovih ISO datotek, še pred "
 "uradnim izidom."
 
 #: share/advertising/29.pl:13
@@ -16853,16 +16858,17 @@ msgstr "<b>Mandriva Online</b>"
 msgid ""
 "<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
-msgstr "<b>Mandriva Online</b> je nova storitev, ki jo ponujamo našim strankam."
+msgstr ""
+"<b>Mandriva Online</b> je nova storitev, ki jo ponujamo našim strankam."
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
 "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 nudi vrsto storitev za <b>preprosto nadgradnjo</b> vašega "
-"Mandrivalinux sistema"
+"Mandriva Linux sistema"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16886,10 +16892,10 @@ msgstr "\t* <b>Hitri</b> popravki."
 #: 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* Upravljanje <b>vseh vaših Mandrivalinux sistemov</b> z enim uporabniškim "
-"imenom."
+"\t* Upravljanje <b>vseh vaših Mandriva Linux sistemov</b> z enim "
+"uporabniškim imenom."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -16900,28 +16906,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 ""
 "Potrebujete <b>pomoč</b>? Obrnite se na naše strokovnjake na 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 ""
-"S pomočjo strokovnjakov v <b>Mandrivalinux experts</b> boste prihranili "
+"S pomočjo strokovnjakov v <b>Mandriva Linux experts</b> boste prihranili "
 "veliko časa."
 
 #: 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 vsa vprašanja o Mandrivalinuxu vam je na voljo plačljiva podpore na "
-"<b>store.mandrakesoft.com</b>."
+"Za vsa vprašanja o Mandriva Linuxu vam je na voljo plačljiva podpore na "
+"<b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17306,15 +17312,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 ""
 "[MOŽNOSTI] [IME_PROGRAMA]\n"
 "\n"
 "MOŽNOSTI:\n"
 "  --help            - izpiši to sporočilo za pomoč.\n"
-"  --report          - program mora biti eno izmed mandrakelinuxovih orodij\n"
-"  --incident        - program mora biti eno izmed mandrakelinuxovih orodij"
+"  --report          - program mora biti eno izmed Mandriva Linuxovih orodij\n"
+"  --incident        - program mora biti eno izmed Mandriva Linuxovih orodij"
 
 #: standalone.pm:63
 #, c-format
@@ -17368,7 +17374,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"
@@ -17382,7 +17388,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[MOŽNOSTI]...\n"
-"Nastavitev terminalskega strežnika Mandrivalinux\n"
+"Nastavitev terminalskega strežnika Mandriva Linux\n"
 "--enable         : omogoči MTS\n"
 "--disable        : onemogoči MTS\n"
 "--start          : poženi MTS\n"
@@ -17442,15 +17448,16 @@ 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"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[MOŽNOST]...\n"
-"  --no-confirmation      v Mandriva Update načinu ne zahtevaj prve potrditve\n"
+"  --no-confirmation      v Mandriva Update načinu ne zahtevaj prve "
+"potrditve\n"
 "  --no-verify-rpm        brez preverjanja podpisov paketov\n"
 "  --changelog-first      v oknu z opisom najprej prikaži dnevnik sprememb\n"
 "  --merge-all-rpmnew     predlog za združitev vseh najdenih datotek ."
@@ -20221,13 +20228,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinuxovo orodje za poročanje o hroščih"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linuxovo orodje za poročanje o hroščih"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Nadzorno središče Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Nadzorno središče Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20718,19 +20725,19 @@ msgstr "Vključeno ob zagonu"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Ta omrežna naprava še ni nastavljena.\n"
-"Zaženite \"Dodaj omrežno napravo\" v Mandrivalinux nadzornem središču"
+"Zaženite \"Dodaj omrežno napravo\" v Mandriva Linux nadzornem središču"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Nobena internetna povezava ni nastavljena.\n"
-"Zaženite \"%s\" v Mandrivalinux nadzornem središču"
+"Zaženite \"%s\" v Mandriva Linux nadzornem središču"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20780,8 +20787,8 @@ msgstr "KDM (Upravitelj prikazovalnika KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Upravitelj prikazovalnika Mandrivalinux)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Upravitelj prikazovalnika Mandriva Linux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21085,18 +21092,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 ""
 "Avtorske pravice (C) 2001-2002 Mandriva. \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (originalna različica)\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
@@ -21671,8 +21678,8 @@ msgstr " --doc <link>          - povezava na drugo spletno stran\n"
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinuxovo središče za pomoč"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linuxovo središče za pomoč"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22333,7 +22340,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 ""
 "Ne zaznam zvočne kartice. Preverite, če imate zvočno kartico, ki jo Linux "
 "podpira in če je pravilno priključena.\n"
@@ -22342,7 +22349,7 @@ msgstr ""
 "Seznam podprte strojne opreme je dosegljiv na:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24357,7 +24364,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čunalniku ni bila zaznana TV kartica. Prosimo preverite da je v "
 "Linuxu podprta TV kartica pravilno vstavljena.\n"
@@ -24366,7 +24373,7 @@ msgstr ""
 "Lahko obiščete bazo podprte strojne opreme na:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25080,13 +25087,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 ""
 "To je HardDrake, %s orodje za nastavljanje strojne opreme.\n"
 "<span foreground=\"royalblue3\">Različica:</span> %s\n"
 "<span foreground=\"royalblue3\">Avtor:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25195,8 +25202,8 @@ msgstr "Da bi uveljavili spremembe, se morate odjaviti."
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Logi mandrakelinuxovih orodij"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Logi Mandriva Linuxovih orodij"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25710,10 +25717,10 @@ msgstr "Povezovanje je opravljeno."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Povezavanje je spodletelo.\n"
-"Preverite nastavitve v Nadzornem središču Mandrivalinux "
+"Preverite nastavitve v Nadzornem središču Mandriva Linux "
 
 #: standalone/net_monitor:341
 #, c-format
diff --git a/perl-install/share/po/sq.po b/perl-install/share/po/sq.po
index de47e1de2..6efa986be 100644
--- a/perl-install/share/po/sq.po
+++ b/perl-install/share/po/sq.po
@@ -1254,11 +1254,11 @@ msgstr "manuelë"
 #: 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 mund ti përmbahen një numër të madhë të gjuhëve.\n"
+"Mandriva Linux mund ti përmbahen një numër të madhë të gjuhëve.\n"
 "Zgjedheni gjuhën në të cilën dëshironi ta instaloni. E cila do të\n"
 "jetë në përdorim e sipër kur ta instaloni kompletisht\n"
 "dhe ta rinisni sistemin tuaj nga fillimi."
@@ -3676,12 +3676,12 @@ msgstr "aktivizoje përkrahjen radio"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
 "Para se të vazhdoni më tutje, ju duhet ti lexoni termet dhe kushtet për\n"
-"përdorimin e licencës. Kjo mbulon tërë shpërndarjen e Mandrivalinux,\n"
+"përdorimin e licencës. Kjo mbulon tërë shpërndarjen e Mandriva Linux,\n"
 "nëse ju pajtoheni me këto kushte, klikoni mbi mbi kopsën \"%s\".\n"
 "Nëse ju nuk pajtoheni atëher thjeshtë ndaleni komjuterin tuaj."
 
@@ -3866,13 +3866,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 ""
-"Pakot e nevojshme për Instalimin e Linux Mandrake janë të shpërndara në "
+"Pakot e nevojshme për Instalimin e Mandriva Linux janë të shpërndara në "
 "shumë\n"
 "CDROM-e. Fatëmirësisht, DrakX i njef të gjitha lokacinet e pakove në CDROM-"
 "e.\n"
@@ -3884,11 +3884,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"
@@ -3940,12 +3941,12 @@ msgid ""
 "megabytes."
 msgstr ""
 "Tani është momenti që ti zgjedhni pakot që duhet të instalohen në sistemin\n"
-"tuaj. Duhet ta dini se Mandrivalinux përmban me mijëra pako instaluese,\n"
+"tuaj. Duhet ta dini se Mandriva Linux përmban me mijëra pako instaluese,\n"
 "dhe nuk është me rendësi që ti njifti të gjitha për mendësh.\n"
 "\n"
 "Pakot janë të radhitura në grupe përkatëse për përdorim të veçant në "
 "makinën\n"
-"tuaj. Mandrivalinux posedon katër instalime të përcaktuara. Ju mund të\n"
+"tuaj. Mandriva Linux posedon katër instalime të përcaktuara. Ju mund të\n"
 "mendoni mbi këto klasa instaluese si kontainer të pakove të ndryshme.\n"
 "Ju keni mundësi ti përzini (mix) dhe ti barazoni aplikacionet nga "
 "kontainerët\n"
@@ -4045,10 +4046,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"
@@ -4078,7 +4079,7 @@ msgstr ""
 "të paraqietet në anën e djathtë.\n"
 "\n"
 "!! Nëse keni zgjedhur një program që ta përdorni në server, ju duhet ta\n"
-"vërtetoni që ai duhet të instalohet. Ndër Mandrake, me marrëveshje të "
+"vërtetoni që ai duhet të instalohet. Ndër Mandriva, me marrëveshje të "
 "gjithë\n"
 "serveret do të nisen nga nisja udhëzuese e sistemit (boot). Fatëkeqësisht\n"
 "nga të gjitha forcat e investuara për të ofruar një Linux të sigut, është\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"
@@ -4295,7 +4296,7 @@ msgid ""
 msgstr ""
 "X (për Sistemin Windows X) është zemra e interfacit grafik për GNU/Linux\n"
 "në të cilin të gjitha mjediset grafike (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etj.) janë të denguara mbi Mandrivalinux.\n"
+"WindowMaker, etj.) janë të denguara mbi Mandriva Linux.\n"
 "\n"
 "Juve do të ju prezentohet lista e parametrave të ndryshëm për të ndryshuar,\n"
 "dhe për të pranuar çfaqjet grafike optimale: Kartelë Grafike\n"
@@ -4420,12 +4421,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"
@@ -4452,7 +4453,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"
@@ -4461,7 +4462,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"
@@ -4482,10 +4484,10 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Kjo etapë do të ju mundësoj që të përcaktoni me precizitet vendosjen dhe\n"
-"instalimin e Mandrivalinux. Nëse disku i juaj i fortë është zbrazët apo i\n"
+"instalimin e Mandriva Linux. Nëse disku i juaj i fortë është zbrazët apo i\n"
 "përdorur nga një sistem tjetër eksploatimi, ju duhet ta shpërndani\n"
 "diskun tuaj në pjesë. Ndarje e diskut d.m.th. ta shpërndani me precizitet\n"
-"që më fund të krijoni një hapësire për instalimin e sistemit Mandrake "
+"që më fund të krijoni një hapësire për instalimin e sistemit Mandriva "
 "Linux.\n"
 "\n"
 "Duke njoftur efektet e proceseve të ndarjeve nuk janë kthyese, (përmbajtjet\n"
@@ -4527,7 +4529,7 @@ msgstr ""
 "\n"
 " * \"%s\": nëse ju dëshironi ti zhdukni të gjitha\n"
 "të dhënat dhe aplikacionet e instaluara në sistemin tuaj, dhe ti\n"
-"zëvendësoni me një sistem të ri Mandrivalinux, zgjedheni këtë mundësi.\n"
+"zëvendësoni me një sistem të ri Mandriva Linux, zgjedheni këtë mundësi.\n"
 "Keni kujDES, sepse kjo mundësi është e pa kthyeshme mbrapa. Është e pa\n"
 "mundur të gjindet të dhënat e zhdukura.\n"
 "\n"
@@ -4687,7 +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."
@@ -4708,7 +4710,7 @@ msgstr ""
 "Klikoni mbi \"%s\" kur ju jeni i gatshëm që ti formatoni ndarjet.\n"
 "\n"
 "Klikoni mbi \"%s\" nëse ju dëshironi të zgjedhni një ndarje tjetër apo\n"
-"të instaloni një sistemi të ri eksploatues Mandrivalinux.\n"
+"të instaloni një sistemi të ri eksploatues Mandriva Linux.\n"
 "\n"
 "Klikoni mbi \"%s\" nëse ju dëshironi ti zgjedhni ndarjet, për një\n"
 "verifikim të sektorëve të dëmtuar në disk."
@@ -4725,7 +4727,7 @@ msgstr "Mbrapa"
 #: 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"
@@ -4737,7 +4739,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Nga momenti kur ju jeni duke instaluar Mandrivalinux, është e mundur që\n"
+"Nga momenti kur ju jeni duke instaluar Mandriva Linux, është e mundur që\n"
 "disa pako janë azhurnuar prej daljes së atij prodhimi. Disa buge mund\n"
 "të korigjohen, njashtu dhe probleme tjera të sigurisë. Për të ju\n"
 "mundësuar të përfitoni një azhurnim, do të jenë të propozuara që të\n"
@@ -4767,7 +4769,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of 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"
@@ -4794,7 +4796,7 @@ msgstr "Siguria e Administratorit:"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4865,7 +4867,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Në këtë etapë ju duhet të zgjedhni se cila(t) ndarje(t) do të përdoret(n)\n"
-"për sistemin tuaj Mandrivalinux. Nëse ndarja e diskut është bërë më heret,\n"
+"për sistemin tuaj Mandriva Linux. Nëse ndarja e diskut është bërë më heret,\n"
 "nga një instalim tjetër GNU/Linux apo nga nji vegël tjetër ndarëse, ju\n"
 "mund të përdorni ndarjet e bëra. Mes tjerash ndarjet duhen të jenë të\n"
 "përcaktuara\n"
@@ -4954,7 +4956,7 @@ msgstr "Kalo mes modit normal/ekspert"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4984,7 +4986,7 @@ msgid ""
 msgstr ""
 "Janë gjetur më shumë se një ndarje Windows në diskun tuaj të fort, ju\n"
 "lutemi zgjedheni njërin për ta ridimenziunuar, dhe për të instaluar\n"
-"sistemin të ri eksploatues Mandrivalinux.\n"
+"sistemin të ri eksploatues Mandriva Linux.\n"
 "\n"
 "Çdo ndarje është listuar simbas: \"Emri Linux\",  \"Emri Windows\"\n"
 "\"Kapaciteti\".\n"
@@ -5033,7 +5035,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"
@@ -5042,19 +5044,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 ""
 "Kjo etapë aktivizohet automatikisht nëse ju posedoni një ndarje të vjetër\n"
 "GNU/Linux, në makinën tuaj.\n"
 "\n"
 "DrakX tani ka nevojë të dijë nëse ju dëshironi të çfaqni një instalim,\n"
-"apo azhurnim të ri, në sistemin ekzistues Mandrivalinux:\n"
+"apo azhurnim të ri, në sistemin ekzistues Mandriva Linux:\n"
 "\n"
 " * \"%s\": Për shumicën e rasteve, ky kompletisht shlyhet nga sistemet\n"
 "e vjetra. Nëse ju dëshironi ta ndërroni shpërndarjen e diskut tuaj të "
@@ -5066,15 +5069,16 @@ msgstr ""
 "disa të dhëna ekzistuese nga të mbi-zëvendësuarat.\n"
 "\n"
 " * \"%s\": kjo klasë instaluese ju mundëson azhurnimin e pakove aktuale\n"
-"të instaluara, në sistemin tuaj Linux Mandrake. Skema e ndarjes,\n"
+"të instaluara, në sistemin tuaj Mandriva Linux. Skema e ndarjes,\n"
 "dhe e të dhënave të përdoruesve, nuk do të ndryshohet. Shumica\n"
 "e etapave të tjera konfiguruese mundësojnë një vazhdim, të njëjtë sikur\n"
 "tek instalimet standarde.\n"
 "\n"
 "Duke përdorur mundësinë ``Azhurno'' duhet të funksionoj shumë mirë në "
 "sistemin\n"
-"Mandrivalinux ndër versionin \"8.1\" apo më të ri. Tentimi i Azhurnimit të\n"
-"një versioni më të vjetër se versioni Mandrivalinux \"8.1\" nuk rekomandohet."
+"Mandriva Linux ndër versionin \"8.1\" apo më të ri. Tentimi i Azhurnimit të\n"
+"një versioni më të vjetër se versioni Mandriva Linux \"8.1\" nuk "
+"rekomandohet."
 
 #: help.pm:591
 #, fuzzy, c-format
@@ -5129,7 +5133,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"
@@ -5391,7 +5396,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"
@@ -5412,7 +5417,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 ""
 "Këtu, ne e zgjedhim një sistem stampues për kompjuterin tuaj. Sistemet "
@@ -5443,7 +5448,7 @@ msgstr ""
 "\n"
 "Nëse e zgjidhni tani, e më vonë, nuk ju pëlqen sistemi stampues, ju keni\n"
 "mundësi ta ndryshoni duke nisur PrinterDrake nga Qendra Kontrolluese "
-"Mandrake\n"
+"Mandriva\n"
 "duke klikuar mbi kopsën ekspert."
 
 #: help.pm:765
@@ -5561,7 +5566,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"
@@ -5578,7 +5584,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"
@@ -5705,11 +5711,11 @@ msgstr "Serviset"
 #, 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 ""
 "Zgjedheni diskun e fort (hard drive) që dëshironi ta zhdukni, për të\n"
-"instaluar një ndarje të re Mandrivalinux. Keni kujDES, të gjitha të dhënat\n"
+"instaluar një ndarje të re Mandriva Linux. Keni kujDES, të gjitha të dhënat\n"
 "do të zhduken, dhe nuk mund të rekuperohen!"
 
 #: help.pm:863
@@ -6058,12 +6064,12 @@ msgstr "Përdorni hapësirën e ndarjes Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Ndarja e juaj Windows është e pa defragmentuar. Ju lutemi riniseni "
 "kompjuterin tuaj në Windows, the niseni programin për defragmentim "
-"``defrag'', mandej riniseni instalimin e Mandrivalinux "
+"``defrag'', mandej riniseni instalimin e Mandriva Linux "
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6179,13 +6185,13 @@ msgstr "Ndalja e rrjetit (network)"
 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"
@@ -6214,8 +6220,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 "
@@ -6229,8 +6235,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 "
@@ -6239,7 +6245,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"
@@ -6273,10 +6279,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"
@@ -6298,11 +6304,11 @@ msgstr ""
 "Parathënie\n"
 "\n"
 "Sistemi eksploatues dhe i komponimeve të tjera në disponibilitet në \n"
-"shpërndarjen Mandrivalinux janë të emruar \"Produkte Software\".\n"
+"shpërndarjen Mandriva Linux janë të emruar \"Produkte Software\".\n"
 "Produketet Softver përmbajnë, mirëpo nuk i nënshtrohen bashkësisë \n"
 "së programeve, të më parme, rregullave dhe dukumentacionit \n"
 "mbi eksploatimin e sistemeve dhe komponimeve të ndryshme të \n"
-"shpërndarjes Mandrivalinux.\n"
+"shpërndarjes Mandriva Linux.\n"
 "\n"
 "\n"
 "1. Licenca\n"
@@ -6343,15 +6349,14 @@ msgstr ""
 "\n"
 "KËSHILLË NË MBAJTJEN APO PËRDORIMIN E PROGRAMEVE TË NDALUARA NË DISA SHTETE\n"
 "\n"
-"Në asnjë mënyrë, as Mandriva S.A. apo furnizuesit e tij nuk mund të "
-"jenë \n"
+"Në asnjë mënyrë, as Mandriva S.A. apo furnizuesit e tij nuk mund të jenë \n"
 "përgjegjës, për arësye të një dëmi special, direkt apo indirekt (duke mos "
 "përfshirë \n"
 "kifizimin e dëmit, humbjes së benificimit, ndërprerjeve punuese humbjes së \n"
 "informacioneve komercializuese apo humbje tjera njashtu dënimet dhe "
 "damshpërblimet duhet të derdhen simbas\n"
 "një vendimi gjygjësor) i cili do të bëjë një përdorim \n"
-"apo transferim të Mandrivalinux të programeve të ndaluara me legjitimitet, "
+"apo transferim të Mandriva Linux të programeve të ndaluara me legjitimitet, "
 "nga i cili ju bëni pjesë.\n"
 "Ky njoftim i përketë njashtu edhe disa programeve të \n"
 "kriptografisë të furnizuar me programe.\n"
@@ -6371,8 +6376,8 @@ msgstr ""
 "Mandriva.\n"
 "Program Zhvilluesi nga Mandriva S.A. është i qeverisur nga Licencat GPL. "
 "Shkrimet në Dokumentacionet \n"
-"nga Mandriva S.A. janë të qeverisura nga licenca e specifikuar. Ju "
-"lutemi referohuni në dokumentacion për \n"
+"nga Mandriva S.A. janë të qeverisura nga licenca e specifikuar. Ju lutemi "
+"referohuni në dokumentacion për \n"
 "më shumë detaje.\n"
 "\n"
 "\n"
@@ -6382,10 +6387,10 @@ msgstr ""
 "autorëve dhe janë \n"
 "të mbrojtura nga përparësitë intelektuale, të drejtat e botimit, dhe "
 "aplikimi i ligjeve në programet softver.\n"
-"Mandriva S.A. rezervon të drejtat për ndryshimin dhe adaptimin e "
-"Produkteve Softver, në tërësi apo në një \n"
+"Mandriva S.A. rezervon të drejtat për ndryshimin dhe adaptimin e Produkteve "
+"Softver, në tërësi apo në një \n"
 "pjesë, d.m.th. të gjitha propozimet e mundshme.\n"
-"\"Mandriva\", \"Mandrivalinux\" dhe logot e shoqëruara janë markë "
+"\"Mandriva\", \"Mandriva Linux\" dhe logot e shoqëruara janë markë "
 "shpërndarëse e Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6495,8 +6500,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"
@@ -6504,14 +6509,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 ""
 "Urime, instalimi mori fund.\n"
 "Nxerreni disketën apo CD-ROM(in) dhe shtypni mbi Enter.\n"
 "\n"
 "\n"
 "Për të gjitha informacionet për korigjimet në disponibilitë për këtë version "
-"të Linux Mandrake, duhet ta konsultoni Errata, e lirë\n"
+"të Mandriva Linux, duhet ta konsultoni Errata, e lirë\n"
 "nga:\n"
 "\n"
 "\n"
@@ -6519,13 +6524,13 @@ msgstr ""
 "\n"
 "\n"
 "Informacionet mbi konfigurimin e sistemit tuaj janë të lira\n"
-"në kapitullin e doracakut për përdorimin e Mandrivalinux"
+"në kapitullin e doracakut për përdorimin e 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
@@ -6554,12 +6559,12 @@ msgstr "Nisja e etapës `%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 ""
 "Kompjuteri i juaj posedon sasi të vogël të memorisë. Ju mund të ndesheni me\n"
-"disa probleme gjatë instalimit të Mandrivalinux. Nëse kjo ndodhë, ju\n"
+"disa probleme gjatë instalimit të Mandriva Linux. Nëse kjo ndodhë, ju\n"
 "mund të vazhdoni në një instalim në modë teksti. Për këtë shtypni mbi\n"
 "`F1' kut të niseni me një nisje të udhëzuar në CDROM, dhe fytni urdhërin "
 "`text'."
@@ -7101,9 +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 ""
-"Lidhje në sitin Mandrivalinux për të pranuar listën e lirë të pasqyreve..."
+"Lidhje në sitin Mandriva Linux për të pranuar listën e lirë të pasqyreve..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7325,8 +7330,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Instalimi i Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Instalimi i Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9913,13 +9918,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 ""
 "Konfigurues i drakfirewall\n"
 "\n"
-"Ky do konfiguroj murin-e-zjarrtë (firewall) personel për makinën Mandrake "
+"Ky do konfiguroj murin-e-zjarrtë (firewall) personel për makinën Mandriva "
 "Linux.\n"
 "Nëse ju dëshironi një mur-të-zjarrtë (firewall) më të fuqishëm, kthehuni në\n"
 "shpërndarjen e specializuar MandrakeSecurity."
@@ -11222,7 +11227,7 @@ msgid ""
 "work, you might want to relaunch the configuration."
 msgstr ""
 "Disa probleme janë lajmëruar gjatë konfigurimit.\n"
-"Testone lidhjen tuaj tek Qendra Kontrolluese Mandrake, apo me urdherinë "
+"Testone lidhjen tuaj tek Qendra Kontrolluese Mandriva, apo me urdherinë "
 "net_monitor. Nëse lidhja juaj nuk fonksionon, ju mund ta ri-nisni "
 "konfigurimin."
 
@@ -12573,7 +12578,7 @@ msgstr ""
 "Nëse ju dëshironi, të shtoni, zhdukni, apo të riemroni një satmpues, ose "
 "dëshironi tia ndryshoni opcionet e tij me marrëveshje (hyrja e letrës, "
 "kualiteti i stampimit, etj) shkoni tek \"Stampuesi\" në zgjedhjen \"Materiali"
-"\" tek seksioni Qendra Kontrolluese Mandrake."
+"\" tek seksioni Qendra Kontrolluese Mandriva."
 
 #: printer/printerdrake.pm:1207 printer/printerdrake.pm:1437
 #: printer/printerdrake.pm:1500 printer/printerdrake.pm:1592
@@ -13918,8 +13923,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 ""
 
@@ -14202,7 +14207,7 @@ msgid ""
 msgstr ""
 "Konfigurimi i rrjetit të bërë gjatë instalimit nuk mund të niset tani. Ju "
 "lutemi verifikoni nëse rrjeti juaj është aktivizuar mbasë nisjes. Niseni "
-"duke përdorur Qendrën Kontrolluese Mandrake, në sektorin \"Rrjeti & Interneti"
+"duke përdorur Qendrën Kontrolluese Mandriva, në sektorin \"Rrjeti & Interneti"
 "\"/\"Kyqja\", dhe provoni përsëri ta konfiguroni stampuesin tuaj në sektorin "
 "\"Materiali\"/\"Stampues\"."
 
@@ -14215,7 +14220,7 @@ msgid ""
 msgstr ""
 "Hyrja në rrjet nuk është në nisje dhe nuk mund të niset. Ju lutemi "
 "verifikojeni konfigurimin dhe materialin tuaj. Mandej provoni të konfiguroni "
-"stampuesin tuaj edhe një herë me ndihmën e Qendrës Kontrolluese Mandrake."
+"stampuesin tuaj edhe një herë me ndihmën e Qendrës Kontrolluese Mandriva."
 
 #: printer/printerdrake.pm:4206
 #, c-format
@@ -15848,18 +15853,18 @@ msgstr "Ndale"
 
 #: 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 "Mirësevini në <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Mirësevini në <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."
@@ -15868,7 +15873,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 ""
 
@@ -15885,9 +15890,9 @@ msgstr "Mirësevini në botën Open Source"
 #: 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 ""
 
@@ -15906,8 +15911,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
@@ -15933,17 +15938,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 ""
 
@@ -15955,7 +15960,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 ""
 
@@ -15993,7 +15998,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
@@ -16012,7 +16017,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
@@ -16030,7 +16035,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
@@ -16045,18 +16050,17 @@ msgstr ""
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
 msgid "<b>Mandriva Products</b>"
-msgstr "Qendra Kontrolluese Mandrivalinux"
+msgstr "Qendra Kontrolluese 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
@@ -16077,7 +16081,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 ""
 
@@ -16089,21 +16093,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 ""
 
@@ -16115,23 +16119,25 @@ msgstr ""
 #: 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 ""
 
 #: 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
@@ -16307,7 +16313,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 ""
 
@@ -16542,14 +16548,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Qendra Kontrolluese Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Qendra Kontrolluese 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 ""
 
@@ -16572,21 +16578,21 @@ 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 "Qendra Kontrolluese Mandrivalinux"
+msgstr "Qendra Kontrolluese Mandriva Linux"
 
 #: 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 ""
 
 #: share/advertising/27.pl:17
@@ -16603,7 +16609,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
@@ -16614,7 +16620,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 ""
 
@@ -16628,7 +16634,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
@@ -16640,14 +16646,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
@@ -16666,7 +16672,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
@@ -16689,7 +16695,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
@@ -16701,21 +16707,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
@@ -17000,7 +17006,7 @@ msgstr "Webcam"
 #: share/compssUsers.pl:187
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "Konfigurim i Serverit me Terminale Mandrake"
+msgstr "Konfigurim i Serverit me Terminale Mandriva"
 
 #: share/compssUsers.pl:191
 #, fuzzy, c-format
@@ -17015,7 +17021,7 @@ msgstr ""
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
-msgstr "Qendra Kontrolluese Mandrivalinux"
+msgstr "Qendra Kontrolluese Mandriva Linux"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -17097,15 +17103,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 ""
 "[OPTIONS] [PROGRAM_NAME]\n"
 "\n"
 "OPTIONS:\n"
 "  --help            - çfaqe këtë lajmë ndihmues.\n"
-"  --report          - ky program duhet të jetë një nga veglat mandrake\n"
-"  --incident        - ky program duhet të jetë një nga veglat mandrake"
+"  --report          - ky program duhet të jetë një nga veglat Mandriva\n"
+"  --incident        - ky program duhet të jetë një nga veglat Mandriva"
 
 #: standalone.pm:63
 #, c-format
@@ -17152,7 +17158,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"
@@ -17166,7 +17172,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Konfigurim i Terminalit Server Mandrake\n"
+"Konfigurim i Terminalit Server Mandriva\n"
 "--enable         : i lirë MTS\n"
 "--disable        : i nxënë MTS\n"
 "--start          : nise MTS\n"
@@ -17222,8 +17228,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"
@@ -17231,7 +17237,7 @@ msgid ""
 msgstr ""
 "[OPTION]...\n"
 "  --no-confirmation      mos pyet për konfigurimin e parë azhrunues të modit "
-"Mandrake\n"
+"Mandriva\n"
 "  --no-verify-rpm        mon i verifiko pakot e nënshkruara\n"
 "  --changelog-first      çfaqi lidhjet e ndryshuara para listës së skadareve "
 "në dritaren e përshkrimeve\n"
@@ -17313,7 +17319,7 @@ msgstr "%s: %s emri i ftuesit të dëshiruar...\n"
 #: standalone/drakTermServ:211 standalone/drakTermServ:214
 #, fuzzy, c-format
 msgid "Terminal Server Configuration"
-msgstr "Konfigurim i Serverit me Terminale Mandrake"
+msgstr "Konfigurim i Serverit me Terminale Mandriva"
 
 #: standalone/drakTermServ:220
 #, c-format
@@ -19997,13 +20003,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Vegël Sinjalizuese bug në Mandrake"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Vegël Sinjalizuese bug në Mandriva"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Qendra Kontrolluese Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Qendra Kontrolluese Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20490,7 +20496,7 @@ msgstr "Nise në Nisje të Udhëzuar"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Ky interfac nuk është i konfiguruar ende.\n"
 "Nise asistentin konfigurues në dritaren kryesore"
@@ -20499,7 +20505,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 ""
 "Ky interfac nuk është i konfiguruar ende.\n"
 "Nise asistentin konfigurues në dritaren kryesore"
@@ -20552,7 +20558,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20857,9 +20863,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
@@ -21426,8 +21432,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Qendra Kontrolluese Mandrake"
+msgid "Mandriva Linux Help Center"
+msgstr "Qendra Kontrolluese Mandriva"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22094,7 +22100,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 ""
 "Asnjë Kartelë e Zërit s'është zbuluar në makinën tuaj. Ju lutemi verifikoni "
 "nëse një kartelë zëri përkrahet nga Linux, dhe është e lidhurë në mënyrë "
@@ -22104,7 +22110,7 @@ msgstr ""
 "Ju mund ta vizitoni mjetin tuaj të bazën së të dhënave në:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, fuzzy, c-format
@@ -23730,7 +23736,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 ""
 "Asnjë Kartelë e TV s'është zbuluar në makinën tuaj. Ju lutemi verifikoni "
 "nëse një kartelë Video/TV përkrahet nga Linux, dhe është e lidhurë në mënyrë "
@@ -23740,7 +23746,7 @@ msgstr ""
 "Ju mund ta vizitoni mjetin tuaj të bazën së të dhënave në:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -24448,18 +24454,18 @@ msgstr "Në lidhje me Harddrake"
 
 #. -PO: Do not alter the <span ..> and </span> tags
 #: standalone/harddrake2:226
-#, fuzzy, c-format
+#, c-format
 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 ""
-"Ky është HardDrake, një vegël konfigurimi për material Mandrake.\n"
+"Ky është HardDrake, një vegël konfigurimi për material %s.\n"
 "<span foreground=\"royalblue3\">Versioni:</span> %s\n"
 "<span foreground=\"royalblue3\">Authori:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -24570,8 +24576,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Shpjegimet e Veglave Mandrake"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Shpjegimet e Veglave Mandriva"
 
 #: standalone/logdrake:51
 #, fuzzy, c-format
@@ -25083,10 +25089,10 @@ msgstr "Lidhja përfundoi."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Lidhja dështoi.\n"
-"Verifikoje konfigurimin në Qendrën Kontrolluese Mandrivalinux."
+"Verifikoje konfigurimin në Qendrën Kontrolluese Mandriva Linux."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -25323,7 +25329,7 @@ msgstr "Ri-prodhimi i listës së skanerve konfigurues ..."
 #: standalone/scannerdrake:101
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "%s nuk përkrahet nga ky version i Mandrivalinux."
+msgstr "%s nuk përkrahet nga ky version i Mandriva Linux."
 
 #: standalone/scannerdrake:104
 #, c-format
@@ -25363,7 +25369,7 @@ msgstr ""
 #: standalone/scannerdrake:144
 #, fuzzy, c-format
 msgid "The %s is not supported under Linux."
-msgstr "%s nuk përkrahet nga ky version i Mandrivalinux."
+msgstr "%s nuk përkrahet nga ky version i Mandriva Linux."
 
 #: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
@@ -25464,7 +25470,7 @@ msgid ""
 "You can launch printerdrake from the %s Control Center in Hardware section."
 msgstr ""
 "Skaneri %s duhet të konfigurohet nga printerdrake.\n"
-"Ju mund ta nisni printerdrake nga Qendra Kontrolluese Mandrake në sektorin "
+"Ju mund ta nisni printerdrake nga Qendra Kontrolluese Mandriva në sektorin "
 "Hardware"
 
 #: standalone/scannerdrake:308 standalone/scannerdrake:315
@@ -25940,7 +25946,6 @@ msgstr "Instalimi dështio"
 #~ msgid "You've not selected any font"
 #~ msgstr "Ju nuk keni zgjedhur ndonji polisë"
 
-
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Asnjë shfletues i lirë! Ju lutemi instalone njërin"
 
@@ -26077,16 +26082,16 @@ msgstr "Instalimi dështio"
 #~ msgstr "Gabim gjatë hapjes së %s për shkruarjen: %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 ""
-#~ "Ky është HardDrake, një vegël konfigurimi për material Mandrivalinux.\n"
+#~ "Ky është HardDrake, një vegël konfigurimi për material Mandriva Linux.\n"
 #~ "<span foreground=\"royalblue3\">Versioni:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Authori:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 
 #~ msgid "OK"
@@ -26796,18 +26801,15 @@ msgstr "Instalimi dështio"
 #~ "\n"
 #~ "OPTIONS:\n"
 #~ "  --help            - çfaqe këtë lajmë ndihmues.\n"
-#~ "  --report          - ky program duhet të jetë një nga veglat mandrake\n"
-#~ "  --incident        - ky program duhet të jetë një nga veglat mandrake"
-
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
+#~ "  --report          - ky program duhet të jetë një nga veglat Mandriva\n"
+#~ "  --incident        - ky program duhet të jetë një nga veglat Mandriva"
 
 #~ msgid ""
 #~ "Connection failed.\n"
 #~ "Verify your configuration in the Mandrake Control Center."
 #~ msgstr ""
 #~ "Lidhja dështoi.\n"
-#~ "Verifikoje konfigurimin në Qendrën Kontrolluese Mandrake."
+#~ "Verifikoje konfigurimin në Qendrën Kontrolluese Mandriva."
 
 #~ msgid "The package %s is needed. Install it?"
 #~ msgstr "Pakoja %s është e nevojshme. Instalojeni atë?"
diff --git a/perl-install/share/po/sr.po b/perl-install/share/po/sr.po
index 29696db4d..64a625fed 100644
--- a/perl-install/share/po/sr.po
+++ b/perl-install/share/po/sr.po
@@ -1245,7 +1245,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 "Можете изабрати други језик који ће бити доступан после инсталације "
@@ -3633,12 +3633,12 @@ msgstr "омогући подршку за радио"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 дистрибуцију, и уколико се  слажете\n"
+"покрива целу Mandriva Linux дистрибуцију, и уколико се  слажете\n"
 "са свим условима који се налазе у њој, кликните на \"Прихватам\" тастер\n"
 "Уколико не прихватате, једноставно искључите \n"
 "рачунар."
@@ -3830,13 +3830,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-ова. "
+"Mandriva Linux инсталација се налази на неколико дискова илити CDROM-ова. "
 "DrakX\n"
 "зна уколико да уколико је селктовани пакет лоциран на другом CDROM-у и "
 "избациће\n"
@@ -3846,11 +3846,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"
@@ -3902,7 +3903,8 @@ msgid ""
 "megabytes."
 msgstr ""
 "Сада је време да одредимо које програме желите да инсталирате на ваш\n"
-"систем. Постоје хиљаде пакета доступних за инсталацију на Mandrivalinux, и \n"
+"систем. Постоје хиљаде пакета доступних за инсталацију на Mandriva Linux, "
+"и \n"
 "да би их учинили доступнијим, смеђтени су у групе сличних апликација.\n"
 "\n"
 "Пакети су сортирани у групе у односу на одговарајућу употребу на вашој\n"
@@ -4009,10 +4011,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"
@@ -4042,7 +4044,7 @@ msgstr ""
 "\n"
 "!! Уколико је сервер пакет изабран случајно или као део\n"
 "целе групе, бићете упитани да ли заиста желите да инсталирате\n"
-"понуђене сервере. Под Mandrivalinux-ом, сви инсталирани\n"
+"понуђене сервере. Под Mandriva Linux-ом, сви инсталирани\n"
 "сервери се стартују по default-у за време подизања система. Чак и ако су "
 "сигурни и немају\n"
 "познатих безбедносних пропуста до времена изласка дистрибуције, може се "
@@ -4207,7 +4209,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"
@@ -4263,7 +4265,7 @@ msgid ""
 msgstr ""
 "X (или  X Window Систем) је срце GNU/Linux графичког интерфејса\n"
 "на који се ослањају сва графичка окружења (KDE, GNOME, AfterStep,\n"
-"WindowMaker, итд.) која се налазе у Mandrivalinux-у.\n"
+"WindowMaker, итд.) која се налазе у Mandriva Linux-у.\n"
 "\n"
 "Биће вам приказана листа са различитим параметрима чијом изменом\n"
 "можете добити оптималан графички приказ: Графичка картица\n"
@@ -4380,12 +4382,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"
@@ -4412,7 +4414,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"
@@ -4421,7 +4423,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"
@@ -4442,11 +4445,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "У овом тренутку, морате да изаберете где ћете инсталирати\n"
-"Mandrivalinux оперативни систем на ваш хард диск. Уколико је празан или\n"
+"Mandriva Linux оперативни систем на ваш хард диск. Уколико је празан или\n"
 "постојећи оперативни систем користи сав постојећи простор на диску, треба да "
 "га\n"
 "партиционирате. У основи, партиционирање хард диска се састоји логичког\n"
-"дељења да би обезбедили простор за инсталацију ваш нови Mandrivalinux "
+"дељења да би обезбедили простор за инсталацију ваш нови Mandriva Linux "
 "систем.\n"
 "\n"
 "Пошто су ефекти процеса партиционирања обично неповратни,\n"
@@ -4455,7 +4458,7 @@ msgstr ""
 "журите.\n"
 "\n"
 "Уколико сте покренули инсталацију у Експерт моду, покренућете\n"
-"DiskDrake, Mandrivalinux-ов алат за партиције, који вам дозвољавав да\n"
+"DiskDrake, Mandriva Linux-ов алат за партиције, који вам дозвољавав да\n"
 "фино подесите ваше партиције. Погледајте DiskDrake секцију у ``User "
 "Guide''.\n"
 "Из инсталационог интерфејса, можете користити чаробњаке као што је описано "
@@ -4493,7 +4496,7 @@ msgstr ""
 "дефрагментирате\n"
 "Windows партицију из самог Windows-а. Backup података такође није лоша "
 "идеја..\n"
-"Ово решење се препоручује уколико желите да користите Mandrivalinux и\n"
+"Ово решење се препоручује уколико желите да користите Mandriva Linux и\n"
 "Microsoft Windows на истом компјутеру.\n"
 "\n"
 "   Пре него што изаберете ову опцију, морате да разумете да након ове "
@@ -4504,7 +4507,7 @@ msgstr ""
 "\n"
 " * \"Брисање цвелог диска\": уколико желите да избришете све податке и све\n"
 "партиције који постоје на вашем хард диску и замените их вашим\n"
-"новим Mandrivalinux системом, можете да изаберете ову оцију. Будите\n"
+"новим Mandriva Linux системом, можете да изаберете ову оцију. Будите\n"
 "пажљивиса овом опцијом, јер нећете бити у могућности\n"
 "да повратите старо стање након потврде.\n"
 "\n"
@@ -4675,7 +4678,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."
@@ -4702,7 +4705,7 @@ msgstr ""
 "\n"
 "Кликните на \"<- Претходно\" ако желите да изаберете другу партицију за свој "
 "нови\n"
-"Mandrivalinux систем.\n"
+"Mandriva Linux систем.\n"
 "\n"
 "Кликните на \"Напредно\" уколико желите да изаберете партиције које ће бити "
 "проверене\n"
@@ -4720,7 +4723,7 @@ msgstr "Претходни"
 #: 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"
@@ -4732,7 +4735,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"
@@ -4764,7 +4767,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of 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"
@@ -4789,7 +4792,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"
@@ -4860,7 +4863,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "На овој тачки, морате избрати коју партицију(e) желите да користите за\n"
-"инсталацију новог Mandrivalinux система. Уколико су партиције\n"
+"инсталацију новог Mandriva Linux система. Уколико су партиције\n"
 "већ дефинисане (од предходне инсталације или од стране\n"
 "другог алата за партиције), можете да користите постојеће партиције.\n"
 "У другим случајевима,\n"
@@ -4947,7 +4950,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"
@@ -4977,7 +4980,7 @@ msgid ""
 msgstr ""
 "Једна или више Microsoft Windows партиција је детектовано \n"
 "на хард диску. Изаберите коју од њих желите да смањите да би инсталирали\n"
-"нови Mandrivalinux оперативни систем.\n"
+"нови Mandriva Linux оперативни систем.\n"
 "\n"
 "Свака партиција је исписана на следећи начин: \"Име Linux-а\",\"Име Windows-а"
 "\"\n"
@@ -5025,7 +5028,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing 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"
@@ -5034,13 +5037,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 ""
 "Овај корак се активира само у случају да постоји стара GNU/Linux партиција "
 "на\n"
@@ -5048,7 +5052,7 @@ msgstr ""
 "\n"
 "DrakX сада треба да зна да ли желите да изведете чисту инсталацију или "
 "ажурирање\n"
-"постојећег Mandrivalinux система:\n"
+"постојећег Mandriva Linux система:\n"
 "\n"
 " * \"Инсталација\": У већини случајева, ова опција комплетно брише стари\n"
 "систем. Уколико желите да измените број партиција, или\n"
@@ -5059,15 +5063,15 @@ msgstr ""
 "\n"
 " * \"Ажурирање\": ова инсталациона класа вам дозвољава да урадите ажурирање "
 "пакета\n"
-"на тренутно инсталираном Mandrivalinux систему. Ваша тренутна\n"
+"на тренутно инсталираном Mandriva Linux систему. Ваша тренутна\n"
 "шема партиција и кориснички подаци се не мењају. Већина других\n"
 "конфигурационих корака и даље остаје доступна, слично стандардној "
 "инсталацији.\n"
 "\n"
-"Употреба опције ``Ажурирање'' би требало да буде без проблема на Mandrake "
+"Употреба опције ``Ажурирање'' би требало да буде без проблема на Mandriva "
 "Linux системима\n"
 "од верзије \"8.1\" или новије. Извођење ажурирања на верзијама \n"
-"Mandrivalinux пре \"8.1\" није препоручљиво."
+"Mandriva Linux пре \"8.1\" није препоручљиво."
 
 #: help.pm:591
 #, fuzzy, c-format
@@ -5122,7 +5126,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"
@@ -5368,7 +5373,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"
@@ -5389,11 +5394,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 ""
 "Сада треба да изаберемо систем за штампање за ваш рачунар. Други OS-ови вам\n"
-"нуде један, али вам Mandrivalinux нуди чак три.\n"
+"нуде један, али вам Mandriva Linux нуди чак три.\n"
 "\n"
 " * \"pdq\" што значи ``print, do not queue'', је избор за оне који имају\n"
 "директни конекцију са својим штампачем и желите да избегнете\n"
@@ -5402,7 +5407,7 @@ msgstr ""
 "само на веома једноставним мрежама и помало је и спор за мреже. Изаберите "
 "\"pdq\"\n"
 "уколико упознајете GNU/Linux. Ваш избор наравно можете променити\n"
-"након иснталације покрећући PrinterDrake from из Mandrake Контролног\n"
+"након иснталације покрећући PrinterDrake from из Mandriva Контролног\n"
 "Центра и кликом на expert тастер.\n"
 "\n"
 " * \"%s\"``Common Unix Printing System'', је изврстан за штампање на вашем\n"
@@ -5551,7 +5556,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"
@@ -5568,7 +5574,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"
@@ -5630,10 +5636,10 @@ 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 ""
-"Изаберите хард диск који желите да избришете да би инсталирали нову Mandrake "
+"Изаберите хард диск који желите да избришете да би инсталирали нову Mandriva "
 "Linux \n"
 "партицију. Будите пажљиви, сви подаци на њему ће бити изгубљени\n"
 "и неће се моћи повратити!"
@@ -5989,7 +5995,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''"
@@ -6106,13 +6112,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"
@@ -6141,8 +6147,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 "
@@ -6156,8 +6162,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 "
@@ -6166,7 +6172,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"
@@ -6200,10 +6206,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"
@@ -6224,12 +6230,13 @@ msgid ""
 msgstr ""
 "Упознавање\n"
 "\n"
-"Оперативни систем и друге компоненте доступне у Mandrivalinux дистрибуцији \n"
+"Оперативни систем и друге компоненте доступне у Mandriva Linux "
+"дистрибуцији \n"
 "на даље ће бити зване \"Софтверски Производи\" . Софтверски производи "
 "укључују, али нису и \n"
 "ограничени на, скуп програма, метода, правила и документацију која је "
 "везаназа оперативни \n"
-"систем и друге компоненте Mandrivalinux дистрибуције.\n"
+"систем и друге компоненте Mandriva Linux дистрибуције.\n"
 "\n"
 "\n"
 "1. Лиценцни уговор\n"
@@ -6256,8 +6263,8 @@ msgstr ""
 "Софтверски Производи и пратећа документрација су омогућене \"као такве\", и "
 "без гаранције, до граница \n"
 "које су дозвољене законом.\n"
-"Mandriva S.A. неће, у свим условима и у границама закона, бити оговоран "
-"за било које специјалне,\n"
+"Mandriva S.A. неће, у свим условима и у границама закона, бити оговоран за "
+"било које специјалне,\n"
 "случајне, директне или индиректне штете (укључујући неограниченештете или "
 "губитке \n"
 "у пословању, прекиду пословања, финансијским губицима, законске тражње и "
@@ -6271,8 +6278,8 @@ msgstr ""
 "Ограничена одговорности везане за поседовање или употребу забрањеног "
 "софтвера у неким земљама\n"
 "\n"
-"До граница које су условљене законом, Mandriva S.A. или његови "
-"дистрибутери неће, ни под којим условима, бити \n"
+"До граница које су условљене законом, Mandriva S.A. или његови дистрибутери "
+"неће, ни под којим условима, бити \n"
 "одговорни за специјалне, намерне директне или индиректне штете(укључујући "
 "неограничене \n"
 "штете или губитке у пословању, прекиду пословања, финансијским губицима, "
@@ -6281,7 +6288,7 @@ msgstr ""
 "произилазе \n"
 "из употребе или немогућности коришћења Софтверских Компоненти или које "
 "произилазе download-ованих софтверских компоненти \n"
-"било ког Mandrivalinux сајта који су забрањени или ограничени у неким "
+"било ког Mandriva Linux сајта који су забрањени или ограничени у неким "
 "земљама по локалним законима.\n"
 "Ова ограничена права се примењују, али нису и ограничена на,криптографске "
 "компоненте \n"
@@ -6301,8 +6308,8 @@ msgstr ""
 "компоненете. Било које питање \n"
 "везано за лиценцу компоненти треба да буде адресирано на аутора компоненте а "
 "нена Mandriva.\n"
-"Програми које је развио Mandriva S.A. подлежу под GPL Лиценцу. "
-"Документација писана од \n"
+"Програми које је развио Mandriva S.A. подлежу под GPL Лиценцу. Документација "
+"писана од \n"
 "стране Mandriva S.A. подлеже под посебну лиценцу. Молим да погледате "
 "документацију  \n"
 "за детаље.\n"
@@ -6317,8 +6324,8 @@ msgstr ""
 "Mandriva S.A. је резервисао своја права на модификовање или адаптацију "
 "СофтверскихПроизвода, како за целину тако и за \n"
 "делове, за све све сврхе и све употребе.\n"
-"\"Mandriva\", \"Mandrivalinux\" и придружени логотипи и ознаке Mandriva "
-"S.A.  \n"
+"\"Mandriva\", \"Mandriva Linux\" и придружени логотипи и ознаке Mandriva S."
+"A.  \n"
 "\n"
 "\n"
 "5. Законска права \n"
@@ -6332,8 +6339,8 @@ msgstr ""
 "Сви неспоразуми би требали бити решени ван суда. Као последње \n"
 "средство, неспоразуми ће бити упућени на одговарајуће Судске установе у "
 "Паризу - Француска.\n"
-"За било које питање које је везано за овај документ, контактирајте  "
-"Mandriva S.A.  \n"
+"За било које питање које је везано за овај документ, контактирајте  Mandriva "
+"S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6421,8 +6428,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"
@@ -6430,27 +6437,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 ""
 "Честитамо, инсталација је завршена.\n"
 "Извадите дискету из драјва и притисните <Enter> да се рачунар ресетује.\n"
 "\n"
 "\n"
 "За информације о поправкама које су на располагању за ово издање\n"
-"Mandrivalinux Линукса, прочитајте део 'Errata' који можете наћи на\n"
+"Mandriva Linux Линукса, прочитајте део 'Errata' који можете наћи на\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Информације о конфигурисању вашег система можете наћи у пост-инсталационом\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
@@ -6479,14 +6486,14 @@ 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' при стартању са CDROM-а, а онда укуцајте  `text'."
 
 #: install_steps_gtk.pm:228 install_steps_interactive.pm:624
@@ -7017,9 +7024,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 сајт да би добили листу доступних mirror-а"
+"КОнтактирајте Mandriva Linux web сајт да би добили листу доступних mirror-а"
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7239,8 +7246,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
@@ -9822,13 +9829,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 конфигуратор\n"
 "\n"
-"Он конфигурише лични firewall за ову Mandrivalinux машину.\n"
+"Он конфигурише лични firewall за ову Mandriva Linux машину.\n"
 "За моћно firewall решење, погледајте\n"
 "специјализовану MandrakeSecurity Firewall дистрибуцију."
 
@@ -12444,7 +12451,7 @@ msgstr ""
 "\n"
 "Уколико желите да додате, уклоните или промените име штампачу, или желите да "
 "промените default опције (папир, квалитет штампања, ...), изаберите \"Штампач"
-"\" у \"Хардвер\" секцији Mandrake Контролног Центра."
+"\" у \"Хардвер\" секцији Mandriva Контролног Центра."
 
 #: printer/printerdrake.pm:1207 printer/printerdrake.pm:1437
 #: printer/printerdrake.pm:1500 printer/printerdrake.pm:1592
@@ -13765,8 +13772,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 ""
 
@@ -14041,9 +14048,9 @@ msgid ""
 msgstr ""
 "Мрежна конфигурација која је креирана током инсталције не може сада да се "
 "покрене. Проверите да ли је мрежа доступна након рестарта система и "
-"исправите конфигурацију користећи Mandrake Контролни Центар, секција \"Мрежа "
+"исправите конфигурацију користећи Mandriva Контролни Центар, секција \"Мрежа "
 "& Интернет\"/\"Коненкција\", и након тога подесите штампач, такође "
-"кориштењем Mandrake Контролног Центра, секција \"Хардвер\"/\"Штампач\""
+"кориштењем Mandriva Контролног Центра, секција \"Хардвер\"/\"Штампач\""
 
 #: printer/printerdrake.pm:4196
 #, c-format
@@ -15763,18 +15770,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."
@@ -15783,7 +15790,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 ""
 
@@ -15800,9 +15807,9 @@ msgstr "Добродошли у Свет Open Source-а"
 #: 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 ""
 
@@ -15821,8 +15828,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
@@ -15848,17 +15855,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 ""
 
@@ -15870,7 +15877,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 ""
 
@@ -15908,7 +15915,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
@@ -15927,7 +15934,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
@@ -15945,7 +15952,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
@@ -15960,18 +15967,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
@@ -15992,7 +15998,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 ""
 
@@ -16004,21 +16010,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 ""
 
@@ -16030,23 +16036,25 @@ msgstr ""
 #: 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 ""
 
 #: 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
@@ -16222,7 +16230,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 ""
 
@@ -16457,14 +16465,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 ""
 
@@ -16487,21 +16495,21 @@ 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
 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 ""
 
 #: share/advertising/27.pl:17
@@ -16518,7 +16526,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
@@ -16529,7 +16537,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 ""
 
@@ -16543,7 +16551,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
@@ -16555,14 +16563,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
@@ -16581,7 +16589,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
@@ -16604,7 +16612,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
@@ -16616,21 +16624,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
@@ -16930,7 +16938,7 @@ msgstr ""
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
-msgstr "Mandrivalinux Контролни Центар"
+msgstr "Mandriva Linux Контролни Центар"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -17013,15 +17021,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 ""
 "[OPTIONS] [PROGRAM_NAME]\n"
 "\n"
 "ОПЦИЈЕ:\n"
 "  --help            - приказује овај текст који сада читате.\n"
-"  --report          - програм треба да буде један од mandrake алата\n"
-"  --incident        - програм треба да буде један од mandrake алата"
+"  --report          - програм треба да буде један од Mandriva алата\n"
+"  --incident        - програм треба да буде један од Mandriva алата"
 
 #: standalone.pm:63
 #, c-format
@@ -17069,7 +17077,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"
@@ -17083,7 +17091,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Програм за подешавање Mandrake Терминалног Сервера\n"
+"Програм за подешавање Mandriva Терминалног Сервера\n"
 "--enable         : укључује MTS\n"
 "--disable        : искључује MTS\n"
 "--start          : покреће MTS\n"
@@ -17141,15 +17149,16 @@ 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"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[OPTION]...\n"
-"  --no-confirmation      не поставља питање о потврди у Mandriva Update моду\n"
+"  --no-confirmation      не поставља питање о потврди у Mandriva Update "
+"моду\n"
 "  --no-verify-rpm        не проверава сигнатуре пакета\n"
 "  --changelog-first      прикаѕује запис о изменама пре листе фајлова у "
 "прозору ѕа опис\n"
@@ -17372,7 +17381,7 @@ msgstr ""
 #: standalone/drakTermServ:509
 #, fuzzy, c-format
 msgid "Terminal Server Overview"
-msgstr "Конфигурација Mandrake Терминалног сервера"
+msgstr "Конфигурација Mandriva Терминалног сервера"
 
 #: standalone/drakTermServ:510
 #, c-format
@@ -19757,13 +19766,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrake Програм за Пријављивање Грешака"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Програм за Пријављивање Грешака"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux Контролни Центар"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux Контролни Центар"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20245,7 +20254,7 @@ msgstr "Покренуто при стартању"
 #, 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 ""
 "Овај интерфејс још увек није подешен.\n"
 "Покрените конфигурационог чаробњака у главном прозору"
@@ -20254,7 +20263,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 ""
 "Овај интерфејс још увек није подешен.\n"
 "Покрените конфигурационог чаробњака у главном прозору"
@@ -20307,7 +20316,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20610,9 +20619,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
@@ -21160,8 +21169,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrake Контролни Центар"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Контролни Центар"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -21772,7 +21781,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 ""
 "Звучна картица није детектована на вашој машини. Проверите да ли Linux-"
 "supported звучна картица правилно прикључена.\n"
@@ -21781,7 +21790,7 @@ msgstr ""
 "Можете посетити нашу базу подржаног хардвера на:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, fuzzy, c-format
@@ -23407,7 +23416,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 ""
 "TV картица на вашем рачунару није детектована. Проверите да ли Linux-"
 "supported Видео/TV картица правилно прикључена.\n"
@@ -23416,7 +23425,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
@@ -24120,13 +24129,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, 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"
 
 #: standalone/harddrake2:243
@@ -24234,8 +24243,8 @@ msgstr "Измене су завршене, али да би их примени
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrake Алати за објашњења"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Алати за објашњења"
 
 #: standalone/logdrake:51
 #, fuzzy, c-format
@@ -24741,10 +24750,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"
-"Проверите вашу конфигурацију у Mandrake Контролном Центру."
+"Проверите вашу конфигурацију у Mandriva Контролном Центру."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -24979,7 +24988,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
@@ -25021,7 +25030,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
@@ -25122,7 +25131,7 @@ msgid ""
 "You can launch printerdrake from the %s Control Center in Hardware section."
 msgstr ""
 "Овај %s мора бити подешен у printerdrake.\n"
-"Можете покренути printerdrake из Mandrake Контролног Центра из Хардвер "
+"Можете покренути printerdrake из Mandriva Контролног Центра из Хардвер "
 "секције."
 
 #: standalone/scannerdrake:308 standalone/scannerdrake:315
@@ -25591,7 +25600,6 @@ msgstr "Инсталација није успела"
 #~ msgid "No network card"
 #~ msgstr "Није пронађена мрежна картица"
 
-
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Нема доступног претраживача! Молим Вас да инсталирате барем једног"
 
@@ -26111,18 +26119,15 @@ msgstr "Инсталација није успела"
 #~ "\n"
 #~ "ОПЦИЈЕ:\n"
 #~ "  --help            - приказује овај текст који сада читате.\n"
-#~ "  --report          - програм треба да буде један од mandrake алата\n"
-#~ "  --incident        - програм треба да буде један од mandrake алата"
-
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
+#~ "  --report          - програм треба да буде један од Mandriva алата\n"
+#~ "  --incident        - програм треба да буде један од Mandriva алата"
 
 #~ msgid ""
 #~ "Connection failed.\n"
 #~ "Verify your configuration in the Mandrake Control Center."
 #~ msgstr ""
 #~ "повезивање неуспело.\n"
-#~ "Проверите вашу конфигурацију у Mandrake Контролном Центру."
+#~ "Проверите вашу конфигурацију у Mandriva Контролном Центру."
 
 #~ msgid "The package %s is needed. Install it?"
 #~ msgstr "Пакет %s је потребан. Да ли желите да га инсталирате?"
diff --git a/perl-install/share/po/sr@Latn.po b/perl-install/share/po/sr@Latn.po
index c3e489f01..13a524539 100644
--- a/perl-install/share/po/sr@Latn.po
+++ b/perl-install/share/po/sr@Latn.po
@@ -1245,7 +1245,7 @@ msgstr "upustvo"
 #: 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 "Možete izabrati drugi jezik koji će biti dostupan posle instalacije "
@@ -3634,12 +3634,12 @@ msgstr "omogući podršku za radio"
 #, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire 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 ""
 "Pre nego što nastavite pažljivo pročitajte uslove licence. Ona\n"
-"pokriva celu Mandrivalinux distribuciju, i ukoliko se  slažete\n"
+"pokriva celu Mandriva Linux distribuciju, i ukoliko se  slažete\n"
 "sa svim uslovima koji se nalaze u njoj, kliknite na \"Prihvatam\" taster\n"
 "Ukoliko ne prihvatate, jednostavno isključite \n"
 "računar."
@@ -3833,13 +3833,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The 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 nalazi na nekoliko diskova iliti CDROM-ova. "
+"Mandriva Linux instalacija se nalazi na nekoliko diskova iliti CDROM-ova. "
 "DrakX\n"
 "zna ukoliko da ukoliko je selktovani paket lociran na drugom CDROM-u i "
 "izbaciće\n"
@@ -3849,11 +3849,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"
@@ -3905,7 +3906,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Sada je vreme da odredimo koje programe želite da instalirate na vaš\n"
-"sistem. Postoje hiljade paketa dostupnih za instalaciju na Mandrivalinux, "
+"sistem. Postoje hiljade paketa dostupnih za instalaciju na Mandriva Linux, "
 "i \n"
 "da bi ih učinili dostupnijim, smeđteni su u grupe sličnih aplikacija.\n"
 "\n"
@@ -4013,10 +4014,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"
@@ -4046,7 +4047,7 @@ msgstr ""
 "\n"
 "!! Ukoliko je server paket izabran slučajno ili kao deo\n"
 "cele grupe, bićete upitani da li zaista želite da instalirate\n"
-"ponuđene servere. Pod Mandrivalinux-om, svi instalirani\n"
+"ponuđene servere. Pod Mandriva Linux-om, svi instalirani\n"
 "serveri se startuju po default-u za vreme podizanja sistema. Čak i ako su "
 "sigurni i nemaju\n"
 "poznatih bezbednosnih propusta do vremena izlaska distribucije, može se "
@@ -4211,7 +4212,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"
@@ -4267,7 +4268,7 @@ msgid ""
 msgstr ""
 "X (ili  X Window Sistem) je srce GNU/Linux grafičkog interfejsa\n"
 "na koji se oslanjaju sva grafička okruženja (KDE, GNOME, AfterStep,\n"
-"WindowMaker, itd.) koja se nalaze u Mandrivalinux-u.\n"
+"WindowMaker, itd.) koja se nalaze u Mandriva Linux-u.\n"
 "\n"
 "Biće vam prikazana lista sa različitim parametrima čijom izmenom\n"
 "možete dobiti optimalan grafički prikaz: Grafička kartica\n"
@@ -4384,12 +4385,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"
@@ -4416,7 +4417,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"
@@ -4425,7 +4426,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"
@@ -4446,11 +4448,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "U ovom trenutku, morate da izaberete gde ćete instalirati\n"
-"Mandrivalinux operativni sistem na vaš hard disk. Ukoliko je prazan ili\n"
+"Mandriva Linux operativni sistem na vaš hard disk. Ukoliko je prazan ili\n"
 "postojeći operativni sistem koristi sav postojeći prostor na disku, treba da "
 "ga\n"
 "particionirate. U osnovi, particioniranje hard diska se sastoji logičkog\n"
-"deljenja da bi obezbedili prostor za instalaciju vaš novi Mandrivalinux "
+"deljenja da bi obezbedili prostor za instalaciju vaš novi Mandriva Linux "
 "sistem.\n"
 "\n"
 "Pošto su efekti procesa particioniranja obično nepovratni,\n"
@@ -4459,7 +4461,7 @@ msgstr ""
 "žurite.\n"
 "\n"
 "Ukoliko ste pokrenuli instalaciju u Ekspert modu, pokrenućete\n"
-"DiskDrake, Mandrivalinux-ov alat za particije, koji vam dozvoljavaw da\n"
+"DiskDrake, Mandriva Linux-ov alat za particije, koji vam dozvoljavaw da\n"
 "fino podesite vaše particije. Pogledajte DiskDrake sekciju u ``User "
 "Guide''.\n"
 "Iz instalacionog interfejsa, možete koristiti čarobnjake kao što je opisano "
@@ -4497,7 +4499,7 @@ msgstr ""
 "defragmentirate\n"
 "Windows particiju iz samog Windows-a. Backup podataka takođe nije loša "
 "ideja..\n"
-"Ovo rešenje se preporučuje ukoliko želite da koristite Mandrivalinux i\n"
+"Ovo rešenje se preporučuje ukoliko želite da koristite Mandriva Linux i\n"
 "Microsoft Windows na istom kompjuteru.\n"
 "\n"
 "   Pre nego što izaberete ovu opciju, morate da razumete da nakon ove "
@@ -4508,7 +4510,7 @@ msgstr ""
 "\n"
 " * \"Brisanje cvelog diska\": ukoliko želite da izbrišete sve podatke i sve\n"
 "particije koji postoje na vašem hard disku i zamenite ih vašim\n"
-"novim Mandrivalinux sistemom, možete da izaberete ovu ociju. Budite\n"
+"novim Mandriva Linux sistemom, možete da izaberete ovu ociju. Budite\n"
 "pažljivisa ovom opcijom, jer nećete biti u mogućnosti\n"
 "da povratite staro stanje nakon potvrde.\n"
 "\n"
@@ -4680,7 +4682,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."
@@ -4707,7 +4709,7 @@ msgstr ""
 "\n"
 "Kliknite na \"<- Prethodno\" ako želite da izaberete drugu particiju za svoj "
 "novi\n"
-"Mandrivalinux sistem.\n"
+"Mandriva Linux sistem.\n"
 "\n"
 "Kliknite na \"Napredno\" ukoliko želite da izaberete particije koje će biti "
 "proverene\n"
@@ -4725,7 +4727,7 @@ msgstr "Prethodni"
 #: 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"
@@ -4737,7 +4739,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"U vreme kada budete instalirali Mandrivalinux, vrlo je moguće da će neki\n"
+"U vreme kada budete instalirali Mandriva Linux, vrlo je moguće da će neki\n"
 "paketi biti ažurirani u odnosu na inicijalno izdanje. Neki bagovi mogu \n"
 "biti ispravljeni, a sigurnosni propusti zatvorene. Da bi mogli da koristite "
 "ove novije verzije\n"
@@ -4769,7 +4771,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"
@@ -4794,7 +4796,7 @@ msgstr "Administrator za sigurnost:"
 #, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your 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"
@@ -4865,7 +4867,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Na ovoj tački, morate izbrati koju particiju(e) želite da koristite za\n"
-"instalaciju novog Mandrivalinux sistema. Ukoliko su particije\n"
+"instalaciju novog Mandriva Linux sistema. Ukoliko su particije\n"
 "već definisane (od predhodne instalacije ili od strane\n"
 "drugog alata za particije), možete da koristite postojeće particije.\n"
 "U drugim slučajevima,\n"
@@ -4954,7 +4956,7 @@ msgstr "Pređi na normalni mod"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4984,7 +4986,7 @@ msgid ""
 msgstr ""
 "Jedna ili više Microsoft Windows particija je detektovano \n"
 "na hard disku. Izaberite koju od njih želite da smanjite da bi instalirali\n"
-"novi Mandrivalinux operativni sistem.\n"
+"novi Mandriva Linux operativni sistem.\n"
 "\n"
 "Svaka particija je ispisana na sledeći način: \"Ime Linux-a\",\"Ime Windows-a"
 "\"\n"
@@ -5032,7 +5034,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"
@@ -5041,13 +5043,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 ""
 "Ovaj korak se aktivira samo u slučaju da postoji stara GNU/Linux particija "
 "na\n"
@@ -5055,7 +5058,7 @@ msgstr ""
 "\n"
 "DrakX sada treba da zna da li želite da izvedete čistu instalaciju ili "
 "ažuriranje\n"
-"postojećeg Mandrivalinux sistema:\n"
+"postojećeg Mandriva Linux sistema:\n"
 "\n"
 " * \"Instalacija\": U većini slučajeva, ova opcija kompletno briše stari\n"
 "sistem. Ukoliko želite da izmenite broj particija, ili\n"
@@ -5066,15 +5069,15 @@ msgstr ""
 "\n"
 " * \"Ažuriranje\": ova instalaciona klasa vam dozvoljava da uradite "
 "ažuriranje paketa\n"
-"na trenutno instaliranom Mandrivalinux sistemu. Vaša trenutna\n"
+"na trenutno instaliranom Mandriva Linux sistemu. Vaša trenutna\n"
 "šema particija i korisnički podaci se ne menjaju. Većina drugih\n"
 "konfiguracionih koraka i dalje ostaje dostupna, slično standardnoj "
 "instalaciji.\n"
 "\n"
-"Upotreba opcije ``Ažuriranje'' bi trebalo da bude bez problema na Mandrake "
+"Upotreba opcije ``Ažuriranje'' bi trebalo da bude bez problema na Mandriva "
 "Linux sistemima\n"
 "od verzije \"8.1\" ili novije. Izvođenje ažuriranja na verzijama \n"
-"Mandrivalinux pre \"8.1\" nije preporučljivo."
+"Mandriva Linux pre \"8.1\" nije preporučljivo."
 
 #: help.pm:591
 #, fuzzy, c-format
@@ -5129,7 +5132,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"
@@ -5375,7 +5379,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"
@@ -5396,12 +5400,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 ""
 "Sada treba da izaberemo sistem za štampanje za vaš računar. Drugi OS-ovi "
 "vam\n"
-"nude jedan, ali vam Mandrivalinux nudi čak tri.\n"
+"nude jedan, ali vam Mandriva Linux nudi čak tri.\n"
 "\n"
 " * \"pdq\" što znači ``print, do not queue'', je izbor za one koji imaju\n"
 "direktni konekciju sa svojim štampačem i želite da izbegnete\n"
@@ -5410,7 +5414,7 @@ msgstr ""
 "samo na veoma jednostavnim mrežama i pomalo je i spor za mreže. Izaberite "
 "\"pdq\"\n"
 "ukoliko upoznajete GNU/Linux. Vaš izbor naravno možete promeniti\n"
-"nakon isntalacije pokrećući PrinterDrake from iz Mandrake Kontrolnog\n"
+"nakon isntalacije pokrećući PrinterDrake from iz Mandriva Kontrolnog\n"
 "Centra i klikom na expert taster.\n"
 "\n"
 " * \"%s\"``Common Unix Printing System'', je izvrstan za štampanje na vašem\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"
@@ -5639,10 +5644,10 @@ msgstr "Servisi"
 #, 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 ""
-"Izaberite hard disk koji želite da izbrišete da bi instalirali novu Mandrake "
+"Izaberite hard disk koji želite da izbrišete da bi instalirali novu Mandriva "
 "Linux \n"
 "particiju. Budite pažljivi, svi podaci na njemu će biti izgubljeni\n"
 "i neće se moći povratiti!"
@@ -5998,7 +6003,7 @@ msgstr "Proračunavam veličinu Windows particije"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Vaša Windows particija je previše fragmentirana, prvo pokrenite ``defrag''"
@@ -6115,13 +6120,13 @@ msgstr "Odstupam od mreže"
 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"
@@ -6150,8 +6155,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 "
@@ -6165,8 +6170,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 "
@@ -6175,7 +6180,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"
@@ -6209,10 +6214,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"
@@ -6233,12 +6238,13 @@ msgid ""
 msgstr ""
 "Upoznavanje\n"
 "\n"
-"Operativni sistem i druge komponente dostupne u Mandrivalinux distribuciji \n"
+"Operativni sistem i druge komponente dostupne u Mandriva Linux "
+"distribuciji \n"
 "na dalje će biti zvane \"Softverski Proizvodi\" . Softverski proizvodi "
 "uključuju, ali nisu i \n"
 "ograničeni na, skup programa, metoda, pravila i dokumentaciju koja je "
 "vezanaza operativni \n"
-"sistem i druge komponente Mandrivalinux distribucije.\n"
+"sistem i druge komponente Mandriva Linux distribucije.\n"
 "\n"
 "\n"
 "1. Licencni ugovor\n"
@@ -6265,8 +6271,8 @@ msgstr ""
 "Softverski Proizvodi i prateća dokumentracija su omogućene \"kao takve\", i "
 "bez garancije, do granica \n"
 "koje su dozvoljene zakonom.\n"
-"Mandriva S.A. neće, u svim uslovima i u granicama zakona, biti ogovoran "
-"za bilo koje specijalne,\n"
+"Mandriva S.A. neće, u svim uslovima i u granicama zakona, biti ogovoran za "
+"bilo koje specijalne,\n"
 "slučajne, direktne ili indirektne štete (uključujući neograničeneštete ili "
 "gubitke \n"
 "u poslovanju, prekidu poslovanja, finansijskim gubicima, zakonske tražnje i "
@@ -6290,7 +6296,7 @@ msgstr ""
 "proizilaze \n"
 "iz upotrebe ili nemogućnosti korišćenja Softverskih Komponenti ili koje "
 "proizilaze download-ovanih softverskih komponenti \n"
-"bilo kog Mandrivalinux sajta koji su zabranjeni ili ograničeni u nekim "
+"bilo kog Mandriva Linux sajta koji su zabranjeni ili ograničeni u nekim "
 "zemljama po lokalnim zakonima.\n"
 "Ova ograničena prava se primenjuju, ali nisu i ograničena na,kriptografske "
 "komponente \n"
@@ -6310,8 +6316,8 @@ msgstr ""
 "komponenete. Bilo koje pitanje \n"
 "vezano za licencu komponenti treba da bude adresirano na autora komponente a "
 "nena Mandriva.\n"
-"Programi koje je razvio Mandriva S.A. podležu pod GPL Licencu. "
-"Dokumentacija pisana od \n"
+"Programi koje je razvio Mandriva S.A. podležu pod GPL Licencu. Dokumentacija "
+"pisana od \n"
 "strane Mandriva S.A. podleže pod posebnu licencu. Molim da pogledate "
 "dokumentaciju  \n"
 "za detalje.\n"
@@ -6326,8 +6332,8 @@ msgstr ""
 "Mandriva S.A. je rezervisao svoja prava na modifikovanje ili adaptaciju "
 "SoftverskihProizvoda, kako za celinu tako i za \n"
 "delove, za sve sve svrhe i sve upotrebe.\n"
-"\"Mandriva\", \"Mandrivalinux\" i pridruženi logotipi i oznake Mandriva "
-"S.A.  \n"
+"\"Mandriva\", \"Mandriva Linux\" i pridruženi logotipi i oznake Mandriva S."
+"A.  \n"
 "\n"
 "\n"
 "5. Zakonska prava \n"
@@ -6430,8 +6436,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"
@@ -6439,27 +6445,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 ""
 "Čestitamo, instalacija je završena.\n"
 "Izvadite disketu iz drajva i pritisnite <Enter> da se računar resetuje.\n"
 "\n"
 "\n"
 "Za informacije o popravkama koje su na raspolaganju za ovo izdanje\n"
-"Mandrivalinux Linux-a, pročitajte deo 'Errata' koji možete naći na\n"
+"Mandriva Linux Linux-a, pročitajte deo 'Errata' koji možete naći na\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Informacije o konfigurisanju vašeg sistema možete naći u post-instalacionom\n"
-"poglavlju zvaničnog Mandrivalinux 'Vodiča za korisnike'."
+"poglavlju zvaničnog Mandriva Linux 'Vodiča za korisnike'."
 
 #. -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
@@ -6488,14 +6494,14 @@ msgstr "Pokrećem 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š sistem ima manjak snage. Usled toga možete imati problema pri "
 "instalaciji\n"
-"Mandrivalinux. Ukoliko se oni pojave, možete probati tekstualnu instalaciju. "
-"Da bi to postigli,\n"
+"Mandriva Linux. Ukoliko se oni pojave, možete probati tekstualnu "
+"instalaciju. Da bi to postigli,\n"
 "pritisnite `F1' pri startanju sa CDROM-a, a onda ukucajte  `text'."
 
 #: install_steps_gtk.pm:228 install_steps_interactive.pm:624
@@ -7026,9 +7032,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 ""
-"KOntaktirajte Mandrivalinux web sajt da bi dobili listu dostupnih mirror-a"
+"KOntaktirajte Mandriva Linux web sajt da bi dobili listu dostupnih mirror-a"
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7248,8 +7254,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
@@ -9831,13 +9837,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 konfigurator\n"
 "\n"
-"On konfiguriše lični firewall za ovu Mandrivalinux mašinu.\n"
+"On konfiguriše lični firewall za ovu Mandriva Linux mašinu.\n"
 "Za moćno firewall rešenje, pogledajte\n"
 "specijalizovanu MandrakeSecurity Firewall distribuciju."
 
@@ -12454,7 +12460,7 @@ msgstr ""
 "\n"
 "Ukoliko želite da dodate, uklonite ili promenite ime štampaču, ili želite da "
 "promenite default opcije (papir, kvalitet štampanja, ...), izaberite "
-"\"Štampač\" u \"Hardver\" sekciji Mandrake Kontrolnog Centra."
+"\"Štampač\" u \"Hardver\" sekciji Mandriva Kontrolnog Centra."
 
 #: printer/printerdrake.pm:1207 printer/printerdrake.pm:1437
 #: printer/printerdrake.pm:1500 printer/printerdrake.pm:1592
@@ -13776,8 +13782,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 ""
 
@@ -14053,9 +14059,9 @@ msgid ""
 msgstr ""
 "Mrežna konfiguracija koja je kreirana tokom instalcije ne može sada da se "
 "pokrene. Proverite da li je mreža dostupna nakon restarta sistema i "
-"ispravite konfiguraciju koristeći Mandrake CKontrolni Centar, sekcija "
-"\"Mreža & Internet\"/\"Konenkcija\", i nakon toga podesite štampač, takođe "
-"korištenjem Mandrake Kontrolnog Centra, sekcija \"Hardver\"/\"Štampač\""
+"ispravite konfiguraciju koristeći Mandriva Kontrolni Centar, sekcija \"Mreža "
+"& Internet\"/\"Konenkcija\", i nakon toga podesite štampač, takođe "
+"korištenjem Mandriva Kontrolnog Centra, sekcija \"Hardver\"/\"Štampač\""
 
 #: printer/printerdrake.pm:4196
 #, c-format
@@ -15781,18 +15787,18 @@ msgstr "Stop"
 
 #: 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 "Dobrodošli u <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Dobrodoš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."
@@ -15801,7 +15807,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 ""
 
@@ -15818,9 +15824,9 @@ msgstr "Dobrodošli u Svet Open Source-a"
 #: 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 ""
 
@@ -15839,8 +15845,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
@@ -15866,17 +15872,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 ""
 
@@ -15888,7 +15894,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 ""
 
@@ -15926,7 +15932,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
@@ -15945,7 +15951,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
@@ -15963,7 +15969,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
@@ -15978,18 +15984,17 @@ msgstr ""
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
 msgid "<b>Mandriva Products</b>"
-msgstr "Mandrivalinux Kontrolni Centar"
+msgstr "Mandriva Linux Kontrolni Centar"
 
 #: 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
@@ -16010,7 +16015,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 ""
 
@@ -16022,21 +16027,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 ""
 
@@ -16048,23 +16053,25 @@ msgstr ""
 #: 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 ""
 
 #: 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
@@ -16240,7 +16247,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 ""
 
@@ -16475,14 +16482,14 @@ msgstr ""
 
 #: 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 ""
 
@@ -16505,21 +16512,21 @@ 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 Kontrolni Centar"
+msgstr "Mandriva Linux Kontrolni Centar"
 
 #: 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 ""
 
 #: share/advertising/27.pl:17
@@ -16536,7 +16543,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
@@ -16547,7 +16554,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 ""
 
@@ -16561,7 +16568,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
@@ -16573,14 +16580,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
@@ -16599,7 +16606,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
@@ -16622,7 +16629,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
@@ -16634,21 +16641,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
@@ -16948,7 +16955,7 @@ msgstr ""
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
 msgid "Mandriva Wizards"
-msgstr "Mandrivalinux Kontrolni Centar"
+msgstr "Mandriva Linux Kontrolni Centar"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -17031,15 +17038,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 ""
 "[OPTIONS] [PROGRAM_NAME]\n"
 "\n"
 "OPCIJE:\n"
 "  --help            - prikazuje ovaj tekst koji sada čitate.\n"
-"  --report          - program treba da bude jedan od mandrake alata\n"
-"  --incident        - program treba da bude jedan od mandrake alata"
+"  --report          - program treba da bude jedan od Mandriva alata\n"
+"  --incident        - program treba da bude jedan od Mandriva alata"
 
 #: standalone.pm:63
 #, c-format
@@ -17087,7 +17094,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"
@@ -17101,7 +17108,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Program za podešavanje Mandrake Terminalnog Servera\n"
+"Program za podešavanje Mandriva Terminalnog Servera\n"
 "--enable         : uključuje MTS\n"
 "--disable        : isključuje MTS\n"
 "--start          : pokreće MTS\n"
@@ -17160,8 +17167,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"
@@ -17392,7 +17399,7 @@ msgstr ""
 #: standalone/drakTermServ:509
 #, fuzzy, c-format
 msgid "Terminal Server Overview"
-msgstr "Konfiguracija Mandrake Terminalnog servera"
+msgstr "Konfiguracija Mandriva Terminalnog servera"
 
 #: standalone/drakTermServ:510
 #, c-format
@@ -19777,13 +19784,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrake Program za Prijavljivanje Grešaka"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Program za Prijavljivanje Grešaka"
 
 #: 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
@@ -20265,7 +20272,7 @@ msgstr "Pokrenuto pri startanju"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Ovaj interfejs još uvek nije podešen.\n"
 "Pokrenite konfiguracionog čarobnjaka u glavnom prozoru"
@@ -20274,7 +20281,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 ""
 "Ovaj interfejs još uvek nije podešen.\n"
 "Pokrenite konfiguracionog čarobnjaka u glavnom prozoru"
@@ -20327,7 +20334,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20631,9 +20638,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
@@ -21181,8 +21188,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrake Kontrolni Centar"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Kontrolni Centar"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -21793,7 +21800,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 ""
 "Zvučna kartica nije detektovana na vašoj mašini. Proverite da li Linux-"
 "supported zvučna kartica pravilno priključena.\n"
@@ -21802,7 +21809,7 @@ msgstr ""
 "Možete posetiti našu bazu podržanog hardvera na:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, fuzzy, c-format
@@ -23428,7 +23435,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 ""
 "TV kartica na vašem računaru nije detektovana. Proverite da li Linux-"
 "supported Video/TV kartica pravilno priključena.\n"
@@ -23437,7 +23444,7 @@ msgstr ""
 "Možete posetiti našu bazu podržanog 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
@@ -24141,13 +24148,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, Mandrivalinux-ov alat za podešavanje hardvera.\n"
+"Ovo je HardDrake, Mandriva Linux-ov alat za podešavanje hardvera.\n"
 "<span foreground=\"royalblue3\">Verzija:</span> %s\n"
 "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -24255,8 +24262,8 @@ msgstr "Izmene su završene, ali da bi ih primenili morate se izlogovati"
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrake Alati za objašnjenja"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Alati za objašnjenja"
 
 #: standalone/logdrake:51
 #, fuzzy, c-format
@@ -24762,10 +24769,10 @@ msgstr "Povezivanje završ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 ""
 "povezivanje neuspelo.\n"
-"Proverite vašu konfiguraciju u Mandrake Kontrolnom Centru."
+"Proverite vašu konfiguraciju u Mandriva Kontrolnom Centru."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -25000,7 +25007,7 @@ msgstr "Osvežavanje liste podešenih skenera ..."
 #: standalone/scannerdrake:101
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "%s nije podržan u ovoj verziji Mandrivalinux-a."
+msgstr "%s nije podržan u ovoj verziji Mandriva Linux-a."
 
 #: standalone/scannerdrake:104
 #, c-format
@@ -25042,7 +25049,7 @@ msgstr ""
 #: standalone/scannerdrake:144
 #, fuzzy, c-format
 msgid "The %s is not supported under Linux."
-msgstr "%s nije podržan u ovoj verziji Mandrivalinux-a."
+msgstr "%s nije podržan u ovoj verziji Mandriva Linux-a."
 
 #: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
@@ -25143,7 +25150,7 @@ msgid ""
 "You can launch printerdrake from the %s Control Center in Hardware section."
 msgstr ""
 "Ovaj %s mora biti podešen u printerdrake.\n"
-"Možete pokrenuti printerdrake iz Mandrake Kontrolnog Centra iz Hardver "
+"Možete pokrenuti printerdrake iz Mandriva Kontrolnog Centra iz Hardver "
 "sekcije."
 
 #: standalone/scannerdrake:308 standalone/scannerdrake:315
@@ -25620,7 +25627,6 @@ msgstr "Instalacija nije uspela"
 #~ msgid "You've not selected any font"
 #~ msgstr "ne mogu da pronađen nijedan font.\n"
 
-
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Nema dostupnog pretraživača! Molim Vas da instalirate barem jednog"
 
@@ -26152,18 +26158,15 @@ msgstr "Instalacija nije uspela"
 #~ "\n"
 #~ "OPCIJE:\n"
 #~ "  --help            - prikazuje ovaj tekst koji sada čitate.\n"
-#~ "  --report          - program treba da bude jedan od mandrake alata\n"
-#~ "  --incident        - program treba da bude jedan od mandrake alata"
-
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
+#~ "  --report          - program treba da bude jedan od Mandriva alata\n"
+#~ "  --incident        - program treba da bude jedan od Mandriva alata"
 
 #~ msgid ""
 #~ "Connection failed.\n"
 #~ "Verify your configuration in the Mandrake Control Center."
 #~ msgstr ""
 #~ "povezivanje neuspelo.\n"
-#~ "Proverite vašu konfiguraciju u Mandrake Kontrolnom Centru."
+#~ "Proverite vašu konfiguraciju u Mandriva Kontrolnom Centru."
 
 #~ msgid "The package %s is needed. Install it?"
 #~ msgstr "Paket %s je potreban. Da li želite da ga instalirate?"
diff --git a/perl-install/share/po/sv.po b/perl-install/share/po/sv.po
index d23cee079..90d2405b7 100644
--- a/perl-install/share/po/sv.po
+++ b/perl-install/share/po/sv.po
author	Pablo Saratxaga <pablo@mandriva.com>	2005-04-23 17:14:40 +0000
committer	Pablo Saratxaga <pablo@mandriva.com>	2005-04-23 17:14:40 +0000
commit	51e407e126f0746aed8b86e733da2ef71698ded8 (patch)
tree	ad215f35cd3b3ee195ea42648078f71745c7126b
parent	ca012347134ab4eec6f196b5f86c9fc1f25cb5b7 (diff)
download	drakx-51e407e126f0746aed8b86e733da2ef71698ded8.tar drakx-51e407e126f0746aed8b86e733da2ef71698ded8.tar.gz drakx-51e407e126f0746aed8b86e733da2ef71698ded8.tar.bz2 drakx-51e407e126f0746aed8b86e733da2ef71698ded8.tar.xz drakx-51e407e126f0746aed8b86e733da2ef71698ded8.zip