various Mandrake -> Mandriva changes

1 files changed, 229 insertions, 219 deletions

diff --git a/perl-install/share/po/eu.po b/perl-install/share/po/eu.po
index 32f82048e..76700eb11 100644
--- a/perl-install/share/po/eu.po
+++ b/perl-install/share/po/eu.po
@@ -1313,11 +1313,11 @@ msgstr "Hizkuntza aukera"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
 msgstr ""
-"Mandrivalinux-ek hainbat hizkuntza onar ditzake. Hautatu\n"
+"Mandriva Linux-ek hainbat hizkuntza onar ditzake. Hautatu\n"
 "instalatu nahi dituzun hizkuntzak. Instalazioa osatzean eta\n"
 "sistema berrabiaraztean, erabilgarri egongo dira."
 
@@ -3738,12 +3738,12 @@ msgstr "gaitu irrati-euskarria"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Aurrera jarraitu aurretik lizentziaren baldintzak arretaz irakurri. \n"
-"Mandrivalinux banaketa osoa hartzen du. Baldintza guztiekin ados \n"
+"Mandriva Linux banaketa osoa hartzen du. Baldintza guztiekin ados \n"
 "bazaude, hautatu \"%s\" laukia. Onartzen ez badituzu, \"%s\" botoian klik\n"
 "egin eta ordenagailua berrabiaraziko da."
 
@@ -3855,7 +3855,7 @@ msgid "Advanced"
 msgstr "Aurreratua"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:54
 #, c-format
 msgid ""
@@ -3925,33 +3925,34 @@ msgstr ""
 "\"bigarren SCSI ID baxuena\", etab."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrivalinux instalazioa zenbait CD-ROMetan banatuta dago. \n"
+"Mandriva Linux instalazioa zenbait CD-ROMetan banatuta dago. \n"
 "Hautatutako pakete bat beste CD-ROM batean badago, DrakX-k du\n"
 "uneko CDa egotziko eta behar den CDa sartzeko eskatuko dizu.\n"
 "Eskatzen zaizun CDa ez badaukazu eskura, sakatu \"%s\",\n"
 "dagozkion paketeak ez dira instalatuko."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:92
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4003,10 +4004,10 @@ msgid ""
 "megabytes."
 msgstr ""
 "Sisteman zein programa instalatu nahi dituzun zehazteko garaia da.\n"
-"Mandrivalinux-erako milaka pakete dituzu erabilgarri, eta kudeaketa\n"
+"Mandriva Linux-erako milaka pakete dituzu erabilgarri, eta kudeaketa\n"
 "errazteko, antzeko aplikazioen multzotan kokatu dira.\n"
 "\n"
-"Mandrivalinux-ek pakete multzoak lau kategoriatan antolatzen ditu.\n"
+"Mandriva Linux-ek pakete multzoak lau kategoriatan antolatzen ditu.\n"
 "Kategoria anitzetako aplikazioak nahastu eta bateratu ditzakezu, honela\n"
 "\"Lanpostua\" instalazio batek \"Zerbitzari\" kategoriako aplikazioak\n"
 "instalatuta izan ditzake.\n"
@@ -4099,7 +4100,7 @@ msgid "Truly minimal install"
 msgstr "Instalazio minimo-minimoa"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:149
 #, c-format
 msgid ""
@@ -4114,10 +4115,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4149,10 +4150,10 @@ msgstr ""
 "Zerbitzari pakete bat hautatu bada, pakete hori zehazki hautatu duzulako\n"
 "edo pakete-talde bateko zati zelako, zerbitzari horiek instalatu nahi "
 "dituzula\n"
-" berresteko eskatuko zaizu. Lehenespenez Mandrivalinux-ek instalatutako\n"
+" berresteko eskatuko zaizu. Lehenespenez Mandriva Linux-ek instalatutako\n"
 "edozein zerbitzu abioan automatikoki abiaraziko du. Nahiz eta seguruak\n"
 " diren eta arazo ezagunik ez duten banaketa kaleratzeko garaian, guztiz\n"
-" posible da Mandrivalinux bertsio hau amaitu eta gero segurtasun zuloak\n"
+" posible da Mandriva Linux bertsio hau amaitu eta gero segurtasun zuloak\n"
 " aurkitu izana. Ez badakizu zerbitzu zehatz batek zer egiten duen edo "
 "zergatik\n"
 " instalatu den, klikatu \"%s\". \"%s \" klikatzeak zerrendatutako "
@@ -4200,7 +4201,7 @@ msgid "Configure"
 msgstr "Konfiguratu"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:189
 #, c-format
 msgid ""
@@ -4239,7 +4240,7 @@ msgstr ""
 "soilik hautatu!!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:206
 #, c-format
 msgid ""
