switch from MandrakeSoft to Mandriva

1 files changed, 244 insertions, 244 deletions

diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po
index e30a7dad6..3d4181888 100644
--- a/perl-install/share/po/et.po
+++ b/perl-install/share/po/et.po
@@ -68,7 +68,7 @@ msgid ""
 "\n"
 "\n"
 "Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
+"plug the key again, and launch Mandriva Move again."
 msgstr ""
 "USB mälupulk paistab olevat kirjutuskaitsega, kuid praegu ei tundu\n"
 "olevat turvalist võimalust seda lahti ühendada.\n"
@@ -94,7 +94,7 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Teie USB mälupulgal pole ühtki sobivat Windows (FAT) partitsiooni.\n"
@@ -105,14 +105,14 @@ msgstr ""
 "\n"
 "\n"
 "Võite muidugi jätkata ka ilma USB mälupulgata - ka sel\n"
-"juhul on Teil võimalik kasutada Mandrake Move'i kui\n"
+"juhul on Teil võimalik kasutada Mandriva Move'i kui\n"
 "tavalist Mandrake operatsioonisüsteemi."
 
 #: ../move/move.pm:483
 #, c-format
 msgid ""
 "We did not detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
+"plug in an USB key now, Mandriva Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
 "or another one. Note: if you plug in a key now, wait several\n"
@@ -120,11 +120,11 @@ msgid ""
 "\n"
 "\n"
 "You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
+"able to use Mandriva Move as a normal live Mandriva\n"
 "Operating System."
 msgstr ""
 "Teie süsteemist ei suudetud leida ühtki USB mälupulka.\n"
-"Kui ühendate USB mälupulga nüüd, võib Mandrake Move\n"
+"Kui ühendate USB mälupulga nüüd, võib Mandriva Move\n"
 "salvestada läbipaistvalt Teie kodukataloogi andmed ning\n"
 "süsteemse seadistuse järgmiseks alglaadimiseks selles\n"
 "või mõnes muus arvutis. Märkus: kui ühendate mälupulga\n"
@@ -133,7 +133,7 @@ msgstr ""
 "\n"
 "\n"
 "Võite muidugi jätkata ka ilma USB mälupulgata - ka sel\n"
-"juhul on Teil võimalik kasutada Mandrake Move'i kui\n"
+"juhul on Teil võimalik kasutada Mandriva Move'i kui\n"
 "tavalist Mandrake operatsioonisüsteemi."
 
 #: ../move/move.pm:494
@@ -258,7 +258,7 @@ msgid ""
 "\n"
 "This may come from corrupted system configuration files\n"
 "on the USB key, in this case removing them and then\n"
-"rebooting Mandrake Move would fix the problem. To do\n"
+"rebooting Mandriva Move would fix the problem. To do\n"
 "so, click on the corresponding button.\n"
 "\n"
 "\n"
@@ -274,7 +274,7 @@ msgstr ""
 "\n"
 "Selle põhjus võib olla vigaste süsteemsete seadistusfailide\n"
 "olemasolu USB mälupulgal, millisel juhul eemaldage failid ja\n"
-"taaskäivitage Mandrake Move, mis peaks asjad korda tegema.\n"
+"taaskäivitage Mandriva Move, mis peaks asjad korda tegema.\n"
 "Selleks klõpsake vastaval nupul.\n"
 "\n"
 "\n"
@@ -1307,11 +1307,11 @@ msgstr "Keelevalik"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrakelinux can support multiple languages. Select\n"
+"Mandrivalinux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
 msgstr ""
-"Mandrakelinux toetab paljusid keeli. Valige keeled, mida\n"
+"Mandrivalinux 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 Mandrakelinux distribution. If you agree with all the\n"
+"covers the entire Mandrivalinux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Enne jätkamist lugege hoolikalt läbi litsentsileping. See kehtib kogu\n"
-"Mandrakelinuxi distributsiooni kohta. Kui Te kõigi selle tingimustega\n"
+"Mandrivalinuxi 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 Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinuxi paigalduspaketid on jagatud mitme CD vahel.\n"
+"Mandrivalinuxi 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,11 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"There are thousands of packages available for Mandrivalinux, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"Mandrivalinux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3971,7 +3971,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Nüüd on aeg valida rakendused, mida soovite oma süsteemi paigaldada.\n"
-"Mandrakelinux pakub tuhandeid pakette ja mõistagi ei eelda keegi,\n"
+"Mandrivalinux 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 +4082,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrakelinux will automatically start any installed\n"
+"installed. By default Mandrivalinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandrakelinux was\n"
+"security holes were discovered after this version of Mandrivalinux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4116,11 +4116,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"
-"Mandrakelinux käivitab kõik paigaldatud serverid vaikimisi alglaadimise "
+"Mandrivalinux 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 Mandrakelinuxi praeguse versiooni valmimist leiti neist "
+"et pärast Mandrivalinuxi praeguse versiooni valmimist leiti neist "
 "turvaauke.\n"
 "Kui Te ei tea, mida konkreetne teenus pakub või miks see üldse "
 "paigaldatakse,\n"
