various Mandrake -> Mandriva changes

1 files changed, 207 insertions, 200 deletions

diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po
index bd34352f5..41004bb9a 100644
--- a/perl-install/share/po/et.po
+++ b/perl-install/share/po/et.po
@@ -1307,11 +1307,11 @@ msgstr "Keelevalik"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
 msgstr ""
-"Mandrivalinux toetab paljusid keeli. Valige keeled, mida\n"
+"Mandriva Linux toetab paljusid keeli. Valige keeled, mida\n"
 "soovite paigaldada. Kui paigaldamine on lõpetatud ja Te teete\n"
 "süsteemile taaskäivituse, saate neid kasutada."
 
@@ -3715,12 +3715,12 @@ msgstr "raadiotoe lubamine"
 #, 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 ""
 "Enne jätkamist lugege hoolikalt läbi litsentsileping. See kehtib kogu\n"
-"Mandrivalinuxi distributsiooni kohta. Kui Te kõigi selle tingimustega\n"
+"Mandriva Linuxi distributsiooni kohta. Kui Te kõigi selle tingimustega\n"
 "nõus olete, märkige ära kast \"%s\". Kui Teile aga miski ei meeldi, siis\n"
 "klõps nupule \"%s\" sooritab arvuti taaskäivitamise."
 
@@ -3898,13 +3898,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrivalinuxi paigalduspaketid on jagatud mitme CD vahel.\n"
+"Mandriva Linuxi paigalduspaketid on jagatud mitme CD vahel.\n"
 "DrakX suudab ära tunda, kui valitud pakett asub muul CD-l,\n"
 "ning väljastab siis seesoleva CD ja palub sisestada selle,\n"
 "mida parajasti vaja läheb.\n"
@@ -3915,11 +3915,12 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3971,7 +3972,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Nüüd on aeg valida rakendused, mida soovite oma süsteemi paigaldada.\n"
-"Mandrivalinux pakub tuhandeid pakette ja mõistagi ei eelda keegi,\n"
+"Mandriva Linux pakub tuhandeid pakette ja mõistagi ei eelda keegi,\n"
 "et Te neid kõiki juba ette tunneksite.\n"
 "\n"
 "Paketid on rühmitatud gruppidesse vastavalt nende kasutusalale.\n"
@@ -4082,10 +4083,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"
@@ -4116,11 +4117,11 @@ msgstr ""
 "!! Kui tahtlikult või seetõttu, et asi kuulus gruppi,\n"
 "on valitud mõni serveripakett, palutakse Teilt kinnitust,\n"
 "et Te ikka tõesti soovite neid servereid paigaldada.\n"
-"Mandrivalinux käivitab kõik paigaldatud serverid vaikimisi alglaadimise "
+"Mandriva Linux käivitab kõik paigaldatud serverid vaikimisi alglaadimise "
 "ajal.\n"
 "Isegi kui nad olid turvalised ja teadaolevalt probleemivabad ajal,\n"
 "mis valmis distributsioon, võib kergesti juhtuda,\n"
-"et pärast Mandrivalinuxi praeguse versiooni valmimist leiti neist "
+"et pärast Mandriva Linuxi praeguse versiooni valmimist leiti neist "
 "turvaauke.\n"
 "Kui Te ei tea, mida konkreetne teenus pakub või miks see üldse "
 "paigaldatakse,\n"
@@ -4273,7 +4274,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"
@@ -4329,7 +4330,7 @@ msgid ""
 msgstr ""
 "X (ehk X Window System) kujutab endast GNU/Linuxi graafilise "
 "kasutajaliidese\n"
-"tuuma ja südant, millele toetuvad kõik Mandrivalinuxiga kaasas käivad\n"
+"tuuma ja südant, millele toetuvad kõik Mandriva Linuxiga kaasas käivad\n"
 "graafilised töökeskkonnad (KDE, GNOME, AfterStep, WindowMaker jne).\n"
 "\n"
 "Siin näidatakse Teile tervet nimekirja parameetreid, mida saab muuta,\n"
