various Mandrake -> Mandriva changes

1 files changed, 212 insertions, 201 deletions

diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index 230b7d8ea..f24f2bfd8 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -1306,7 +1306,7 @@ msgstr "Dewis iaith"
 #: 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 ""
@@ -3729,12 +3729,12 @@ msgstr "galluogi cynnal 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 ""
 "Cyn parhau dylech ddarllen amodau'r drwydded yn ofalus. Mae'n ymwneud\n"
-"â holl ddosbarthiad Mandrivalinux. Os ydych yn cytuno â'r holl amodau,\n"
+"â holl ddosbarthiad Mandriva Linux. Os ydych yn cytuno â'r holl amodau,\n"
 "cliciwch flwch \"%s\". Os nad, bydd clicio ar y botwm \"%s\" yn\n"
 "ail gychwyn eich cyfrifiadur."
 
@@ -3894,13 +3894,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 ""
-"Mae gosodiad Mandrivalinux i'w gael ar nifer o CD-ROMau. Mae DrakX\n"
+"Mae gosodiad Mandriva Linux i'w gael ar nifer o CD-ROMau. Mae DrakX\n"
 "yn gwybod os yw pecyn penodol wedi ei leoli ar CD-ROM arall a bydd yn bwrw\n"
 "allan y CD cyfredol a gofyn am y llall. Os nad yw'r CD angenrheidiol "
 "gennych\n"
@@ -3910,11 +3910,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"
@@ -3966,11 +3967,11 @@ msgid ""
 "megabytes."
 msgstr ""
 "Mae'n amser penderfynu pa raglenni rydych am eu gosod ar eich\n"
-"system. Mae yna filoedd o becynnau ar gael ar gyfer Mandrivalinux, ond\n"
+"system. Mae yna filoedd o becynnau ar gael ar gyfer Mandriva Linux, ond\n"
 "i'w gwneud hi'n haws eu rheoli maent wedi cael eu gosod mewn grwpiau\n"
 "o raglenni tebyg.\n"
 "\n"
-"Mae Mandrivalinux wedi trefnu'r grwpiau pecynnau i bedwar categori. Mae\n"
+"Mae Mandriva Linux wedi trefnu'r grwpiau pecynnau i bedwar categori. Mae\n"
 "modd dewis a dethol rhaglenni o'r categorïau gwahanol, fel bo \"Man Gwaith"
 "\"\n"
 "yn medru cael rhaglenni o'r categori \"Gweinydd\".\n"
@@ -4073,10 +4074,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"
@@ -4106,11 +4107,11 @@ msgstr ""
 "\n"
 "!! Os oes pecyn gweinydd wedi ei ddewis, yn fwriadol neu am ei fod yn rhan\n"
 "o grwp cyfan, bydd angen i chi gadarnhau eich bod eisiau i'r gweinyddion\n"
-"gael eu gosod. Ym Mandrivalinux mae unrhyw weinydd sydd wedi ei\n"
+"gael eu gosod. Ym Mandriva Linux mae unrhyw weinydd sydd wedi ei\n"
 "osod yn cael ei gychwyn fel rhagosodiad wrth gychwyn. Hyd yn oed os ydynt\n"
 "yn ddiogel a doedd dim materion pryder pan gafodd y dosbarthiad ei ryddhau,\n"
 "mae'n bosibl i fylchau diogelwch gael eu darganfod wedi i'r fersiwn hwn o\n"
-"Mandrivalinux gael ei gwblhau. Os nad ydych yn gwybod beth mae\n"
+"Mandriva Linux gael ei gwblhau. Os nad ydych yn gwybod beth mae\n"
 "gwasanaeth arbennig i fod i'w wneud na pham mae wedi ei osod, yna\n"
 "cliciwch\"%s\". Bydd clicio \"%s\" yn gosod y gwasanaethau hynny a\n"
 "byddant yncael eu cychwyn yn awtomatig drwy ragosodiad!!\n"
@@ -4257,7 +4258,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"
@@ -4313,7 +4314,7 @@ msgid ""
 msgstr ""
 "X (sef X Window System) yw calon rhyngwyneb graffigol GNU/Linux a'r\n"
 "hyn mae'r holl amgylcheddau graffigol (KDE, Gnome, AterStep,\n"
-"WindowMaker, etc) sy'n dod gyda Mandrivalinux yn dibynnu arno.\n"
+"WindowMaker, etc) sy'n dod gyda Mandriva Linux yn dibynnu arno.\n"
 "\n"
 "Byddwch yn derbyn rhestr o baramedrau gwahanol i'w newid i gael\n"
 "y dangosiad graffigol gorau:\n"
