various Mandrake -> Mandriva changes

1 files changed, 234 insertions, 228 deletions

diff --git a/perl-install/share/po/wa.po b/perl-install/share/po/wa.po
index 0a2db8d7b..9e2f99296 100644
--- a/perl-install/share/po/wa.po
+++ b/perl-install/share/po/wa.po
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Pablo Saratxaga <pablo@mandrakesoft.com>, 2000,2002,2003,2004.
+# Pablo Saratxaga <pablo@mandriva.com>, 2000,2002,2003,2004.
 # Lorint Hendschel <lorinthendschel@skynet.be>, 2002.
 # Lucyin Mahin <lucyin@walon.org>, 2002,2003.
 # Pablo Saratxaga <pablo@walon.org>, 2003, 2004, 2005.
@@ -107,7 +107,7 @@ msgstr ""
 "\n"
 "\n"
 "Vos ploz eto continouwer sins sere USB - vos pôroz co eployî\n"
-"Mandriva Move come on sistinme d' operance Mandrivalinux normå,\n"
+"Mandriva Move come on sistinme d' operance Mandriva Linux normå,\n"
 "mins vos piedroz a l' enondaedje ki vént çou k' vos åroz candjî."
 
 #: ../move/move.pm:483
@@ -134,7 +134,7 @@ msgstr ""
 "\n"
 "\n"
 "Vos ploz eto continouwer sins sere USB - vos pôroz co eployî\n"
-"Mandriva Move come on sistinme d' operance Mandrivalinux normå,\n"
+"Mandriva Move come on sistinme d' operance Mandriva Linux normå,\n"
 "mins vos piedroz a l' enondaedje ki vént çou k' vos åroz candjî."
 
 #: ../move/move.pm:494
@@ -1324,7 +1324,7 @@ msgstr "Tchoezi l' lingaedje"
 #: 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 ""
@@ -3766,12 +3766,12 @@ msgstr "mete en alaedje li sopoirt pol 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 ""
 "Divant d' aler pus avant, vos dvrîz lére atintivmint l' licince.\n"
-"Ele covere li distribucion Mandrivalinux, si vos estoz d' acoird\n"
+"Ele covere li distribucion Mandriva Linux, si vos estoz d' acoird\n"
 "avou les termes del licince, clitchîz sol boesse «%s».\n"
 "Ôtrumint, clitchîz sol boton «%s» po renonder l' copiutrece."
 
@@ -3956,13 +3956,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 ""
-"L' astalaedje del distribucion Mandrivalinux si fwait a pårti di\n"
+"L' astalaedje del distribucion Mandriva Linux si fwait a pårti di\n"
 "sacwantès plakes lazer diferinnes. Si on pacaedje k' a stî tchoezi\n"
 "est so ene ôte plake lazer, DrakX frè rexhe li plake k' est el lijheu\n"
 "d' plakes lazer eyet vos dmander d' î mete li cene k' i fåt.\n"
@@ -3973,11 +3973,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"
@@ -4029,8 +4030,8 @@ msgid ""
 "megabytes."
 msgstr ""
 "Asteure c' est l' moumint di specifyî kés programes ki vos vloz astaler so\n"
-"voste éndjole. I gn a des meyes et des meyes di pacaedjes pol "
-"Mandrivalinux,\n"
+"voste éndjole. I gn a des meyes et des meyes di pacaedjes pol Mandriva "
+"Linux,\n"
 "po rinde li tchoezixhaedje pus simpe il ont stî metous dins des groupes\n"
 "di programes sorlon les bouyes k' i permetèt d' fé.\n"
 "\n"
@@ -4145,10 +4146,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"
@@ -4178,12 +4179,12 @@ msgstr ""
 "\n"
 "!! Si on pacaedje di sierveu a stî tchoezi, soeye-t i en esprès, ou k' i\n"
 "fwait pårteye d' on groupe, on vos dmandrè d' acertiner ki vos vloz\n"
-"vormint astaler ces sierveus la. Avou Mandrivalinux tot l' minme ké\n"
+"vormint astaler ces sierveus la. Avou Mandriva Linux tot l' minme ké\n"
 "sierveu k' a stî astalé est, avou les prémetowès tchuzes, metou en\n"
 "alaedje tins di l' enondaedje di l' éndjole. Minme s' i sont seurs\n"
 "et k' i gn a nou cnoxhou problinme å moumint ki l' distribucion a stî\n"
 "fwaite, i s' pout k' des trôs di såvrité soeyexhe discovrous après ki\n"
-"cisse modêye chal di Mandrivalinux fouxhe fineye. Si vos n' savoz nén çou\n"
+"cisse modêye chal di Mandriva Linux fouxhe fineye. Si vos n' savoz nén çou\n"
 "k' on siervice dné est supôzé di fé, ou pocwè k' il est astalé, adon\n"
 "clitchîz so «%s». Si vos clitchîz so «%s» les siervices mostrés sront\n"
 "astalés eyet enondés otomaticmint. !!\n"
