various Mandrake -> Mandriva changes

1 files changed, 237 insertions, 223 deletions

diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po
index 830afddc1..6717b8210 100644
--- a/perl-install/share/po/af.po
+++ b/perl-install/share/po/af.po
@@ -1303,7 +1303,7 @@ msgstr "selfdoen"
 #: 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 "U kan ander tale selekteer wat na installasie beskikbaar sal wees."
@@ -3707,12 +3707,12 @@ msgstr "laat radio ondersteuning toe"
 #, 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 ""
 "Voordat u voortgaan, lees asb die lisensieterme noukeurig deur. Dit dek\n"
-"die hele Mandrivalinux distribusie. Indien u saamstem met al die\n"
+"die hele Mandriva Linux distribusie. Indien u saamstem met al die\n"
 "voorwaardes daarin, merk die \"%s\" boksie. Indien nie, kan u op die\n"
 "\"%s\" knoppie druk om teherlaai."
 
@@ -3898,13 +3898,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, 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 ""
-"Die Mandrivalinux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"
+"Die Mandriva Linux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"
 "weet wanneer 'n gekose pakket op 'n ander CD-ROM is. DrakX sal in so\n"
 "geval die huidige CD uitskop en aandui watter een benodig word."
 
@@ -3912,11 +3912,12 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for 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"
@@ -3968,12 +3969,12 @@ msgid ""
 "megabytes."
 msgstr ""
 "Nou moet u spesifiseer watter programme u op die rekenaar wil\n"
-"installeer. Daar is duisende pakkette beskikbaar vir Mandrivalinux, en\n"
+"installeer. Daar is duisende pakkette beskikbaar vir Mandriva Linux, en\n"
 "om alles meer eenvoudig te maak, is die pakkette gegroepeer onder\n"
 "groepe van selfde tipe programme.\n"
 "\n"
 "Die groepe is so saamgestel dat dit saamval met die tipe gebruik van u\n"
-"rekenaar. Mandrivalinux het vier vooraf gespesifseerde installasies\n"
+"rekenaar. Mandriva Linux het vier vooraf gespesifseerde installasies\n"
 "beskikbaar. Dink aan hierdie tipes as houers met verskillende pakkette.\n"
 "U kan wel uit die verskillende houers, verskillende pakkette kies.\n"
 "Dus kan u \"Werkstasie\" ook programme uit die \"Ontwikkeling\"\n"
@@ -4066,10 +4067,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"
@@ -4099,7 +4100,7 @@ msgstr ""
 "\n"
 "Indien u 'n diensprogram kies, of dit nou deel is van 'n groepe pakkette of\n"
 "'n enkel een, sal u gevra word om die installasie daarvan te bevestig.\n"
-"Mandrivalinux sal by verstek alle bediener-programme afskop nadat u die\n"
+"Mandriva Linux sal by verstek alle bediener-programme afskop nadat u die\n"
 "rekenaar aangeskakel het. Hierdie bediener-programme is verpak sonder\n"
 "enige probleme bekend. Dit kon intussen verander het, nadat sekuriteits-"
 "gate\n"
@@ -4242,7 +4243,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"
@@ -4410,12 +4411,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, 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"
@@ -4442,7 +4443,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"
@@ -4451,7 +4452,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"
@@ -4471,11 +4473,11 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandrivalinux\n"
+"Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandriva Linux\n"
 "wil installeer. Indien u 'n leë hardeskyf het, of indien 'n bestaande\n"
 "bedryfstelsel al die beskikbare spasie gebruik, sal u partisies moet\n"
 "skep. Om 'n partisie te skep veroorsaak dat u die hardeskyf logies\n"
-"verdeel, om spasie te skep vir u nuwe Mandrivalinux bedryfstelsel.\n"
+"verdeel, om spasie te skep vir u nuwe Mandriva Linux bedryfstelsel.\n"
 "\n"
 "Indien u 'n onervare gebruiker is, kan die skep van partisies vreemd en\n"
 "intimiderend wees.\n"
@@ -4505,14 +4507,14 @@ msgstr ""
 "geskied\n"
 "sonner verlies van data, mits u die partisie gedefragmenteer het.Ons beveel "
 "ten sterkste aan dat u 'n rugsteun maak van u data. Hierdie is\n"
-"die beste metode indien u beide Mandrivalinux en Microsoft Windows op die\n"
+"die beste metode indien u beide Mandriva Linux en Microsoft Windows op die\n"
 "rekenaar wil gebruik.\n"
 "\n"
 "Neem tog kennis dat dit die beskikbare oop spasie in Microsoft Windows sal\n"
 "verminder, aangesien ons plek moet maak vir Linux op die hardeskyf.\n"
 "\n"
 " * \"%s\": Indien u alle data op alle partisies op u hardeskyf wil uitwis,\n"
-"en dit dan vervang met Mandrivalinux, kan u hierdie opsie kies.\n"
+"en dit dan vervang met Mandriva Linux, kan u hierdie opsie kies.\n"
 "Wees versigtig die opsie is onomkeerbaar!\n"
 "\n"
 "   !! Net weer waarsku: alle data op die skyf sal vernietig word. !! \n"
@@ -4664,7 +4666,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."
@@ -4704,7 +4706,7 @@ msgstr "Vorige"
 #: help.pm:434
 #, fuzzy, 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"
@@ -4716,7 +4718,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Teen die tyd wat u Mandrivalinux installeer, is dit hoogs waarskynlik\n"
+"Teen die tyd wat u Mandriva Linux installeer, is dit hoogs waarskynlik\n"
 "dat van die pakkette intussen opgedateer is. Foute kom reggestel wees,\n"
 "of sekuriteits probleme is dalk opgelos. Om voordeel hieruit te put, kan\n"
 "u hulle nou van die Internet aflaai. Merk \"%s\" indien u 'n werkende\n"
