Synthesized commit during git-svn import combining previous Mandriva history with Mageia.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r431 | dmorgan | 2011-02-06 01:58:02 +0000 (Sun, 06 Feb 2011) | 1 line

Add drakx structure on the SVN
------------------------------------------------------------------------
r432 | dmorgan | 2011-02-06 01:59:38 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned advertising
------------------------------------------------------------------------
r446 | dmorgan | 2011-02-06 22:37:08 +0000 (Sun, 06 Feb 2011) | 1 line

Import Clean perl-install
------------------------------------------------------------------------
r448 | dmorgan | 2011-02-06 23:02:36 +0000 (Sun, 06 Feb 2011) | 1 line

Add cleaned files
------------------------------------------------------------------------
r449 | dmorgan | 2011-02-06 23:03:52 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned kernel
------------------------------------------------------------------------
r450 | dmorgan | 2011-02-06 23:23:30 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned tools
------------------------------------------------------------------------
r451 | dmorgan | 2011-02-07 00:01:56 +0000 (Mon, 07 Feb 2011) | 1 line

Import stage1
------------------------------------------------------------------------
r473 | dmorgan | 2011-02-07 11:20:50 +0000 (Mon, 07 Feb 2011) | 1 line

Import images
------------------------------------------------------------------------
r497 | ennael | 2011-02-09 21:02:06 +0000 (Wed, 09 Feb 2011) | 2 lines

readd missing file

------------------------------------------------------------------------
r502 | pterjan | 2011-02-09 23:30:32 +0000 (Wed, 09 Feb 2011) | 1 line

Import rescue
------------------------------------------------------------------------
r603 | ennael | 2011-02-24 13:32:54 +0000 (Thu, 24 Feb 2011) | 2 lines

import cleaned rescue for Mageia

------------------------------------------------------------------------
r2061 | tv | 2011-10-20 20:32:19 +0100 (Thu, 20 Oct 2011) | 1 line

import (cleaned) doc
------------------------------------------------------------------------

1 files changed, 65 insertions, 70 deletions

diff --git a/perl-install/install/help/po/gl.po b/perl-install/install/help/po/gl.po
index 4e4e20a9c..cf6a6b369 100644
--- a/perl-install/install/help/po/gl.po
+++ b/perl-install/install/help/po/gl.po
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../help.pm:14
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandriva Linux distribution. If you agree with all the\n"
+"covers the entire Mageia 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 atentamente os termos da licenza. Esta\n"
-"licenza cobre toda a distribución Mandriva Linux. Se está de acordo\n"
+"licenza cobre toda a distribución Mageia. 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."
 
@@ -190,15 +190,15 @@ msgstr ""
 "significa \"segundo ID SCSI menor\", etc."
 
 #: ../help.pm:88
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
+"The Mageia 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 Mandriva Linux distribúese en varios CD-ROMs. Se un\n"
+"A instalación de Mageia distribúese en varios CD-ROMs. Se un\n"
 "paquete dos seleccionados está noutro CD-ROM, DrakX expulsará o CD\n"
 "actual e diralle que insira o CD requirido. Se non ten o CD requirido a "
 "man,\n"
@@ -208,12 +208,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandriva Linux, and to make "
-"it\n"
+"There are thousands of packages available for Mageia, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandriva Linux sorts package groups in four categories. You can mix and\n"
+"Mageia 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"
@@ -264,11 +263,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "Agora terá que especificar que programas desexa instalar no seu sistema.\n"
-"Hai milleiros de paquetes dispoñibles para Mandriva Linux, e para facer que\n"
+"Hai milleiros de paquetes dispoñibles para Mageia, e para facer que\n"
 "sexa máis sinxelo manexalos, puxéronse en grupos de aplicacións "
 "semellantes.\n"
 "\n"
-"Mandriva Linux ordena os grupos de paquetes en catro categorías. Vostede\n"
+"Mageia ordena os grupos de paquetes en catro categorías. Vostede\n"
 "pode mesturar aplicacións de varias categorías, de xeito que unha "
 "instalación\n"
 "``Estación de Traballo'' poida ter instaladas aplicacións da categoría "
@@ -335,7 +334,7 @@ msgid "Truly minimal install"
 msgstr "Instalación mínima de verdade"
 
 #: ../help.pm:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "If you choose to install packages individually, the installer will present\n"
 "a tree containing all packages classified by groups and subgroups. While\n"