@@ -4307,7 +4308,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4362,7 +4363,7 @@ msgid ""
 "not successful in getting the display configured."
 msgstr ""
 "X (X Window sistema) GNU/Linux-en interfaze grafikoaren bihotza da,\n"
-" Mandrivalinux-ekin bildutako ingurune grafiko guztiek (KDE, Gnome,\n"
+" Mandriva Linux-ekin bildutako ingurune grafiko guztiek (KDE, Gnome,\n"
 "Afterstep, WindowMaker...) erabiltzen dutena.\n"
 "\n"
 "Bistaratze grafiko optimoa lortzeko aldatu daitekeen parametro zerrenda\n"
@@ -4462,7 +4463,7 @@ msgstr ""
 "zaizu."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:308
 #, c-format
 msgid ""
@@ -4481,16 +4482,16 @@ msgstr ""
 "bistaratzea konfiguratzea lortzen ez baduzu."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4517,7 +4518,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4526,7 +4527,8 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4546,11 +4548,11 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Hona iritsita, Mandrivalinux sistema eragilea disko zurrunean non\n"
+"Hona iritsita, Mandriva Linux sistema eragilea disko zurrunean non\n"
 "instalatu aukeratu behar duzu. Zure disko zurruna hutsik badago edo\n"
 "lehendik dagoen sistema eragile batek leku erabilgarri guztia betetzen\n"
 "badu, diska zatikatu beharko duzu. Disko zurruna zatikatzea, funtsean,  \n"
-"diskoa logikoki zatitzea da, Mandrivalinux sistema berria instalatzeko\n"
+"diskoa logikoki zatitzea da, Mandriva Linux sistema berria instalatzeko\n"
 "behar den lekua sortzeko.\n"
 "\n"
 "Disko zurruna zatikatzeko prozesua normalean itzulbiderik gabea denez\n"
@@ -4581,7 +4583,7 @@ msgstr ""
 " edo NTFS partizioei neurria aldatu. Neurri aldaketa datu galerarik gabe\n"
 "gauzatu daiteke baldin eta aurretik Windows partizioa desfragmentatu\n"
 " baduzu. Oso gomendagarria da datuen babeskopiak egitea. Aukera hau\n"
-" erabiltzea gomendatzen da Mandrivalinux eta Microsoft Windows, biak,\n"
+" erabiltzea gomendatzen da Mandriva Linux eta Microsoft Windows, biak,\n"
 " konputagailu berean erabili nahi badituzu.\n"
 "\n"
 "   Aukera hau hautatu aurretik, ulertu ezazu prozedura honen ondoren,\n"
@@ -4590,7 +4592,7 @@ msgstr ""
 "zure datuak gorde edo software berria instalatzeko.\n"
 "\n"
 " * \"%s\": Disko zurrunean dauden datu eta partizio guztiak ezabatu eta \n"
-"Mandrivalinux sistema berriarekin ordeztu nahi badituzu, hautatu aukera\n"
+"Mandriva Linux sistema berriarekin ordeztu nahi badituzu, hautatu aukera\n"
 " hau. Kontuz, berretsi ondoren ezingo baituzu eragiketa desegin.\n"
 "\n"
 "   !! Aukera hau hautatzen baduzu, diskoko datu guztiak ezabatuko dira. !!\n"
@@ -4640,7 +4642,7 @@ msgid "Custom disk partitioning"
 msgstr "Disko-partizio pertsonalizatua"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:377
 #, c-format
 msgid ""
@@ -4736,7 +4738,7 @@ msgid "Save packages selection"
 msgstr "Gorde pakete-hautapena"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:412
 #, c-format
 msgid ""
@@ -4757,7 +4759,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4778,7 +4780,7 @@ msgstr ""
 "\n"
 "Klikatu \"%s\" partizioak eratzeko prest zaudenean.\n"
 "\n"
-"Klikatu \"%s\" Mandrivalinux sistema eragile berria instalatzeko beste "
+"Klikatu \"%s\" Mandriva Linux sistema eragile berria instalatzeko beste "
 "partizio\n"
 " bat aukeratu nahi baduzu.\n"
 "\n"
@@ -4795,11 +4797,11 @@ msgid "Previous"
 msgstr "Aurrekoa"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4811,7 +4813,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Mandrivalinux instalatzen duzunerako, litekeena da pakete batzuk\n"
+"Mandriva Linux instalatzen duzunerako, litekeena da pakete batzuk\n"
 "hasierako argitalpenetik aldatu izana. Baliteke akatsak zuzendu eta \n"
 "segurtasun arazoak konpondu izatea. Eguneratzeez baliatu ahal izan\n"
 "zaitezen, orain, Internetetik jaitsi ditzakezu. Markatu \"%s\" dabilen "