@@ -4273,7 +4273,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4329,7 +4329,7 @@ msgid ""
 msgstr ""
 "X (ehk X Window System) kujutab endast GNU/Linuxi graafilise "
 "kasutajaliidese\n"
-"tuuma ja südant, millele toetuvad kõik Mandrakelinuxiga kaasas käivad\n"
+"tuuma ja südant, millele toetuvad kõik Mandrivalinuxiga 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 +4452,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrakelinux\n"
+"You now need to decide where you want to install the Mandrivalinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrakelinux system.\n"
+"Mandrivalinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4484,7 +4484,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4493,7 +4493,7 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrakelinux system, choose\n"
+"your hard drive and replace them with your new Mandrivalinux system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4513,12 +4513,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 Mandrakelinux\n"
+"Olete jõudnud punkti, kus peate otsustama, kuhu täpselt Mandrivalinux\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 Mandrakelinuxi süsteemi paigaldamiseks.\n"
+"piirkonnad Teie uue Mandrivalinuxi 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 +4548,7 @@ msgstr ""
 "defragmenteerinud. Siiski ei tule kindlasti kahjuks ka andmetest varukoopia\n"
 "valmistamine... See lahendus on soovitatav, kui tahate kasutada ühes "
 "arvutis\n"
-"nii Mandrakelinuxit kui Microsoft Windowsit.\n"
+"nii Mandrivalinuxit kui Microsoft Windowsit.\n"
 "\n"
 "   Enne selle valiku kasuks otsustamist pidage silmas, et kirjeldatud "
 "protseduuri\n"
@@ -4558,7 +4558,7 @@ msgstr ""
 "paigaldamiseks.\n"
 "\n"
 " * \"%s\": kui soovite kustutada kõik andmed ja partitsioonid, mis\n"
-"kõvakettal parajasti on, ning asendada need uue Mandrakelinuxi süsteemiga, "
+"kõvakettal parajasti on, ning asendada need uue Mandrivalinuxi süsteemiga, "
 "on\n"
 "see õige valik. Aga tasub olla ettevaatlik, sest pärast selle valiku "
 "langetamist\n"
@@ -4725,7 +4725,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrakelinux operating system installation.\n"
+"Mandrivalinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4747,7 +4747,7 @@ msgstr ""
 "\n"
 "Klõpsake \"%s\", kui olete vormindamiseks valmis.\n"
 "\n"
-"Klõpsake \"%s\", kui soovite valida oma uue Mandrakelinuxi süsteemi\n"
+"Klõpsake \"%s\", kui soovite valida oma uue Mandrivalinuxi süsteemi\n"
 "paigaldamiseks mõne muu partitsiooni.\n"
 "\n"
 "Klõpsake \"%s\", kui soovite valida partitsioone, millel kontrollitaks\n"
@@ -4765,7 +4765,7 @@ msgstr "Eelmine"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"By the time you install Mandrivalinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4777,7 +4777,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 Mandrakelinuxit, on mõned\n"
+"On tõenäoline, et praegu, kui Te paigaldate Mandrivalinuxit, 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 +4810,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"to change it later with the draksec tool, which is part of Mandrivalinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4823,7 +4823,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 Mandrakelinuxi juhtimiskeskuses abivahendiga "
+"saate turvataset muuta Mandrivalinuxi juhtimiskeskuses abivahendiga "
 "Draksec.\n"
 "\n"
 "Väli \"%s\" on mõeldud süsteemi turvalisuse eest vastutava kasutaja\n"
@@ -4838,7 +4838,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 Mandrakelinux system. If partitions have already been\n"
+"installation of your Mandrivalinux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -4908,7 +4908,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 Mandrakelinuxi paigaldada.\n"
+"Nüüd peate valima partitsiooni(d), kuhu soovite Mandrivalinuxi 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 +5000,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"
-"Mandrakelinux operating system.\n"
+"Mandrivalinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5029,7 +5029,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 Mandrakelinuxi jaoks muuta.\n"
+"Palun valige välja see, mille suurust soovite Mandrivalinuxi jaoks muuta.\n"
 "\n"
 "Teie abistamiseks on igal partitsioonil näidatud \"Nimi Linuxis\", \"Nimi "
 "Windowsis\" ja \"Mahutavus\".\n"
