switch from MandrakeSoft to Mandriva

1 files changed, 114 insertions, 114 deletions

diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 8baa1f292..cc164c9c8 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -57,7 +57,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -76,7 +76,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr ""
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -92,7 +92,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 
@@ -158,7 +158,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -1088,7 +1088,7 @@ msgstr ""
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
 msgstr ""
@@ -3252,7 +3252,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
@@ -3354,7 +3354,7 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
@@ -3365,11 +3365,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3475,10 +3475,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
 "the listed services and they will be started automatically at boot time. !!\n"
@@ -3583,7 +3583,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -3681,12 +3681,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -3713,7 +3713,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -3722,7 +3722,7 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this operation\n"
 "after you confirm.\n"
 "\n"
@@ -3849,7 +3849,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -3863,7 +3863,7 @@ msgstr ""
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -3891,7 +3891,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -3907,7 +3907,7 @@ msgstr ""
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -3993,7 +3993,7 @@ msgstr ""
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4037,7 +4037,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4046,13 +4046,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4093,7 +4093,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4248,7 +4248,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -4269,7 +4269,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -4368,7 +4368,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -4385,7 +4385,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -4446,7 +4446,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 
@@ -4743,7 +4743,7 @@ msgstr ""
 
 #: install_interactive.pm:163
 #, c-format
-msgid "Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrakelinux installation."
+msgid "Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrivalinux installation."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -4845,16 +4845,16 @@ msgstr ""
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Mandrakelinux distribution \n"
+"The operating system and the different components available in the Mandrivalinux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related to the operating \n"
-"system and the different components of the Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this License. \n"
 "If you disagree with any portion of the License, you are not allowed to install, duplicate or use \n"
@@ -4869,21 +4869,21 @@ msgid ""
 "\n"
 "The Software Products and attached documentation are provided \"as is\", with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,\n"
+"Mandriva S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without limitation damages for loss of \n"
 "business, interruption of business, financial loss, legal fees and penalties resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or occurrence of such \n"
+"Products, even if Mandriva S.A. has been advised of the possibility or occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, in no circumstances, be \n"
+"To the extent permitted by law, Mandriva S.A. or its distributors will, in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever (including without \n"
 "limitation damages for loss of business, interruption of business, financial loss, legal fees \n"
 "and penalties resulting from a court judgment, or any other consequential loss) arising out \n"
 "of the possession and use of software components or arising out of  downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some countries by local laws.\n"
+"from one of Mandrivalinux sites  which are prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong cryptography components \n"
 "included in the Software Products.\n"
 "\n"
@@ -4895,9 +4895,9 @@ msgid ""
 "Licence, hereafter called \"GPL\", or of similar licenses. Most of these licenses allow you to use, \n"
 "duplicate, adapt or redistribute the components which they cover. Please read carefully the terms \n"
 "and conditions of the license agreement for each component before using any component. Any question \n"
-"on a component license should be addressed to the component author and not to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the documentation for \n"
+"on a component license should be addressed to the component author and not to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. Documentation written \n"
+"by Mandriva S.A. is governed by a specific license. Please refer to the documentation for \n"
 "further details.\n"
 "\n"
 "\n"
@@ -4905,9 +4905,9 @@ msgid ""
 "\n"
 "All rights to the components of the Software Products belong to their respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software Products, as a whole or in \n"
+"Mandriva S.A. reserves its rights to modify or adapt the Software Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -4918,7 +4918,7 @@ msgid ""
 "The terms and conditions of this License are governed by the Laws of France.\n"
 "All disputes on the terms of this license will preferably be settled out of court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 ""
 msgstr ""
 
@@ -4974,7 +4974,7 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of Mandrakelinux,\n"
+"For information on fixes which are available for this release of Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -4982,7 +4982,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5016,7 +5016,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For this,\n"
+"Mandrivalinux. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
@@ -5500,7 +5500,7 @@ msgstr ""
 
 #: install_steps_interactive.pm:821
 #, c-format
-msgid "Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgid "Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
 
 #: install_steps_interactive.pm:840
@@ -5692,7 +5692,7 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
+msgid "Mandrivalinux Installation %s"
 msgstr ""
 
 #. -PO: This string must fit in a 80-char wide text screen
@@ -8236,7 +8236,7 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -11471,7 +11471,7 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share your scanner on the network.\n"
 "\n"
 ""
 msgstr ""
@@ -13035,22 +13035,22 @@ msgstr ""
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
 msgstr ""
 
 #: share/advertising/01.pl:17
 #, c-format
-msgid "Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the system, called the <b>operating system</b> (based on the Linux kernel) together with <b>a lot of applications</b> meeting every need you could even think of."
+msgid "Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the system, called the <b>operating system</b> (based on the Linux kernel) together with <b>a lot of applications</b> meeting every need you could even think of."
 msgstr ""
 
 #: share/advertising/01.pl:19
 #, c-format