@@ -4428,12 +4429,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"
@@ -4460,7 +4461,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"
@@ -4469,7 +4470,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"
@@ -4490,7 +4492,7 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Mae angen i chi nawr ddewis lle ar eich disg caled i osod eich system\n"
-"weithredu Mandrivalinux. Os yw eich disg caled yn wag neu os oes\n"
+"weithredu Mandriva Linux. Os yw eich disg caled yn wag neu os oes\n"
 "yna system weithredol eisoes yn cymryd yr holl le sydd ar gael, bydd\n"
 "angen i chi greu rhaniadau arno. Yn y bôn, mae rhannu disg caled yn\n"
 "golygu ei rhannu'n rhesymegol i greu lle i osod eich system Mandrake\n"
@@ -4522,14 +4524,14 @@ msgstr ""
 "Mae modd ail lunio maint y rhaniad heb golli data cyn belled eich bod wedi\n"
 "dad-ddarnio rhaniad Windows ac mae'n defnyddio fformat Windows.\n"
 "Argymhellir cadw data wrth gefn hefyd. Argymhellir gwneud hyn os ydych\n"
-"am ddefnyddio Mandrivalinux a Microsoft Windows ar yr un cyfrifiadur.\n"
+"am ddefnyddio Mandriva Linux a Microsoft Windows ar yr un cyfrifiadur.\n"
 "\n"
 "  Cyn gwneud y dewis hwn, cofiwch y bydd maint eich rhaniad Microsoft\n"
 "Windows yn llai nag yw ar hyn o bryd ar ol dilyn y drefn yma. Bydd gennych\n"
 "llai o le yn Microsoft Windows i gadw data neu i osod meddalwedd newydd\n"
 "\n"
 " * \"%s\" os ydych am ddileu'r holl ddata a rhaniadau presennol ar\n"
-"eich disg caled a'u cyfnewid am system Mandrivalinux, yna dewiswch\n"
+"eich disg caled a'u cyfnewid am system Mandriva Linux, yna dewiswch\n"
 "hwn. Byddwch yn ofalus wrth wneud hyn gan na fydd modd troi nôl\n"
 "ar ôl cadarnhau.\n"
 "\n"
@@ -4687,7 +4689,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."
@@ -4709,7 +4711,7 @@ msgstr ""
 "Cliciwch \"%s\" pan ydych yn barod i fformatio rhaniadau.\n"
 "\n"
 "Cliciwch \"%s\" os ydych am ddewis rhaniad arall ar gyfer eich gosodiad\n"
-"Mandrivalinux newydd\n"
+"Mandriva Linux newydd\n"
 "\n"
 "Cliciwch \"%s\" os ydych am ddewis rhaniadau i'w gwirio am flociau\n"
 "gwallus ar y ddisg."
@@ -4726,7 +4728,7 @@ msgstr "Blaenorol"
 #: 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"
@@ -4738,7 +4740,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Erbyn i chi osod Mandrivalinux, mae'n debygol y bydd rhai \n"
+"Erbyn i chi osod Mandriva Linux, mae'n debygol y bydd rhai \n"
 "pecynnau wedi eu diweddaru ers y rhyddhad cychwynnol. Bydd rhai \n"
 "gwallau wedi eu cywiro a materion diogelwch wedi eu datrys. I ganiatáu\n"
 "i chi fanteisio ar hyn mae cynnig i chi eu llwytho i lawr o'r rhyngrwyd.\n"
@@ -4766,7 +4768,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"
@@ -4795,7 +4797,7 @@ msgstr "Cyfrinair Gweinyddwr"
 #, 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"
@@ -4866,7 +4868,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Yn awr mae angen i chi ddewis pa raniadau i'w defnyddio ar gyfer gosodiad\n"
-"eich system Mandrivalinux. Os oes rhaniadau wedi eu diffinio eisoes, un\n"
+"eich system Mandriva Linux. Os oes rhaniadau wedi eu diffinio eisoes, un\n"
 "ai drwy osodiad blaenorol o GNU/Linux neu gan offeryn rhannu arall, mae\n"
 "modd i chi ddefnyddio'r rhaniadau presennol. Os nad, rhaid i' rhaniadau'r\n"
 "ddisg caled gael eu diffinio.\n"
@@ -4951,7 +4953,7 @@ msgstr "Amnewid rhwng modd arferol/arbenigol"
 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"
@@ -4981,7 +4983,7 @@ msgid ""
 msgstr ""
 "Mae mwy nag un rhaniad Microsoft wedi ei ganfod ar eich disg caled.\n"
 "Dewiswch ba un rydych am newid ei faint er mwyn gosod eich\n"
-"system weithredu Mandrivalinux newydd\n"
+"system weithredu Mandriva Linux newydd\n"
 "\n"
 "Mae pob rhaniad wedi ei restri fel hyn: \"Enw Linux\", \"Enw Windows\",\n"
 "\"Maint\".\n"