@@ -4341,7 +4342,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"
@@ -4397,7 +4398,7 @@ msgid ""
 msgstr ""
 "X (po Sistinme di Purneas X) est l' miercour di l' eterface grafike di\n"
 "GNU/Linux, ki tos les evironmints grafikes (KDE, Gnome, AfterStep,\n"
-"WindowsMaker, evnd.) ki vnèt avou Mandrivalinux end ont mezåjhe.\n"
+"WindowsMaker, evnd.) ki vnèt avou Mandriva Linux end ont mezåjhe.\n"
 "\n"
 "Vos åroz ene djivêye des diferins parametes a candjî po-z aveur\n"
 "voste eterface grafike a l' idêye:\n"
@@ -4517,12 +4518,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"
@@ -4549,7 +4550,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"
@@ -4558,7 +4559,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"
@@ -4579,11 +4581,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Asteure, vos dvoz tchoezi wice ki vos vloz astaler vosse sistinme\n"
-"d' operance Mandrivalinux so vosse deure plake. Si l' plake est vude,\n"
+"d' operance Mandriva Linux so vosse deure plake. Si l' plake est vude,\n"
 "ou si les sistinmes d' operance k' i gn a ddja prindèt tote li plaece,\n"
 "vos avoz mezåjhe del pårti. Fé on pårtixhaedje d' ene deure plake çoula\n"
 "vout dire del pårti lodjicmint po fé del plaece po-z astaler vosse novea\n"
-"sistinme Mandrivalinux.\n"
+"sistinme Mandriva Linux.\n"
 "\n"
 "Come, on côp ki li pårtixhaedje est fwait, on n' sait rivni en erî\n"
 "(normålmint), les apurdisses ont sovint sogne ou peu di s' enonder.\n"
@@ -4614,7 +4616,7 @@ msgstr ""
 "Li candjmint d' grandeu des pårticions si pout fé sins piede des dnêyes,\n"
 "a condicion del disfragminter d' aprume, eyet kel pårticion soeye ene\n"
 "pårticion FAT. C' est hôtmint ricmandé di fé ene copeye di såvrité.\n"
-"Cisse solucions est ricmandêye si vos vloz eployî Mandrivalinux et\n"
+"Cisse solucions est ricmandêye si vos vloz eployî Mandriva Linux et\n"
 "Microsoft Windows sol minme copiutrece.\n"
 "\n"
 "Divant di tchoezi cisse solucion, i vos fåt comprinde kel grandeu di vosse\n"
@@ -4623,7 +4625,7 @@ msgstr ""
 "les dnêyes da vosse ou astaler des noveas programes.\n"
 "\n"
 " * «%s»: si vos vloz disfacer totes les dnêyes k' i gn a\n"
-"so vosse deure plake po mete el plaece li sistinme Mandrivalinux,\n"
+"so vosse deure plake po mete el plaece li sistinme Mandriva Linux,\n"
 "vos ploz tchoezi cisse tchuze chal.\n"
 "Prindoz asteme k' avou cisse solucion chal vos n' pôroz nén rivni en erî\n"
 "on côp ki vos avoz acertiné vosse tchuze.\n"
@@ -4790,7 +4792,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."
@@ -4815,7 +4817,7 @@ msgstr ""
 "pårticions.\n"
 "\n"
 "Clitchîz so «%s» si vos vloz tchoezi ene ôte pårticion po-z astaler\n"
-"vosse novea sistinme d' operance Mandrivalinux.\n"
+"vosse novea sistinme d' operance Mandriva Linux.\n"
 "\n"
 "Clitchîz so «%s» si vos vloz tchoezi les pårticions ki sront\n"
 "verifieyes po vey s' i gn a des måvas bloks sol deure plake."
@@ -4832,7 +4834,7 @@ msgstr "Di dvant"
 #: 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"
@@ -4844,7 +4846,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Å moumint ki vos astalez Mandrivalinux, i s' pout bén k' i gn åye\n"
+"Å moumint ki vos astalez Mandriva Linux, i s' pout bén k' i gn åye\n"
 "des pacaedjes k' ont stî metous a djoû dispoy li moumint do fijhaedje\n"
 "del distribucion. Motoit k' des bugs ont stî coridjîs, ou des problinmes\n"
 "di såvrité. Por vos profiter di ces metaedjes a djoû, on vs propôze\n"
@@ -4875,7 +4877,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"
@@ -4888,8 +4890,8 @@ msgstr ""
 "d' eployî li copiutrece.\n"
 "\n"
 "Si vos n' savoz cwè tchoezi, leyîz li prémetou livea. Vos l' pôroz candjî\n"
-"pus tård avou l' usteye draksec a pårti do cinte di contrôle di "
-"Mandrivalinux.\n"
+"pus tård avou l' usteye draksec a pårti do cinte di contrôle di Mandriva "
+"Linux.\n"
 "\n"
 "Li tchamp «%s» c' est po dner l' adresse emile d' ene sakî responsåve del\n"
 "såvrité po ciste éndjole ci. Les messaedjes sol såvrité lyi sront evoyîs."
@@ -4903,7 +4905,7 @@ msgstr "Manaedjeu pol såvrité"
 #, 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"
