switch from MandrakeSoft to Mandriva

1 files changed, 246 insertions, 246 deletions

diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index c976ea79c..213517d95 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -68,14 +68,14 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "Mae'r allwedd USB i weld a'i ddiogelu rhag ysgrifennu ymlaen, ond nid oes.\n"
 "modd ei dynnu'n ddiogel.\n"
 "\n"
 "\n"
 "Cliciwch y botwm i ailgychwyn y peiriant, tynnwch yr allwedd, diffodd y\n"
-"diogelu, ailosod y plwg a chychwyn Mandrake Move eto."
+"diogelu, ailosod y plwg a chychwyn Mandriva Move eto."
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
 #, c-format
@@ -93,7 +93,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Does gan eich allwedd USB raniadau Windows (FAT) dilys\n"
@@ -104,14 +104,14 @@ msgstr ""
 "\n"
 "\n"
 "Mae modd mynd yn eich blaen heb allwedd USB - bydd dal\n"
-"modd i chi ddefnyddio Mandrake Move fel System Weithredu\n"
+"modd i chi ddefnyddio Mandriva Move fel System Weithredu\n"
 "Mandrake hyfyw."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -119,11 +119,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Nid ydym wedi canfod allwedd USB ar eich system Os wnewch\n"
-"rhoi'r allwedd USB yn ei le, mae gan Mandrake Move y gallu i\n"
+"rhoi'r allwedd USB yn ei le, mae gan Mandriva Move y gallu i\n"
 "gadw eich data yn eich cyfeiriadur cartref a ffurfweddiad system\n"
 "gyfan, ar gyfer ail gychwyn y cyfrifiadur hwn neu un arall\n"
 "Sylwch: os wnewch chi roi'r allwedd yn ei le nawr, arhoswch\n"
@@ -131,7 +131,7 @@ msgstr ""
 "\n"
 "\n"
 "Mae modd mynd yn eich blaen heb allwedd USB - bydd dal\n"
-"modd i chi ddefnyddio Mandrake Move fel system weithredu\n"
+"modd i chi ddefnyddio Mandriva Move fel system weithredu\n"
 "Mandrake hyfyw."
 
 #: ../move/move.pm:494
@@ -258,7 +258,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -274,7 +274,7 @@ msgstr ""
 "\n"
 "Gall hyn fod wedi dod o ffeiliau ffurfweddu'r system\n"
 "ar yr allwedd USB, yn yr achos yma bydd eu tynnu ac\n"
-"ailgychwyn Mandrake Move yn datrys y broblem. I wneud\n"
+"ailgychwyn Mandriva Move yn datrys y broblem. I wneud\n"
 "hynny, cliciwch y botwm perthnasol.\n"
 "\n"
 "\n"
@@ -1306,7 +1306,7 @@ msgstr "Dewis iaith"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux 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 Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux 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 Mandrakelinux. Os ydych yn cytuno â'r holl amodau,\n"
+"â holl ddosbarthiad Mandrivalinux. 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 Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux 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 Mandrakelinux i'w gael ar nifer o CD-ROMau. Mae DrakX\n"
+"Mae gosodiad Mandrivalinux 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,11 @@ 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 Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux 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 +3966,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 Mandrakelinux, ond\n"
+"system. Mae yna filoedd o becynnau ar gael ar gyfer Mandrivalinux, ond\n"
 "i'w gwneud hi'n haws eu rheoli maent wedi cael eu gosod mewn grwpiau\n"
 "o raglenni tebyg.\n"
 "\n"