@@ -5028,7 +5030,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"
@@ -5037,19 +5039,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 ""
 "Mae'r cam hwn yn cael ei weithredu os oes hen raniad GNU/Linux wedi\n"
 "ei ganfod ar y cyfrifiadur.\n"
 "\n"
 "Bydd DrakX angen gwybod a ydych am osod o'r newydd neu uwchraddio\n"
-"system Mandrivalinux presennol.\n"
+"system Mandriva Linux presennol.\n"
 "\n"
 " *\"%s\" Ar y cyfan, mae hwn yn tynnu'r hen system gyfan oddi ar eich\n"
 "cyfrifiadur. Er hynny, yn ddibynnol ar eich trefn rhannu, mae modd atal\n"
@@ -5059,13 +5062,13 @@ msgstr ""
 "system ffeil, dylech ddewis hwn.\n"
 "\n"
 " *\"%s\": Mae'r dosbarth gosod hwn yn caniatáu i chi ddiweddaru'r\n"
-"pecynnau sydd wedi eu gosod ar eich system Mandrivalinux. Bydd eich\n"
+"pecynnau sydd wedi eu gosod ar eich system Mandriva Linux. Bydd eich\n"
 "rhaniadau presenol a'ch data personol yn cael eu cadw. Bydd y rhan fwyaf\n"
 "o'r camau ffurfweddu ar gael fel gyda'r gosod arferol.\n"
 "\n"
-"Dylai defnyddio \"Diweddaru\" weithio'n iawn ar systemau Mandrivalinux\n"
+"Dylai defnyddio \"Diweddaru\" weithio'n iawn ar systemau Mandriva Linux\n"
 "sy'n rhedeg systemau \"8.1\" neu'n ddiweddarach. Nid yw uwchraddio\n"
-"fersiynau cyn Mandrivalinux \"8.1\" yn cael ei gymeradwyo."
+"fersiynau cyn Mandriva Linux \"8.1\" yn cael ei gymeradwyo."
 
 #: help.pm:591
 #, c-format
@@ -5128,7 +5131,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"
@@ -5169,7 +5173,7 @@ msgstr ""
 "Ynghylch cefnogaeth UTF-8 (unicode): Amgodiad nod newydd yw Unicode\n"
 "sydd i gynnwys pob iaith. Er hynny, mae cefnogaeth i bob iaith o fewn\n"
 "GNU/Linux yn dal yn cael ei ddatblygu Oherwydd hynn mae defnydd\n"
-"Mandrivalinux o UTF-8 yn ddibynnol ar ddewis y defnyddiwr:\n"
+"Mandriva Linux o UTF-8 yn ddibynnol ar ddewis y defnyddiwr:\n"
 "\n"
 " * Os ydych yn dewis iaith gyda hen amgodiad cryf (ieithoedd lladin1\n"
 "Rwsieg, Siapanëeg, Tsieinëeg, Corëeg, Thai, Groeg, Twrceg, y rhan\n"
@@ -5420,7 +5424,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"
@@ -5441,7 +5445,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Yma byddwn yn dewis system argraffu i'ch cyfrifiadur ei ddefnyddio. Efallai\n"
@@ -5590,7 +5594,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"
@@ -5607,7 +5612,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"
@@ -5656,7 +5661,7 @@ msgstr ""
 " \n"
 " * \"%s\": os ydych am ffurfweddu eich mynediad i'r Rhyngrwyd neu\n"
 "eich rhwydwaith lleol, mae modd gwneud hynny. Darllenwch y deunydd\n"
-"ysgrifenedig neu ddefnyddio Canolfan Reoli Mandrivalinux wedi i'r gosod\n"
+"ysgrifenedig neu ddefnyddio Canolfan Reoli Mandriva Linux wedi i'r gosod\n"
 "orffen i fanteisio ar gymorth ar-lein llawn.\n"
 "\n"
 " * \"%s\": os ydych am ffurfweddu cyfeiriadau dirprwyol HTTP ac FTP os\n"
@@ -5673,7 +5678,7 @@ msgstr ""
 " * \"%s\": os hoffech newid ffurfweddiad eich cychwynnwr\n"
 "cliciwch y botwm yma. Ar gyfer defnyddwyr profiadol. Darllenwch y\n"
 "deunydd ysgrifenedig  neu'r cymorth ar-lein am ffurfweddiad\n"
-"cychwynwyr yng Nghanolfan Rheoli Mandrivalinux.\n"
+"cychwynwyr yng Nghanolfan Rheoli Mandriva Linux.\n"
 "\n"
 " *\"%s\": yma bydd modd i chi wneud man newidiadau i'r\n"
 "gwasanaethau sy'n cael eu rhedeg ar eich cyfrifiadur. Os ydych yn\n"
