various Mandrake -> Mandriva changes

1 files changed, 129 insertions, 123 deletions

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