-"Mae Mandrakelinux wedi trefnu'r grwpiau pecynnau i bedwar categori. Mae\n"
+"Mae Mandrivalinux 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 +4073,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 Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux 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 Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux 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 +4106,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 Mandrakelinux mae unrhyw weinydd sydd wedi ei\n"
+"gael eu gosod. Ym Mandrivalinux 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"
-"Mandrakelinux gael ei gwblhau. Os nad ydych yn gwybod beth mae\n"
+"Mandrivalinux 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 +4257,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 Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4313,7 +4313,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 Mandrakelinux yn dibynnu arno.\n"
+"WindowMaker, etc) sy'n dod gyda Mandrivalinux 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 +4428,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\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"
-"Mandrakelinux system.\n"
+"Mandrivalinux 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 +4460,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 Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4469,7 +4469,7 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4490,7 +4490,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 Mandrakelinux. Os yw eich disg caled yn wag neu os oes\n"
+"weithredu Mandrivalinux. 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 +4522,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 Mandrakelinux a Microsoft Windows ar yr un cyfrifiadur.\n"
+"am ddefnyddio Mandrivalinux 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 Mandrakelinux, yna dewiswch\n"
+"eich disg caled a'u cyfnewid am system Mandrivalinux, 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 +4687,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"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux 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 +4709,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"
-"Mandrakelinux newydd\n"
+"Mandrivalinux newydd\n"
 "\n"
 "Cliciwch \"%s\" os ydych am ddewis rhaniadau i'w gwirio am flociau\n"
 "gwallus ar y ddisg."
@@ -4726,7 +4726,7 @@ msgstr "Blaenorol"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, 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 +4738,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 Mandrakelinux, mae'n debygol y bydd rhai \n"
+"Erbyn i chi osod Mandrivalinux, 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 +4766,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 Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4795,7 +4795,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 Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux 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 +4866,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Yn awr mae angen i chi ddewis pa raniadau i'w defnyddio ar gyfer gosodiad\n"
-"eich system Mandrakelinux. Os oes rhaniadau wedi eu diffinio eisoes, un\n"
+"eich system Mandrivalinux. 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 +4951,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4981,7 +4981,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 Mandrakelinux newydd\n"
+"system weithredu Mandrivalinux newydd\n"
 "\n"
 "Mae pob rhaniad wedi ei restri fel hyn: \"Enw Linux\", \"Enw Windows\",\n"
 "\"Maint\".\n"
@@ -5028,7 +5028,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 Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux 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 +5037,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux 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 Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux 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 Mandrakelinux presennol.\n"
+"system Mandrivalinux 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 +5059,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 Mandrakelinux. Bydd eich\n"
+"pecynnau sydd wedi eu gosod ar eich system Mandrivalinux. 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 Mandrakelinux\n"
+"Dylai defnyddio \"Diweddaru\" weithio'n iawn ar systemau Mandrivalinux\n"
 "sy'n rhedeg systemau \"8.1\" neu'n ddiweddarach. Nid yw uwchraddio\n"
-"fersiynau cyn Mandrakelinux \"8.1\" yn cael ei gymeradwyo."
+"fersiynau cyn Mandrivalinux \"8.1\" yn cael ei gymeradwyo."
 
 #: help.pm:591
 #, c-format
@@ -5128,7 +5128,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux'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 +5169,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"
-"Mandrakelinux o UTF-8 yn ddibynnol ar ddewis y defnyddiwr:\n"
+"Mandrivalinux 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 +5420,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 Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux 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 +5441,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 Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\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 +5590,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux 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 +5607,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"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux 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 +5656,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 Mandrakelinux wedi i'r gosod\n"
+"ysgrifenedig neu ddefnyddio Canolfan Reoli Mandrivalinux 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 +5673,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 Mandrakelinux.\n"
+"cychwynwyr yng Nghanolfan Rheoli Mandrivalinux.\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 +5735,11 @@ msgstr "Gwasanaethau"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux 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"
-"Mandrakelinux newydd. Byddwch ofalus, bydd yr holl ddata sydd arno'n\n"
+"Mandrivalinux 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 +6091,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 Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Mae eich rhaniad Windows yn rhy ysgyriog, rhedwch \"defrag\" yn gyntaf o dan "
-"Windows ac yna ailgychwyn gosodi Mandrakelinux."
+"Windows ac yna ailgychwyn gosodi Mandrivalinux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6209,19 +6209,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux 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 Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6243,7 +6243,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"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"
@@ -6251,14 +6251,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"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"
@@ -6268,7 +6268,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 Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux 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"
@@ -6288,10 +6288,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6302,11 +6302,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"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"
-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6322,25 +6322,25 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Cyflwyniad\n"
 "\n"
 "Bydd y system weithredu a'r cydrannau gwahanol sydd o fewn dosbarthiad "