@@ -4831,7 +4833,7 @@ msgid "Install"
 msgstr "Instalatu"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:447
 #, c-format
 msgid ""
@@ -4842,7 +4844,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4855,7 +4857,7 @@ msgstr ""
 "ezartzean, normalean erabilera erraztasuna galtzen da.\n"
 "\n"
 "Zer aukeratu ez badakizu, hautatu aukera lehenetsia. Gero aldatu \n"
-"ahal izango duzu draksec tresnarekin, Mandrivalinux Aginte Gunearen\n"
+"ahal izango duzu draksec tresnarekin, Mandriva Linux Aginte Gunearen\n"
 "zati bat.\n"
 "\n"
 "Bete \"%s\" eremua segurtasun arduradunaren postaE helbidearekin.\n"
@@ -4867,12 +4869,12 @@ msgid "Security Administrator"
 msgstr "Segurtasun-administratzailea"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:461
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -4942,7 +4944,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Orain, Mandrivalinux sistema instalatzeko zein partizio erabiliko\n"
+"Orain, Mandriva Linux sistema instalatzeko zein partizio erabiliko\n"
 "d(ir)en aukeratu behar duzu. Partizioak jadanik definituta badaude,\n"
 "(GNU/Linux-en aurreko instalazio batek edo beste partizio-tresna batek\n"
 "definituta), lehendik dauden partizioak erabil ditzakezu. Bestela, disko \n"
@@ -5030,13 +5032,13 @@ msgid "Toggle between normal/expert mode"
 msgstr "Aldatu modu normalera/aditu modura"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:533
 #, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5065,7 +5067,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Microsoft partizio bat baino gehiago aurkitu dira zure disko zurrunean.\n"
-"Hautatu zeinen tamaina aldatu nahi duzun, Mandrivalinux sistema\n"
+"Hautatu zeinen tamaina aldatu nahi duzun, Mandriva Linux sistema\n"
 "berria instalatu ahal izateko.\n"
 "\n"
 "Partizioak honela azaltzen dira: \"Linux izena\", \"Windows izena\"\n"
@@ -5119,7 +5121,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5128,37 +5130,38 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux system. Your current "
+"partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
 msgstr ""
 "Zure makinan GNU/Linux partizio zahar bat aurkitzen bada bakarrik\n"
 "aktibatzen da urrats hau.\n"
 "\n"
 "DrakX-k orain jakin behar du instalazio berri bat egin behar duzun edo\n"
-"lehendik dagoen Mandrivalinux sistema baten bertsioa berritu nahi duzun:\n"
+"lehendik dagoen Mandriva Linux sistema baten bertsioa berritu nahi duzun:\n"
 "\n"
 " * \"%s\": Zatirik handienean, sistema zaharra guztiz ezabatzen du. \n"
 "Disko zurruneko partizio-banaketa aldatu nahi baduzu, edo fitxategi-sistema\n"
 "aldatu, erabili aukera hau. Nolanahi ere, zure partizio-eskemaren arabera,\n"
 "lehendik dauden datu batzuk gainidaztea saihestu dezakezu.\n"
 "\n"
-" * \"%s\" instalazio-mota honek unean Mandrivalinux sisteman \n"
+" * \"%s\" instalazio-mota honek unean Mandriva Linux sisteman \n"
 "instalatuta dituzun paketeak eguneratzeko aukera ematen du. Uneko \n"
 "partizio-eskema eta erabiltzaile-datuak ez dira aldatzen. Bestelako \n"
 "konfigurazio-urrats gehienak erabilgarri mantentzen dira, instalazio\n"
 "estandarretan bezalatsu.\n"
 "\n"
-"``Bertsio-berritu'' aukerak ondo funtzionatu behar luke Mandrivalinux\n"
-"sistemaren \"8.1\" bertsioetan edo berriagoetan. Mandrivalinux-en \"8.1\" \n"
+"``Bertsio-berritu'' aukerak ondo funtzionatu behar luke Mandriva Linux\n"
+"sistemaren \"8.1\" bertsioetan edo berriagoetan. Mandriva Linux-en \"8.1\" \n"
 "baino bertsio zaharragoetan ez da gomendatzen Bertsio-berritzea."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:591
 #, c-format
 msgid ""
@@ -5199,7 +5202,7 @@ msgstr ""
 "laster-teklak konfiguratzeko aukera emango dizu."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:609
 #, c-format
 msgid ""
@@ -5217,7 +5220,8 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5259,7 +5263,8 @@ msgstr ""
 "UTF-8 (unicode) euskarriari buruz: Unicode karaktere kodeketa berri bat da,\n"
 "existitzen diren hizkuntza guztiak hartu nahi dituena. Hala ere, "
 "berarentzako\n"