@@ -5735,11 +5740,11 @@ msgstr "Gwasanaethau"
 #, 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 ""
 "Dewiswch y ddisg galed rydych am ei ddileu er mwy n gosod eich rhaniad\n"
-"Mandrivalinux newydd. Byddwch ofalus, bydd yr holl ddata sydd arno'n\n"
+"Mandriva Linux newydd. Byddwch ofalus, bydd yr holl ddata sydd arno'n\n"
 "cael ei ddileu ac ni fydd modd ei adfer!"
 
 #: help.pm:863
@@ -6091,11 +6096,11 @@ msgstr "Cyfrifo maint rhaniad 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 ""
 "Mae eich rhaniad Windows yn rhy ysgyriog, rhedwch \"defrag\" yn gyntaf o dan "
-"Windows ac yna ailgychwyn gosodi Mandrivalinux."
+"Windows ac yna ailgychwyn gosodi Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6208,13 +6213,13 @@ msgstr "Cau'r rhwydwaith"
 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"
@@ -6268,7 +6273,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"
@@ -6305,7 +6310,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"
@@ -6327,13 +6332,13 @@ msgstr ""
 "Cyflwyniad\n"
 "\n"
 "Bydd y system weithredu a'r cydrannau gwahanol sydd o fewn dosbarthiad "
-"Mandrivalinux yn\n"
+"Mandriva Linux yn\n"
 "cael eu galw yn \"Gynnyrch Meddalwedd\" o hyn ymlaen. Mae'r Cynnyrch "
 "Meddalwedd yn\n"
 "cynnwys, ond heb eu cyfyngu, i'r  casgliad o raglenni , dulliau, rheolau a "
 "dogfennau mewn\n"
-"perthynas â'r system weithredu a chydrannau gwahanol ddosbarthiad "
-"Mandrivalinux.\n"
+"perthynas â'r system weithredu a chydrannau gwahanol ddosbarthiad Mandriva "
+"Linux.\n"
 "\n"
 "\n"
 "1. Cytundeb Trwyddedu\n"
@@ -6388,7 +6393,7 @@ msgstr ""
 "costau cyfreithiol, a chosb o ganlyniad\n"
 "i achos llys, neu unrhyw golled o ganlyniad) yn codi o lwytho i lawr "
 "cydrannau meddalwedd o un o safleoedd\n"
-" Mandrivalinux, sydd wedi eu gwahardd neu eu hatal mewn rhai gwledydd gan "
+" Mandriva Linux, sydd wedi eu gwahardd neu eu hatal mewn rhai gwledydd gan "
 "gyfreithiau lleol. Mae'r\n"
 "cyfrifoldeb cyfyngedig hwn yn perthyn i , ond heb ei gyfyngu i'r, cydrannau "
 "cryptograffiaeth cryf sy'n cael\n"
@@ -6425,7 +6430,7 @@ msgstr ""
 "ei hawl i newid neu addasu ei Gynnyrch Meddalwedd, yn rhannol neu yn gyfan, "
 "drwy unrhyw ddull ac ar gyfer\n"
 "unrhyw bwrpas.\n"
-"Mae \"Mandriva\", \"Mandrivalinux\"  a'r logos cysylltiedig yn nodau "
+"Mae \"Mandriva\", \"Mandriva Linux\"  a'r logos cysylltiedig yn nodau "
 "masnachol sy'n perthyn i Mandriva S.A.\n"
 "\n"
 "\n"
@@ -6531,8 +6536,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"
@@ -6540,14 +6545,14 @@ 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 ""
 "Llongyfarchiadau, mae'r gosod wedi ei gwblhau.\n"
 "Tynnwch y cyfrwng cychwyn a chlicio Ailgychwyn.\n"
 "\n"
 "\n"
-"Am wybodaeth am gywiriadau sydd ar gael ar gyfer y rhyddhad hwn o "
-"Mandrivalinux,\n"
+"Am wybodaeth am gywiriadau sydd ar gael ar gyfer y rhyddhad hwn o Mandriva "
+"Linux,\n"
 "cysylltwch â'r atodiad, sydd i'w gael yn:\n"
 "\n"
 "\n"
@@ -6555,13 +6560,13 @@ msgstr ""
 "\n"
 "\n"
 "Mae gwybodaeth ar ffurfweddu eich system ar gael ym mhenawdau ôl osod\n"
-"yr Official Mandrivalinux User's Guide."
+"yr Official Mandriva Linux User's Guide."
 
 #. -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
@@ -6590,12 +6595,12 @@ msgstr "Cychwyn cam '%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 ""
 "Mae eich system yn brin o adnoddau. Efallai y cewch anawsterau wrth osod\n"