-"Mandrakelinux yn\n"
+"Mandrivalinux 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 "
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "\n"
 "\n"
 "1. Cytundeb Trwyddedu\n"
 "\n"
 "Darllenwch y ddogfen hon yn ofalus. Mae'r ddogfen hon yn gytundeb trwyddedu "
 "rhyngoch\n"
-"chi â Mandrakesoft S.A,. sy'n berthnasol i'r Cynnyrch Meddalwedd.\n"
+"chi â Mandriva S.A,. sy'n berthnasol i'r Cynnyrch Meddalwedd.\n"
 "\n"
 "Wrth osod, dyblygu neu ddefnyddio'r Cynnyrch Meddalwedd mewn unrhyw fodd, "
 "rydych yn\n"
@@ -6365,7 +6365,7 @@ msgstr ""
 "\"fel ag y maent\",\n"
 "heb ddim gwarant,\n"
 "hyd y mae'r gyfraith yn caniatáu.\n"
-"Ni fydd Mandrakesoft S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd ag "
+"Ni fydd Mandriva S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd ag "
 "y bydd y gyfraith yn\n"
 "caniatáu,  am unrhyw iawn o gwbl,\n"
 "arbennig, damweiniol, uniongyrchol neu anuniongyrchol (gan gynnwys heb "
@@ -6374,14 +6374,14 @@ msgstr ""
 "chosb o ganlyniad i achos llys,\n"
 "neu unrhyw golled o ganlyniad) yn codi o'r defnydd neu'r anallu i "
 "ddefnyddio'r Cynnyrch Meddalwedd,\n"
-"hyd yn oed os yw Mandrakesoft wedi eu cynghori o'r posibilrwydd o'r fath "
+"hyd yn oed os yw Mandriva wedi eu cynghori o'r posibilrwydd o'r fath "
 "iawn.\n"
 "\n"
 "CYFRIFOLDEB CYFYNGEDIG YN GYSYLLTIEDIG GYDA'R MEDDIANT NEU'R DEFNYDD O "
 "FEDDALWEDD\n"
 " GWAHARDDEDIG MEWN RHAI GWLEDYDD\n"
 "\n"
-"Ni fydd Mandrakesoft S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd y "
+"Ni fydd Mandriva S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd y "
 "bydd y gyfraith yn caniatáu,\n"
 "i fod yn atebol am unrhyw iawn o gwbl, arbennig, damweiniol, uniongyrchol "
 "neu anuniongyrchol (gan gynnwys\n"
@@ -6389,7 +6389,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"
-" Mandrakelinux, sydd wedi eu gwahardd neu eu hatal mewn rhai gwledydd gan "
+" Mandrivalinux, 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"
@@ -6409,10 +6409,10 @@ msgstr ""
 " ailddosbarthu'r cydrannau maent yn eu cynnwys. Darllenwch delerau ac amodau "
 "trwydded pob cydran cyn\n"
 "eu defnyddio. Dylai pob cwestiwn am drwydded cydran gael ei ofyn i awdur y "
-"gydran ac nid i Mandrakesoft.\n"
-"Mae'r rhaglenni a ddatblygwyd gan Mandrakesoft yn cael eu llywodraethu o dan "
+"gydran ac nid i Mandriva.\n"
+"Mae'r rhaglenni a ddatblygwyd gan Mandriva yn cael eu llywodraethu o dan "
 "Drwydded GLP. Mae'r dogfennau\n"
-" ysgrifennwyd gan Mandrakesoft S.A. yn cael eu llywodraethu gan drwydded "
+" ysgrifennwyd gan Mandriva S.A. yn cael eu llywodraethu gan drwydded "
 "benodol. Darllenwch y dogfennau\n"
 "am fwy o fanylion.\n"
 "\n"
@@ -6422,12 +6422,12 @@ msgstr ""
 "Mae pob hawl cydrannau'r Cynnyrch Meddalwedd yn perthyn i'w hawduron "
 "perthnasol ac wedi eu hamddiffyn\n"
 "gan gyfreithiau eiddo deallusol a hawlfraint sy'n berthnasol i raglenni "