@@ -4974,7 +4976,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Chal, vos dvoz tchoezi so kéne/kénès pårticion(s) ki vos voloz astaler\n"
-"vosse sistinme Mandrivalinux. Si vos pårticions ont ddja stî fwaites\n"
+"vosse sistinme Mandriva Linux. Si vos pårticions ont ddja stî fwaites\n"
 "(p. egz. li dierin côp ki vos avoz astalé GNU/Linux ou bén avou ene ôte\n"
 "usteye di pårtixhaedje), vos les ploz eployî. Ôtrumint, des pårticions dvèt\n"
 "esse defineyes so vosse deure plake. Ça vout dire ki vos alez dispårti\n"
@@ -5068,7 +5070,7 @@ msgstr "Candjî pol môde normå/spepieus"
 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"
@@ -5098,7 +5100,7 @@ msgid ""
 msgstr ""
 "Pus d' ene pårticion Windows a stî detectêye so vosse deure plake.\n"
 "Tchoezixhoz li cene ki vos vloz candjî si grandeu, po-z astaler vosse\n"
-"novea sistinme d'&nbsp;operance Mandrivalinux s' i vs plait.\n"
+"novea sistinme d'&nbsp;operance Mandriva Linux s' i vs plait.\n"
 "\n"
 "Po l' informåcion, tchaeke pårticion est mostrêye come çoula:\n"
 "«no Linux», «no Windows», «grandeu».\n"
@@ -5148,7 +5150,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"
@@ -5157,19 +5159,20 @@ 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 ""
 "Ciste etape est enondêye seulmint si ene viye pårticion GNU/Linux a stî\n"
 "trovêye so voste éndjole.\n"
 "\n"
 "DrakX asteure a mezåjhe di saveur si vos vloz fé ene novele astalåcion\n"
-"oudonbén fé on metaedje a djoû d' on sistinme Mandrivalinux k' i gn a\n"
+"oudonbén fé on metaedje a djoû d' on sistinme Mandriva Linux k' i gn a\n"
 "ddja sol plake:\n"
 "\n"
 " * «%s»: çouchal va spotchî ttafwait l' vî sistinme k' i gn\n"
@@ -5180,14 +5183,14 @@ msgstr ""
 "ki n' seront nén spotcheyes.\n"
 "\n"
 " * «%s»: cisse classe d' astalaedje chal vos permete di\n"
-"mete a djoû les pacaedjes k' i gn a so vosse sistinme Mandrivalinux.\n"
+"mete a djoû les pacaedjes k' i gn a so vosse sistinme Mandriva Linux.\n"
 "Vosse pårtixhaedje est wårdé et les dnêyes des uzeus n' sont nén\n"
 "candjeyes. Li plupårt des ôtès etapes d' apontiaedje dimorèt, come\n"
 "pol cas d' èn astalaedje sitandård.\n"
 "\n"
 "Eployî l' tchuze «Metaedje a djoû» rote comifåt po mete a djoû des\n"
-"sistinmes Mandrivalinux modêye «8.1» ou pus nouve. Mins l' fé po\n"
-"des modêyes di Mandrivalinux pus viyes kel «8.1» n' est nén ricmandé."
+"sistinmes Mandriva Linux modêye «8.1» ou pus nouve. Mins l' fé po\n"
+"des modêyes di Mandriva Linux pus viyes kel «8.1» n' est nén ricmandé."
 
 #: help.pm:591
 #, c-format
@@ -5245,7 +5248,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"
@@ -5290,7 +5294,7 @@ msgstr ""
 "Åd fwait do sopoirt UTF-8 (unicôde): Unicôde est on novea ecôdaedje\n"
 "ki permete di scrire tos les lingaedjes del Daegn. Mins i gn a co des\n"
 "sacwès a-z amidrer dins l' sopoirt UTF-8 so GNU/Linux. Vola pocwè\n"
-"Mandrivalinux eployrè UTF-8 ou nén sorlon les tchuzes ki vos djhoz:\n"
+"Mandriva Linux eployrè UTF-8 ou nén sorlon les tchuzes ki vos djhoz:\n"
 "\n"
 " * Si vos tchoezixhoz on lingaedje avou ene foite eritance d' on dné\n"
 "ecôdaedje (lingaedjes latin1, rûsse, djaponès, chinwès, corêyin, taylandès\n"
@@ -5541,7 +5545,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"
@@ -5562,12 +5566,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 ""
 "Chal, vos tchoezixhoz li ké sistinme d' imprimaedje vos vloz eployî\n"
 "so vosse copiutrece. Des ôtes sistinmes d' operance k' i gn a\n"
-"vos dnèt onk, mins Mandrivalinux vos lait tchoezi inte deus, tchaeke onk\n"
+"vos dnèt onk, mins Mandriva Linux vos lait tchoezi inte deus, tchaeke onk\n"
 "estant l' meyeu dins on cas dné.\n"
 "\n"
 " * «%s» - ki vout dire «print, do not queue» (imprimer sins cawêye), est\n"
@@ -5591,7 +5595,7 @@ msgstr ""
 "\n"
 "Si vos tchoezixhoz asteure, et ki pus tård vos n' inmez nén vosse sistinme\n"
 "d' imprimaedje, vos l' poloz åjheymint candjî avou l' usteye d' apontiaedje\n"