-"Mandrivalinux. Os bydd hynny'n digwydd, gallwch geisio gwneud gosodiad\n"
+"Mandriva Linux. Os bydd hynny'n digwydd, gallwch geisio gwneud gosodiad\n"
 "testunol. I wneud hynny, gwasgwch F1 wrth gychwyn ar y CD-ROM ac yna rhoi "
 "'text'."
 
@@ -6819,7 +6824,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 "Mae gennych y dewis i gopîo cynnwys y CD ar i'r disg caled cyn gosod "
-"Mandrivalinux.\n"
+"Mandriva Linux.\n"
 "Bydd yna'n parhau o'r disg caled a bydd y pecynnau ar gael unwaith i'r "
 "system gael ei osod yn gyflawn."
 
@@ -7135,8 +7140,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
-msgstr "Cysylltu â safle Mandrivalinux i estyn rhestr o'r drychau sydd ar gael"
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr ""
+"Cysylltu â safle Mandriva Linux i estyn rhestr o'r drychau sydd ar gael"
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7359,8 +7365,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Gosodiad %s Mandrivalinux"
+msgid "Mandriva Linux Installation %s"
+msgstr "Gosodiad %s Mandriva Linux"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9950,14 +9956,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 ""
 "ffurfweddiadur drakfirewall\n"
 "\n"
 "Mae hwn yn ffurfweddu mur gwarchod personol ar gyfer y peiriant \n"
-"Mandrivalinux hwn. Am fur gwarchod pwrpasol pwerus, \n"
+"Mandriva Linux hwn. Am fur gwarchod pwrpasol pwerus, \n"
 "edrychwch ddosbarthiad arbenigol MandrakeSecurity Firewall."
 
 #: network/drakfirewall.pm:164
@@ -14028,12 +14034,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 ""
-"Rhedwch Scannerdrake (Caledwedd/Sganiwr yng Nghanolfan Rheoli Mandrivalinux) "
-"i rannu eich sganiwr ar y rhwydwaith.\n"
+"Rhedwch Scannerdrake (Caledwedd/Sganiwr yng Nghanolfan Rheoli Mandriva "
+"Linux) i rannu eich sganiwr ar y rhwydwaith.\n"
 "\n"
 
 #: printer/printerdrake.pm:3933
@@ -15971,33 +15977,33 @@ msgstr "Aros"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Beth yw Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Beth yw Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Croeso i <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Croeso i <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 ""
-"Mae Mandrivalinux yn <b>ddosbarthiad Linux</b> sy'n cynnwys y system graidd, "
-"sef, <b>system weithredu</b> (yn seiliedig ar gnewyllyn Linux) ynghyd â <b> "
-"llawer o raglenni</b> sy'n darparu ar gyfer pob angen."
+"Mae Mandriva Linux yn <b>ddosbarthiad Linux</b> sy'n cynnwys y system "
+"graidd, sef, <b>system weithredu</b> (yn seiliedig ar gnewyllyn Linux) "
+"ynghyd â <b> llawer o raglenni</b> sy'n darparu ar gyfer pob angen."
 
 #: 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 yw'r dosbarthiad Linux mwyaf <b>cyfeillgar</b> heddiw. Mae'n "
+"Mandriva Linux yw'r dosbarthiad Linux mwyaf <b>cyfeillgar</b> heddiw. Mae'n "
 "un o'r dosbarthiadau mwyaf <b>poblogaidd</b> o Linux ar draws y byd i gyd!"
 
 #: share/advertising/02.pl:13
@@ -16013,15 +16019,15 @@ msgstr "Croeso i <b>fyd Cod Agored</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 ""
-"Mae Mandrivalinux yn ymroddedig i fodel cod agored. Mae'n golygu fod y "
+"Mae Mandriva Linux yn ymroddedig i fodel cod agored. Mae'n golygu fod y "
 "rhyddhad newydd yn ganlyniad <b>cydweithrediad</b> rhwng <b>tîm o "
 "ddatblygwyr Mandriva</b> a <b>chyfranwyr cymuned byd eang</b> cyfranwyr "
-"Mandrivalinux."
+"Mandriva Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16040,11 +16046,11 @@ msgstr "<b>Y drwydded 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 ""
 "Mae'r rhan fwyaf o'r feddalwedd sydd wedi ei gynnwys ynghyd â holl offer "
-"Mandrivalinux wedi eu trwyddedu o dan y <b>Drwydded Gyhoeddus Cyffredinol "
+"Mandriva Linux wedi eu trwyddedu o dan y <b>Drwydded Gyhoeddus Cyffredinol "
 "(GPL)</b>"
 
 #: share/advertising/03.pl:17