-"meddalwedd. Mae Mandrakesoft yn cadw\n"
+"meddalwedd. Mae Mandriva yn cadw\n"
 "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 \"Mandrake\", \"Mandrakelinux\"  a'r logos cysylltiedig yn nodau "
-"masnachol sy'n perthyn i Mandrakesoft S.A.\n"
+"Mae \"Mandriva\", \"Mandrivalinux\"  a'r logos cysylltiedig yn nodau "
+"masnachol sy'n perthyn i Mandriva S.A.\n"
 "\n"
 "\n"
 "5. Cyfreithiau Llywodraethol\n"
@@ -6442,7 +6442,7 @@ msgstr ""
 "bydd pob anghytundeb ar amodau'r drwydded yn cael eu datrys y tu allan i'r "
 "llys. Fel cam olaf, bydd yr anghytundeb yn cael ei drosglwyddo i'r Llysoedd "
 "Barn, Paris - Ffrainc. Am unrhyw gwestiwn ynghylch y ddogfen hon cysylltwch "
-"â Mandrakesoft S.A.  \n"
+"â Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6533,7 +6533,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6541,14 +6541,14 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux 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 "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "cysylltwch â'r atodiad, sydd i'w gael yn:\n"
 "\n"
 "\n"
@@ -6556,7 +6556,7 @@ msgstr ""
 "\n"
 "\n"
 "Mae gwybodaeth ar ffurfweddu eich system ar gael ym mhenawdau ôl osod\n"
-"yr Official Mandrakelinux User's Guide."
+"yr Official Mandrivalinux User's Guide."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6591,12 +6591,12 @@ msgstr "Cychwyn cam '%s\"\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. 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"
-"Mandrakelinux. Os bydd hynny'n digwydd, gallwch geisio gwneud gosodiad\n"
+"Mandrivalinux. 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'."
 
@@ -6820,7 +6820,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 "
-"Mandrakelinux.\n"
+"Mandrivalinux.\n"
 "Bydd yna'n parhau o'r disg caled a bydd y pecynnau ar gael unwaith i'r "
 "system gael ei osod yn gyflawn."
 
@@ -7136,8 +7136,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "Cysylltu â safle Mandrakelinux i estyn rhestr o'r drychau sydd ar gael"
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
+msgstr "Cysylltu â safle Mandrivalinux i estyn rhestr o'r drychau sydd ar gael"
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7360,8 +7360,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Gosodiad %s Mandrakelinux"
+msgid "Mandrivalinux Installation %s"
+msgstr "Gosodiad %s Mandrivalinux"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9951,14 +9951,14 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux 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"
-"Mandrakelinux hwn. Am fur gwarchod pwrpasol pwerus, \n"
+"Mandrivalinux hwn. Am fur gwarchod pwrpasol pwerus, \n"
 "edrychwch ddosbarthiad arbenigol MandrakeSecurity Firewall."
 
 #: network/drakfirewall.pm:164
@@ -14029,11 +14029,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"Rhedwch Scannerdrake (Caledwedd/Sganiwr yng Nghanolfan Rheoli Mandrakelinux) "
+"Rhedwch Scannerdrake (Caledwedd/Sganiwr yng Nghanolfan Rheoli Mandrivalinux) "
 "i rannu eich sganiwr ar y rhwydwaith.\n"
 "\n"
 
@@ -15972,33 +15972,33 @@ msgstr "Aros"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Beth yw Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Beth yw Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Croeso i <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Croeso i <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux 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 Mandrakelinux yn <b>ddosbarthiad Linux</b> sy'n cynnwys y system graidd, "
+"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."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux 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 ""
-"Mandrakelinux yw'r dosbarthiad Linux mwyaf <b>cyfeillgar</b> heddiw. Mae'n "
+"Mandrivalinux 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
@@ -16014,15 +16014,15 @@ msgstr "Croeso i <b>fyd Cod Agored</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"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 "
 "contributors."
 msgstr ""