-"des scrireces, a-z enonder a pårti do cinte di contrôle di Mandrivalinux, "
+"des scrireces, a-z enonder a pårti do cinte di contrôle di Mandriva Linux, "
 "tot\n"
 "clitchant sol boton «%s»."
 
@@ -5709,7 +5713,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"
@@ -5726,7 +5731,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"
@@ -5777,7 +5782,7 @@ msgstr ""
 "\n"
 " * «%s»: Si vos vloz apontyî li rantoele (locåle ou daegnrece),\n"
 "clitchîz so ç' boton chal. Lijhoz li documintåcion so papî oudonbén\n"
-"li cene håynåve a pårti do cinte di controle di Mandrivalinux\n"
+"li cene håynåve a pårti do cinte di controle di Mandriva Linux\n"
 "après l' astalaedje po-z aveur pus di racsegnes.\n"
 "\n"
 " * «%s»: vos permete d' apontyî les adresses des procsis HTTP eyet FTP\n"
@@ -5794,7 +5799,7 @@ msgstr ""
 " * «%s»: si vos vloz candjî l' apontiaedje di l' enondrece\n"
 "di l' éndjole. Vos nel duvrîz fé ki si vos estoz seur di vos.\n"
 "Lijhoz li documintåcion so l' enondrece dins l' cinte di controle\n"
-"di Mandrivalinux po pus di racsegnes.\n"
+"di Mandriva Linux po pus di racsegnes.\n"
 "\n"
 " * «%s»: vos pôroz controler finmint les kés siervices ki vos vloz\n"
 "enonder so voste éndjole. Si vos l' vloz eployî po fé do sierveu c' est\n"
@@ -5855,11 +5860,11 @@ msgstr "Siervices"
 #, 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 ""
 "Tchoezixhoz li deure plake ki vos vloz disfacer po-z î astaler vosse\n"
-"novele pårticion Mandrivalinux. Prindoz asteme, totes les dnêyes\n"
+"novele pårticion Mandriva Linux. Prindoz asteme, totes les dnêyes\n"
 "k' i gn a sol deure plake vont esse pierdowes, et vos n' pôroz les rapexhî."
 
 #: help.pm:863
@@ -5902,7 +5907,8 @@ msgstr ""
 "Dji n' sai vey les modules po vosse nawea (i gn a pont d' fitchî %s), çoula "
 "vout probåblumint dire ki vosse plakete d' enondaedje n' a nén stî fwait pol "
 "sopoirt d' astalaedje ki vos vloz eployî. Vos dvrîz fé ene nouve plakete, a "
-"pårti des imådjes ki vnèt avou li modêye di Mandrivalinux ki vos vloz astaler"
+"pårti des imådjes ki vnèt avou li modêye di Mandriva Linux ki vos vloz "
+"astaler"
 
 #: install2.pm:172
 #, c-format
@@ -6219,7 +6225,7 @@ msgstr "Carculant l' grandeu del pårticion 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 "Vosse pårticion Windows est trop fragmintêye, i fåreut eployî «defrag»"
 
@@ -6338,13 +6344,13 @@ msgstr "Dj' arestêye li rantoele"
 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"
@@ -6373,8 +6379,8 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by "
-"law, be liable for any special,\n"
+"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
+"be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
 "business, interruption of business, financial loss, legal fees and penalties "
@@ -6388,8 +6394,8 @@ msgid ""
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, "
-"in no circumstances, be \n"
+"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
+"no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
 "limitation damages for loss of business, interruption of business, financial "
@@ -6398,7 +6404,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"
@@ -6432,10 +6438,10 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software "
-"Products, as a whole or in \n"
+"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
+"as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6514,8 +6520,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"
@@ -6523,13 +6529,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "Felicitåcions, l' astalåcion a stî fwaite.\n"
 "Bodjîz li sopoirt d' enondaedje et tapez so Return po renonder l' éndjole.\n"
 "\n"
 "Po des informåcions so les coridjaedjes k' i gn a po cisse modêye di "
-"Mandrivalinux,\n"
+"Mandriva Linux,\n"
 "loukîz al pådje des Errata sol waibe:\n"
 "\n"
 "\n"
@@ -6537,13 +6543,13 @@ msgstr ""
 "\n"
 "\n"
 "vos trovroz di l' informåcion so l' apontiaedje do sistinme el tchaptrê\n"
-"sol post-astalåcion do Guide di l' Uzeu Mandrivalinux Oficir."
+"sol post-astalåcion do Guide di l' Uzeu Mandriva Linux Oficir."
 
 #. -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
@@ -6573,12 +6579,12 @@ msgstr "Intrant e l' etape '%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 ""
 "Vosse sistinme a po di rsources. Vos pôrîz aveur des rujhes po\n"
-"l' astalåcion di Mandrivalinux. Si çoula arive, vos ploz sayî ene\n"
+"l' astalåcion di Mandriva Linux. Si çoula arive, vos ploz sayî ene\n"
 "astalåcion e môde tecse. Po çoula, tchoûkîz sol tape «F1» a l' enondaedje\n"
 "et poy tapez «text»."
 