-"erabateko euskarria oraindik garatzen ari da GNU/Linux-en, Mandrivalinux-en\n"
+"erabateko euskarria oraindik garatzen ari da GNU/Linux-en, Mandriva Linux-"
+"en\n"
 "UTF-8 erabilera erabiltzailearen hautaketen araberakoa da:\n"
 "\n"
 " * Jatorrizko kodeketa ahaltsua duen hizkuntza bat aukeratzen baduzu \n"
@@ -5293,7 +5298,7 @@ msgid "Espanol"
 msgstr "Gaztelania"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:650
 #, c-format
 msgid ""
@@ -5373,7 +5378,7 @@ msgid "Universal | Any PS/2 & USB mice"
 msgstr "Unibertsala | Edozein PS/2 eta USB sagu"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:684
 #, c-format
 msgid ""
@@ -5384,7 +5389,7 @@ msgstr ""
 "\"ttyS0\" izena du GNU/Linux-en."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:688
 #, c-format
 msgid ""
@@ -5506,12 +5511,12 @@ msgstr ""
 "badakizu."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:742
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5532,11 +5537,12 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Inprimatzeko sistema bat hautatzeko unea da orain.Eeste sistema eragile \n"
-"batzuk bakarra eskainiko dizute, baina Mandrivalinux-ek bi eskaintzen ditu.\n"
+"batzuk bakarra eskainiko dizute, baina Mandriva Linux-ek bi eskaintzen "
+"ditu.\n"
 "Inprimaketa sistema bakoitza egokiago da konfigurazio mota batzuetarako.\n"
 "\n"
 " * \"%s\" -- ``print, do not queue'' esapidearen akronimoa da, eta aukera\n"
@@ -5557,7 +5563,7 @@ msgstr ""
 "hautatzeko eta inprimagailua kudeatzeko interfaze grafikoak ditu.\n"
 "\n"
 "Hautapena orain egiten baduzu, eta beranduago ohartzen bazara zure\n"
-" inprimaketa sistema ez zaizula guztoko Mandrivalinux Aginte Guneko\n"
+" inprimaketa sistema ez zaizula guztoko Mandriva Linux Aginte Guneko\n"
 " PrintDrake exekutatuz eta \"%s\" botoian klik eginez alda zenezake."
 
 #: help.pm:765
@@ -5576,7 +5582,7 @@ msgid "Expert"
 msgstr "Aditu"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:768
 #, c-format
 msgid ""
@@ -5679,7 +5685,8 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5696,7 +5703,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5764,7 +5771,7 @@ msgstr ""
 "\n"
 " * \"%s\": abio zamatzailearen konfigurazioa aldatu nahi baduzu, klikatu\n"
 "botoi hontan. Erabiltzaile aurreratuek bakarrik erabili behar lukete. Jo\n"
-"inprimatutako dokumentaziora edo Mandrivalinux Aginte Guneko\n"
+"inprimatutako dokumentaziora edo Mandriva Linux Aginte Guneko\n"
 " abio-zamatzailearen konfigurazioari buruzko lerroko laguntzara.\n"
 "\n"
 " * \"%s\": sarrera honen bitartez zehatz doitu dezakezu zure makinan\n"
@@ -5826,20 +5833,20 @@ msgid "Services"
 msgstr "Zerbitzuak"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:858
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Hautatu Mandrivalinux partizio berria instalatu ahal izateko ezabatu nahi\n"
+"Hautatu Mandriva Linux partizio berria instalatu ahal izateko ezabatu nahi\n"
 "duzun disko zurruna. Kontuz ibili, unitate horretako datu guztiak galdu\n"
 "egingo dira eta ezin izango dira berreskuratu!"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
+# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: help.pm:863
 #, c-format
 msgid ""
@@ -6191,11 +6198,11 @@ msgstr "Windows-en partizioaren tamaina kalkulatzen"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -6309,13 +6316,13 @@ msgstr "Sarea ixten"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -6369,7 +6376,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6406,7 +6413,7 @@ msgid ""
 "Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
 "as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6427,10 +6434,10 @@ msgid ""
 msgstr ""
 "Sarrera\n"
 "\n"
-"Mandrivalinux banaketako sistema eragileari eta erabilgarri dauden osagaiei"
+"Mandriva Linux banaketako sistema eragileari eta erabilgarri dauden osagaiei"
 "\"Software-produktuak\"\n"
 "deituko zaie aurrerantzean. Software-produktuetan sartzen dira, besteak \n"