@@ -4743,7 +4745,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"
@@ -4756,7 +4758,8 @@ msgstr ""
 "dit algemene gebruik op die rekenaar moeiliker maak.\n"
 "\n"
 "Indien u onseker is oor wat om te kies, bly by die verstek opsie. U\n"
-"kan altyd later die vlak verander deur draksec in die Mandrivalinux Control\n"
+"kan altyd later die vlak verander deur draksec in die Mandriva Linux "
+"Control\n"
 "Center te grbruik.\n"
 "\n"
 "Die \"%s\" veld kan boodskappe stuur na 'n gekose persoon wat\n"
@@ -4772,7 +4775,7 @@ msgstr "Sekuriteits-admin:"
 #, 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"
@@ -4843,7 +4846,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Nou moet u asseblief besluit watter partisie(s) u gaan gebruik vir die\n"
-"installasie van u Mandrivalinux rekenaar.Indien die partisies reeds\n"
+"installasie van u Mandriva Linux rekenaar.Indien die partisies reeds\n"
 "geskep is gedurende 'n vorige GNU/Linux installasie of deur 'n ander\n"
 "partisie-program, kan u hulle gebruik.Indien nie, moet u eerstens\n"
 "partisies skep.\n"
@@ -4927,7 +4930,7 @@ msgstr "Skakel tussen normale/kenner modus"
 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"
@@ -4957,7 +4960,7 @@ msgid ""
 msgstr ""
 "Ons het meer as een Microsoft-partisie op u hardeskyf gevind.\n"
 "Kies dan nou die een wie se grootte u wil verander, om plek te maak\n"
-"vir u nuwe Mandrivalinux bedryfstelsel.\n"
+"vir u nuwe Mandriva Linux bedryfstelsel.\n"
 "\n"
 "Elke partisie is as volg gelys: \"Linux-naam\", \"Windows-naam\"\n"
 "\"Kapasiteit\".\n"
@@ -5006,7 +5009,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"
@@ -5015,19 +5018,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 ""
 "Hierdie stap word slegs gedoen indien ou GNU/Linux partisies op die\n"
 "rekenaar gevind is.\n"
 "\n"
 "DrakX moet nou weet of u 'n nuwe installasie of 'n opgradering van 'n\n"
-"bestaande Mandrivalinux wil doen:\n"
+"bestaande Mandriva Linux wil doen:\n"
 "\n"
 " * \"%s\": Hierdie deel word grootliks gebruik vir 'n hele nuwe "
 "installasie.\n"
@@ -5036,7 +5040,7 @@ msgstr ""
 "van u partisies se data wil behou.\n"
 "\n"
 " * \"%s\": hierdie tipe installasie laat u toe om pakkette op te dateer\n"
-"wat deel uitmaak van u huidige Mandrivalinux installasie. Die partisies\n"
+"wat deel uitmaak van u huidige Mandriva Linux installasie. Die partisies\n"
 "en gebruiker se data bly onveranderd. Ander stappe is baie dieselfde as\n"
 "'n normale installasie.\n"
 "\n"
@@ -5095,7 +5099,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"
@@ -5349,7 +5354,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but 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"
@@ -5370,11 +5375,11 @@ 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 ""
 "Dit is nou tyd om u drukkerstelsel te kies. Ander bedryfstelsels sal\n"
-"seker net een aan u bied, maar Mandrivalinux gee twee. Elk van hulle\n"
+"seker net een aan u bied, maar Mandriva Linux gee twee. Elk van hulle\n"
 "is beter as die ander in sekere gevalle.\n"
 "\n"
 " * \"%s\" -- wat vir \"print, do not queue\" staan. Kies dit indien u\n"
@@ -5393,7 +5398,7 @@ msgstr ""
 "opsies te keis en drukkers te bestuur.\n"
 "\n"
 "Sou u die keuse nou, later wil verander, gaan gerus na 'PrinterDrake'\n"
-"in die 'Mandrivalinux Control Center' en klik op die \"Kenner\" knoppie."
+"in die 'Mandriva Linux Control Center' en klik op die \"Kenner\" knoppie."
 
 #: help.pm:765
 #, c-format
@@ -5511,7 +5516,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"
@@ -5528,7 +5534,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"
@@ -5640,10 +5646,10 @@ msgstr "Dienste"
 #, 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 ""
-"Kies die hardeskyf wat u wil wis, om u nuwe Mandrivalinux\n"
+"Kies die hardeskyf wat u wil wis, om u nuwe Mandriva Linux\n"
 "te kan installeer. Wees tog versigtig, alle huidige data op daardie\n"
 "partisie sal vernietig word!"
 
@@ -5990,7 +5996,7 @@ msgstr "Bereken die grootte van die Windowspartisie"
 #, 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 "U Windows-partisie is te gefragmenteer. Loop eers 'defrag' asb."
 
@@ -6104,13 +6110,13 @@ msgstr "Netwerk op pad af"
 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"
@@ -6164,7 +6170,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"
@@ -6201,7 +6207,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"
@@ -6309,8 +6315,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"
@@ -6318,13 +6324,13 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "Geluk, installasie is afgehandel.\n"
 "Verwyder die herlaaimedium en druk 'enter' om te herlaai.\n"
 "\n"
 "\n"
-"Vir inligting oor hierdie vrystelling van Mandrivalinux,\n"
+"Vir inligting oor hierdie vrystelling van Mandriva Linux,\n"
 "bekyk die errata beskikbaar op\n"
 "\n"
 "\n"
@@ -6332,13 +6338,13 @@ msgstr ""
 "\n"
 "\n"
 "Inligting oor stelskonfigurasie is beskikbaar in die postinstallasie-\n"