@@ -7125,10 +7131,10 @@ 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 ""
-"Dj' atôche li waibe da Mandrivalinux po-z aveur li djivêye di muroes k' i gn "
-"a"
+"Dj' atôche li waibe da Mandriva Linux po-z aveur li djivêye di muroes k' i "
+"gn a"
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7353,8 +7359,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Astalåcion di Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Astalåcion di Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -8109,7 +8115,7 @@ msgstr "Eslovenyinne"
 msgid ""
 "_: keyboard\n"
 "Sinhala"
-msgstr ""
+msgstr "Sinhala"
 
 #: keyboard.pm:294
 #, c-format
@@ -8193,14 +8199,14 @@ msgstr "Taprece taylandesse (pattachote)"
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
-msgstr ""
+msgstr "Tifinar (taprece marokinne) (+latén/arabe)"
 
 #: keyboard.pm:311
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
-msgstr ""
+msgstr "Tifinar (fonetike) (+latén/arabe)"
 
 #: keyboard.pm:313
 #, c-format
@@ -9941,14 +9947,14 @@ 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 ""
 "Apontiaedje do côpe feu drakefirewall\n"
 "\n"
 "Çouci apontieye on côpe feu personel (dj' ô bén, po esse eployî sor on\n"
-"posse éndjolrece) po ciste éndjole Mandrivalinux chal.\n"
+"posse éndjolrece) po ciste éndjole Mandriva Linux chal.\n"
 "Po ene poûxhante solucion di côpe feu, loukîz purade do costé\n"
 "del distribucion MandrakeSecurity avou on côpe feu di hôte såvrité."
 
@@ -10879,7 +10885,7 @@ msgstr "Astaler on novea mineu"
 #: network/netconnect.pm:1191
 #, c-format
 msgid "Select a device:"
-msgstr ""
+msgstr "Tchoezixhoz èn éndjin:"
 
 #: network/netconnect.pm:1216
 #, c-format
@@ -14025,12 +14031,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 ""
 "Enondez Scannerdrake («Éndjolreye/Sicanreces» e cinte di controle di "
-"Mandrivalinux) po pårtaedjî vosse sicanrece sol rantoele.\n"
+"Mandriva Linux) po pårtaedjî vosse sicanrece sol rantoele.\n"
 "\n"
 
 #: printer/printerdrake.pm:3933
@@ -16018,23 +16024,23 @@ msgstr "Arester"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Mandrivalinux, k' est çki c' est d' ça?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Mandriva Linux, k' est çki c' est d' ça?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Bénvnowe a <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Bénvnowe 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 est ene <b>distribucion di GNU/Linux</b> fwait do cour do "
+"Mandriva Linux est ene <b>distribucion di GNU/Linux</b> fwait do cour do "
 "sistinme, dj' ô bén li <b>nawea</b> do sistinme d' operance (båzé sol nawea "
 "Linux) eyet aconcoisté di <b>bråmint di programes</b> po pleur fé ene miete "
 "tot çki vos pôrîz tuzer d' fé."
@@ -16042,10 +16048,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 est li distribucion di GNU/Linux li pus <b>uzeu-amiståve</b> "
+"Mandriva Linux est li distribucion di GNU/Linux li pus <b>uzeu-amiståve</b> "
 "d' enute.C' est eto ene des distribucions di Linux les <b>pus eployeyes sol "
 "Daegn</b>!"
 
@@ -16062,15 +16068,15 @@ msgstr "Wilicome amon les <b>libes programes</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandriva's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
+"Mandriva Linux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's team "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
-"Mandrivalinux shût l' modele des libès programes. Dj' ô bén ki cisse nouve "
+"Mandriva Linux shût l' modele des libès programes. Dj' ô bén ki cisse nouve "
 "modêye est l' rizultat del <b>colaboråcion</b> etur l' <b>ekipe di "
 "diswalpeus di Mandriva</b> eyet li <b>cminålté daegnrece</b> des "
-"contribouweus a Mandrivalinux."
+"contribouweus a Mandriva Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16089,11 +16095,11 @@ msgstr "<b>Li licince 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 ""
 "Li plupårt des programes ki vnèt avou l' distribucion, eyet totes les "
-"usteyes di Mandrivalinux, sont dizo li <b>Licince Publike Djeneråle</b> "
+"usteyes di Mandriva Linux, sont dizo li <b>Licince Publike Djeneråle</b> "
 "(GPL)."
 
 #: share/advertising/03.pl:17
@@ -16126,26 +16132,26 @@ msgstr "<b>Ridjondoz li cminålté</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 a-st ene des <b>pus grandès cminåltés</b> d' uzeus eyet "
+"Mandriva Linux a-st ene des <b>pus grandès cminåltés</b> d' uzeus eyet "
 "d' diswalpeus. Li role d' ene sifwaite kiminålté est foirt lådje, alant des "
 "rapoirtaedjes di bugs å diswalpaedje di noveas programes. Li cminålté djouwe "