@@ -348,10 +347,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 Mandriva Linux will automatically start any installed\n"
+"installed. By default Mageia will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandriva Linux was\n"
+"security holes were discovered after this version of Mageia 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"
@@ -382,10 +381,10 @@ msgstr ""
 "!!Se se selecciona un paquete de servidor, xa sexa porque vostede elixiu\n"
 "dito paquete ou porque é parte dun grupo de paquetes, pediráselle que\n"
 "confirme que desexa instalar estes servidores. De maneira predeterminada\n"
-"Mandriva Linux iniciará automáticamente ó arrincar o sistema tódolos\n"
+"Mageia iniciará automáticamente ó arrincar o sistema tódolos\n"
 "servicios instalados. Incluso se son seguros e non tiñan ningún problema\n"
 "coñecido cando se fixo a distribución, é posible que se descubriran buratos\n"
-"de seguridade despois de que se rematara esta versión de Mandriva Linux.\n"
+"de seguridade despois de que se rematara esta versión de Mageia.\n"
 "Se non sabe que fai un determinado servicio ou por que se vai instalar,\n"
 "prema en \"%s\". Se preme en \"%s\" instalaranse os servicios listados e\n"
 "iniciaranse automáticamente ó arrincar o sistema!!\n"
@@ -511,11 +510,11 @@ msgstr ""
 "necesidades."
 
 #: ../help.pm:234
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
+"WindowMaker, etc.) bundled with Mageia rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -571,7 +570,7 @@ msgid ""
 msgstr ""
 "As X (por X Window System) son o corazón da interface gráfica de\n"
 "GNU/Linux do que dependen tódolos ambientes gráficos (KDE, GNOME,\n"
-"AfterStep, WindowMaker, etc.) proporcionados por Mandriva Linux.\n"
+"AfterStep, WindowMaker, etc.) proporcionados por Mageia.\n"
 "\n"
 "Vostede verá unha lista dos diferentes parámetros que se poden\n"
 "cambiar para obter unha visualización gráfica óptima.\n"
@@ -687,14 +686,14 @@ msgstr ""
 "coma un servidor, ou se non tivo éxito configurando o sistema gráfico."
 
 #: ../help.pm:319
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandriva Linux\n"
+"You now need to decide where you want to install the Mageia\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandriva Linux system.\n"
+"Mageia 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"
@@ -721,7 +720,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 Mandriva Linux and Microsoft Windows on\n"
+"recommended if you want to use both Mageia and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -730,8 +729,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 Mandriva Linux system, "
-"choose\n"
+"your hard drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -752,11 +750,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"
-"Mandriva Linux no disco duro. Se o seu disco duro está baleiro, ou se\n"
+"Mageia 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 Mandriva Linux.\n"
+"sistema Mageia.\n"
 "\n"
 "Debido a que o proceso de particionamento é normalmente irreversible\n"
 "e pode provocar perdas de datos, o particionamento pode intimidar e\n"
@@ -786,7 +784,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 Mandriva Linux e Microsoft\n"
+"usar esta opción se desexa usar Mageia e Microsoft\n"
 "Windows no mesmo ordenador.\n"
 "\n"
 "   Antes de escoller esta opción, debe comprender que despois deste\n"
@@ -795,7 +793,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 Mandriva Linux, elixa\n"
+"seu disco duro e remprazalas polo seu novo sistema Mageia, elixa\n"
 "esta opción. Teña coidado, porque non poderá desfacer esta operación\n"
 "despois de que confirme.\n"
 "\n"
@@ -924,7 +922,7 @@ msgid "Save packages selection"
 msgstr ""
 
 #: ../help.pm:408
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
 "reformat some of them and erase any data they contain. To do so, please\n"
@@ -943,7 +941,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"
-"Mandriva Linux operating system installation.\n"
+"Mageia 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."
@@ -966,15 +964,15 @@ msgstr ""
 "Prema en \"%s\" cando estea preparado para formatar as particións.\n"
 "\n"
 "Prema en \"%s\" se desexa elixir outra partición para a instalación do seu\n"
-"novo sistema operativo Mandriva Linux.\n"
+"novo sistema operativo Mageia.\n"
 "\n"
 "Prema en \"%s\" se desexa seleccionar as particións nas que se realizarán\n"
 "comprobacións de bloques erróneos."
 
 #: ../help.pm:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"By the time you install Mandriva Linux, it's likely that some packages will\n"