-"hoofstuk in die Offisiële Mandrivalinux Gebruikersgids."
+"hoofstuk in die Offisiële Mandriva Linux Gebruikersgids."
 
 #. -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
@@ -6367,13 +6373,13 @@ msgstr "Gaan stap '%s' binne\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 ""
 "U stelsel het min hulpbronne beskikbaar. U mag dalk probleme\n"
 "ondervind met die installering\n"
-"van Mandrivalinux. In so 'n geval probeer eerder die teksinstallasie.\n"
+"van Mandriva Linux. In so 'n geval probeer eerder die teksinstallasie.\n"
 "Daarvoor moet u\n"
 "'F1' druk wanneer u vanaf die CDROM herlaai en dan 'text' op die\n"
 "instruksielyn intik."
@@ -6912,8 +6918,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
-msgstr "Kontak Mandrivalinux se webwerf vir 'n lys van spieëlwebplekke...."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr "Kontak Mandriva Linux se webwerf vir 'n lys van spieëlwebplekke...."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7135,8 +7141,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux Installasie %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux Installasie %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9727,13 +9733,13 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall konfigurasie\n"
 "\n"
-"Hiermee stel u 'n persoonlike vuurmuur op vir die Mandrivalinux\n"
+"Hiermee stel u 'n persoonlike vuurmuur op vir die Mandriva Linux\n"
 "rekenaar. Indien u 'n kragtige en toegewyde vuurmuur verlang, kyk\n"
 "dan gerus na die 'MandrakeSecurity Firewall'."
 
@@ -13773,8 +13779,8 @@ 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 ""
 
@@ -14046,7 +14052,7 @@ msgid ""
 msgstr ""
 "Die netwerk, soos opgestel gedurende die installasie, kom nie aan die gang "
 "nie. Maak tog seker die netwerk is tot u beskikking, en gaan u konfigurasie "
-"na deur die 'Mandrivalinux Control Center' te gebruik. "
+"na deur die 'Mandriva Linux Control Center' te gebruik. "
 
 #: printer/printerdrake.pm:4196
 #, c-format
@@ -15674,18 +15680,18 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Wat is Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Wat is Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Welkom by <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Welkom by <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."
@@ -15694,11 +15700,11 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, fuzzy, 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 is 'n Oopbron bedryfstelsel wat duisende van die keurigste "
-"programme beskikbaar in die Oopbron wêreld bevat. Mandrivalinux is een van "
+"Mandriva Linux is 'n Oopbron bedryfstelsel wat duisende van die keurigste "
+"programme beskikbaar in die Oopbron wêreld bevat. Mandriva Linux is een van "
 "die gewildste in die wereld!"
 
 #: share/advertising/02.pl:13
@@ -15714,12 +15720,12 @@ msgstr "Welkom by die wêreld van Oopbron sagteware!"
 #: share/advertising/02.pl:17
 #, fuzzy, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux is committed to the open source model. This means that this "
 "new release is the result of <b>collaboration</b> between <b>Mandriva's team "
-"of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
-"Mandrivalinux is toegewyd aan die Oopbron manier van dinge doen. Hierdie "
+"Mandriva Linux is toegewyd aan die Oopbron manier van dinge doen. Hierdie "
 "vrystelling is die reslutaat van samewerking tussen Mandriva se span "
 "ontwikkelaars en 'n wereldwye gemeenskap wan mense wat bydraes lewer."
 
@@ -15740,8 +15746,8 @@ msgstr "<b>Neem Kennis</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 ""
 
 #: share/advertising/03.pl:17
@@ -15762,34 +15768,34 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, fuzzy, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Sluit aan by die Mandrivalinux gemeenskap!</b>"
+msgstr "<b>Sluit aan by die Mandriva Linux gemeenskap!</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 ""
 
 #: 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 ""
 
 #: share/advertising/05.pl:15
 #, fuzzy, c-format
 msgid "<b>Download Version</b>"
-msgstr "Hierdie is die Mandrivalinux <b>Download weergawe</b>."
+msgstr "Hierdie is die Mandriva Linux <b>Download weergawe</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 ""
 
@@ -15827,7 +15833,7 @@ msgstr ""
 
 #: 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 ""
 
 #: share/advertising/06.pl:17
@@ -15849,7 +15855,7 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
@@ -15870,7 +15876,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15893,13 +15899,13 @@ msgstr "<b>Mandriva Store</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 ""
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux Updates Applet"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux Updates Applet"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -15919,7 +15925,7 @@ 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 ""
 
@@ -15931,21 +15937,21 @@ msgstr ""
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
@@ -15963,17 +15969,19 @@ 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 ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -16152,10 +16160,10 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, fuzzy, 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 ""
-"Die kieslys in Mandrivalinux het gebruikersvriendelike programme vir alle "
+"Die kieslys in Mandriva Linux het gebruikersvriendelike programme vir alle "
 "behoefdes:"
 
 #: share/advertising/18.pl:16
@@ -16397,18 +16405,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux Control Center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux Control Center</b>"
 
 #: share/advertising/25.pl:15
 #, fuzzy, 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 ""
-"Die \"Mandrivalinux Control Center\" is 'n versameling nutsprogramme wat die "
-"opstel van u rekenaar vergemaklik."
+"Die \"Mandriva Linux Control Center\" is 'n versameling nutsprogramme wat "
+"die opstel van u rekenaar vergemaklik."
 
 #: share/advertising/25.pl:17
 #, fuzzy, c-format
@@ -16432,8 +16440,8 @@ 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 ""
 
@@ -16465,8 +16473,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Gaan draai sommer vandag by <b>store.mandrakesoft.com</b>"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Gaan draai sommer vandag by <b>store.mandriva.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16476,7 +16484,7 @@ 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 ""
 