@@ -5076,7 +5076,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrakelinux system:\n"
+"upgrade of an existing Mandrivalinux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5085,19 +5085,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"currently installed on your Mandrivalinux system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrakelinux version \"8.1\" is not recommended."
+"to Mandrivalinux version \"8.1\" is not recommended."
 msgstr ""
 "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 Mandrakelinuxi süsteemi:\n"
+"olemasolevat Mandrivalinuxi 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 +5106,13 @@ msgstr ""
 "ülekirjutamise eest päästa.\n"
 "\n"
 " * \"%s\": see paigaldamisviis võimaldab uuendada praegu olemasolevasse\n"
-"Mandrakelinuxi süsteemi paigaldatud pakette. Kettajagamisskeemi ega "
+"Mandrivalinuxi 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 Mandrakelinuxi süsteemides\n"
+"Võimalus \"Uuendus\" peaks toimima edukalt Mandrivalinuxi süsteemides\n"
 "alates versioonist 8.1. Uuenduse proovimist varasemate versioonide peal\n"
 "me siiski ei soovita."
 
@@ -5168,7 +5168,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5206,7 +5206,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 Mandrakelinux selle\n"
+"siiski veel täielikult teostatud. Seetõttu lähtub Mandrivalinux selle\n"
 "kasutamisel või mittekasutamisel järgmistest asjaoludest:\n"
 "\n"
 " * Kui valite keele, mis üldreeglina kasutab muud kodeeringut (latin1 \n"
@@ -5447,7 +5447,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5468,12 +5468,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 Mandrakelinux\n"
+"system you may change it by running PrinterDrake from the Mandrivalinux\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 Mandrakelinuxi puhul saate\n"
+"võivad Teile pakkuda vaid üht süsteemi, kuid Mandrivalinuxi puhul saate\n"
 "valida tervelt kahe seast.\n"
 "\n"
 " * \"%s\" - mis tähendab \"trüki kohe\" (\"print, do not queue\") - tuleks "
@@ -5498,7 +5498,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 Mandrakelinuxi juhtimiskeskuses PrinterDrake abil,\n"
+"siis saate seda muuta Mandrivalinuxi juhtimiskeskuses PrinterDrake abil,\n"
 "klõpsates seal nupule \"%s\"."
 
 #: help.pm:765
@@ -5620,7 +5620,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"Mandrivalinux Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5637,7 +5637,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrakelinux Control Center.\n"
+"Mandrivalinux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5698,7 +5698,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 Mandrakelinuxi juhtimiskeskusest.\n"
+"Täpsemat infot leiab käsiraamatust või Mandrivalinuxi 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 +5759,10 @@ msgstr "Teenused"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
+"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Valige kõvaketas, mida soovite puhastada oma uue Mandrakelinuxi\n"
+"Valige kõvaketas, mida soovite puhastada oma uue Mandrivalinuxi\n"
 "paigaldamiseks. Ettevaatust, kõik sellel leiduvad andmed hävitatakse\n"
 "ja neid ei saa enam taastada."
 
@@ -6116,12 +6116,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 Mandrakelinux "
+"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
 "installation."
 msgstr ""
 "Teie Windowsi partitsioon on fragmenteerunud. Palun tehke arvutile uus "
 "alglaadimine, käivitage Windows ja seejärel utiliit \"defrag\" ning tulge "
-"siis Mandrakelinuxi paigaldamise juurde tagasi."
+"siis Mandrivalinuxi paigaldamise juurde tagasi."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6237,19 +6237,19 @@ msgid ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6271,7 +6271,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6279,14 +6279,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6296,7 +6296,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6316,10 +6316,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6330,11 +6330,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva S.A. reserves its rights to modify or adapt the Software "
 "Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6350,7 +6350,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Järgnev lõppkasutaja litsents on eksimuste vältimiseks originaalkeeles!\n"
 "\n"
@@ -6358,19 +6358,19 @@ msgstr ""
 "Introduction\n"
 "\n"
 "The operating system and the different components available in the "
-"Mandrakelinux distribution \n"
+"Mandrivalinux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrakelinux distribution.\n"
+"system and the different components of the Mandrivalinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandrakesoft S.A. which applies to the Software Products.\n"
+"Mandriva S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6392,7 +6392,7 @@ msgstr ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandriva S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6400,14 +6400,14 @@ msgstr ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"Products, even if Mandriva S.A. has been advised of the possibility or "
 "occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandriva S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6417,7 +6417,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 Mandrakelinux sites  which are prohibited or restricted in some "