@@ -16075,25 +16081,25 @@ msgstr "<b>Ymunwch â chymuned</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 ""
-"Mae gan Mandrivalinux un o'r <b>cymunedau mwyaf</b> o ddefnyddwyr a "
+"Mae gan Mandriva Linux un o'r <b>cymunedau mwyaf</b> o ddefnyddwyr a "
 "datblygwyr. Mae rôl y gymuned yn eang iawn yn ymestyn o adrodd ar wallau i "
 "ddatblygu rhaglenni newydd. Mae'r gymuned yn chwarae <b>rhan allweddol</b> "
-"ym myd Mandrivalinux."
+"ym myd 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 ""
-"I <b>ddysgu mwy</b> am ein cymuned egniol, ewch i <b>www.mandrakelinux.com</"
-"b> neu yn uniongyrchol at <b>www.mandrakelinux.com/ên/cookerdevel.php3</b> "
+"I <b>ddysgu mwy</b> am ein cymuned egniol, ewch i <b>www.mandrivalinux.com</"
+"b> neu yn uniongyrchol at <b>www.mandrivalinux.com/ên/cookerdevel.php3</b> "
 "os hoffech <b>ymuno</b> â'r datblygiadau."
 
 #: share/advertising/05.pl:15
@@ -16104,11 +16110,11 @@ msgstr "<b>Fersiwn Llwytho</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 ""
-"Rydych yn gosod <b> Mandrivalinux Llwytho i Lawr</b>. Hwn yw'r fersiwn rhydd "
-"mae Mandriva am ei ddarparu <b>ar gael i bawb</b>."
+"Rydych yn gosod <b> Mandriva Linux Llwytho i Lawr</b>. Hwn yw'r fersiwn "
+"rhydd mae Mandriva am ei ddarparu <b>ar gael i bawb</b>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16150,7 +16156,7 @@ msgstr "<b>Discovery, Eich Bwrdd Gwaith Linux Cyntaf</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
 msgstr "Rydych yn gosod <b>Mandrake Discovery</b>"
 
 #: share/advertising/06.pl:17
@@ -16173,8 +16179,8 @@ msgstr "<b>PowerPack, Y Bwrdd Gwaith Linux Gorau</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Rydych yn gosod <b>Mandrivalinux PowerPack</b>"
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Rydych yn gosod <b>Mandriva Linux PowerPack</b>"
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16194,8 +16200,8 @@ msgstr "<b>PowerPack+, Ateb Linux ar gyfer Byrddau gwaith a Gweinyddion</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Rydych yn gosod <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Rydych yn gosod <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16217,14 +16223,15 @@ msgstr "<b>Cynnyrch 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 ""
-"Mae <b>Mandriva</b> wedi datblygu ystod eang o gynnyrch <b>Mandrivalinux</b>."
+"Mae <b>Mandriva</b> wedi datblygu ystod eang o gynnyrch <b>Mandriva Linux</"
+"b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Cynnyrch Mandrivalinux yw:"
+msgid "The Mandriva Linux products are:"
+msgstr "Cynnyrch Mandriva Linux yw:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16245,11 +16252,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 ar gyfer x86-64</b>, Ateb Mandrivalinux i wneud y gorau "
-"o'ch prosesydd 64-did."
+"\t* <b>Mandriva Linux ar gyfer x86-64</b>, Ateb Mandriva Linux i wneud y "
+"gorau o'ch prosesydd 64-did."
 
 #: share/advertising/10.pl:15
 #, c-format
@@ -16259,27 +16266,28 @@ msgstr "<b>Cynnyrch Mandriva (Cynnyrch Nomad)</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 ""
-"Mae Mandrivalinux wedi datblygu dau gynnyrch sy'n caniatáu i chi ddefnyddio "
-"Mandrivalinux <b>ar unrhyw gyfrifiadur</b> heb fod angen ei osod:"
+"Mae Mandriva Linux wedi datblygu dau gynnyrch sy'n caniatáu i chi ddefnyddio "
+"Mandriva Linux <b>ar unrhyw gyfrifiadur</b> heb fod angen ei osod:"
 
 #: 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>, dosbarthiad Mandrivalinux sy'n rhedeg yn llwyr o CD-ROM byw."
+"\t* <b>Move</b>, dosbarthiad Mandriva Linux sy'n rhedeg yn llwyr o CD-ROM "
+"byw."
 
 #: 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>, dosbarthiad Mandrivalinux sydd wedi ei osod yn "
+"\t* <b>GlobeTrotter</b>, dosbarthiad Mandriva Linux sydd wedi ei osod yn "
 "barod ar “LaCie Mobile Hard Drive” bychan iawn"
 
 #: share/advertising/11.pl:13