-"Mae Mandrakelinux yn ymroddedig i fodel cod agored. Mae'n golygu fod y "
+"Mae Mandrivalinux yn ymroddedig i fodel cod agored. Mae'n golygu fod y "
 "rhyddhad newydd yn ganlyniad <b>cydweithrediad</b> rhwng <b>tîm o "
-"ddatblygwyr Mandrakesoft</b> a <b>chyfranwyr cymuned byd eang</b> cyfranwyr "
-"Mandrakelinux."
+"ddatblygwyr Mandriva</b> a <b>chyfranwyr cymuned byd eang</b> cyfranwyr "
+"Mandrivalinux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16042,10 +16042,10 @@ msgstr "<b>Y drwydded GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux 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 "
-"Mandrakelinux wedi eu trwyddedu o dan y <b>Drwydded Gyhoeddus Cyffredinol "
+"Mandrivalinux wedi eu trwyddedu o dan y <b>Drwydded Gyhoeddus Cyffredinol "
 "(GPL)</b>"
 
 #: share/advertising/03.pl:17
@@ -16076,15 +16076,15 @@ msgstr "<b>Ymunwch â chymuned</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux 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 Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mae gan Mandrakelinux un o'r <b>cymunedau mwyaf</b> o ddefnyddwyr a "
+"Mae gan Mandrivalinux 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 Mandrakelinux."
+"ym myd Mandrivalinux."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16105,11 +16105,11 @@ msgstr "<b>Fersiwn Llwytho</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Rydych yn gosod <b> Mandrakelinux Llwytho i Lawr</b>. Hwn yw'r fersiwn rhydd "
-"mae Mandrakesoft am ei ddarparu <b>ar gael i bawb</b>."
+"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>."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -16139,10 +16139,10 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
 "Ni fydd gennych fynediad i'r <b>gwasanaethau ynglwm</b> yn y cynnyrch "
-"Mandrakesoft eraill ychwaith."
+"Mandriva eraill ychwaith."
 
 #: share/advertising/06.pl:13
 #, c-format
@@ -16151,7 +16151,7 @@ msgstr "<b>Discovery, Eich Bwrdd Gwaith Linux Cyntaf</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr "Rydych yn gosod <b>Mandrake Discovery</b>"
 
 #: share/advertising/06.pl:17
@@ -16174,17 +16174,17 @@ msgstr "<b>PowerPack, Y Bwrdd Gwaith Linux Gorau</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Rydych yn gosod <b>Mandrakelinux PowerPack</b>"
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Rydych yn gosod <b>Mandrivalinux PowerPack</b>"
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack yw <b>prif gynnyrch bwrdd gwaith Linux</b> Mandrakesoft. Mae "
+"PowerPack yw <b>prif gynnyrch bwrdd gwaith Linux</b> Mandriva. Mae "
 "PowerPack yn cynnwys <b>miloedd o raglenni</b> - popeth o'r mwyaf poblogaidd "
 "i'r mwyaf technegol."
 
@@ -16195,8 +16195,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>Mandrakelinux PowerPack+</b>."
-msgstr "Rydych yn gosod <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Rydych yn gosod <b>Mandrivalinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16212,22 +16212,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Cynnyrch Mandrakesoft</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Cynnyrch Mandriva</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"Mae <b>Mandrakesoft</b> wedi datblygu ystod eang o gynnyrch "
-"<b>Mandrakelinux</b>."
+"Mae <b>Mandriva</b> wedi datblygu ystod eang o gynnyrch "
+"<b>Mandrivalinux</b>."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Cynnyrch Mandrakelinux yw:"
+msgid "The Mandrivalinux products are:"
+msgstr "Cynnyrch Mandrivalinux yw:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16248,73 +16248,73 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux ar gyfer x86-64</b>, Ateb Mandrakelinux i wneud y gorau "
+"\t* <b>Mandrivalinux ar gyfer x86-64</b>, Ateb Mandrivalinux i wneud y gorau "
 "o'ch prosesydd 64-did."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Cynnyrch Mandrakesoft (Cynnyrch Nomad)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Cynnyrch Mandriva (Cynnyrch Nomad)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mae Mandrakelinux wedi datblygu dau gynnyrch sy'n caniatáu i chi ddefnyddio "