+"from one of Mandrivalinux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6437,10 +6437,10 @@ msgstr ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to Mandrakesoft.\n"
-"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
+"to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
+"by Mandriva S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6451,11 +6451,11 @@ msgstr ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
+"Mandriva S.A. reserves its rights to modify or adapt the Software "
 "Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
-"Mandrakesoft S.A.  \n"
+"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6471,7 +6471,7 @@ msgstr ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandrakesoft S.A.  \n"
+"For any question on this document, please contact Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6565,7 +6565,7 @@ msgid ""
 "\n"
 "\n"
 "For information on fixes which are available for this release of "
-"Mandrakelinux,\n"
+"Mandrivalinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6573,21 +6573,21 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrakelinux User's Guide."
+"install chapter of the Official Mandrivalinux User's Guide."
 msgstr ""
 "Õ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"
-"Mandrakelinuxi koduleheküljelt:\n"
+"Mandrivalinuxi koduleheküljelt:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Abi süsteemi edasiseks seadistamiseks saab eelkõige\n"
-"Mandrakelinuxi kasutaja käsiraamatust."
+"Mandrivalinuxi kasutaja käsiraamatust."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6621,7 +6621,7 @@ msgstr "Järgmine samm: %s\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrakelinux. If that occurs, you can try a text install instead. For "
+"Mandrivalinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -7151,7 +7151,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 Mandrakelinuxi distributsiooni ilmumist ja võivad sisaldada vigade\n"
+"pärast Mandrivalinuxi 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 +7161,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Contacting Mandrivalinux web site to get the list of available mirrors..."
 msgstr ""
-"Mandrakelinuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."
+"Mandrivalinuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7386,8 +7386,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinuxi paigaldamine %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinuxi paigaldamine %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9973,7 +9973,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrakelinux machine.\n"
+"This configures a personal firewall for this Mandrivalinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -14021,11 +14021,11 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
 "your scanner on the network.\n"
 "\n"
 msgstr ""
-"Oma skänneri väljajagamiseks võrgus käivitage Scannerdrake (Mandrakelinuxi "
+"Oma skänneri väljajagamiseks võrgus käivitage Scannerdrake (Mandrivalinuxi "
 "juhtimiskeskuses rubriik Riistvara/Skänner).\n"
 "\n"
 
@@ -15933,23 +15933,23 @@ msgstr "Peata"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mis on Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
+msgstr "<b>Mis on Mandrivalinux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Tere tulemast <b>Mandrakelinuxisse</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Tere tulemast <b>Mandrivalinuxisse</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrakelinux on <b>Linuxi distributsioon</b>, mis koosneb süsteemi "
+"Mandrivalinux 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 +15957,10 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrakelinux on kõige <b>kasutajasõbralikum</b> Linuxi distributsioon. See "
+"Mandrivalinux 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 +15976,13 @@ msgstr "Tere tulemast <b>vaba tarkvara maailma</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"Mandrivalinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
 "contributors."
 msgstr ""
-"Mandrakelinux toetab kõigiti vaba tarkvara. Ka praegune väljalase on "
-"<b>Mandrakesofti arendajate meeskonna</b> ja Mandrakelinuxi <b>üleilmse "
+"Mandrivalinux toetab kõigiti vaba tarkvara. Ka praegune väljalase on "
+"<b>Mandrivai arendajate meeskonna</b> ja Mandrivalinuxi <b>üleilmse "
 "kaasautorite kogukonna</b> <b>ühise koostöö</b> vili."
 
 #: share/advertising/02.pl:19
@@ -16003,9 +16003,9 @@ msgstr "<b>GPL</b>"
 #, c-format
 msgid ""
 "Most of the software included in the distribution and all of the "
-"Mandrakelinux tools are licensed under the <b>General Public License</b>."
+"Mandrivalinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Suuremat osa distributsiooni kaasatud tarkvara ja kõiki Mandrakelinuxi "
+"Suuremat osa distributsiooni kaasatud tarkvara ja kõiki Mandrivalinuxi "
 "abivahendeid levitatakse <b>Üldise Avaliku Litsentsi</b> (GPL) alusel."
 
 #: share/advertising/03.pl:17
@@ -16031,20 +16031,20 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Liituge Mandrakelinuxi kogukonnaga</b>"
+msgstr "<b>Liituge Mandrivalinuxi kogukonnaga</b>"
 
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"Mandrivalinux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrakelinux world."
+"<b>key role</b> in the Mandrivalinux world."
 msgstr ""