@@ -4452,12 +4453,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4484,7 +4485,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"
@@ -4493,7 +4494,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"
@@ -4513,12 +4515,12 @@ 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 ""
-"Olete jõudnud punkti, kus peate otsustama, kuhu täpselt Mandrivalinux\n"
+"Olete jõudnud punkti, kus peate otsustama, kuhu täpselt Mandriva Linux\n"
 "oma kõvakettal paigaldada. Kui kõvaketas on tühi või mõni muu\n"
 "operatsioonisüsteem seda täielikult kasutab, on vaja see osadeks jagada\n"
 "ehk partitsioneerida.\n"
 "Partitsioneerimine on tegevus, mille käigus tekitatakse kettale loogilised\n"
-"piirkonnad Teie uue Mandrivalinuxi süsteemi paigaldamiseks.\n"
+"piirkonnad Teie uue Mandriva Linuxi süsteemi paigaldamiseks.\n"
 "\n"
 "Kuna kõvaketta jagamine on pöördumatu protsess, siis peab kogemusteta\n"
 "kasutaja olema iseäranis ettevaatlik! Selle tegevuse lihtsustamiseks ja\n"
@@ -4548,7 +4550,7 @@ msgstr ""
 "defragmenteerinud. Siiski ei tule kindlasti kahjuks ka andmetest varukoopia\n"
 "valmistamine... See lahendus on soovitatav, kui tahate kasutada ühes "
 "arvutis\n"
-"nii Mandrivalinuxit kui Microsoft Windowsit.\n"
+"nii Mandriva Linuxit kui Microsoft Windowsit.\n"
 "\n"
 "   Enne selle valiku kasuks otsustamist pidage silmas, et kirjeldatud "
 "protseduuri\n"
@@ -4558,7 +4560,7 @@ msgstr ""
 "paigaldamiseks.\n"
 "\n"
 " * \"%s\": kui soovite kustutada kõik andmed ja partitsioonid, mis\n"
-"kõvakettal parajasti on, ning asendada need uue Mandrivalinuxi süsteemiga, "
+"kõvakettal parajasti on, ning asendada need uue Mandriva Linuxi süsteemiga, "
 "on\n"
 "see õige valik. Aga tasub olla ettevaatlik, sest pärast selle valiku "
 "langetamist\n"
@@ -4725,7 +4727,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."
@@ -4747,7 +4749,7 @@ msgstr ""
 "\n"
 "Klõpsake \"%s\", kui olete vormindamiseks valmis.\n"
 "\n"
-"Klõpsake \"%s\", kui soovite valida oma uue Mandrivalinuxi süsteemi\n"
+"Klõpsake \"%s\", kui soovite valida oma uue Mandriva Linuxi süsteemi\n"
 "paigaldamiseks mõne muu partitsiooni.\n"
 "\n"
 "Klõpsake \"%s\", kui soovite valida partitsioone, millel kontrollitaks\n"
@@ -4765,7 +4767,7 @@ msgstr "Eelmine"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4777,7 +4779,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"On tõenäoline, et praegu, kui Te paigaldate Mandrivalinuxit, on mõned\n"
+"On tõenäoline, et praegu, kui Te paigaldate Mandriva Linuxit, on mõned\n"
 "paketid jõudnud pärast väljalaset juba uuenduskuuri üle elada. Mõnes on ära\n"
 "parandatud paar väiksemat viga, mõnes turvaprobleemid. Et võiksite neist\n"
 "uuendustest tulu lõigata, on Teil nüüd võimalik need Internetist alla "
@@ -4810,7 +4812,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"
@@ -4823,7 +4825,7 @@ msgstr ""
 "enamasti kasutamise mõnevõrra keerukamaks.\n"
 "\n"
 "Kui Te ei tea, mida valida, jätke kehtima vaikimisi pakutud valik. Hiljem\n"
-"saate turvataset muuta Mandrivalinuxi juhtimiskeskuses abivahendiga "
+"saate turvataset muuta Mandriva Linuxi juhtimiskeskuses abivahendiga "
 "Draksec.\n"
 "\n"
 "Väli \"%s\" on mõeldud süsteemi turvalisuse eest vastutava kasutaja\n"
@@ -4838,7 +4840,7 @@ msgstr "Turvaadministraator"
 #, 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"