-"Mandrakelinux <b>ar unrhyw gyfrifiadur</b> heb fod angen ei osod:"
+"Mae Mandrivalinux wedi datblygu dau gynnyrch sy'n caniatáu i chi ddefnyddio "
+"Mandrivalinux <b>ar unrhyw gyfrifiadur</b> heb fod angen ei osod:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, dosbarthiad Mandrakelinux sy'n rhedeg yn llwyr o CD-ROM byw."
+"\t* <b>Move</b>, dosbarthiad Mandrivalinux sy'n rhedeg yn llwyr o CD-ROM byw."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, dosbarthiad Mandrakelinux sydd wedi ei osod yn "
+"\t* <b>GlobeTrotter</b>, dosbarthiad Mandrivalinux sydd wedi ei osod yn "
 "barod ar “LaCie Mobile Hard Drive” bychan iawn"
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Cynnyrch Mandrakesoft (Atebion Proffesiynol)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Cynnyrch Mandriva (Atebion Proffesiynol)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Isod mae cynnyrch Mandrakesoft sydd wedi eu cynllunio i ateb <b>anghenion "
+"Isod mae cynnyrch Mandriva sydd wedi eu cynllunio i ateb <b>anghenion "
 "proffesiynol</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
-"\t* <b>Y Bwrdd Gwaith Corfforaethol</b>, Bwrdd Gwaith Mandrakelinux ar gyfer "
+"\t* <b>Y Bwrdd Gwaith Corfforaethol</b>, Bwrdd Gwaith Mandrivalinux ar gyfer "
 "Busnesau."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Y Gweinydd Corfforaethol</b>, Ateb Gweinydd Mandrakelinux."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Y Gweinydd Corfforaethol</b>, Ateb Gweinydd Mandrivalinux."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>Mur Cadarn Aml-Rhwydwaith</b>, Ateb Diogelwch Mandrakelinux."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>Mur Cadarn Aml-Rhwydwaith</b>, Ateb Diogelwch Mandrivalinux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16358,10 +16358,10 @@ msgstr "<b>Dewiswch eich Hoff Amgylchedd Bwrdd Gwaith</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Gyda PowerPack, bydd gennych y dewis o <b>amgylchedd bwrdd gwaith graffigol</"
-"b>. Mae Mandrakesoft wedi dewis <b>KDE</b> fel yr un rhagosodedig."
+"b>. Mae Mandriva wedi dewis <b>KDE</b> fel yr un rhagosodedig."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16385,10 +16385,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "Gyda PowerPack+, mae gennych y dewis o <b>amgylcheddau bwrdd gwaith "
-"graffigol</b>. Mae Mandrakesoft wedi dewis <b>KDE</b> fel y rhagosodedig."
+"graffigol</b>. Mae Mandriva wedi dewis <b>KDE</b> fel y rhagosodedig."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16513,10 +16513,10 @@ msgstr "<b>Mwynhau'r Ystod Eang o Raglenni</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Yn newislen Mandrakelinux byddwch yn canfod rhaglenni <b>hawdd eu defnyddio</"
+"Yn newislen Mandrivalinux byddwch yn canfod rhaglenni <b>hawdd eu defnyddio</"
 "b> ar gyfer <b>eich holl waith</b>:"
 
 #: share/advertising/18.pl:16
@@ -16781,18 +16781,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Canolfan Rheoli Mandrakelinux</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Canolfan Rheoli Mandrivalinux</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"Mae <b>Canolfan Reoli Mandrakelinux</b> yn gasgliad hanfodol o wasanaethau "
-"ar gyfer Mandrakelinux swydd wedi eu cynllunio i symlhau ffurfweddiad eich "
+"Mae <b>Canolfan Reoli Mandrivalinux</b> yn gasgliad hanfodol o wasanaethau "
+"ar gyfer Mandrivalinux swydd wedi eu cynllunio i symlhau ffurfweddiad eich "
 "cyfrifiadur."
 
 #: share/advertising/25.pl:17
@@ -16817,16 +16817,16 @@ msgstr "<b>Y Model Cod Agored</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"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 "
 "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 Mandrakesoft yn gwerthu cynnyrch gwerth ychwanegol a "