@@ -16492,7 +16500,7 @@ msgstr ""
 #, fuzzy, 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* Spesiale afslag vir produkte en dienste by \"Mandriva Store\""
 
 #: share/advertising/28.pl:21
@@ -16504,14 +16512,14 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, fuzzy, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
 msgstr "\t* Deel in die aanlyn kletzkamers met <b>Kopete</b>"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
@@ -16530,7 +16538,7 @@ 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 ""
 
 #: share/advertising/29.pl:18
@@ -16553,7 +16561,7 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
@@ -16565,21 +16573,21 @@ 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: share/compssUsers.pl:25
@@ -16970,8 +16978,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 "[OPSIES] [PROGRAMNAAM]\n"
 "\n"
@@ -17032,7 +17040,7 @@ msgstr ""
 #, fuzzy, 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"
@@ -19890,13 +19898,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux Bug Report Tool"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux Control Center"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux Control Center"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20388,20 +20396,20 @@ msgstr "Gelaai tydens herlaaityd"
 #, 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 ""
 "Hierdie koppelvlak is nog nie opgestel nie.\n"
-"Loods die \"Add an interface\"-assistent vanuit die Mandrivalinux Control "
+"Loods die \"Add an interface\"-assistent vanuit die Mandriva Linux Control "
 "Center"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, fuzzy, 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 ""
 "Hierdie koppelvlak is nog nie opgestel nie.\n"
-"Loods die \"%s\"-assistent vanuit die Mandrivalinux Control Center"
+"Loods die \"%s\"-assistent vanuit die Mandriva Linux Control Center"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20451,7 +20459,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20754,18 +20762,18 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 "Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\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>"
 
 #: standalone/drakfont:520
 #, c-format
@@ -21338,8 +21346,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinux Hulp Sentrum"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linux Hulp Sentrum"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22000,7 +22008,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 ""
 "Geen klankkaart is op u rekenaar bespeur nie. Maak tog seker dat dit 'n\n"
 "Linux-ondersteunde klankkaart is. Kyk of dit reg ingeprop is.\n"
@@ -22009,7 +22017,7 @@ msgstr ""
 "U kan ons hardeware-databasis besoek te:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24021,7 +24029,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 ""
 "Geen TV-kaart is op u rekenaar bespeur nie. Maak tog seker dat dit 'n Linux-"
 "ondersteunde Video/TV-kaart is. Kyk of dit reg ingeprop is.\n"
@@ -24030,7 +24038,7 @@ msgstr ""
 "U kan ons hardeware-databasis besoek te:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -24741,13 +24749,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 ""
 "Hierdie is HardDrake,'n Mandrake program vir hardewarekonfigurasie.\n"
 "<span foreground=\"royalblue3\">Weergawe:</span> %s\n"
 "<span foreground=\"royalblue3\">Skrywer</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -24857,8 +24865,8 @@ msgstr "Die verandering is aangebring, maar u moet eers afteken"
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinux Tools Logs"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linux Tools Logs"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25368,10 +25376,10 @@ msgstr "Voltooide konneksie."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Probleme met die Konneksie\n"
-"Maak tog seker van u konfigurasie in die 'Mandrivalinux Control Center'."
+"Maak tog seker van u konfigurasie in die 'Mandriva Linux Control Center'."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26394,16 +26402,17 @@ msgstr "Installasie het gefaal!"
 #~ msgstr "Fout om %s in skryfmodus te open: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandriva Linux 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 ""
-#~ "Hierdie is HardDrake,'n Mandrivalinux program vir hardewarekonfigurasie.\n"
+#~ "Hierdie is HardDrake,'n Mandriva Linux program vir "
+#~ "hardewarekonfigurasie.\n"
 #~ "<span foreground=\"royalblue3\">Weergawe:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Skrywer</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 
 #~ msgid "OK"
@@ -26804,8 +26813,8 @@ msgstr "Installasie het gefaal!"
 #~ msgstr ""
 #~ "Probleme om drukker \"%s\" uit Star Office/OpenOffice.org/GIMP te verwyder"
 
-#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
-#~ msgstr "<b>Veels Geluk met u puik keuse van Mandrivalinux! ;-)</b>"
+#~ msgid "<b>Congratulations for choosing Mandriva Linux!</b>"
+#~ msgstr "<b>Veels Geluk met u puik keuse van Mandriva Linux! ;-)</b>"
 
 #~ msgid ""
 #~ "We would like to thank everyone who participated in the development of "
@@ -26916,9 +26925,9 @@ msgstr "Installasie het gefaal!"
 #~ "\t* Spesiale spieel bedieners wat uitsluitlik vir \"Mandriva Club\" se "
 #~ "lede is"
 
-#~ msgid "\t* Voting for software to put in Mandrivalinux"
+#~ msgid "\t* Voting for software to put in Mandriva Linux"
 #~ msgstr ""
-#~ "\t* Stemreg om te kan se watter sagteware u in Mandrivalinux wil sien"
+#~ "\t* Stemreg om te kan se watter sagteware u in Mandriva Linux wil sien"
 
 #~ msgid "\t* Plus much more"
 #~ msgstr "\t* Plus veel meer"
@@ -26934,10 +26943,10 @@ msgstr "Installasie het gefaal!"
 
 #~ msgid ""
 #~ "If you have Linux questions, subscribe to Mandriva Expert at <b>www."
-#~ "mandrakeexpert.com</b>"
+#~ "mandrivaexpert.com</b>"
 #~ msgstr ""
 #~ "Sou u enige Linux tipe vrae het, sluit aan by Mandriva Expert <b>www. "