-"Mandrakelinuxi kasutajad ja arendajad moodustavad <b>väga suure kogukonna</"
+"Mandrivalinuxi 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 "
-"Mandrakelinuxi maailmas lausa <b>võtmeroll</b>."
+"Mandrivalinuxi maailmas lausa <b>võtmeroll</b>."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -16066,11 +16066,11 @@ msgstr "<b>Allatõmmatav versioon</b> (\"Download version\")"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrakelinux Download</b>. This is the free "
-"version that Mandrakesoft wants to keep <b>available to everyone</b>."
+"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Paigaldate praegu <b>Mandrakelinuxi allatõmmatavat</b> versiooni. See on "
-"vaba versioon, mis Mandrakesofti tahtmist mööda on <b>kättesaadav kõigile</"
+"Paigaldate praegu <b>Mandrivalinuxi 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
@@ -16103,9 +16103,9 @@ msgstr ""
 #, c-format
 msgid ""
 "You will not have access to the <b>services included</b> in the other "
-"Mandrakesoft products either."
+"Mandriva products either."
 msgstr ""
-"Teil puudub ligipääs ka muudesse Mandrakesofti toodetesse <b>lisatud "
+"Teil puudub ligipääs ka muudesse Mandrivai toodetesse <b>lisatud "
 "teenustele</b>."
 
 #: share/advertising/06.pl:13
@@ -16115,8 +16115,8 @@ msgstr "<b>Discovery - Teie esimene Linuxi töölaud</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr "Paigaldate praegu <b>Mandrakelinuxi Discovery</b> versiooni."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgstr "Paigaldate praegu <b>Mandrivalinuxi Discovery</b> versiooni."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16138,17 +16138,17 @@ msgstr "<b>PowerPack - tipptasemel Linuxi töölaud</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr "Paigaldate praegu <b>Mandrakelinuxi PowerPack</b> versiooni."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgstr "Paigaldate praegu <b>Mandrivalinuxi PowerPack</b> versiooni."
 
 #: share/advertising/07.pl:17
 #, c-format
 msgid ""
-"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"PowerPack is Mandriva's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack on Mandrakesofti <b>tipptasemega Linuxi töölaua lahendus</b>. "
+"PowerPack on Mandrivai <b>tipptasemega Linuxi töölaua lahendus</b>. "
 "PowerPack pakub <b>tuhandeid rakendusi</b> alates kõige populaarsematest "
 "kuni kõige spetsiifilisemateni."
 
@@ -16159,8 +16159,8 @@ msgstr "<b>PowerPack+ - Linuxi lahendus töölaudadele ja serveritele</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr "Paigaldate praegu <b>Mandrakelinuxi PowerPack+</b> versiooni."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgstr "Paigaldate praegu <b>Mandrivalinuxi PowerPack+</b> versiooni."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16177,22 +16177,22 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakesofti tooted</b>"
+msgid "<b>Mandriva Products</b>"
+msgstr "<b>Mandrivai tooted</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
 "products."
 msgstr ""
-"<b>Mandrakesoft</b> on välja töötanud terve rea <b>Mandrakelinuxi</b> "
+"<b>Mandriva</b> on välja töötanud terve rea <b>Mandrivalinuxi</b> "
 "tooteid."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
-msgstr "Mandrakelinux koosseisu kuuluvad järgmised tooted:"
+msgid "The Mandrivalinux products are:"
+msgstr "Mandrivalinux koosseisu kuuluvad järgmised tooted:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16212,73 +16212,73 @@ msgstr "\t* <b>PowerPack+</b> - Linuxi lahendus töölaudadele ja serveritele."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrakelinux for x86-64</b> - Mandrakelinuxi lahendus, mis sobib "
+"\t* <b>Mandrivalinux for x86-64</b> - Mandrivalinuxi lahendus, mis sobib "
 "kõige paremini Teie 64-bitisele protsessorile."
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr "<b>Mandrakesofti tooted (kaasaskantavad)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
+msgstr "<b>Mandrivai tooted (kaasaskantavad)</b>"
 
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"Mandriva has developed two products that allow you to use Mandrivalinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandrakesoft on välja töötanud kaks toodet, mis lubavad Teil kasutada "
-"Mandrakelinuxit <b>suvalises arvutis</b>, ilma et peaksite seda tegelikult "
+"Mandriva on välja töötanud kaks toodet, mis lubavad Teil kasutada "
+"Mandrivalinuxit <b>suvalises arvutis</b>, ilma et peaksite seda tegelikult "
 "arvutisse paigaldamagi:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b> - Mandrakelinuxi distributsioon, mis töötab täielikult "