+"By the time you install Mageia, 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"
@@ -986,7 +984,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Cando instale Mandriva Linux é probable que algúns paquetes se\n"
+"Cando instale Mageia é probable que algúns paquetes se\n"
 "actualizaran dende a publicación inicial. Pode ser que se solucionaran "
 "erros,\n"
 "e se resolveran problemas de seguridade. Para beneficiarse destas\n"
@@ -1001,7 +999,7 @@ msgstr ""
 "seleccionado(s), ou en \"%s\" para abortar."
 
 #: ../help.pm:450
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "At this point, DrakX will allow you to choose the security level you desire\n"
 "for your machine. As a rule of thumb, the security level should be set\n"
@@ -1010,7 +1008,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 Mandriva Linux\n"
+"to change it later with the draksec tool, which is part of Mageia\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -1024,7 +1022,7 @@ msgstr ""
 "\n"
 "Se non sabe cal escoller, deixe a opción predeterminada. Poderá\n"
 "cambiala máis tarde ca ferramenta draksec, a cal é parte do Centro de\n"
-"Control de Mandriva Linux.\n"
+"Control de Mageia.\n"
 "\n"
 "Complete o campo \"%s\" co enderezo de correo-e (e-mail) da persoa\n"
 "responsable da seguridade. As mensaxes de seguridade enviaranse a\n"
@@ -1036,10 +1034,10 @@ msgid "Security Administrator"
 msgstr "Administrador de Seguridade"
 
 #: ../help.pm:464
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandriva Linux system. If partitions have already been\n"
+"installation of your Mageia 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"
@@ -1110,7 +1108,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Neste punto cómpre que escolla que partición(s) se van usar para a\n"
-"instalación do seu sistema Mandriva Linux. Se as particións xa se\n"
+"instalación do seu sistema Mageia. Se as particións xa se\n"
 "crearon, xa sexa nunha instalación anterior de GNU/Linux ou con\n"
 "outra ferramenta de particionamento, poderá usar as particións\n"
 "existentes. Se non é así, débense crear as particións no disco duro.\n"
@@ -1220,11 +1218,11 @@ msgid "Toggle between normal/expert mode"
 msgstr "Cambiar entre modo normal/experto"
 
 #: ../help.pm:536
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandriva Linux operating system.\n"
+"Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -1254,7 +1252,7 @@ msgid ""
 msgstr ""
 "Detectouse máis dunha partición Microsoft no seu disco duro. Elixa a que\n"
 "quere redimensionar para poder instalar o seu novo sistema operativo\n"
-"Mandriva Linux.\n"
+"Mageia.\n"
 "\n"
 "Cada partición está listada do seguinte xeito: \"Nome en Linux\",\n"
 "\"Nome en Windows\", \"Capacidade\".\n"
@@ -1295,13 +1293,13 @@ msgstr ""
 "que se amosa, prema no botón \"%s\" para obter a lista completa de países."
 
 #: ../help.pm:572
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandriva Linux system:\n"
+"upgrade of an existing Mageia 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"
@@ -1310,20 +1308,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandriva Linux system. Your current "
-"partitioning\n"
+"currently installed on your Mageia system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
+"Using the ``Upgrade'' option should work fine on Mageia systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandriva Linux version \"8.1\" is not recommended."
+"to Mageia version \"8.1\" is not recommended."
 msgstr ""
 "Este paso actívase só se se atopou algunha partición GNU/Linux na súa\n"
 "máquina.\n"
 "\n"
 "DrakX necesita saber se desexa facer unha nova instalación ou\n"
-"unha actualización dun sistema Mandriva Linux xa existente:\n"
+"unha actualización dun sistema Mageia xa existente:\n"
 "\n"
 " * \"%s\". A maioría das veces, isto destrúe completamente o sistema\n"
 "antigo. Sen embargo, dependendo de como sexa o seu esquema de\n"
@@ -1333,15 +1330,15 @@ msgstr ""
 "o sistema de ficheiros, debe usar esta opción.\n"
 "\n"
 " * \"%s\". Esta clase de instalación permítelle actualiza-los paquetes que\n"