@@ -4908,7 +4910,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Nüüd peate valima partitsiooni(d), kuhu soovite Mandrivalinuxi paigaldada.\n"
+"Nüüd peate valima partitsiooni(d), kuhu soovite Mandriva Linuxi paigaldada.\n"
 "Kui need on juba olemas kas GNU/Linuxi varasema paigalduse või mõne muu\n"
 "kettajagamisvahendi tegevuse tulemusena, võite kasutada olemasolevaid\n"
 "partitsioone. Vastasel juhul tuleb need luua.\n"
@@ -5000,7 +5002,7 @@ msgstr "Tava- ja ekspertrežiimi lülitamine"
 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"
@@ -5029,7 +5031,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Teie arvuti kõvakettal on rohkem kui üks Microsoft Windowsi partitsioon.\n"
-"Palun valige välja see, mille suurust soovite Mandrivalinuxi jaoks muuta.\n"
+"Palun valige välja see, mille suurust soovite Mandriva Linuxi jaoks muuta.\n"
 "\n"
 "Teie abistamiseks on igal partitsioonil näidatud \"Nimi Linuxis\", \"Nimi "
 "Windowsis\" ja \"Mahutavus\".\n"
@@ -5076,7 +5078,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"
@@ -5085,19 +5087,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 ""
 "Seda sammu on vaja ainult siis, kui masinas leiti varasem\n"
 "GNU/Linuxi partitsioon.\n"
 "\n"
 "DrakX soovib nüüd teada, kas tahate paigaldada uue süsteemi või uuendada\n"
-"olemasolevat Mandrivalinuxi süsteemi:\n"
+"olemasolevat Mandriva Linuxi süsteemi:\n"
 "\n"
 " * \"%s\": üldiselt pühib see vana süsteemi täielikult minema. Kui\n"
 "soovite muuta praeguseid partitsioone või failisüsteemi, siis võiks seda "
@@ -5106,13 +5109,13 @@ msgstr ""
 "ülekirjutamise eest päästa.\n"
 "\n"
 " * \"%s\": see paigaldamisviis võimaldab uuendada praegu olemasolevasse\n"
-"Mandrivalinuxi süsteemi paigaldatud pakette. Kettajagamisskeemi ega "
+"Mandriva Linuxi süsteemi paigaldatud pakette. Kettajagamisskeemi ega "
 "kasutajate\n"
 "andmeid ei muudeta. Enamik seadistussamme on kasutatavad sarnaselt "
 "tavapärasele\n"
 "paigaldamisele.\n"
 "\n"
-"Võimalus \"Uuendus\" peaks toimima edukalt Mandrivalinuxi süsteemides\n"
+"Võimalus \"Uuendus\" peaks toimima edukalt Mandriva Linuxi süsteemides\n"
 "alates versioonist 8.1. Uuenduse proovimist varasemate versioonide peal\n"
 "me siiski ei soovita."
 
@@ -5168,7 +5171,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"
@@ -5206,7 +5210,7 @@ msgstr ""
 "\n"
 "Mõni sõna UTF-8 (unicode) toetuse kohta. Unicode on uus kodeering, mis\n"
 "peaks hõlmama kõiki keeli. Selle täielik toetus ei ole GNU/Linuxis\n"
-"siiski veel täielikult teostatud. Seetõttu lähtub Mandrivalinux selle\n"
+"siiski veel täielikult teostatud. Seetõttu lähtub Mandriva Linux selle\n"
 "kasutamisel või mittekasutamisel järgmistest asjaoludest:\n"
 "\n"
 " * Kui valite keele, mis üldreeglina kasutab muud kodeeringut (latin1 \n"
@@ -5447,7 +5451,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5468,12 +5472,12 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Siin saate valida oma arvuti trükkimissüsteemi. Teised "
 "operatsioonisüsteemid\n"
-"võivad Teile pakkuda vaid üht süsteemi, kuid Mandrivalinuxi puhul saate\n"
+"võivad Teile pakkuda vaid üht süsteemi, kuid Mandriva Linuxi puhul saate\n"
 "valida tervelt kahe seast.\n"
 "\n"
 " * \"%s\" - mis tähendab \"trüki kohe\" (\"print, do not queue\") - tuleks "