-#~ "mandrakeexpert.com</b>"
+#~ "mandrivaexpert.com</b>"
 
 #~ msgid ""
 #~ "If you would like to get involved, please subscribe to the \"Cooker\" "
@@ -26954,22 +26963,23 @@ msgstr "Installasie het gefaal!"
 #~ "mandrake- linux.com</b>!"
 
 #~ msgid ""
-#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "
+#~ "Mandriva Linux includes the famous graphical desktops KDE and GNOME, plus "
 #~ "the latest versions of the most popular Open Source applications."
 #~ msgstr ""
-#~ "Mandrivalinux sluit die bekende KDEen GNOME grafiese werkskerms, asook "
+#~ "Mandriva Linux sluit die bekende KDEen GNOME grafiese werkskerms, asook "
 #~ "die nuutste weergawes van die mees gewilde Oopbron programme in."
 
 #~ msgid ""
-#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "
+#~ "Mandriva Linux is widely known as the most user-friendly and the easiest "
 #~ "to install and easy to use Linux distribution."
 #~ msgstr ""
-#~ "Mandrivalinux word deur meeste mense as die gebruikervriendelikste Linux "
+#~ "Mandriva Linux word deur meeste mense as die gebruikervriendelikste Linux "
 #~ "beskou. Dit is maklik om te installeer en maklik om te gebruik."
 
-#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandrakemove</b>"
+#~ msgid ""
+#~ "\t* Find out Mandriva Linux on a bootable CD with <b>Mandrakemove</b>"
 #~ msgstr ""
-#~ "\t* Vind uit oor Mandrivalinux op 'n selflaai CD - <b>Mandrakemove</b>"
+#~ "\t* Vind uit oor Mandriva Linux op 'n selflaai CD - <b>Mandrakemove</b>"
 
 #~ msgid ""
 #~ "\t* If you use Linux mostly for Office, Internet and Multimedia tasks, "
@@ -27015,9 +27025,8 @@ msgstr "Installasie het gefaal!"
 
 #~ msgid ""
 #~ "<b>MandrakeClustering</b>: the power and speed of a Linux cluster "
-#~ "combined with the stability and easy-of-use of the world-famous "
-#~ "Mandrivalinux distribution. A unique blend for incomparable HPC "
-#~ "performance."
+#~ "combined with the stability and easy-of-use of the world-famous Mandriva "
+#~ "Linux distribution. A unique blend for incomparable HPC performance."
 #~ msgstr ""
 #~ "<b>MandrakeClustering</b>: die krag en spoed van 'n Linux-trosrekenaar "
 #~ "gekombineer met die stabiliteit en gebruikersvriendelikheid van Mandrake "
@@ -27038,8 +27047,8 @@ msgstr "Installasie het gefaal!"
 #~ msgid "<b>Do you require assistance?</b>"
 #~ msgstr "<b>Benodig u bystand?</b>"
 
-#~ msgid "This is the Mandrivalinux <b>Download version</b>."
-#~ msgstr "Hierdie is die Mandrivalinux <b>Download weergawe</b>."
+#~ msgid "This is the Mandriva Linux <b>Download version</b>."
+#~ msgstr "Hierdie is die Mandriva Linux <b>Download weergawe</b>."
 
 #~ msgid ""
 #~ "The free download version does not include commercial software, and "
@@ -27063,26 +27072,27 @@ msgstr "Installasie het gefaal!"
 #~ "'n volledige keuse wereldklas bediener aplikasies in te sluit."
 
 #~ msgid ""
-#~ "It is the only Mandrivalinux product that includes the groupware solution."
+#~ "It is the only Mandriva Linux product that includes the groupware "
+#~ "solution."
 #~ msgstr ""
-#~ "Dit is die enigste Mandrivalinux produk wat die \"groupware\" oplossing "
+#~ "Dit is die enigste Mandriva Linux produk wat die \"groupware\" oplossing "
 #~ "bevat."
 
 #~ msgid ""
-#~ "When you log into your Mandrivalinux system for the first time, you can "
+#~ "When you log into your Mandriva Linux system for the first time, you can "
 #~ "choose between several popular graphical desktops environments, "
 #~ "including: KDE, GNOME, WindowMaker, IceWM, and others."
 #~ msgstr ""
-#~ "Sodra u die eerste keer inteken op u Mandrivalinux rekenaar, het u 'n "
+#~ "Sodra u die eerste keer inteken op u Mandriva Linux rekenaar, het u 'n "
 #~ "keuse watter grafiese werksomgewing om te gebruik. Keuses sluit KDE, "
 #~ "GNOME, WindowMaker, IceWM, en ander in."
 
 #~ msgid ""
-#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
+#~ "In the Mandriva Linux menu you will find easy-to-use applications for all "
 #~ "of your tasks:"
 #~ msgstr ""
-#~ "Die kieslys in Mandrivalinux het gebruikersvriendelike programme vir alle "
-#~ "behoefdes:"
+#~ "Die kieslys in Mandriva Linux het gebruikersvriendelike programme vir "
+#~ "alle behoefdes:"
 
 #~ msgid ""
 #~ "\t* Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
@@ -27126,11 +27136,11 @@ msgstr "Installasie het gefaal!"
 #~ msgstr "\t* Adresboek (kliënt en bediener)"
 
 #~ msgid ""
-#~ "Your new Mandrivalinux distribution is the result of collaborative "
-#~ "efforts between Mandriva developers and Mandrivalinux contributors "
+#~ "Your new Mandriva Linux distribution is the result of collaborative "
+#~ "efforts between Mandriva developers and Mandriva Linux contributors "
 #~ "throughout the world."
 #~ msgstr ""