-"beste, Mandrivalinux banaketako sistema eragileari eta osagaiei "
+"beste, Mandriva Linux banaketako sistema eragileari eta osagaiei "
 "dagozkienprogramak, \n"
 "metodoak, arauak eta dokumentazioa.\n"
 "\n"
@@ -6479,7 +6486,7 @@ msgstr ""
 "dute, ezein kasutan, \n"
 "erantzukizunik izango herrialde batzuetan, bertako legeek debekatutako edo "
 "mugatutako software-osagaiak edo\n"
-"Mandrivalinux-en guneetatik deskargatutako software-osagaiak eduki eta "
+"Mandriva Linux-en guneetatik deskargatutako software-osagaiak eduki eta "
 "erabiltzearen ondorioz \n"
 "sortutako kalte berezi ustekabeko, zuzeneko edo zeharkakoengatik (lana "
 "galtzea, lana etetea \n"
@@ -6521,8 +6528,8 @@ msgstr ""
 "Mandriva S.A.k eskubidea du Software-produktuak bere osotasunean edo zatika "
 "aldatzeko, \n"
 "edozein bide erabiliz eta helburu guztietarako.\n"
-"\"Mandriva\", \"Mandrivalinux\" eta asoziatutako logotipoak Mandriva S.A.ren "
-"marka erregistratuak dira.  \n"
+"\"Mandriva\", \"Mandriva Linux\" eta asoziatutako logotipoak Mandriva S.A."
+"ren marka erregistratuak dira.  \n"
 "\n"
 "\n"
 "5. Lege eraentzaileak \n"
@@ -6630,8 +6637,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6639,27 +6646,27 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "Zorionak, instalazioa burutu da.\n"
 "Atera abioko diskoa eta sakatu itzulera-tekla berrabiarazteko.\n"
 "\n"
 "\n"
-"Mandrivalinux-en bertsio honetarako erabilgarri dauden konponbideen \n"
+"Mandriva Linux-en bertsio honetarako erabilgarri dauden konponbideen \n"
 "informaziorako, kontsultatu Erratak helbide honetan:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"Zure sistema konfiguratzeko informazioa Mandrivalinux-en Erabiltzailearen\n"
+"Zure sistema konfiguratzeko informazioa Mandriva Linux-en Erabiltzailearen\n"
 "Gida Ofizialeko instalatu ondorengo azalpenei buruzko kapituluan duzu."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -6688,11 +6695,11 @@ msgstr "`%s'. urratsean sartzen\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Sistemak baliabide gutxi ditu. Arazoak izan ditzakezu Mandrivalinux \n"
+"Sistemak baliabide gutxi ditu. Arazoak izan ditzakezu Mandriva Linux \n"
 "instalatzeko. Horrela bada, testu-instalazioa egiten saia zaitezke. \n"
 "Horretarako, sakatu `F1' CD-ROMetik abiaraztean, eta idatzi `text'."
 
@@ -7232,9 +7239,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
-"Mandrivalinux web gunearekin konektatzen, ispilu erabilgarrien zerrenda "
+"Mandriva Linux web gunearekin konektatzen, ispilu erabilgarrien zerrenda "
 "lortzeko..."
 
 #: install_steps_interactive.pm:840
@@ -7459,8 +7466,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux %s instalazioa"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux %s instalazioa"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10048,13 +10055,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall konfiguratzailea\n"
 "\n"
-"Mandrivalinux makinarako suebaki pertsonal bat konfiguratzen du.\n"
+"Mandriva Linux makinarako suebaki pertsonal bat konfiguratzen du.\n"
 "Suebaki-soluzio ahaltsua eskuratu ahal izateko, kontsultatu\n"
 "MandrakeSecurity suebaki banaketa espezializatua."
 
@@ -14128,11 +14135,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
-"Exekutatu Scandrake (Hardwarea/Eskanerra Mandrivalinux-en Aginte Gunean) "
+"Exekutatu Scandrake (Hardwarea/Eskanerra Mandriva Linux-en Aginte Gunean) "
 "zure eskanerra sarean partekatzeko\n"
 "\n"
 
@@ -16085,33 +16092,33 @@ msgstr "Gelditu"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Zer da Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Zer da Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Ongi etorri <b>Mandrivalinux</b>-era!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Ongi etorri <b>Mandriva Linux</b>-era!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrivalinux <b>Linux banaketa</b> bat da sistemaren bihotza duena, "
+"Mandriva Linux <b>Linux banaketa</b> bat da sistemaren bihotza duena, "
 "<b>sistema eragilea</b> deitua (Linux nukleoan oinarritua) <b>aplikazio pila "
 "batekin</b> batera, izan ditzakezun behar guztiak hasetuko dituena."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrivalinux gaur egun Linux banaketa <b>lagunkoiena</b> da. Gainera "