+"\t* <b>Move</b> - Mandrivalinuxi distributsioon, mis töötab täielikult "
 "alglaaditava CD pealt."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b> - Mandrakelinuxi distributsioon, mis on juba "
+"\t* <b>GlobeTrotter</b> - Mandrivalinuxi distributsioon, mis on juba "
 "paigaldatud ülikompaktsele LaCie välisele kõvakettale."
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "<b>Mandrakesofti tooted (professonaalsed lahendused)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
+msgstr "<b>Mandrivai tooted (professonaalsed lahendused)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandrakesoft products designed to meet the <b>professional "
+"Below are the Mandriva products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
-"Toome siin ära Mandrakesofti tooted, mis peavad rahuldama ka kõige "
+"Toome siin ära Mandrivai tooted, mis peavad rahuldama ka kõige "
 "nõudlikumaid <b>professionaalseid vajadusi</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b> - Mandrakelinuxi töölaud firmadele."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b> - Mandrivalinuxi töölaud firmadele."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>Corporate Server</b> - Mandrakelinuxi serverilahendus."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgstr "\t* <b>Corporate Server</b> - Mandrivalinuxi serverilahendus."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b> - Mandrakelinuxi turvalahendus."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b> - Mandrivalinuxi turvalahendus."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16322,10 +16322,10 @@ msgstr "<b>Valige meelepärane graafiline töökeskkond</b>"
 #, c-format
 msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "PowerPack võimaldab teil valida meelepärase <b>graafilise töökeskkonna</b>. "
-"Mandrakesoft on selleks vaikimisi valinud <b>KDE</b>."
+"Mandriva on selleks vaikimisi valinud <b>KDE</b>."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -16350,10 +16350,10 @@ msgstr ""
 #, c-format
 msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
-"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+"environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
 "PowerPack+ võimaldab teil valida meelepärase <b>graafilise töökeskkonna</b>. "
-"Mandrakesoft on selleks vaikimisi valinud <b>KDE</b>."
+"Mandriva on selleks vaikimisi valinud <b>KDE</b>."
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16480,10 +16480,10 @@ msgstr "<b>Ääretu valik rakendusi igaks vajaduseks</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Mandrakelinuxi menüüst leiab <b>hõlpsasti kasutatavad</b> rakendused "
+"Mandrivalinuxi menüüst leiab <b>hõlpsasti kasutatavad</b> rakendused "
 "<b>igaks vajaduseks</b>:"
 
 #: share/advertising/18.pl:16
@@ -16746,18 +16746,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinuxi juhtimiskeskus</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinuxi juhtimiskeskus</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrakelinux Control Center</b> is an essential collection of "
-"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandrivalinux Control Center</b> is an essential collection of "
+"Mandrivalinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrakelinuxi juhtimiskeskus</b> koondab ühtekokku olulised, "
-"Mandrakelinuxile spetsiifilised tööriistad, et Te saaksite oma arvutit "
+"<b>Mandrivalinuxi juhtimiskeskus</b> koondab ühtekokku olulised, "
+"Mandrivalinuxile spetsiifilised tööriistad, et Te saaksite oma arvutit "
 "lihtsamalt ja mugavamalt seadistada."
 
 #: share/advertising/25.pl:17
@@ -16781,15 +16781,15 @@ msgstr "<b>Vaba tarkvara mudel</b>"
 msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
-"Mandrakesoft sells added value products and services to <b>keep improving "
-"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"Mandriva sells added value products and services to <b>keep improving "
+"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrivalinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Nagu programmeerimine üldse, nõuab ka vaba tarkvara arendamiseks <b>aega ja "
-"inimesi</b>. Vaba tarkvara põhimõtete vaimu elushoidmiseks müüb Mandrakesoft "
-"oma tooteid ja teenuseid, et <b>aidata arendada Mandrakelinuxit</b>. Kui ka "
-"Teie soovite <b>toetada vaba tarkvara põhimõtteid</b> ning Mandrakelinuxi "
+"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 "
 "arendustegevust, kaaluge <b>palun</b> mõtet osta mõni meie toode või teenus!"
 
 #: share/advertising/27.pl:13
@@ -16800,10 +16800,10 @@ msgstr "<b>Internetikauplus</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandrakesoft products and services, you can visit our "
+"To learn more about Mandriva products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Mandrakesofti toodete ja teenustega põhjalikumaks tutvumiseks võite "
+"Mandrivai toodete ja teenustega põhjalikumaks tutvumiseks võite "
 "külastada meie <b>e-kaubanduse keskust</b>."
 
 #: share/advertising/27.pl:17