-#~ "U nuwe Mandrivalinux bedryfstelsel met al sy programme is die resultaat "
+#~ "U nuwe Mandriva Linux bedryfstelsel met al sy programme is die resultaat "
 #~ "van 'n wereldwye gemeenskap, wat Mandriva se ontwikkelaars, asook mense "
 #~ "in Sonnige Suid-Afrika insluit!"
 
@@ -27200,13 +27210,13 @@ msgstr "Installasie het gefaal!"
 #~ msgid ""
 #~ "Before continuing, you should carefully read the terms of the license. "
 #~ "It\n"
-#~ "covers the entire Mandrivalinux distribution. If you do agree with all "
+#~ "covers the entire Mandriva Linux distribution. If you do agree with all "
 #~ "the\n"
 #~ "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
 #~ "will reboot your computer."
 #~ msgstr ""
 #~ "Voordat u voortgaan, lees asb die lisensieterme noukeurig deur. Dit dek\n"
-#~ "die hele Mandrivalinux distribusie. Indien u saamstem met al die\n"
+#~ "die hele Mandriva Linux distribusie. Indien u saamstem met al die\n"
 #~ "voorwaardes daarin, merk die \"%s\" boksie. Indien nie, kan u op die\n"
 #~ "\"%s\" knoppie druk om teherlaai."
 
@@ -27318,25 +27328,27 @@ msgstr "Installasie het gefaal!"
 #~ "nie. "
 
 #~ 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 correct CD as required."
 #~ msgstr ""
-#~ "Die Mandrivalinux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"
+#~ "Die Mandriva Linux installasie is versprei oor 'n aantal CD-ROMs.DrakX\n"
 #~ "weet wanneer 'n gekose pakket op 'n ander CD-ROM is. DrakX sal in so\n"
 #~ "geval die huidige CD uitskop en aandui watter een benodig word."
 
 #~ msgid ""
 #~ "It is now time to specify which programs you wish to install on your\n"
-#~ "system. There are thousands of packages available for Mandrivalinux, and\n"
+#~ "system. There are thousands of packages available for Mandriva Linux, "
+#~ "and\n"
 #~ "to make it simpler to manage the packages have been placed into groups "
 #~ "of\n"
 #~ "similar applications.\n"
 #~ "\n"
 #~ "Packages are sorted into groups corresponding to a particular use of "
 #~ "your\n"
-#~ "machine. Mandrivalinux sorts packages groups in four categories. You can\n"
+#~ "machine. Mandriva Linux sorts packages groups in four categories. You "
+#~ "can\n"
 #~ "mix and match applications from the various categories, so a\n"
 #~ "``Workstation'' installation can still have applications from the\n"
 #~ "``Development'' category installed.\n"
@@ -27389,12 +27401,12 @@ msgstr "Installasie het gefaal!"
 #~ "updating an existing system."
 #~ msgstr ""
 #~ "Nou moet u spesifiseer watter programme u op die rekenaar wil\n"
-#~ "installeer. Daar is duisende pakkette beskikbaar vir Mandrivalinux, en\n"
+#~ "installeer. Daar is duisende pakkette beskikbaar vir Mandriva Linux, en\n"
 #~ "om alles meer eenvoudig te maak, is die pakkette gegroepeer onder\n"
 #~ "groepe van selfde tipe programme.\n"
 #~ "\n"
 #~ "Die groepe is so saamgestel dat dit saamval met die tipe gebruik van u\n"
-#~ "rekenaar. Mandrivalinux het vier vooraf gespesifseerde installasies\n"
+#~ "rekenaar. Mandriva Linux het vier vooraf gespesifseerde installasies\n"
 #~ "beskikbaar. Dink aan hierdie tipes as houers met verskillende pakkette.\n"
 #~ "U kan wel uit die verskillende houers, verskillende pakkette kies.\n"
 #~ "Dus kan u \"Werkstasie\" ook programme uit die \"Ontwikkeling\"\n"
@@ -27450,11 +27462,11 @@ msgstr "Installasie het gefaal!"
 #~ "chose the individual package or because it was part of a group of "
 #~ "packages,\n"
 #~ "you will be asked to confirm that you really want those servers to be\n"
-#~ "installed. By default Mandrivalinux will automatically start any "
+#~ "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 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\n"
 #~ "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
@@ -27493,7 +27505,7 @@ msgstr "Installasie het gefaal!"
 #~ "Indien u 'n diensprogram kies, of dit nou deel is van 'n groepe pakkette "
 #~ "of\n"
 #~ "'n enkel een, sal u gevra word om die installasie daarvan te bevestig.\n"
-#~ "Mandrivalinux sal by verstek alle bediener-programme afskop nadat u die\n"
+#~ "Mandriva Linux sal by verstek alle bediener-programme afskop nadat u die\n"
 #~ "rekenaar aangeskakel het. Hierdie bediener-programme is verpak sonder\n"
 #~ "enige probleme bekend. Dit kon intussen verander het, nadat sekuriteits-"
 #~ "gate\n"
@@ -27522,7 +27534,8 @@ msgstr "Installasie het gefaal!"
 #~ "You will now set up your Internet/network connection. If you wish to\n"
 #~ "connect your computer to the Internet or to a local network, click \"%s"
 #~ "\".\n"
-#~ "Mandrivalinux will attempt to auto-detect network devices and modems. If\n"
+#~ "Mandriva Linux will attempt to auto-detect network devices and modems. "
+#~ "If\n"
 #~ "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
 #~ "configure the network, or to do it later, in which case clicking the \"%s"
 #~ "\"\n"
@@ -27543,7 +27556,7 @@ msgstr "Installasie het gefaal!"
 #~ "modems\n"
 #~ "that require additional software to work compared to Normal modems. Some "
 #~ "of\n"