@@ -5498,7 +5502,7 @@ msgstr ""
 "trükkimiseks või printeri seadistamiseks.\n"
 "\n"
 "Kui leiate hiljem, et siinkohal langetatud valik polnud vahest kõige parem,\n"
-"siis saate seda muuta Mandrivalinuxi juhtimiskeskuses PrinterDrake abil,\n"
+"siis saate seda muuta Mandriva Linuxi juhtimiskeskuses PrinterDrake abil,\n"
 "klõpsates seal nupule \"%s\"."
 
 #: help.pm:765
@@ -5620,7 +5624,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"
@@ -5637,7 +5642,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"
@@ -5698,7 +5703,7 @@ msgstr ""
 "\n"
 " * \"%s\": kui soovite muuta alglaaduri seadistusi, klõpsake\n"
 "sellele nupule. See on mõeldud siiski vaid kogenud kasutajatele.\n"
-"Täpsemat infot leiab käsiraamatust või Mandrivalinuxi juhtimiskeskusest.\n"
+"Täpsemat infot leiab käsiraamatust või Mandriva Linuxi juhtimiskeskusest.\n"
 "\n"
 " * \"%s\": saate täpselt kontrollida, millised teenused Teie\n"
 "süsteemis töötavad. Kui kavatsete kasutada oma masinat serverina, kuluks\n"
@@ -5759,10 +5764,10 @@ msgstr "Teenused"
 #, 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 ""
-"Valige kõvaketas, mida soovite puhastada oma uue Mandrivalinuxi\n"
+"Valige kõvaketas, mida soovite puhastada oma uue Mandriva Linuxi\n"
 "paigaldamiseks. Ettevaatust, kõik sellel leiduvad andmed hävitatakse\n"
 "ja neid ei saa enam taastada."
 
@@ -6116,12 +6121,12 @@ msgstr "Vaba ruumi arvutamine Windowsi partitsioonil"
 #, 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 ""
 "Teie Windowsi partitsioon on fragmenteerunud. Palun tehke arvutile uus "
 "alglaadimine, käivitage Windows ja seejärel utiliit \"defrag\" ning tulge "
-"siis Mandrivalinuxi paigaldamise juurde tagasi."
+"siis Mandriva Linuxi paigaldamise juurde tagasi."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6236,13 +6241,13 @@ msgstr "Võrgu seiskamine"
 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"
@@ -6296,7 +6301,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"
@@ -6333,7 +6338,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"
@@ -6357,13 +6362,13 @@ msgstr ""
 "\n"
 "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"
@@ -6417,7 +6422,7 @@ msgstr ""
 "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"
@@ -6454,7 +6459,7 @@ msgstr ""
 "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"
@@ -6564,8 +6569,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"
@@ -6573,27 +6578,27 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "Õnnitleme, paigaldamine on edukalt lõpetatud.\n"
 "Võtke palun välja diskett ja/või CD ja vajutage Enter alglaadimiseks.\n"
 "\n"
 "\n"
 "Informatsiooni selle distributsiooni paranduste kohta (Errata) saab\n"
-"Mandrivalinuxi koduleheküljelt:\n"
+"Mandriva Linuxi koduleheküljelt:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Abi süsteemi edasiseks seadistamiseks saab eelkõige\n"
-"Mandrivalinuxi kasutaja käsiraamatust."
+"Mandriva Linuxi kasutaja käsiraamatust."
 
 #. -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
@@ -6621,7 +6626,7 @@ msgstr "Järgmine samm: %s\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -7151,7 +7156,7 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 "Teil on nüüd võimalus alla laadida uuendatud pakette. Need on välja lastud\n"
-"pärast Mandrivalinuxi distributsiooni ilmumist ja võivad sisaldada vigade\n"
+"pärast Mandriva Linuxi distributsiooni ilmumist ja võivad sisaldada vigade\n"
 "parandusi või turvauuendusi.\n"
 "\n"
 "Allalaadimiseks peab Teil olema töötav internetiühendus.\n"