-"están instalados agora mesmo no seu sistema Mandriva Linux. Non se\n"
+"están instalados agora mesmo no seu sistema Mageia. Non se\n"
 "modificarán nin o esquema de particionamento actual nin os datos dos\n"
 "usuarios. A maior parte dos outros pasos de configuración estarán\n"
 "dispoñibles e serán semellantes ós dunha instalación estándar.\n"
 "\n"
 "O uso da opción ``Actualizar'' debería funcionar ben en sistemas con\n"
-"Mandriva Linux versión \"8.1\" ou posteriores. Non se recomenda levar\n"
+"Mageia versión \"8.1\" ou posteriores. Non se recomenda levar\n"
 "a cabo actualizacións en versións anteriores á versión \"8.1\" de\n"
-"Mandriva Linux."
+"Mageia."
 
 #: ../help.pm:594
 #, c-format
@@ -1381,7 +1378,7 @@ msgstr ""
 "teclado cambie entre unha disposición Latina e unha non Latina."
 
 #: ../help.pm:612
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -1397,8 +1394,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, Mandriva Linux's use of UTF-8 "
-"will\n"
+"still under development. For that reason, Mageia'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"
@@ -1441,7 +1437,7 @@ msgstr ""
 "Acerca do soporte de UTF-8 (unicode): Unicode é unha nova codificación de\n"
 "caracteres pensada para cubrir tódalas linguas existentes. Sen embargo o\n"
 "soporte completo para ela en GNU/Linux ainda se está desenvolvendo. Por\n"
-"esta razón, o uso de UTF-8 en Mandriva Linux dependerá das eleccións do\n"
+"esta razón, o uso de UTF-8 en Mageia dependerá das eleccións do\n"
 "usuario:\n"
 "\n"
 " * Se selecciona unha lingua cunha codificación fortemente asociada\n"
@@ -1605,10 +1601,10 @@ msgstr ""
 "opción só se sabe o que está facendo."
 
 #: ../help.pm:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
+"operating systems may offer you one, but Mageia 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"
@@ -1629,12 +1625,12 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandriva Linux\n"
+"system you may change it by running PrinterDrake from the Mageia\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Agora é a hora de seleccionar un sistema de impresión para o seu\n"
 "ordenador. Pode ser que outros sistemas operativos lle ofrezan un, pero\n"
-"Mandriva Linux ofrécelle dous. Cada un dos sistemas de impresión está\n"
+"Mageia ofrécelle dous. Cada un dos sistemas de impresión está\n"
 "máis adaptado a determinados tipos de configuración.\n"
 "\n"
 " * \"%s\" -- que é un acrónimo de ``print, do not queue'' (imprime, non o\n"
@@ -1658,7 +1654,7 @@ msgstr ""
 "\n"
 "Se elixe un agora, e máis tarde se da conta de que non lle gusta o seu\n"
 "sistema de impresión poderá cambialo executando PrinterDrake dende o\n"
-"Centro de Control de Mandriva Linux e premendo no botón \"%s\"."
+"Centro de Control de Mageia e premendo no botón \"%s\"."
 
 #: ../help.pm:768
 #, c-format
@@ -1768,8 +1764,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"
-"Mandriva Linux Control Center after the installation has finished to "
-"benefit\n"
+"Mageia 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"
@@ -1786,7 +1781,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"
-"Mandriva Linux Control Center.\n"
+"Mageia 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"
@@ -1834,7 +1829,7 @@ msgstr ""
 "\n"
 " * \"%s\": se desexa configurar o seu acceso á Internet ou a unha rede\n"
 "local, pode facelo agora. Consulte a documentación impresa ou use o\n"
-"Centro de Control de Mandriva Linux despois de rematar a instalación para\n"
+"Centro de Control de Mageia despois de rematar a instalación para\n"
 "sacar partido da axuda en liña.\n"
 "\n"
 " * \"%s\": permítelle configurar os enderezos do proxy HTTP e FTP no\n"
@@ -1875,14 +1870,14 @@ msgid "Graphical Interface"
 msgstr "Interface Gráfica"
 
 #: ../help.pm:861
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
+"Mageia 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"
-"Mandriva Linux. Teña tino, porque se perderán tódolos datos da unidade e\n"
+"Mageia. Teña tino, porque se perderán tódolos datos da unidade e\n"
 "non se poderán volver recuperar!"
 
 #: ../help.pm:866