-"on <b>role-clé</b> dins l' monde di Mandrivalinux."
+"on <b>role-clé</b> dins l' monde di 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 ""
 "Po-z <b>aprinde di pus</b> so nosse kiminålté dinamike, vizitez s' i vs "
-"plait li waibe <b>www.mandrakelinux.com</b> oudonbén directumint al pådje "
-"<b>http://www.mandrakelinux.com/fr/cookerdevel.php3</b> si vos vloz "
+"plait li waibe <b>www.mandrivalinux.com</b> oudonbén directumint al pådje "
+"<b>http://www.mandrivalinux.com/fr/cookerdevel.php3</b> si vos vloz "
 "<b>pårticiper</b> dins l' diswalpaedje."
 
 #: share/advertising/05.pl:15
@@ -16156,10 +16162,10 @@ msgstr "<b>Modêye aberwetaedje («Download version»)</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 ""
-"Vos estoz k' astale li <b>Modêye aberwetaedje di Mandrivalinux</b>. C' est "
+"Vos estoz k' astale li <b>Modêye aberwetaedje di Mandriva Linux</b>. C' est "
 "ene modêye po rén ki Mandriva rind <b>disponibe po tertos</b>."
 
 #: share/advertising/05.pl:19
@@ -16205,8 +16211,8 @@ msgstr "<b>«Discovery», li dischovraedje di vosse prumî scribanne Linux</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Vos estoz k' astale <b>Mandrivalinux Discovery</b> (dischovraedje)."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Vos estoz k' astale <b>Mandriva Linux Discovery</b> (dischovraedje)."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16229,8 +16235,8 @@ msgstr "<b>Li PowerPack, li meyeu do scribanne Linux</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Vos estoz k' astale <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Vos estoz k' astale <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16239,9 +16245,9 @@ msgid ""
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"Li PowerPack est li prodût Mandriva avou on <b>scribanne Linux di "
-"prumire classe</b>. Li PowerPack vént avou des <b>meyes di programes</b> - "
-"di ttafwait, des pus simpes disk' ås pus spepieus."
+"Li PowerPack est li prodût Mandriva avou on <b>scribanne Linux di prumire "
+"classe</b>. Li PowerPack vént avou des <b>meyes di programes</b> - di "
+"ttafwait, des pus simpes disk' ås pus spepieus."
 
 #: share/advertising/08.pl:13
 #, c-format
@@ -16250,8 +16256,8 @@ msgstr "<b>PowerPack+, li solucion Linux po les scribannes et les sierveus</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Vos estoz k' astale <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Vos estoz k' astale <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16274,16 +16280,14 @@ msgstr "<b>Prodûts 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> a diswalpé ene lådje game di prodûts <b>Mandrivalinux</"
-"b>."
+"<b>Mandriva</b> a diswalpé ene lådje game di prodûts <b>Mandriva Linux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Les prodûts Mandrivalinux sont:"
+msgid "The Mandriva Linux products are:"
+msgstr "Les prodûts Mandriva Linux sont:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16305,11 +16309,11 @@ 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 ""
-"\t* <b>Mandrivalinux pås x86-64</b>, li solucion Mandrivalinux po-z eployî å "
-"mî li processeu 64-bits da vosse."
+"\t* <b>Mandriva Linux pås x86-64</b>, li solucion Mandriva Linux po-z eployî "
+"å mî li processeu 64-bits da vosse."
 
 #: share/advertising/10.pl:15
 #, c-format
@@ -16319,26 +16323,26 @@ msgstr "<b>Prodûts Mandriva (prodûts nomades)</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 a diswalpé deus prodûts ki vs permetèt d' eployî Mandrivalinux "
-"so <b>tot l' minme li kéne copiutrece</b> eyet sins mezåjhe di l' astaler po "
+"Mandriva a diswalpé deus prodûts ki vs permetèt d' eployî Mandriva Linux so "
+"<b>tot l' minme li kéne copiutrece</b> eyet sins mezåjhe di l' astaler po "
 "l' eployî:"
 
 #: 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> (bodjî), ene distribucion Mandrivalinux ki s' enonde "
+"\t* <b>Move</b> (bodjî), ene distribucion Mandriva Linux ki s' enonde "
 "totafwaitmint a pårti d' ene plake lazer."
 
 #: 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> (trote-Daegn), ene distribucion pré-astalêye sol "
@@ -16352,32 +16356,33 @@ msgstr "<b>Prodûts Mandriva (solucions professioneles)</b>"
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandriva products designed to meet the <b>professional "
-"needs</b>:"
-msgstr ""
-"Chal pa dzo les prodûts Mandriva fwait po les <b>mezåjhes professionels</"
+"Below are the Mandriva products designed to meet the <b>professional needs</"
 "b>:"
+msgstr ""
+"Chal pa dzo les prodûts Mandriva fwait po les <b>mezåjhes professionels</b>:"
 
 #: 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 ""
 "\t* <b>Sicribanne po eterprijhes («Corporate Desktop»)</b>, li scribanne di "