@@ -7161,9 +7166,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
-"Mandrivalinuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."
+"Mandriva Linuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7386,8 +7391,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinuxi paigaldamine %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linuxi paigaldamine %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9973,7 +9978,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -14021,11 +14026,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
-"Oma skänneri väljajagamiseks võrgus käivitage Scannerdrake (Mandrivalinuxi "
+"Oma skänneri väljajagamiseks võrgus käivitage Scannerdrake (Mandriva Linuxi "
 "juhtimiskeskuses rubriik Riistvara/Skänner).\n"
 "\n"
 
@@ -15933,23 +15938,23 @@ msgstr "Peata"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Mis on Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Mis on Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Tere tulemast <b>Mandrivalinuxisse</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Tere tulemast <b>Mandriva Linuxisse</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrivalinux on <b>Linuxi distributsioon</b>, mis koosneb süsteemi "
+"Mandriva Linux on <b>Linuxi distributsioon</b>, mis koosneb süsteemi "
 "tuumikust ehk <b>operatsioonisüsteemist</b> (selle aluseks on Linuxi kernel) "
 "ning <b>paljudest rakendustest</b>, mis rahuldavad ilmselt küll kõik Teie "
 "vajadused."
@@ -15957,10 +15962,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrivalinux on kõige <b>kasutajasõbralikum</b> Linuxi distributsioon. See "
+"Mandriva Linux on kõige <b>kasutajasõbralikum</b> Linuxi distributsioon. See "
 "on üks maailma <b>kõige kasutatavamaid</b> distributsioone!"
 
 #: share/advertising/02.pl:13
@@ -15976,13 +15981,13 @@ msgstr "Tere tulemast <b>vaba tarkvara maailma</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux is committed to the open source model. This means that this "
 "new release is the result of <b>collaboration</b> between <b>Mandriva's team "
-"of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
-"Mandrivalinux toetab kõigiti vaba tarkvara. Ka praegune väljalase on "
-"<b>Mandrivai arendajate meeskonna</b> ja Mandrivalinuxi <b>üleilmse "
+"Mandriva Linux toetab kõigiti vaba tarkvara. Ka praegune väljalase on "
+"<b>Mandrivai arendajate meeskonna</b> ja Mandriva Linuxi <b>üleilmse "
 "kaasautorite kogukonna</b> <b>ühise koostöö</b> vili."
 
 #: share/advertising/02.pl:19
@@ -16002,10 +16007,10 @@ msgstr "<b>GPL</b>"
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Suuremat osa distributsiooni kaasatud tarkvara ja kõiki Mandrivalinuxi "
+"Suuremat osa distributsiooni kaasatud tarkvara ja kõiki Mandriva Linuxi "
 "abivahendeid levitatakse <b>Üldise Avaliku Litsentsi</b> (GPL) alusel."
 
 #: share/advertising/03.pl:17
@@ -16031,31 +16036,31 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Liituge Mandrivalinuxi kogukonnaga</b>"
+msgstr "<b>Liituge Mandriva Linuxi kogukonnaga</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 ""
-"Mandrivalinuxi kasutajad ja arendajad moodustavad <b>väga suure kogukonna</"
+"Mandriva Linuxi kasutajad ja arendajad moodustavad <b>väga suure kogukonna</"
 "b>. Selle liikmete tegevusvaldkond on äärmiselt lai, ulatudes vigade "
-"teatamisest kuni uute rakenduste väljatöötamiseni. Kogukonnal on "
-"Mandrivalinuxi maailmas lausa <b>võtmeroll</b>."
+"teatamisest kuni uute rakenduste väljatöötamiseni. Kogukonnal on Mandriva "
+"Linuxi maailmas lausa <b>võtmeroll</b>."
 
 #: 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 ""
 "Kui soovite meie toimekast kogukonnast <b>rohkem teada saada</b>, külastage "
-"palun veebisaiti <b>www.mandrakelinux.com</b> või kui soovite "
-"arendustegevuses <b>kaasa lüüa</b>, siis ka <b>www.mandrakelinux.com/en/"
+"palun veebisaiti <b>www.mandrivalinux.com</b> või kui soovite "
+"arendustegevuses <b>kaasa lüüa</b>, siis ka <b>www.mandrivalinux.com/en/"
 "cookerdevel.php3</b>."
 
 #: share/advertising/05.pl:15