@@ -16298,20 +16306,22 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
-"\t* <b>Y Bwrdd Gwaith Corfforaethol</b>, Bwrdd Gwaith Mandrivalinux ar gyfer "
-"Busnesau."
+"\t* <b>Y Bwrdd Gwaith Corfforaethol</b>, Bwrdd Gwaith Mandriva Linux ar "
+"gyfer Busnesau."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Y Gweinydd Corfforaethol</b>, Ateb Gweinydd Mandrivalinux."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Y Gweinydd Corfforaethol</b>, Ateb Gweinydd Mandriva Linux."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
-msgstr "\t* <b>Mur Cadarn Aml-Rhwydwaith</b>, Ateb Diogelwch Mandrivalinux."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr "\t* <b>Mur Cadarn Aml-Rhwydwaith</b>, Ateb Diogelwch Mandriva Linux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16510,11 +16520,11 @@ msgstr "<b>Mwynhau'r Ystod Eang o Raglenni</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 ""
-"Yn newislen Mandrivalinux byddwch yn canfod rhaglenni <b>hawdd eu defnyddio</"
-"b> ar gyfer <b>eich holl waith</b>:"
+"Yn newislen Mandriva Linux byddwch yn canfod rhaglenni <b>hawdd eu "
+"defnyddio</b> ar gyfer <b>eich holl waith</b>:"
 
 #: share/advertising/18.pl:16
 #, c-format
@@ -16778,18 +16788,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Canolfan Rheoli Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Canolfan Rheoli 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 ""
-"Mae <b>Canolfan Reoli Mandrivalinux</b> yn gasgliad hanfodol o wasanaethau "
-"ar gyfer Mandrivalinux swydd wedi eu cynllunio i symlhau ffurfweddiad eich "
+"Mae <b>Canolfan Reoli Mandriva Linux</b> yn gasgliad hanfodol o wasanaethau "
+"ar gyfer Mandriva Linux swydd wedi eu cynllunio i symlhau ffurfweddiad eich "
 "cyfrifiadur."
 
 #: share/advertising/25.pl:17
@@ -16815,15 +16825,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 ""
 "Fel pob rhaglenni cyfrifiadurol, mae meddalwedd cod agored <b>yn golygu "
 "amser a phobl</b> ar gyfer datblygiad. Er mwyn parchu athroniaeth cod "
 "agored, mae Mandriva yn gwerthu cynnyrch gwerth ychwanegol a gwasanaethau i "
-"<b>barhau i wella Mandrivalinux</b>. Os hoffech chi <b>gefnogi athroniaeth "
-"cod agored</b> a datblygiad Mandrivalinux, <b>os gwelwch chi'n dda</b> "
+"<b>barhau i wella Mandriva Linux</b>. Os hoffech chi <b>gefnogi athroniaeth "
+"cod agored</b> a datblygiad Mandriva Linux, <b>os gwelwch chi'n dda</b> "
 "ystyriwch brynu ein cynnyrch neu ein gwasanaethau!"
 
 #: share/advertising/27.pl:13
@@ -16857,8 +16867,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Ewch i <b> store.mandrakesoft.com</b> heddiw."
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Ewch i <b> store.mandriva.com</b> heddiw."
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16868,11 +16878,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> yw'r <b>cydymaith perffaith</b> ar gyfer eich cynnyrch "
-"Mandrivalinux..."
+"Mandriva Linux..."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -16886,10 +16896,10 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 "\t* <b>Gostyngiadau arbennig</b> ar gyfer cynnyrch a gwasanaethau yn ein "
-"siop ar-lein <b>store.mandrakesoft.com</b>."
+"siop ar-lein <b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -16901,17 +16911,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Cymryd rhan mewn <b>fforymau defnyddwyr</b> Mandrivalinux."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Cymryd rhan mewn <b>fforymau defnyddwyr</b> 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>Mynediad cynnar a breintiol</b>, cyn eu rhyddhau'n gyhoeddus, i "
-"<b>ddelweddau ISO</b> Mandrivalinux."
+"<b>ddelweddau ISO</b> Mandriva Linux."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -16931,10 +16941,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 ""
 "Mae Mandriva Online yn darparu ystod eang o wasanaethau gwerthfawr ar gyfer "
-"<b>diweddaru'n hawdd</b> eich systemau your Mandrivalinux:"
+"<b>diweddaru'n hawdd</b> eich systemau your Mandriva Linux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16960,8 +16970,9 @@ msgstr "\t* Hyblyg <b>amserlen</b> diweddariadau."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
-msgstr "\t* Rheolaeth o'ch <b>holl systemau Mandrivalinux</b> gydag un cyfrif."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
+msgstr ""
+"\t* Rheolaeth o'ch <b>holl systemau Mandriva Linux</b> gydag un cyfrif."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -16972,28 +16983,28 @@ 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 ""
 "Ydych chi angen <b>cymorth?</b> Mae arbenigwyr technegol Mandriva i'w cael "