-#~ "those modems actually work under Mandrivalinux, some others do not. You\n"
+#~ "those modems actually work under Mandriva Linux, some others do not. You\n"
 #~ "can consult the list of supported modems at LinModems.\n"
 #~ "\n"
 #~ "You can consult the ``Starter Guide'' chapter about Internet connections\n"
@@ -27554,7 +27567,7 @@ msgstr "Installasie het gefaal!"
 #~ "U kan nou die Internet/netwerk konneksie opstel. Indien u graag die "
 #~ "rekenaar\n"
 #~ "aan die Internet of plaaslike netwerk wil koppel, kies \"%s\".\n"
-#~ "Mandrivalinux sal poog om u netwerk toestelle en modems te outospeur.\n"
+#~ "Mandriva Linux sal poog om u netwerk toestelle en modems te outospeur.\n"
 #~ "Indien\n"
 #~ "dit onsuksesvol was, probeer waar \"%s\" nie gemerk is nie. U kan ook "
 #~ "kies\n"
@@ -27681,7 +27694,7 @@ msgstr "Installasie het gefaal!"
 #~ "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 will be presented with a list of different parameters to change to "
 #~ "get\n"
@@ -27866,7 +27879,7 @@ msgstr "Installasie het gefaal!"
 #~ "have to partition the drive. Basically, partitioning a hard drive "
 #~ "consists\n"
 #~ "of logically dividing 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 lost data if there is an existing operating system "
@@ -27905,7 +27918,7 @@ msgstr "Installasie het gefaal!"
 #~ "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 #~ "data, provided you have 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 "
+#~ "recommended if you want to use both Mandriva Linux and Microsoft Windows "
 #~ "on\n"
 #~ "the same computer.\n"
 #~ "\n"
@@ -27915,7 +27928,7 @@ msgstr "Installasie het gefaal!"
 #~ "Windows 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,\n"
+#~ "your hard drive and replace them with your new Mandriva Linux system,\n"
 #~ "choose this option. Be careful, because you will not be able to undo "
 #~ "your\n"
 #~ "choice after you confirm.\n"
@@ -27940,11 +27953,11 @@ msgstr "Installasie het gefaal!"
 #~ "refer to the ``Managing Your Partitions'' section in the ``Starter "
 #~ "Guide''."
 #~ msgstr ""
-#~ "Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandrivalinux\n"
+#~ "Op hierdie tydstip moet u besluit waar op die hardeskyf u Mandriva Linux\n"
 #~ "wil installeer. Indien u 'n leë hardeskyf het, of indien 'n bestaande\n"
 #~ "bedryfstelsel al die beskikbare spasie gebruik, sal u partisies moet\n"
 #~ "skep. Om 'n partisie te skep veroorsaak dat u die hardeskyf logies\n"
-#~ "verdeel, om spasie te skep vir u nuwe Mandrivalinux bedryfstelsel.\n"
+#~ "verdeel, om spasie te skep vir u nuwe Mandriva Linux bedryfstelsel.\n"
 #~ "\n"
 #~ "Indien u 'n onervare gebruiker is, kan die skep van partisies vreemd en\n"
 #~ "intimiderend wees.\n"
@@ -27980,7 +27993,7 @@ msgstr "Installasie het gefaal!"
 #~ "geskied\n"
 #~ "sonner verlies van data, mits u die partisie gedefragmenteer het.Ons "
 #~ "beveel ten sterkste aan dat u 'n rugsteun maak van u data. Hierdie is\n"
-#~ "die beste metode indien u beide Mandrivalinux en Microsoft Windows op "
+#~ "die beste metode indien u beide Mandriva Linux en Microsoft Windows op "
 #~ "die\n"
 #~ "rekenaar wil gebruik.\n"
 #~ "\n"
@@ -27990,7 +28003,7 @@ msgstr "Installasie het gefaal!"
 #~ "\n"
 #~ " * \"%s\": Indien u alle data op alle partisies op u hardeskyf wil "
 #~ "uitwis,\n"
-#~ "en dit dan vervang met Mandrivalinux, kan u hierdie opsie kies.\n"
+#~ "en dit dan vervang met Mandriva Linux, kan u hierdie opsie kies.\n"
 #~ "Wees versigtig die opsie is onomkeerbaar!\n"
 #~ "\n"
 #~ "   !! Net weer waarsku: alle data op die skyf sal vernietig word. !! \n"
@@ -28097,7 +28110,7 @@ msgstr "Installasie het gefaal!"
 #~ "Click on \"%s\" when you are 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 that will be checked "
 #~ "for\n"
@@ -28127,7 +28140,7 @@ msgstr "Installasie het gefaal!"
 #~ "getoets moet word."
 
 #~ msgid ""
-#~ "At the time you are installing Mandrivalinux, it is likely that some\n"
+#~ "At the time you are installing Mandriva Linux, it is likely that some\n"
 #~ "packages will have been updated since the initial release. Bugs may have\n"
 #~ "been fixed, security issues resolved. To allow you to benefit from these\n"
 #~ "updates, you are now able to download them from the Internet. Check \"%s"
@@ -28142,7 +28155,7 @@ msgstr "Installasie het gefaal!"
 #~ "the\n"
 #~ "selected package(s), or \"%s\" to abort."
 #~ msgstr ""
-#~ "Teen die tyd wat u Mandrivalinux installeer, is dit hoogs waarskynlik\n"
+#~ "Teen die tyd wat u Mandriva Linux installeer, is dit hoogs waarskynlik\n"
 #~ "dat van die pakkette intussen opgedateer is. Foute kom reggestel wees,\n"
 #~ "of sekuriteits probleme is dalk opgelos. Om voordeel hieruit te put, kan\n"
 #~ "u hulle nou van die Internet aflaai. Merk \"%s\" indien u 'n werkende\n"