@@ -16066,10 +16071,10 @@ msgstr "<b>Allatõmmatav versioon</b> (\"Download version\")"
 #: 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 ""
-"Paigaldate praegu <b>Mandrivalinuxi allatõmmatavat</b> versiooni. See on "
+"Paigaldate praegu <b>Mandriva Linuxi allatõmmatavat</b> versiooni. See on "
 "vaba versioon, mis Mandrivai tahtmist mööda on <b>kättesaadav kõigile</b>."
 
 #: share/advertising/05.pl:19
@@ -16114,8 +16119,8 @@ msgstr "<b>Discovery - Teie esimene Linuxi töölaud</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Paigaldate praegu <b>Mandrivalinuxi Discovery</b> versiooni."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Paigaldate praegu <b>Mandriva Linuxi Discovery</b> versiooni."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16137,8 +16142,8 @@ msgstr "<b>PowerPack - tipptasemel Linuxi töölaud</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Paigaldate praegu <b>Mandrivalinuxi PowerPack</b> versiooni."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Paigaldate praegu <b>Mandriva Linuxi PowerPack</b> versiooni."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16158,8 +16163,8 @@ msgstr "<b>PowerPack+ - Linuxi lahendus töölaudadele ja serveritele</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Paigaldate praegu <b>Mandrivalinuxi PowerPack+</b> versiooni."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Paigaldate praegu <b>Mandriva Linuxi PowerPack+</b> versiooni."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16182,14 +16187,14 @@ msgstr "<b>Mandrivai tooted</b>"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
-"<b>Mandriva</b> on välja töötanud terve rea <b>Mandrivalinuxi</b> tooteid."
+"<b>Mandriva</b> on välja töötanud terve rea <b>Mandriva Linuxi</b> tooteid."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux koosseisu kuuluvad järgmised tooted:"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux koosseisu kuuluvad järgmised tooted:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16209,10 +16214,10 @@ msgstr "\t* <b>PowerPack+</b> - Linuxi lahendus töölaudadele ja serveritele."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrivalinux for x86-64</b> - Mandrivalinuxi lahendus, mis sobib "
+"\t* <b>Mandriva Linux for x86-64</b> - Mandriva Linuxi lahendus, mis sobib "
 "kõige paremini Teie 64-bitisele protsessorile."
 
 #: share/advertising/10.pl:15
@@ -16223,29 +16228,29 @@ msgstr "<b>Mandrivai tooted (kaasaskantavad)</b>"
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandriva on välja töötanud kaks toodet, mis lubavad Teil kasutada "
-"Mandrivalinuxit <b>suvalises arvutis</b>, ilma et peaksite seda tegelikult "
-"arvutisse paigaldamagi:"
+"Mandriva on välja töötanud kaks toodet, mis lubavad Teil kasutada Mandriva "
+"Linuxit <b>suvalises arvutis</b>, ilma et peaksite seda tegelikult arvutisse "
+"paigaldamagi:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b> - Mandrivalinuxi distributsioon, mis töötab täielikult "
+"\t* <b>Move</b> - Mandriva Linuxi distributsioon, mis töötab täielikult "
 "alglaaditava CD pealt."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b> - Mandrivalinuxi distributsioon, mis on juba "
+"\t* <b>GlobeTrotter</b> - Mandriva Linuxi distributsioon, mis on juba "
 "paigaldatud ülikompaktsele LaCie välisele kõvakettale."
 
 #: share/advertising/11.pl:13
@@ -16264,18 +16269,20 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b> - Mandrivalinuxi töölaud firmadele."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b> - Mandriva Linuxi töölaud firmadele."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b> - Mandrivalinuxi serverilahendus."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b> - Mandriva Linuxi serverilahendus."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b> - Mandrivalinuxi turvalahendus."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b> - Mandriva Linuxi turvalahendus."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16477,10 +16484,10 @@ msgstr "<b>Ääretu valik rakendusi igaks vajaduseks</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Mandrivalinuxi menüüst leiab <b>hõlpsasti kasutatavad</b> rakendused "
+"Mandriva Linuxi menüüst leiab <b>hõlpsasti kasutatavad</b> rakendused "
 "<b>igaks vajaduseks</b>:"
 
 #: share/advertising/18.pl:16