-"gwasanaethau i <b>barhau i wella Mandrakelinux</b>. Os hoffech chi "
-"<b>gefnogi athroniaeth cod agored</b> a datblygiad Mandrakelinux, <b>os "
+"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> ystyriwch brynu ein cynnyrch neu ein gwasanaethau!"
 
 #: share/advertising/27.pl:13
@@ -16837,10 +16837,10 @@ msgstr "<b>Siop Ar-lein</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"I ddysgu rhagor am gynnyrch a gwasanaethau Mandrakesoft, ewch i'n "
+"I ddysgu rhagor am gynnyrch a gwasanaethau Mandriva, ewch i'n "
 "<b>platfform e-fasnachu</b>."
 
 #: share/advertising/27.pl:17
@@ -16865,24 +16865,24 @@ msgstr "Ewch i <b> store.mandrakesoft.com</b> heddiw."
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> yw'r <b>cydymaith perffaith</b> ar gyfer eich cynnyrch "
-"Mandrakelinux..."
+"<b>Mandriva Club</b> yw'r <b>cydymaith perffaith</b> ar gyfer eich cynnyrch "
+"Mandrivalinux..."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
-"Cewch fanteisio ar <b>freintiau gwerthfawr</b> drwy ymuno â Mandrakeclub, e."
+"Cewch fanteisio ar <b>freintiau gwerthfawr</b> drwy ymuno â Mandriva Club, e."
 "e:"
 
 #: share/advertising/28.pl:20
@@ -16904,40 +16904,40 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Cymryd rhan mewn <b>fforymau defnyddwyr</b> Mandrakelinux."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Cymryd rhan mewn <b>fforymau defnyddwyr</b> Mandrivalinux."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Mynediad cynnar a breintiol</b>, cyn eu rhyddhau'n gyhoeddus, i "
-"<b>ddelweddau ISO</b> Mandrakelinux."
+"<b>ddelweddau ISO</b> Mandrivalinux."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> yw'r gwasanaeth newydd gwerthfawr mae Mandrakesoft yn "
+"<b>Mandriva Online</b> yw'r gwasanaeth newydd gwerthfawr mae Mandriva yn "
 "ei gynnig i 'w gwsmeriaid!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mae Mandrakeonline yn darparu ystod eang o wasanaethau gwerthfawr ar gyfer "
-"<b>diweddaru'n hawdd</b> eich systemau your Mandrakelinux:"
+"Mae Mandriva Online yn darparu ystod eang o wasanaethau gwerthfawr ar gyfer "
+"<b>diweddaru'n hawdd</b> eich systemau your Mandrivalinux:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16963,39 +16963,39 @@ msgstr "\t* Hyblyg <b>amserlen</b> diweddariadau."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
-msgstr "\t* Rheolaeth o'ch <b>holl systemau Mandrakelinux</b> gydag un cyfrif."
+"\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."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Ydych chi angen <b>cymorth?</b> Mae arbenigwyr technegol Mandrakesoft i'w "
+"Ydych chi angen <b>cymorth?</b> Mae arbenigwyr technegol Mandriva i'w "
 "cael ar  <b>ein platfform cefnogaeth dechnegol </b> www.mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Drwy gymorth <b>arbenigwyr cymwysedig Mandrakelinux</b>, byddwch yn abed "
+"Drwy gymorth <b>arbenigwyr cymwysedig Mandrivalinux</b>, byddwch yn abed "
 "llawer o amser."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Am unrhyw gwestiwn am Mandrakelinux, mae gennych y gallu i brynu cefnogaeth "
+"Am unrhyw gwestiwn am Mandrivalinux, mae gennych y gallu i brynu cefnogaeth "
 "ar gyfer unrhyw ddigwyddiad o <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17295,8 +17295,8 @@ msgstr "Offer monitro, cyfrifo prosesau, tcpdunp, nmap..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Dewiniaid Mandrakesoft"
+msgid "Mandriva Wizards"
+msgstr "Dewiniaid Mandriva"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17392,8 +17392,8 @@ msgstr ""
 "\n"
 "DEWISIADAU:\n"
 "  --help            - argraffu'r neges cymorth.\n"