+"Mandriva Linux gaur egun Linux banaketa <b>lagunkoiena</b> da. Gainera "
 "munduan zehar <b>gehien erabilitakonux</b> banaketen an artean dago!"
 
 #: share/advertising/02.pl:13
@@ -16127,14 +16134,14 @@ msgstr "Ongi etorri <b>Iturburu Irekiaren mundura</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux is committed to the open source model. This means that this "
 "new release is the result of <b>collaboration</b> between <b>Mandriva's team "
-"of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
-"Mandrivalinux iturburu irekiko ereduari herabat atsekitzen zaio. Honek esan "
+"Mandriva Linux iturburu irekiko ereduari herabat atsekitzen zaio. Honek esan "
 "nahi du bertsio berri hau <b>Mandriva-eko garatzaile taldearen</b> eta "
-"Mandrivalinux-en <b>mundu zabaleko</b> komunitatearen arteko "
+"Mandriva Linux-en <b>mundu zabaleko</b> komunitatearen arteko "
 "<b>lankidetzaren</b> emaitza dela."
 
 #: share/advertising/02.pl:19
@@ -16154,11 +16161,11 @@ msgstr "<b>GPLa</b>"
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Banaketa honetan sartutako software gehiena eta Mandrivalinux tresna guztiak "
-"<b>Lizentzia Publiko Orokorra</b>ren babesean lizentziatuta daude."
+"Banaketa honetan sartutako software gehiena eta Mandriva Linux tresna "
+"guztiak <b>Lizentzia Publiko Orokorra</b>ren babesean lizentziatuta daude."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16183,30 +16190,30 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Elkartu Mandrivalinux komunitatera</b>"
+msgstr "<b>Elkartu Mandriva Linux komunitatera</b>"
 
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrivalinux world."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
-"Mandrivalinux-ek erabitzaile eta garatzaile <b>komunitate handienetako</b> "
+"Mandriva Linux-ek erabitzaile eta garatzaile <b>komunitate handienetako</b> "
 "bat dauka. Horrelako komunitate baten eginkizuna oso zabala da, akatsak "
 "jakinaraztetik aplikazio berrien garapenera. Komunitateak <b>funtsezko "
-"eginkizuna</b> betetzen du Mandrivalinux munduan."
+"eginkizuna</b> betetzen du Mandriva Linux munduan."
 
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 "Gure komunitate dinamikoari buruz <b>gehiago jakiteko</b>, mesedez bisitatu "
-"<b>www.mandrakelinux.com</b> edo zuzenean <b>www.mandrakelinux.com/en/"
+"<b>www.mandrivalinux.com</b> edo zuzenean <b>www.mandrivalinux.com/en/"
 "cookerdevel.php3</b> garapenean <b>nahastu</b> nahi bazenu."
 
 #: share/advertising/05.pl:15
@@ -16217,10 +16224,10 @@ msgstr "<b>Deskargatzeko bertsioa</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Orain <b>Mandrivalinux Download</b> instalatzen ari zara. Hau Mandrivaek "
+"Orain <b>Mandriva Linux Download</b> instalatzen ari zara. Hau Mandrivaek "
 "<b>guztientzako eskuragarri</b> mantendu nahi duen doako bertsioa da."
 
 #: share/advertising/05.pl:19
@@ -16264,8 +16271,8 @@ msgstr "<b>Discovery, Zure Lehenengo Linux Idaztegia</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Orain <b>Mandrivalinux Discovery</b> instalatzen ari zara."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Orain <b>Mandriva Linux Discovery</b> instalatzen ari zara."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16287,8 +16294,8 @@ msgstr "<b>PowerPack, Linux Idaztegia Gorena</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "<b>Mandrivalinux PowerPack</b> instalatzen ari zara."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "<b>Mandriva Linux PowerPack</b> instalatzen ari zara."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16308,8 +16315,8 @@ msgstr "<b>PowerPack+, Idaztegi eta Zerbitzarietarako Linux Soluzioa</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "<b>Mandrivalinux PowerPack+</b> instalatzen ari zara."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "<b>Mandriva Linux PowerPack+</b> instalatzen ari zara."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16331,13 +16338,14 @@ msgstr "<b>Mandriva Produktuak</b>"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
-msgstr "<b>Mandriva</b>ek <b>Mandrivalinux</b> produktu eremu zabala garatudu."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
+msgstr ""
+"<b>Mandriva</b>ek <b>Mandriva Linux</b> produktu eremu zabala garatudu."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux produktuak dira:"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux produktuak dira:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16357,11 +16365,11 @@ msgstr "\t* <b>PowerPack+</b>, Idaztegi eta Zerbitzarietarako Linux Soluzioa."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrivalinux x86-64-rako</b>, zure 64-biteko prozesatzaileari onena "
-"ateratzeko Mandrivalinux soluzioa."
+"\t* <b>Mandriva Linux x86-64-rako</b>, zure 64-biteko prozesatzaileari onena "
+"ateratzeko Mandriva Linux soluzioa."
 
 #: share/advertising/10.pl:15
 #, c-format