@@ -16743,19 +16750,19 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinuxi juhtimiskeskus</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linuxi juhtimiskeskus</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrivalinuxi juhtimiskeskus</b> koondab ühtekokku olulised, "
-"Mandrivalinuxile spetsiifilised tööriistad, et Te saaksite oma arvutit "
-"lihtsamalt ja mugavamalt seadistada."
+"<b>Mandriva Linuxi juhtimiskeskus</b> koondab ühtekokku olulised, Mandriva "
+"Linuxile spetsiifilised tööriistad, et Te saaksite oma arvutit lihtsamalt ja "
+"mugavamalt seadistada."
 
 #: share/advertising/25.pl:17
 #, c-format
@@ -16779,14 +16786,14 @@ 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 ""
 "Nagu programmeerimine üldse, nõuab ka vaba tarkvara arendamiseks <b>aega ja "
 "inimesi</b>. Vaba tarkvara põhimõtete vaimu elushoidmiseks müüb Mandriva oma "
-"tooteid ja teenuseid, et <b>aidata arendada Mandrivalinuxit</b>. Kui ka Teie "
-"soovite <b>toetada vaba tarkvara põhimõtteid</b> ning Mandrivalinuxi "
+"tooteid ja teenuseid, et <b>aidata arendada Mandriva Linuxit</b>. Kui ka "
+"Teie soovite <b>toetada vaba tarkvara põhimõtteid</b> ning Mandriva Linuxi "
 "arendustegevust, kaaluge <b>palun</b> mõtet osta mõni meie toode või teenus!"
 
 #: share/advertising/27.pl:13
@@ -16820,8 +16827,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Astuge juba täna läbi aadressilt <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Astuge juba täna läbi aadressilt <b>store.mandriva.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16831,10 +16838,10 @@ msgstr "<b>Mandriva Club</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
-"<b>Mandriva Club</b> on <b>suurepärane kaaslane</b> Teie Mandrivalinuxi "
+"<b>Mandriva Club</b> on <b>suurepärane kaaslane</b> Teie Mandriva Linuxi "
 "tootele."
 
 #: share/advertising/28.pl:19
@@ -16849,10 +16856,10 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 "\t* Toodete ja teenuste <b>spetsiaalne allahindlus</b> meie Internetipoes "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -16865,17 +16872,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Osalemine Mandrivalinuxi <b>kasutajate foorumitel</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Osalemine Mandriva Linuxi <b>kasutajate foorumitel</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Varane ja privilegeeritud ligipääs</b> juba enne ametlikku väljalaset "
-"Mandrivalinuxi <b>ISO-tõmmistele</b>."
+"Mandriva Linuxi <b>ISO-tõmmistele</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -16895,9 +16902,9 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
-"Mandriva Online tähendab mitmeid hinnalisi teenuseid oma Mandrivalinuxi "
+"Mandriva Online tähendab mitmeid hinnalisi teenuseid oma Mandriva Linuxi "
 "süsteemi <b>hõlpsaks uuendamiseks</b>:"
 
 #: share/advertising/29.pl:18
@@ -16923,9 +16930,9 @@ msgstr "\t* Paindlik uuenduste <b>ajastamine</b>."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
-"\t* <b>Kõigi oma Mandrivalinuxi süsteemide</b> haldamine ühe konto alt."
+"\t* <b>Kõigi oma Mandriva Linuxi süsteemide</b> haldamine ühe konto alt."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -16936,28 +16943,28 @@ msgstr "<b>Mandriva Expert</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 "Läheb Teil vaja <b>veidi abi</b>? Mandrivai asjatundjad on valmis seda Teile "
-"osutama <b>meie tehnilise toe keskkonnas</b> www.mandrakeexpert.com."
+"osutama <b>meie tehnilise toe keskkonnas</b> www.mandrivaexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"<b>Kvalifitseeritud Mandrivalinuxi ekspertide</b> abiga võite kokku hoida "
+"<b>Kvalifitseeritud Mandriva Linuxi ekspertide</b> abiga võite kokku hoida "
 "hulganisti aega ja vaeva."
 
 #: 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 ""