-"Mandrivalinux po ls eterprijhes."
+"Mandriva Linux po ls eterprijhes."
 
 #: 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 ""
 "\t* <b>Sierveu po eterprijhes («Corporate Server»)</b>, li solucion sierveus "
-"di Mandrivalinux"
+"di Mandriva Linux"
 
 #: 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 ""
 "\t* <b>Côpe-feu multi-rantoeles («Multi-Network Firewall» u «MNF»)</b>, li "
-"solucion Mandrivalinux pol såvrité des rantoeles."
+"solucion Mandriva Linux pol såvrité des rantoeles."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16581,10 +16586,10 @@ msgstr "<b>Mo do plaijhi avou l' lådje fortchete di programes</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 ""
-"E menu Mandrivalinux vos trovroz des programes <b>åjheys a-z eployî</b> po "
+"E menu Mandriva Linux vos trovroz des programes <b>åjheys a-z eployî</b> po "
 "<b>tot çki vos vôrîz fé</b>:"
 
 #: share/advertising/18.pl:16
@@ -16854,18 +16859,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Cinte di contrôle di Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Cinte di contrôle di 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 ""
-"Li <b>cinte di contrôle di Mandrivalinux</b> est ene ramexhnêye d' usteyes "
-"essincieles di Mandrivalinux po vs simplifyî l' apontiaedje del copiutrece "
+"Li <b>cinte di contrôle di Mandriva Linux</b> est ene ramexhnêye d' usteyes "
+"essincieles di Mandriva Linux po vs simplifyî l' apontiaedje del copiutrece "
 "da vosse."
 
 #: share/advertising/25.pl:17
@@ -16892,17 +16897,17 @@ 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 ""
 "Come tot programaedje po les copiutreces, les libes programes <b>ont mezåjhe "
 "di tines et d' djins</b> po-z esse diswalpés. Po shure li filozofeye des "
 "libes programes Mandriva vind des prodûts avou del radjoutêye valixhance "
-"eyet des siervices po ki <b>Mandrivalinux continouwe a-z esse tofer "
+"eyet des siervices po ki <b>Mandriva Linux continouwe a-z esse tofer "
 "improuvé</b>. Si vos vloz <b>sopoirter l' filozofeye des libes programes</b> "
-"eyet l' diswalpaedje di Mandrivalinux, adon, <b>si vos vloz bén</b>, tuzez a-"
-"z atchter onk di nos prodûts ou siervices!"
+"eyet l' diswalpaedje di Mandriva Linux, adon, <b>si vos vloz bén</b>, tuzez "
+"a-z atchter onk di nos prodûts ou siervices!"
 
 #: share/advertising/27.pl:13
 #, c-format
@@ -16912,11 +16917,11 @@ msgstr "<b>Li botike so les fyis</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandriva products and services, you can visit our "
-"<b>e-commerce platform</b>."
+"To learn more about Mandriva products and services, you can visit our <b>e-"
+"commerce platform</b>."
 msgstr ""
 "Vos trovroz tos les prodûts eyet siervices da Mandriva sol Botike di "
-"Mandrivalinux -- nosse <b>tcherpinte di siervices eyet di comiece so les "
+"Mandriva Linux -- nosse <b>tcherpinte di siervices eyet di comiece so les "
 "fyis</b>."
 
 #: share/advertising/27.pl:17
@@ -16936,8 +16941,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Passez ådjourdu minme pa <b>store.mandrakesoft.com</b>"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Passez ådjourdu minme pa <b>store.mandriva.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16947,11 +16952,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> est li <b>cpagnon a l' idêye</b> po vosse prodût "
-"Mandrivalinux.."
+"Mandriva Linux.."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -16964,10 +16969,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* Des <b>discontes especiåles</b> po les prodûts et siervices di nosse "
-"botike <b>store.mandrakesoft.com</b>."
+"botike <b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -16980,17 +16985,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Pårticiper åzès <b>foroms des uzeus</b> di Mandrivalinux."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Pårticiper åzès <b>foroms des uzeus</b> di 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>Accès priviledjî eyet pus timpe</b>, divant l' publik cossemaedje, "
-"åzès <b>imådjes ISO</b> di Mandrivalinux."
+"åzès <b>imådjes ISO</b> di Mandriva Linux."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -17003,17 +17008,17 @@ msgid ""
 "<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandriva Online</b> est on novea siervice di prumî livea ki Mandriva "
-"est fir d' ofri a ses candes!"
+"<b>Mandriva Online</b> est on novea siervice di prumî livea ki Mandriva est "
+"fir d' ofri a ses candes!"
 
 #: share/advertising/29.pl:17
 #, 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 dene ene lådje fortchete di clapants siervices po<b>mete "
-"åjheymint a djoû</b> vos sistinmes Mandrivalinux:"
+"åjheymint a djoû</b> vos sistinmes Mandriva Linux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17039,8 +17044,9 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
-msgstr "\t* Manaedjî <b>tos vos sistinmes Mandrivalinux</b> avou on seu conte."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
+msgstr ""
+"\t* Manaedjî <b>tos vos sistinmes Mandriva Linux</b> avou on seu conte."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -17051,29 +17057,29 @@ 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 ""
 "Avoz vs mezåjhe d' <b>aidance</b>? Rescontrez les esperts tecnikes di "