-msgid "Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It is also one of the <b>most widely used</b> Linux distributions worldwide!"
+msgid "Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
 #: share/advertising/02.pl:13
@@ -13065,7 +13065,7 @@ msgstr ""
 
 #: share/advertising/02.pl:17
 #, c-format
-msgid "Mandrakelinux is committed to the open source model. This means that this new release is the result of <b>collaboration</b> between <b>Mandrakesoft's team of developers</b> and the <b>worldwide community</b> of Mandrakelinux contributors."
+msgid "Mandrivalinux is committed to the open source model. This means that this new release is the result of <b>collaboration</b> between <b>Mandriva's team of developers</b> and the <b>worldwide community</b> of Mandrivalinux contributors."
 msgstr ""
 
 #: share/advertising/02.pl:19
@@ -13080,7 +13080,7 @@ msgstr ""
 
 #: share/advertising/03.pl:15
 #, c-format
-msgid "Most of the software included in the distribution and all of the Mandrakelinux tools are licensed under the <b>General Public License</b>."
+msgid "Most of the software included in the distribution and all of the Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -13100,7 +13100,7 @@ msgstr ""
 
 #: share/advertising/04.pl:15
 #, c-format
-msgid "Mandrakelinux has one of the <b>biggest communities</b> of users and developers. The role of such a community is very wide, ranging from bug reporting to the development of new applications. The community plays a <b>key role</b> in the Mandrakelinux world."
+msgid "Mandrivalinux has one of the <b>biggest communities</b> of users and developers. The role of such a community is very wide, ranging from bug reporting to the development of new applications. The community plays a <b>key role</b> in the Mandrivalinux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
@@ -13115,7 +13115,7 @@ msgstr ""
 
 #: share/advertising/05.pl:17
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Download</b>. This is the free version that Mandrakesoft wants to keep <b>available to everyone</b>."
+msgid "You are now installing <b>Mandrivalinux Download</b>. This is the free version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
 #: share/advertising/05.pl:19
@@ -13135,7 +13135,7 @@ msgstr ""
 
 #: share/advertising/05.pl:23
 #, c-format
-msgid "You will not have access to the <b>services included</b> in the other Mandrakesoft products either."
+msgid "You will not have access to the <b>services included</b> in the other Mandriva products either."
 msgstr ""
 
 #: share/advertising/06.pl:13
@@ -13145,7 +13145,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -13160,12 +13160,12 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
 #, c-format
-msgid "PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack includes <b>thousands of applications</b> - everything from the most popular to the most advanced."
+msgid "PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack includes <b>thousands of applications</b> - everything from the most popular to the most advanced."
 msgstr ""
 
 #: share/advertising/08.pl:13
@@ -13175,7 +13175,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -13185,17 +13185,17 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
+msgid "<b>Mandriva Products</b>"
 msgstr ""
 
 #: share/advertising/09.pl:15
 #, c-format
-msgid "<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> products."
+msgid "<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -13215,52 +13215,52 @@ msgstr ""
 
 #: share/advertising/09.pl:21
 #, c-format
-msgid "\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making the most of your 64-bit processor."
+msgid "\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: share/advertising/10.pl:17
 #, c-format
-msgid "Mandrakesoft has developed two products that allow you to use Mandrakelinux <b>on any computer</b> and without any need to actually install it:"
+msgid "Mandriva has developed two products that allow you to use Mandrivalinux <b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
-msgid "\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a bootable CD-ROM."
+msgid "\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
-msgid "\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the ultra-compact “LaCie Mobile Hard Drive”."
+msgid "\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: share/advertising/11.pl:15
 #, c-format
-msgid "Below are the Mandrakesoft products designed to meet the <b>professional needs</b>:"
+msgid "Below are the Mandriva products designed to meet the <b>professional needs</b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -13290,7 +13290,7 @@ msgstr ""
 
 #: share/advertising/13-a.pl:15
 #, c-format
-msgid "With PowerPack, you will have the choice of the <b>graphical desktop environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+msgid "With PowerPack, you will have the choice of the <b>graphical desktop environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -13305,7 +13305,7 @@ msgstr ""
 
 #: share/advertising/13-b.pl:15
 #, c-format
-msgid "With PowerPack+, you will have the choice of the <b>graphical desktop environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+msgid "With PowerPack+, you will have the choice of the <b>graphical desktop environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 
 #: share/advertising/14.pl:15
@@ -13410,7 +13410,7 @@ msgstr ""
 
 #: share/advertising/18.pl:15
 #, c-format