@@ -16828,25 +16828,25 @@ msgstr "Astuge juba täna läbi aadressilt <b>store.mandrakesoft.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
-msgid "<b>Mandrakeclub</b>"
-msgstr "<b>Mandrakeclub</b>"
+msgid "<b>Mandriva Club</b>"
+msgstr "<b>Mandriva Club</b>"
 
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub</b> on <b>suurepärane kaaslane</b> Teie Mandrakelinuxi "
+"<b>Mandriva Club</b> on <b>suurepärane kaaslane</b> Teie Mandrivalinuxi "
 "tootele."
 
 #: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+"Take advantage of <b>valuable benefits</b> by joining Mandriva Club, such as:"
 msgstr ""
 "Saage kasu <b>hinnalistest eelistest</b>, mida pakub ühinemine "
-"Mandrakeclub'iga:"
+"Mandriva Club'iga:"
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -16868,39 +16868,39 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Osalemine Mandrakelinuxi <b>kasutajate foorumitel</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgstr "\t* Osalemine Mandrivalinuxi <b>kasutajate foorumitel</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrakelinux <b>ISO images</b>."
+"Mandrivalinux <b>ISO images</b>."
 msgstr ""
 "\t* <b>Varane ja privilegeeritud ligipääs</b> juba enne ametlikku väljalaset "
-"Mandrakelinuxi <b>ISO-tõmmistele</b>."
+"Mandrivalinuxi <b>ISO-tõmmistele</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
-msgid "<b>Mandrakeonline</b>"
-msgstr "<b>Mandrakeonline</b>"
+msgid "<b>Mandriva Online</b>"
+msgstr "<b>Mandriva Online</b>"
 
 #: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
 msgstr ""
-"<b>Mandrakeonline</b> on uus suurepärane teenus, mida Mandrakesoft uhkusega "
+"<b>Mandriva Online</b> on uus suurepärane teenus, mida Mandriva uhkusega "
 "oma klientidele pakub!"
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"Mandrakeonline provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrakelinux systems:"
+"Mandriva Online provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrivalinux systems:"
 msgstr ""
-"Mandrakeonline tähendab mitmeid hinnalisi teenuseid oma Mandrakelinuxi "
+"Mandriva Online tähendab mitmeid hinnalisi teenuseid oma Mandrivalinuxi "
 "süsteemi <b>hõlpsaks uuendamiseks</b>:"
 
 #: share/advertising/29.pl:18
@@ -16926,40 +16926,40 @@ msgstr "\t* Paindlik uuenduste <b>ajastamine</b>."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
 msgstr ""
-"\t* <b>Kõigi oma Mandrakelinuxi süsteemide</b> haldamine ühe konto alt."
+"\t* <b>Kõigi oma Mandrivalinuxi süsteemide</b> haldamine ühe konto alt."
 
 #: share/advertising/30.pl:13
 #, c-format
-msgid "<b>Mandrakeexpert</b>"
-msgstr "<b>Mandrakeexpert</b>"
+msgid "<b>Mandriva Expert</b>"
+msgstr "<b>Mandriva Expert</b>"
 
 #: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Läheb Teil vaja <b>veidi abi</b>? Mandrakesofti asjatundjad on valmis seda "
+"Läheb Teil vaja <b>veidi abi</b>? Mandrivai asjatundjad on valmis seda "
 "Teile osutama <b>meie tehnilise toe keskkonnas</b> www.mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"<b>Kvalifitseeritud Mandrakelinuxi ekspertide</b> abiga võite kokku hoida "
+"<b>Kvalifitseeritud Mandrivalinuxi ekspertide</b> abiga võite kokku hoida "
 "hulganisti aega ja vaeva."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrakelinux, you have the possibility to "
+"For any question related to Mandrivalinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Iga Mandrakelinuxiga seotud küsimuse puhul on Teil võimalik osta konkreetne "
+"Iga Mandrivalinuxiga seotud küsimuse puhul on Teil võimalik osta konkreetne "
 "tugiteenus meie Internetikaupluses <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
@@ -17255,8 +17255,8 @@ msgstr "Jälgimisvahendid, protsesside jälgimine, tcpdump, nmap..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakesofti nõustajad"
+msgid "Mandriva Wizards"
+msgstr "Mandrivai nõustajad"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -17351,8 +17351,8 @@ msgstr ""
 "\n"
 "VÕTMED:\n"
 "  --help            - näitab käesolevat abiteadet.\n"