@@ -16371,29 +16379,29 @@ msgstr "<b>Mandriva Produktuak (Nomada Produktuak)</b>"
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandriva-ek bi produktu garatu ditu Mandrivalinux <b>edozein "
+"Mandriva-ek bi produktu garatu ditu Mandriva Linux <b>edozein "
 "konputagailutan</b> erabili ahal izateko berau instalatu beharrik gabe:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, osorik CD-ROM abiarazle batetik exekutatzen den "
-"Mandrivalinux banaketa bat."
+"\t* <b>Move</b>, osorik CD-ROM abiarazle batetik exekutatzen den Mandriva "
+"Linux banaketa bat."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 "\t* <b>GlobeTrotter</b>, “LaCie Mobile Hard Drive” ultra-konpaktoan aurre-"
-"instalatutako Mandrivalinux banaketa bat."
+"instalatutako Mandriva Linux banaketa bat."
 
 #: share/advertising/11.pl:13
 #, c-format
@@ -16411,18 +16419,20 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, Enpresentzako Mandrivalinux Idaztegia."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Enpresentzako Mandriva Linux Idaztegia."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Mandrivalinux Zerbitzari Soluzioa."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandriva Linux Zerbitzari Soluzioa."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b>, Mandrivalinux Segurtasun Soluzioa."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, Mandriva Linux Segurtasun Soluzioa."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16624,10 +16634,10 @@ msgstr "<b>Gozatu ezazu Aplikazio Eremu Zabala</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Mandrivalinux menuan zure eginbehar guztientzako aplikazio erabilerrazak "
+"Mandriva Linux menuan zure eginbehar guztientzako aplikazio erabilerrazak "
 "aurkituko dituzu:"
 
 #: share/advertising/18.pl:16
@@ -16897,18 +16907,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux kontrol-zentroa</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux kontrol-zentroa</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrivalinux Aginte Gunea</b> zure konputagailuaren konfigurazioa "
-"errazteko diseinatutako Mandrivalinux-en ezinbesteko utilitate espezifikoen "
+"<b>Mandriva Linux Aginte Gunea</b> zure konputagailuaren konfigurazioa "
+"errazteko diseinatutako Mandriva Linux-en ezinbesteko utilitate espezifikoen "
 "bilduma bat da."
 
 #: share/advertising/25.pl:17
@@ -16933,15 +16943,15 @@ msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
 "Mandriva sells added value products and services to <b>keep improving "
-"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrivalinux, <b>please</b> consider buying one of "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Konputagailu programaketa guztiak bezala, iturburu irekiko softwareak "
 "<b>denbora eta jendea</b> behar du garapenerako. Iturburu irekiko filosofia "
 "errespetatzeko asmoz, Mandriva-ek balio erantsidun produktu eta zerbitzuak "
-"saltzen ditu <b>Mandrivalinux hobetzen jarraitzeko</b>. <b>Iturburu irekiko "
-"filosofiari</b> eta Mandrivalinux-en garapenari laguntza eman nahi badiezu, "
+"saltzen ditu <b>Mandriva Linux hobetzen jarraitzeko</b>. <b>Iturburu irekiko "
+"filosofiari</b> eta Mandriva Linux-en garapenari laguntza eman nahi badiezu, "
 "<b>mesedez</b> gogoan hartu gure produktu edo zerbitzuetako baten erosketa!"
 
 #: share/advertising/27.pl:13
@@ -16976,8 +16986,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Joan gaur bertan <b>store.mandrakesoft.com</b> gunera"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Joan gaur bertan <b>store.mandriva.com</b> gunera"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16987,10 +16997,10 @@ msgstr "<b>Mandriva Club</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
-"<b>Mandriva Club</b> zure Mandrivalinux produktuen <b>lagunperfektua</b> "
+"<b>Mandriva Club</b> zure Mandriva Linux produktuen <b>lagunperfektua</b> "
 "da..."
 
 #: share/advertising/28.pl:19
@@ -17004,7 +17014,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 "\t* <b>Deskontu bereziak</b> gure lerroko dendaren, <b>store.mandrakesoft."
 "com</b>, produktu eta zerbitzuetan."