-msgid "In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for <b>all of your tasks</b>:"
+msgid "In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for <b>all of your tasks</b>:"
 msgstr ""
 
 #: share/advertising/18.pl:16
@@ -13615,12 +13615,12 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
 msgstr ""
 
 #: share/advertising/25.pl:15
 #, c-format
-msgid "The <b>Mandrakelinux Control Center</b> is an essential collection of Mandrakelinux-specific utilities designed to simplify the configuration of your computer."
+msgid "The <b>Mandrivalinux Control Center</b> is an essential collection of Mandrivalinux-specific utilities designed to simplify the configuration of your computer."
 msgstr ""
 
 #: share/advertising/25.pl:17
@@ -13635,7 +13635,7 @@ msgstr ""
 
 #: share/advertising/26.pl:15
 #, c-format
-msgid "Like all computer programming, open source software <b>requires time and people</b> for development. In order to respect the open source philosophy, Mandrakesoft sells added value products and services to <b>keep improving Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> and the development of Mandrakelinux, <b>please</b> consider buying one of our products or services!"
+msgid "Like all computer programming, open source software <b>requires time and people</b> for development. In order to respect the open source philosophy, Mandriva sells added value products and services to <b>keep improving Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> and the development of Mandrivalinux, <b>please</b> consider buying one of our products or services!"
 msgstr ""
 
 #: share/advertising/27.pl:13
@@ -13645,7 +13645,7 @@ msgstr ""
 
 #: share/advertising/27.pl:15
 #, c-format
-msgid "To learn more about Mandrakesoft products and services, you can visit our <b>e-commerce platform</b>."
+msgid "To learn more about Mandriva products and services, you can visit our <b>e-commerce platform</b>."
 msgstr ""
 
 #: share/advertising/27.pl:17
@@ -13665,17 +13665,17 @@ msgstr ""
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
 msgstr ""
 
 #: share/advertising/28.pl:17
 #, c-format
-msgid "<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux product.."
+msgid "<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux product.."
 msgstr ""
 
 #: share/advertising/28.pl:19
 #, c-format
-msgid "Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+msgid "Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 
 #: share/advertising/28.pl:20
@@ -13690,27 +13690,27 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
-msgid "\t* <b>Early and privileged access</b>, before public release, to Mandrakelinux <b>ISO images</b>."
+msgid "\t* <b>Early and privileged access</b>, before public release, to Mandrivalinux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
 msgstr ""
 
 #: share/advertising/29.pl:15
 #, c-format
-msgid "<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to offer its customers!"
+msgid "<b>Mandriva Online</b> is a new premium service that Mandriva is proud to offer its customers!"
 msgstr ""
 
 #: share/advertising/29.pl:17
 #, c-format
-msgid "Mandrakeonline provides a wide range of valuable services for <b>easily updating</b> your Mandrakelinux systems:"
+msgid "Mandriva Online provides a wide range of valuable services for <b>easily updating</b> your Mandrivalinux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -13730,27 +13730,27 @@ msgstr ""
 
 #: share/advertising/29.pl:21
 #, c-format
-msgid "\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+msgid "\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
 msgstr ""
 
 #: share/advertising/30.pl:15
 #, c-format
-msgid "Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on <b>our technical support platform</b> www.mandrakeexpert.com."
+msgid "Do you require <b>assistance?</b> Meet Mandriva's technical experts on <b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
-msgid "Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save a lot of time."
+msgid "Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
-msgid "For any question related to Mandrakelinux, you have the possibility to purchase support incidents at <b>store.mandrakesoft.com</b>."
+msgid "For any question related to Mandrivalinux, you have the possibility to purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
 #: share/compssUsers.pl:25
@@ -14030,7 +14030,7 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
+msgid "Mandriva Wizards"
 msgstr ""
 
 #: share/compssUsers.pl:197
@@ -14127,7 +14127,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -14171,7 +14171,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      do not ask first confirmation question in MandrakeUpdate mode\n"
+"  --no-confirmation      do not ask first confirmation question in Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
@@ -16609,12 +16609,12 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr ""
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
+msgid "Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakbug:48
@@ -16634,7 +16634,7 @@ msgstr ""
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
+msgid "Mandriva Online"
 msgstr ""
 
 #: standalone/drakbug:52
@@ -16679,7 +16679,7 @@ msgstr ""
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -17072,14 +17072,14 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
@@ -17130,7 +17130,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -17413,7 +17413,7 @@ msgstr ""
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -17860,7 +17860,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU GPL.\n"
 "\n"
 "Usage: \n"
@@ -17890,7 +17890,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr ""
 
 #: standalone/drakhelp:36
@@ -20833,7 +20833,7 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr ""
 
 #: standalone/logdrake:51
@@ -21336,7 +21336,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 
 #: standalone/net_monitor:341