-"ar  <b>ein platfform cefnogaeth dechnegol </b> www.mandrakeexpert.com."
+"ar  <b>ein platfform cefnogaeth dechnegol </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 ""
-"Drwy gymorth <b>arbenigwyr cymwysedig Mandrivalinux</b>, byddwch yn abed "
+"Drwy gymorth <b>arbenigwyr cymwysedig Mandriva Linux</b>, byddwch yn abed "
 "llawer o amser."
 
 #: 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 ""
-"Am unrhyw gwestiwn am Mandrivalinux, mae gennych y gallu i brynu cefnogaeth "
-"ar gyfer unrhyw ddigwyddiad o <b>store.mandrakesoft.com</b>."
+"Am unrhyw gwestiwn am Mandriva Linux, mae gennych y gallu i brynu cefnogaeth "
+"ar gyfer unrhyw ddigwyddiad o <b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17382,15 +17393,15 @@ 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 ""
 "[DEWISIADAU] [PROGRAM_NAME]\n"
 "\n"
 "DEWISIADAU:\n"
 "  --help            - argraffu'r neges cymorth.\n"
-"  --report          - dylai'r rhaglen fod yn un o offer Mandrivalinux\n"
-"  --incident        - ylai'r rhaglen fod yn un o offer Mandrivalinux"
+"  --report          - dylai'r rhaglen fod yn un o offer Mandriva Linux\n"
+"  --incident        - ylai'r rhaglen fod yn un o offer Mandriva Linux"
 
 #: standalone.pm:63
 #, c-format
@@ -17444,7 +17455,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"
@@ -17457,7 +17468,7 @@ msgid ""
 "--delclient      : delete a client machine from MTS (requires MAC address, "
 "IP, nbi image name)"
 msgstr ""
-"Ffurfweddwr Gweinydd Terfynell Mandrivalinux\n"
+"Ffurfweddwr Gweinydd Terfynell Mandriva Linux\n"
 "--enable         : galluogi MTS\n"
 "--disable        : analluogi MTS\n"
 "--start          : cychwyn MTS\n"
@@ -20299,13 +20310,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Offeryn Cofnodi Gwall Mandrivalinux"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Offeryn Cofnodi Gwall Mandriva Linux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Canolfan Rheoli Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Canolfan Rheoli Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20797,7 +20808,7 @@ msgstr "Cychwyn y peiriant"
 #, 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 ""
 "Nid yw'r rhag wyneb hwn wedi ei ffurfweddu eto.\n"
 "Cychwynnwch y cynorthwyydd \"Ychwanegu rhyngwyneb\" o' Ganolfan Rheoli "
@@ -20807,7 +20818,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 ""
 "Nid oes gennych gyswllt wedi ei ffurfweddu â'r Rhyngrwyd.\n"
 "Cychwynnwch gynorthwy-ydd \"%s\" o Ganolfan Rheoli Mandrake"
@@ -20860,8 +20871,8 @@ msgstr "KDM (rheolwr arddangos KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (rheolwr arddangos Mandrivalinux)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (rheolwr arddangos Mandriva Linux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21165,18 +21176,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 ""
 "Hawlfraint (C) 2001-2002  Mandriva \n"
 "\n"
 "\n"
 "        DUPONT Sebastien sdupont (fersiwn wreiddiol)\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
@@ -21752,8 +21763,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Canolfan Gymorth Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Canolfan Gymorth Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22415,7 +22426,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 ""
 "Nid oes Cerdyn Sain wedi ei ganfod ar eich peiriant. Gwriwch fod Cerdyn Sain "
 "sy'n cael ei gynnal gan Linux wedi ei osod yn gywir.\n"
@@ -22424,7 +22435,7 @@ msgstr ""
 "Cewch ymweld â'n cronfa ddata caledwedd yn:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24439,7 +24450,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 ""
 "Nid oes Cerdyn Teledu wedi ei ganfod ar eich peiriant. Gwiriwch fod Cerdyn "
 "Fideo/Teledu sy'n cael ei gynnal gan Linux wedi ei osod yn gywir.\n"
@@ -24448,7 +24459,7 @@ msgstr ""
 "Cewch ymweld â'n cronfa ddata caledwedd yn:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25162,13 +25173,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 ""
 "Dyma HardDrake, offeryn ffurfweddu caledwedd %s.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;tvignaud"
-"\\@mandrakesoft.com&gt;\n"
+"\\@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25278,8 +25289,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Cofnodion Offer Mandrivalinux"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Cofnodion Offer Mandriva Linux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25793,10 +25804,10 @@ msgstr "Cysylltiad wedi ei gwblhau"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Methodd y cysylltiad.\n"
-"Gwiriwch eich ffurfweddiad yng Nghanolfan Rheoli Mandrivalinux."
+"Gwiriwch eich ffurfweddiad yng Nghanolfan Rheoli Mandriva Linux."
 
 #: standalone/net_monitor:341
 #, c-format