@@ -17020,17 +17030,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Parte-hartzea Mandrivalinux <b>erabiltzaile foruetan</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Parte-hartzea Mandriva Linux <b>erabiltzaile foruetan</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 "\t* Askapen publikoaren aurretik <b>sarbide goiztiar eta pribilegiatua</b>, "
-"Mandrivalinux <b>ISO irudietara</b>."
+"Mandriva Linux <b>ISO irudietara</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -17050,10 +17060,10 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 "Mandriva Online-k zerbitzu baliogarrien aukera zabala eskaintzen du zure "
-"Mandrivalinux sistema <b>erraz eguneratzeko</b>:"
+"Mandriva Linux sistema <b>erraz eguneratzeko</b>:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17079,9 +17089,9 @@ msgstr "\t* Eguneraketa <b>programazio</b> malgua."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
-"\t* Zure <b>Mandrivalinux sistema guztien</b> kudeaketa kontu bakarrarekin."
+"\t* Zure <b>Mandriva Linux sistema guztien</b> kudeaketa kontu bakarrarekin."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -17092,27 +17102,27 @@ msgstr "<b>Mandriva Expert</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 "<b>Laguntza</b> behar duzu? Mandriva-en aditu teknikoak aurkituko dituzu www."
-"mandrakeexpert.com <b>gure euskarri teknikoaren plataforman</b>."
+"mandrivaexpert.com <b>gure euskarri teknikoaren plataforman</b>."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"<b>Mandrivalinux aditu gaituen</b> laguntzari esker, denbora asko aurreztuko "
-"duzu."
+"<b>Mandriva Linux aditu gaituen</b> laguntzari esker, denbora asko "
+"aurreztuko duzu."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
-"Mandrivalinux-ekin zerikusia duten galderak erantzuteko, <b>store."
+"Mandriva Linux-ekin zerikusia duten galderak erantzuteko, <b>store."
 "mandrakesoft.com</b>-en euskarri gertakariak erosteko aukera daukazu."
 
 #: share/compssUsers.pl:25
@@ -17502,8 +17512,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 "[AUKERAK] [PROGRAMA_IZENA]\n"
 "\n"
@@ -17566,7 +17576,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -20442,13 +20452,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux-en programa-erroreen berri emateko tresna"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux-en programa-erroreen berri emateko tresna"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux-en kontrol-zentroa"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux-en kontrol-zentroa"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20941,20 +20951,20 @@ msgstr "Abioan abiaraztekoa"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Interfaze hau ez da oraindik konfiguratu.\n"
-"Exekutatu Mandrivalinux kontrol-zentroko \"Gehitu interfaze bat\" "
+"Exekutatu Mandriva Linux kontrol-zentroko \"Gehitu interfaze bat\" "
 "laguntzailea"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Ez daukazu konfiguratutako Internet loturarik.\n"
-"Exekutatu Mandrivalinux Aginte Guneko \"%s\" morroia"
+"Exekutatu Mandriva Linux Aginte Guneko \"%s\" morroia"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21004,8 +21014,8 @@ msgstr "KDM (KDE konexioen kudeatzailea)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Mandrivalinux konexioen kudeatzailea)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Mandriva Linux konexioen kudeatzailea)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21309,18 +21319,18 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 "Copyright (C) 2001-2002 Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (jatorrizko bertsioa)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 
 #: standalone/drakfont:520
 #, c-format
@@ -21893,8 +21903,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux Laguntza Gunea"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux Laguntza Gunea"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22558,7 +22568,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "Soinu-txartelik ez da detektatu zure makinan. Egiazta ezazu Linux-ek "
 "onartutako soinu-txartela behar bezala sartuta dagoela.\n"
@@ -22567,7 +22577,7 @@ msgstr ""
 "Gure hardwarearen datu-basea bisita dezakezu:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24584,7 +24594,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "Telebista-txartelik ez da detektatu zure makinan. Egiazta ezazu Linux-ek "
 "onartutako bideo/telebista-txartela behar bezala sartuta dagoela.\n"
@@ -24593,7 +24603,7 @@ msgstr ""
 "Gure hardwarearen datu-basea bisita dezakezu:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25310,13 +25320,13 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
 "Hau HardDrake da, %s hardwarea konfiguratzeko tresna.\n"
 "<span foreground=\"royalblue3\">Bertsioa:</span> %s\n"
 "<span foreground=\"royalblue3\">Egilea:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25426,8 +25436,8 @@ msgstr "Aldaketa egin da, baina, eragina izan dezan, saioa amaitu behar duzu"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinux Tresnen Erregistroak"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linux Tresnen Erregistroak"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25940,7 +25950,7 @@ msgstr "Konexioa osatu da."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Konexioak huts egin du.\n"
 "Egiaztatu zure konfigurazioa Mandrake-ren kontrol-zentroan."