-"Iga Mandrivalinuxiga seotud küsimuse puhul on Teil võimalik osta konkreetne "
-"tugiteenus meie Internetikaupluses <b>store.mandrakesoft.com</b>."
+"Iga Mandriva Linuxiga seotud küsimuse puhul on Teil võimalik osta konkreetne "
+"tugiteenus meie Internetikaupluses <b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17341,15 +17348,15 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 "[VÕTMED] [RAKENDUSE_NIMI]\n"
 "\n"
 "VÕTMED:\n"
 "  --help            - näitab käesolevat abiteadet.\n"
-"  -report           - rakendus peab olema üks Mandrivalinuxi tööriistadest\n"
-"  -incident         - rakendus peab olema üks Mandrivalinuxi tööriistadest"
+"  -report           - rakendus peab olema üks Mandriva Linuxi tööriistadest\n"
+"  -incident         - rakendus peab olema üks Mandriva Linuxi tööriistadest"
 
 #: standalone.pm:63
 #, c-format
@@ -17404,7 +17411,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17418,7 +17425,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[VÕTMED]...\n"
-"Mandrivalinuxi terminaliserveri seadistaja\n"
+"Mandriva Linuxi terminaliserveri seadistaja\n"
 "--enable         : lubab MTSi\n"
 "--disable        : keelab MTSi\n"
 "--start          : käivitab MTSi\n"
@@ -20254,13 +20261,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinuxi vigadest teatamise vahend"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linuxi vigadest teatamise vahend"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinuxi juhtimiskeskus"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linuxi juhtimiskeskus"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20751,19 +20758,19 @@ msgstr "Käivitub laadimisel"
 #, 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 ""
 "Seda liidest ei ole veel seadistatud.\n"
-"Käivitage Mandrivalinuxi juhtimiskeskuses nõustaja \"Liidese lisamine\""
+"Käivitage Mandriva Linuxi juhtimiskeskuses nõustaja \"Liidese lisamine\""
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Internetiühendust ei ole veel seadistatud.\n"
-"Käivitage Mandrivalinuxi juhtimiskeskuses nõustaja \"%s\""
+"Käivitage Mandriva Linuxi juhtimiskeskuses nõustaja \"%s\""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20813,8 +20820,8 @@ msgstr "KDM (KDE kuvahaldur)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MkdKDM (Mandrivalinuxi kuvahaldur)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MkdKDM (Mandriva Linuxi kuvahaldur)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21118,18 +21125,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 ""
 "Autoriõigus (C) 2001-2002: Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (algversioon)\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
@@ -21699,8 +21706,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinuxi abikeskus"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linuxi abikeskus"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22353,7 +22360,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 ""
 "Teie masinas ei leitud helikaarti. Kontrollige palun, et Linuxi toega "
 "helikaart on korrektselt ühendatud.\n"
@@ -22362,7 +22369,7 @@ msgstr ""
 "Meie riistvara andmebaasi saab näha aadressil:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24377,7 +24384,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 ""
 "Teie süsteemis ei leitud TV-kaarti. Kontrollige palun, et Linuxi toega video/"
 "TV-kaart on korrektselt ühendatud.\n"
@@ -24386,7 +24393,7 @@ msgstr ""
 "Meie riistvara andmebaasi saate külastada aadressil:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25092,13 +25099,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 ""
 "See on HardDrake - %si riistvara seadistamisvahend.\n"
 "<span foreground=\"royalblue3\">Versioon:</span> %s\n"
 "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
-"<tvignaud@mandrakesoft.com>&gt;\n"
+"<tvignaud@mandriva.com>&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25207,8 +25214,8 @@ msgstr "Muudatus on tehtud, aga selle rakendamiseks tuleb välja logida"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrivalinuxi vahendite logi"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Linuxi vahendite logi"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25720,10 +25727,10 @@ msgstr "Ühendus on loodud."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Ühenduse loomine ebaõnnestus.\n"
-"Kontrollige palun seadistusi Mandrivalinuxi juhtimiskeskuse abil."
+"Kontrollige palun seadistusi Mandriva Linuxi juhtimiskeskuse abil."
 
 #: standalone/net_monitor:341
 #, c-format