-"  --report          - dylai'r rhaglen fod yn un o offer Mandrakelinux\n"
-"  --incident        - ylai'r rhaglen fod yn un o offer Mandrakelinux"
+"  --report          - dylai'r rhaglen fod yn un o offer Mandrivalinux\n"
+"  --incident        - ylai'r rhaglen fod yn un o offer Mandrivalinux"
 
 #: standalone.pm:63
 #, c-format
@@ -17447,7 +17447,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17460,7 +17460,7 @@ msgid ""
 "--delclient      : delete a client machine from MTS (requires MAC address, "
 "IP, nbi image name)"
 msgstr ""
-"Ffurfweddwr Gweinydd Terfynell Mandrakelinux\n"
+"Ffurfweddwr Gweinydd Terfynell Mandrivalinux\n"
 "--enable         : galluogi MTS\n"
 "--disable        : analluogi MTS\n"
 "--start          : cychwyn MTS\n"
@@ -17517,7 +17517,7 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -17525,7 +17525,7 @@ msgid ""
 msgstr ""
 "[DEWIS]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -20302,13 +20302,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Offeryn Cofnodi Gwall Mandrakelinux"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Offeryn Cofnodi Gwall Mandrivalinux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Canolfan Rheoli Mandrakelinux"
+msgid "Mandrivalinux Control Center"
+msgstr "Canolfan Rheoli Mandrivalinux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20328,8 +20328,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20373,8 +20373,8 @@ msgstr "Dewin Ffurfweddu"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Dewis Offeryn Mandrakesoft:"
+msgid "Select Mandriva Tool:"
+msgstr "Dewis Offeryn Mandriva:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20800,7 +20800,7 @@ msgstr "Cychwyn y peiriant"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Nid yw'r rhag wyneb hwn wedi ei ffurfweddu eto.\n"
 "Cychwynnwch y cynorthwyydd \"Ychwanegu rhyngwyneb\" o' Ganolfan Rheoli "
@@ -20810,7 +20810,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Nid oes gennych gyswllt wedi ei ffurfweddu â'r Rhyngrwyd.\n"
 "Cychwynnwch gynorthwy-ydd \"%s\" o Ganolfan Rheoli Mandrake"
@@ -20863,8 +20863,8 @@ msgstr "KDM (rheolwr arddangos KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MdkKDM (rheolwr arddangos Mandrakelinux)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MdkKDM (rheolwr arddangos Mandrivalinux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21163,7 +21163,7 @@ msgstr "Mewnforio"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21172,7 +21172,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Hawlfraint (C) 2001-2002  Mandrakesoft \n"
+"Hawlfraint (C) 2001-2002  Mandriva \n"
 "\n"
 "\n"
 "        DUPONT Sebastien sdupont (fersiwn wreiddiol)\n"
@@ -21718,14 +21718,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Hawlfraint (C) 2003-2004 Mandrakesoft.\n"
+"Hawlfraint (C) 2003-2004 Mandriva.\n"
 "Mae hwn yn feddalwedd rhydd ac mae modd ei ailddosbarthu o dan amodau GNU "
 "GPL.\n"
 "\n"
@@ -21755,8 +21755,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Canolfan Gymorth Mandrakelinux"
+msgid "Mandrivalinux Help Center"
+msgstr "Canolfan Gymorth Mandrivalinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25281,8 +25281,8 @@ msgstr ""
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Cofnodion Offer Mandrakelinux"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Cofnodion Offer Mandrivalinux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25796,10 +25796,10 @@ msgstr "Cysylltiad wedi ei gwblhau"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Methodd y cysylltiad.\n"
-"Gwiriwch eich ffurfweddiad yng Nghanolfan Rheoli Mandrakelinux."
+"Gwiriwch eich ffurfweddiad yng Nghanolfan Rheoli Mandrivalinux."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26684,8 +26684,8 @@ msgstr "Methodd y gosod"
 #~ msgstr "Cadw a chau"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Dewiniaid Mandrakesoft"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Dewiniaid Mandriva"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Dim porwr ar gael! Gosodwch un"