@@ -28205,7 +28218,7 @@ msgstr "Installasie het gefaal!"
 #~ "\n"
 #~ "DrakX now needs to know if you want to perform a new install or an "
 #~ "upgrade\n"
-#~ "of an existing Mandrivalinux system:\n"
+#~ "of an existing Mandriva Linux system:\n"
 #~ "\n"
 #~ " * \"%s\": For the most part, this completely wipes out the old system. "
 #~ "If\n"
@@ -28217,21 +28230,21 @@ msgstr "Installasie het gefaal!"
 #~ "written.\n"
 #~ "\n"
 #~ " * \"%s\": this installation class allows you to update the packages\n"
-#~ "currently installed on your Mandrivalinux system. Your current\n"
+#~ "currently installed on your Mandriva Linux system. Your current\n"
 #~ "partitioning scheme and user data is not altered. Most of other\n"
 #~ "configuration steps remain available, 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 ""
 #~ "Hierdie stap word slegs gedoen indien ou GNU/Linux partisies op die\n"
 #~ "rekenaar gevind is.\n"
 #~ "\n"
 #~ "DrakX moet nou weet of u 'n nuwe installasie of 'n opgradering van 'n\n"
-#~ "bestaande Mandrivalinux wil doen:\n"
+#~ "bestaande Mandriva Linux wil doen:\n"
 #~ "\n"
 #~ " * \"%s\": Hierdie deel word grootliks gebruik vir 'n hele nuwe "
 #~ "installasie.\n"
@@ -28242,7 +28255,7 @@ msgstr "Installasie het gefaal!"
 #~ "van u partisies se data wil behou.\n"
 #~ "\n"
 #~ " * \"%s\": hierdie tipe installasie laat u toe om pakkette op te dateer\n"
-#~ "wat deel uitmaak van u huidige Mandrivalinux installasie. Die partisies\n"
+#~ "wat deel uitmaak van u huidige Mandriva Linux installasie. Die partisies\n"
 #~ "en gebruiker se data bly onveranderd. Ander stappe is baie dieselfde as\n"
 #~ "'n normale installasie.\n"
 #~ "\n"
@@ -28307,7 +28320,8 @@ msgstr "Installasie het gefaal!"
 #~ "About UTF-8 (unicode) support: Unicode is a new character encoding meant "
 #~ "to\n"
 #~ "cover all existing languages. Though full support for it in GNU/Linux is\n"
-#~ "still under development. For that reason, Mandrivalinux will be using it\n"
+#~ "still under development. For that reason, Mandriva Linux will be using "
+#~ "it\n"
 #~ "or not depending on the user choices:\n"
 #~ "\n"
 #~ " * If you choose a languages with a strong legacy encoding (latin1\n"
@@ -28563,7 +28577,7 @@ msgstr "Installasie het gefaal!"
 #~ "checking this box.\n"
 #~ "\n"
 #~ "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"
+#~ "\"%s\"), you must ensure that you have a way to boot your Mandriva Linux\n"
 #~ "system! Be sure you know what you are doing before changing any of the\n"
 #~ "options. !!\n"
 #~ "\n"
@@ -28695,7 +28709,7 @@ msgstr "Installasie het gefaal!"
 #~ msgid ""
 #~ "Now, it's time to select a printing system for your computer. Other OSs "
 #~ "may\n"
-#~ "offer you one, but Mandrivalinux offers two. Each of the printing "
+#~ "offer you one, but Mandriva Linux offers two. Each of the printing "
 #~ "systems\n"
 #~ "is best suited to particular types of configuration.\n"
 #~ "\n"
@@ -28731,7 +28745,7 @@ msgstr "Installasie het gefaal!"
 #~ "Center and clicking the expert button."
 #~ msgstr ""
 #~ "Dit is nou tyd om u drukkerstelsel te kies. Ander bedryfstelsels sal\n"
-#~ "seker net een aan u bied, maar Mandrivalinux gee twee. Elk van hulle\n"
+#~ "seker net een aan u bied, maar Mandriva Linux gee twee. Elk van hulle\n"
 #~ "is beter as die ander in sekere gevalle.\n"
 #~ "\n"
 #~ " * \"%s\" -- wat vir \"print, do not queue\" staan. Kies dit indien u\n"
@@ -29271,9 +29285,9 @@ msgstr "Installasie het gefaal!"
 #~ msgstr "\t* Spesiale afslag vir produkte en dienste by \"MandrakeStore\""
 
 #~ msgid ""
-#~ "\t* Find out Mandrivalinux on a bootable CD with <b>Mandriva Move</b>"
+#~ "\t* Find out Mandriva Linux on a bootable CD with <b>Mandriva Move</b>"
 #~ msgstr ""
-#~ "\t* Vind uit oor Mandrivalinux op 'n selflaai CD - <b>Mandriva Move</b>"
+#~ "\t* Vind uit oor Mandriva Linux op 'n selflaai CD - <b>Mandriva Move</b>"
 
 #~ msgid ""
 #~ "Find all Mandriva products at <b>MandrakeStore</b> -- our full service e-"
@@ -29286,11 +29300,11 @@ msgstr "Installasie het gefaal!"
 #~ msgstr "<b>Word 'n lid van die MandrakeClub!</b>"
 
 #~ msgid ""
-#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
+#~ "In the Mandriva Linux menu you will find easy-to-use applications for all "
 #~ "tasks:"
 #~ msgstr ""
-#~ "Die kieslys in Mandrivalinux het gebruikersvriendelike programme vir alle "
-#~ "behoefdes:"
+#~ "Die kieslys in Mandriva Linux het gebruikersvriendelike programme vir "
+#~ "alle behoefdes:"
 
 #~ msgid ""
 #~ "\t* Take charge of your personal data with the integrated personal "