-"  -report           - rakendus peab olema üks Mandrakelinuxi tööriistadest\n"
-"  -incident         - rakendus peab olema üks Mandrakelinuxi tööriistadest"
+"  -report           - rakendus peab olema üks Mandrivalinuxi tööriistadest\n"
+"  -incident         - rakendus peab olema üks Mandrivalinuxi tööriistadest"
 
 #: standalone.pm:63
 #, c-format
@@ -17407,7 +17407,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrakelinux Terminal Server Configurator\n"
+"Mandrivalinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17421,7 +17421,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[VÕTMED]...\n"
-"Mandrakelinuxi terminaliserveri seadistaja\n"
+"Mandrivalinuxi terminaliserveri seadistaja\n"
 "--enable         : lubab MTSi\n"
 "--disable        : keelab MTSi\n"
 "--start          : käivitab MTSi\n"
@@ -17479,14 +17479,14 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 msgid ""
 "[OPTION]...\n"
 "  --no-confirmation      do not ask first confirmation question in "
-"MandrakeUpdate mode\n"
+"Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[VÕTI]...\n"
-"  --no-confirmation      ei küsita esimest kinnitust MandrakeUpdate "
+"  --no-confirmation      ei küsita esimest kinnitust Mandriva Update "
 "režiimis\n"
 "  -no-verify-rpm        pakettide signatuure ei kontrollita\n"
 "  --changelog-first      näitab kirjelduse aknas enne failinimekirja "
@@ -20257,13 +20257,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrakelinux Bug Report Tool"
-msgstr "Mandrakelinuxi vigadest teatamise vahend"
+msgid "Mandrivalinux Bug Report Tool"
+msgstr "Mandrivalinuxi vigadest teatamise vahend"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinuxi juhtimiskeskus"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinuxi juhtimiskeskus"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20283,8 +20283,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -20328,8 +20328,8 @@ msgstr "Seadistamise nõustajad"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
-msgstr "Valige Mandrakesofti tööriist:"
+msgid "Select Mandriva Tool:"
+msgstr "Valige Mandrivai tööriist:"
 
 #: standalone/drakbug:82
 #, c-format
@@ -20754,19 +20754,19 @@ msgstr "Käivitub laadimisel"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Seda liidest ei ole veel seadistatud.\n"
-"Käivitage Mandrakelinuxi juhtimiskeskuses nõustaja \"Liidese lisamine\""
+"Käivitage Mandrivalinuxi 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 Mandrakelinux Control Center"
+"Run the \"%s\" assistant from the Mandrivalinux Control Center"
 msgstr ""
 "Internetiühendust ei ole veel seadistatud.\n"
-"Käivitage Mandrakelinuxi juhtimiskeskuses nõustaja \"%s\""
+"Käivitage Mandrivalinuxi 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
@@ -20816,8 +20816,8 @@ msgstr "KDM (KDE kuvahaldur)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
-msgstr "MkdKDM (Mandrakelinuxi kuvahaldur)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgstr "MkdKDM (Mandrivalinuxi kuvahaldur)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21116,7 +21116,7 @@ msgstr "Import"
 #: standalone/drakfont:511
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by Mandrakesoft \n"
+"Copyright (C) 2001-2002 by Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -21125,7 +21125,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Autoriõigus (C) 2001-2002: Mandrakesoft \n"
+"Autoriõigus (C) 2001-2002: Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (algversioon)\n"
@@ -21666,7 +21666,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 Mandrakesoft.\n"
+"Copyright (C) 2003-2004 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -21702,8 +21702,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinuxi abikeskus"
+msgid "Mandrivalinux Help Center"
+msgstr "Mandrivalinuxi abikeskus"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -25210,8 +25210,8 @@ msgstr "Muudatus on tehtud, aga selle rakendamiseks tuleb välja logida"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrakelinux Tools Logs"
-msgstr "Mandrakelinuxi vahendite logi"
+msgid "Mandrivalinux Tools Logs"
+msgstr "Mandrivalinuxi vahendite logi"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25723,10 +25723,10 @@ msgstr "Ühendus on loodud."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "Ühenduse loomine ebaõnnestus.\n"
-"Kontrollige palun seadistusi Mandrakelinuxi juhtimiskeskuse abil."
+"Kontrollige palun seadistusi Mandrivalinuxi juhtimiskeskuse abil."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26615,8 +26615,8 @@ msgstr "Paigaldamine ebaõnnestus!"
 #~ msgid "Save and close"
 #~ msgstr "Salvesta ja sulge"
 
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Mandrakesofti nõustajad"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Mandrivai nõustajad"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Brauserit ei leitud! Palun paigaldage mõni"