-"Mandriva dizo <b>nosse platfôme di sopoirt tecnike</b> www."
-"mandrakeexpert.com."
+"Mandriva dizo <b>nosse platfôme di sopoirt tecnike</b> www.mandrivaexpert."
+"com."
 
 #: 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 ""
-"Gråces a l' aidance des <b>esperts cwålifyîs Mandrivalinux</b>, vos alez "
+"Gråces a l' aidance des <b>esperts cwålifyîs Mandriva Linux</b>, vos alez "
 "wangnî bråmint do tins."
 
 #: 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 ""
-"Po tote kesse åd fwait di Mandrivalinux, vos ploz atchter do sopoirt po des "
-"problinmes sol botike <b>store.mandrakesoft.com</b>."
+"Po tote kesse åd fwait di Mandriva Linux, vos ploz atchter do sopoirt po des "
+"problinmes sol botike <b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17467,16 +17473,16 @@ 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 ""
 "[TCHUZES] [NO_DO_PROGRAME]\n"
 "\n"
 "TCHUZES:\n"
 "  --help            - mostere ci messaedje d' aidance chal.\n"
-"  --report          - li programe doet esse ene des usteyes di "
-"Mandrivalinux\n"
-"  --incident        - li programe doet esse ene des usteyes di Mandrivalinux"
+"  --report          - li programe doet esse ene des usteyes di Mandriva "
+"Linux\n"
+"  --incident        - li programe doet esse ene des usteyes di Mandriva Linux"
 
 #: standalone.pm:63
 #, c-format
@@ -17531,7 +17537,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"
@@ -17588,16 +17594,16 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 #, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      do not ask first confirmation question in "
-"Mandriva Update mode\n"
+"  --no-confirmation      do not ask first confirmation question in Mandriva "
+"Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[TCHUZES]...\n"
-"  --no-confirmation      èn nén dmander d' aveurixhaedje e môde "
-"Mandriva Update\n"
+"  --no-confirmation      èn nén dmander d' aveurixhaedje e môde Mandriva "
+"Update\n"
 "  --no-verify-rpm        èn nén verifyî les sinateures des pacaedjes rpm\n"
 "  --changelog-first      håyner li djournå des candjmints divant l' djivêye "
 "des fitchîs e purnea\n"
@@ -20268,13 +20274,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Usteye di rapoirtaedje di bugs di Mandrivalinux"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Usteye di rapoirtaedje di bugs di Mandriva Linux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Cinte di contrôle di Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Cinte di contrôle di Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20766,7 +20772,7 @@ msgstr "En alaedje a l' enondaedje"
 #, 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 ""
 "Ciste eterface n' a nén co stî apontieye.\n"
 "Enondez li macrea «Radjouter ene eterface» a pårti do cinte di contrôle."
@@ -20775,7 +20781,7 @@ msgstr ""
 #, 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 ""
 "Vos n' avoz nou raloyaedje al daegntoele d' apontyî.\n"
 "Enondez li macrea «%s» a pårti do cinte di contrôle."
@@ -20828,8 +20834,8 @@ msgstr "KDM (manaedjeu di håynaedje KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM ((manaedjeu di håynaedje Mandrivalinux)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM ((manaedjeu di håynaedje Mandriva Linux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21136,18 +21142,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 pa Mandriva \n"
 "\n"
 "\n"
 "        DUPONT Sébastien (prumire modêye)\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
@@ -21727,8 +21733,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Cinte di l' aidance di Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Cinte di l' aidance di Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22391,7 +22397,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 ""
 "Nole cåte son a stî detectêye so voste éndjole. Acertinez vs k' ene cåte son "
 "ricnoxhowe pa Linux est bén sol copiutrece.\n"
@@ -22399,7 +22405,7 @@ msgstr ""
 "Vos ploz viziter nosse båze di dnêyes del sopoirtêye éndjolreye so:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24223,7 +24229,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 ""
 "Nole cåte tévé a stî detectêye so voste éndjole. Acertinez vs k' ene cåte "
 "videyo/tévé ricnoxhowe pa Linux est bén raloyeye al copiutrece.\n"
@@ -24231,7 +24237,7 @@ msgstr ""
 "Vos ploz viziter nosse båze di dnêyes del sopoirtêye éndjolreye so:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -24952,13 +24958,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 ""
 "Çouchal c' est HardDrake, l' usteye d' apontiaedje di l' éndjolreye di %s.\n"
 "<span foreground=\"royalblue3\">Modêye:</span> %s\n"
 "<span foreground=\"royalblue3\">Oteur:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25070,8 +25076,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Djournås des usteyes di Mandrivalinux"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Djournås des usteyes di Mandriva Linux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25586,10 +25592,10 @@ msgstr "Raloyaedje completé."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Li raloyaedje a fwait berwete.\n"
-"Verifyîz vost apontiaedje dins l' cinte di contrôle di Mandrivalinux."
+"Verifyîz vost apontiaedje dins l' cinte di contrôle di Mandriva Linux."
 
 #: standalone/net_monitor:341
 #, c-format