various Mandrake -> Mandriva changes

1 files changed, 176 insertions, 168 deletions

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:"