switch from MandrakeSoft to Mandriva

1 files changed, 178 insertions, 178 deletions

diff --git a/perl-install/share/po/sr@Latn.po b/perl-install/share/po/sr@Latn.po
index 3375990a5..90c9084ca 100644
--- a/perl-install/share/po/sr@Latn.po
+++ b/perl-install/share/po/sr@Latn.po
@@ -60,7 +60,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 ""
 
 #: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320
@@ -79,7 +79,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 ""
 
@@ -87,7 +87,7 @@ msgstr ""
 #, 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"
@@ -95,7 +95,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 ""
 
@@ -221,7 +221,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"
@@ -1245,7 +1245,7 @@ msgstr "upustvo"
 #: 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 "Možete izabrati drugi jezik koji će biti dostupan posle instalacije "
@@ -3634,12 +3634,12 @@ msgstr "omogući podršku za radio"
 #, fuzzy, 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 ""
 "Pre nego što nastavite pažljivo pročitajte uslove licence. Ona\n"
-"pokriva celu Mandrakelinux distribuciju, i ukoliko se  slažete\n"
+"pokriva celu Mandrivalinux distribuciju, i ukoliko se  slažete\n"
 "sa svim uslovima koji se nalaze u njoj, kliknite na \"Prihvatam\" taster\n"
 "Ukoliko ne prihvatate, jednostavno isključite \n"
 "računar."
@@ -3833,13 +3833,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, 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 ""
-"Mandrakelinux instalacija se nalazi na nekoliko diskova iliti CDROM-ova. "
+"Mandrivalinux instalacija se nalazi na nekoliko diskova iliti CDROM-ova. "
 "DrakX\n"
 "zna ukoliko da ukoliko je selktovani paket lociran na drugom CDROM-u i "
 "izbaciće\n"
@@ -3849,11 +3849,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for 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"
@@ -3905,7 +3905,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Sada je vreme da odredimo koje programe želite da instalirate na vaš\n"
-"sistem. Postoje hiljade paketa dostupnih za instalaciju na Mandrakelinux, "
+"sistem. Postoje hiljade paketa dostupnih za instalaciju na Mandrivalinux, "
 "i \n"
 "da bi ih učinili dostupnijim, smeđteni su u grupe sličnih aplikacija.\n"
 "\n"
@@ -4013,10 +4013,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"
@@ -4046,7 +4046,7 @@ msgstr ""
 "\n"
 "!! Ukoliko je server paket izabran slučajno ili kao deo\n"
 "cele grupe, bićete upitani da li zaista želite da instalirate\n"
-"ponuđene servere. Pod Mandrakelinux-om, svi instalirani\n"
+"ponuđene servere. Pod Mandrivalinux-om, svi instalirani\n"
 "serveri se startuju po default-u za vreme podizanja sistema. Čak i ako su "
 "sigurni i nemaju\n"
 "poznatih bezbednosnih propusta do vremena izlaska distribucije, može se "
@@ -4211,7 +4211,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"
@@ -4267,7 +4267,7 @@ msgid ""
 msgstr ""
 "X (ili  X Window Sistem) je srce GNU/Linux grafičkog interfejsa\n"
 "na koji se oslanjaju sva grafička okruženja (KDE, GNOME, AfterStep,\n"
-"WindowMaker, itd.) koja se nalaze u Mandrakelinux-u.\n"
+"WindowMaker, itd.) koja se nalaze u Mandrivalinux-u.\n"
 "\n"
 "Biće vam prikazana lista sa različitim parametrima čijom izmenom\n"
 "možete dobiti optimalan grafički prikaz: Grafička kartica\n"
@@ -4384,12 +4384,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, 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"
@@ -4416,7 +4416,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"
@@ -4425,7 +4425,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"
@@ -4446,11 +4446,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "U ovom trenutku, morate da izaberete gde ćete instalirati\n"
-"Mandrakelinux operativni sistem na vaš hard disk. Ukoliko je prazan ili\n"
+"Mandrivalinux operativni sistem na vaš hard disk. Ukoliko je prazan ili\n"
 "postojeći operativni sistem koristi sav postojeći prostor na disku, treba da "
 "ga\n"
 "particionirate. U osnovi, particioniranje hard diska se sastoji logičkog\n"
-"deljenja da bi obezbedili prostor za instalaciju vaš novi Mandrakelinux "
+"deljenja da bi obezbedili prostor za instalaciju vaš novi Mandrivalinux "
 "sistem.\n"
 "\n"
 "Pošto su efekti procesa particioniranja obično nepovratni,\n"
@@ -4459,7 +4459,7 @@ msgstr ""
 "žurite.\n"
 "\n"
 "Ukoliko ste pokrenuli instalaciju u Ekspert modu, pokrenućete\n"
-"DiskDrake, Mandrakelinux-ov alat za particije, koji vam dozvoljavaw da\n"
+"DiskDrake, Mandrivalinux-ov alat za particije, koji vam dozvoljavaw da\n"
 "fino podesite vaše particije. Pogledajte DiskDrake sekciju u ``User "
 "Guide''.\n"
 "Iz instalacionog interfejsa, možete koristiti čarobnjake kao što je opisano "
@@ -4497,7 +4497,7 @@ msgstr ""
 "defragmentirate\n"
 "Windows particiju iz samog Windows-a. Backup podataka takođe nije loša "
 "ideja..\n"
-"Ovo rešenje se preporučuje ukoliko želite da koristite Mandrakelinux i\n"
+"Ovo rešenje se preporučuje ukoliko želite da koristite Mandrivalinux i\n"
 "Microsoft Windows na istom kompjuteru.\n"
 "\n"
 "   Pre nego što izaberete ovu opciju, morate da razumete da nakon ove "
@@ -4508,7 +4508,7 @@ msgstr ""
 "\n"
 " * \"Brisanje cvelog diska\": ukoliko želite da izbrišete sve podatke i sve\n"
 "particije koji postoje na vašem hard disku i zamenite ih vašim\n"
-"novim Mandrakelinux sistemom, možete da izaberete ovu ociju. Budite\n"
+"novim Mandrivalinux sistemom, možete da izaberete ovu ociju. Budite\n"
 "pažljivisa ovom opcijom, jer nećete biti u mogućnosti\n"
 "da povratite staro stanje nakon potvrde.\n"
 "\n"
@@ -4680,7 +4680,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."
@@ -4707,7 +4707,7 @@ msgstr ""
 "\n"
 "Kliknite na \"<- Prethodno\" ako želite da izaberete drugu particiju za svoj "
 "novi\n"
-"Mandrakelinux sistem.\n"
+"Mandrivalinux sistem.\n"
 "\n"
 "Kliknite na \"Napredno\" ukoliko želite da izaberete particije koje će biti "
 "proverene\n"
@@ -4725,7 +4725,7 @@ msgstr "Prethodni"
 #: help.pm:434
 #, fuzzy, 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"
@@ -4737,7 +4737,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"U vreme kada budete instalirali Mandrakelinux, vrlo je moguće da će neki\n"
+"U vreme kada budete instalirali Mandrivalinux, vrlo je moguće da će neki\n"
 "paketi biti ažurirani u odnosu na inicijalno izdanje. Neki bagovi mogu \n"
 "biti ispravljeni, a sigurnosni propusti zatvorene. Da bi mogli da koristite "
 "ove novije verzije\n"
@@ -4769,7 +4769,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"
@@ -4794,7 +4794,7 @@ msgstr "Administrator za sigurnost:"
 #, fuzzy, 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"
@@ -4865,7 +4865,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Na ovoj tački, morate izbrati koju particiju(e) želite da koristite za\n"
-"instalaciju novog Mandrakelinux sistema. Ukoliko su particije\n"
+"instalaciju novog Mandrivalinux sistema. Ukoliko su particije\n"
 "već definisane (od predhodne instalacije ili od strane\n"
 "drugog alata za particije), možete da koristite postojeće particije.\n"
 "U drugim slučajevima,\n"
@@ -4954,7 +4954,7 @@ msgstr "Pređi na normalni mod"
 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"
@@ -4984,7 +4984,7 @@ msgid ""
 msgstr ""
 "Jedna ili više Microsoft Windows particija je detektovano \n"
 "na hard disku. Izaberite koju od njih želite da smanjite da bi instalirali\n"
-"novi Mandrakelinux operativni sistem.\n"
+"novi Mandrivalinux operativni sistem.\n"
 "\n"
 "Svaka particija je ispisana na sledeći način: \"Ime Linux-a\",\"Ime Windows-a"
 "\"\n"
@@ -5032,7 +5032,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"
@@ -5041,13 +5041,13 @@ 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 ""
 "Ovaj korak se aktivira samo u slučaju da postoji stara GNU/Linux particija "
 "na\n"
@@ -5055,7 +5055,7 @@ msgstr ""
 "\n"
 "DrakX sada treba da zna da li želite da izvedete čistu instalaciju ili "
 "ažuriranje\n"
-"postojećeg Mandrakelinux sistema:\n"
+"postojećeg Mandrivalinux sistema:\n"
 "\n"
 " * \"Instalacija\": U većini slučajeva, ova opcija kompletno briše stari\n"
 "sistem. Ukoliko želite da izmenite broj particija, ili\n"
@@ -5066,7 +5066,7 @@ msgstr ""
 "\n"
 " * \"Ažuriranje\": ova instalaciona klasa vam dozvoljava da uradite "
 "ažuriranje paketa\n"
-"na trenutno instaliranom Mandrakelinux sistemu. Vaša trenutna\n"
+"na trenutno instaliranom Mandrivalinux sistemu. Vaša trenutna\n"
 "šema particija i korisnički podaci se ne menjaju. Većina drugih\n"
 "konfiguracionih koraka i dalje ostaje dostupna, slično standardnoj "
 "instalaciji.\n"
@@ -5074,7 +5074,7 @@ msgstr ""
 "Upotreba opcije ``Ažuriranje'' bi trebalo da bude bez problema na Mandrake "
 "Linux sistemima\n"
 "od verzije \"8.1\" ili novije. Izvođenje ažuriranja na verzijama \n"
-"Mandrakelinux pre \"8.1\" nije preporučljivo."
+"Mandrivalinux pre \"8.1\" nije preporučljivo."
 
 #: help.pm:591
 #, fuzzy, c-format
@@ -5129,7 +5129,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"
@@ -5375,7 +5375,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but 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"
@@ -5396,12 +5396,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 ""
 "Sada treba da izaberemo sistem za štampanje za vaš računar. Drugi OS-ovi "
 "vam\n"
-"nude jedan, ali vam Mandrakelinux nudi čak tri.\n"
+"nude jedan, ali vam Mandrivalinux nudi čak tri.\n"
 "\n"
 " * \"pdq\" što znači ``print, do not queue'', je izbor za one koji imaju\n"
 "direktni konekciju sa svojim štampačem i želite da izbegnete\n"
@@ -5560,7 +5560,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"
@@ -5577,7 +5577,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"
@@ -5639,7 +5639,7 @@ msgstr "Servisi"
 #, fuzzy, 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 ""
 "Izaberite hard disk koji želite da izbrišete da bi instalirali novu Mandrake "
@@ -5998,7 +5998,7 @@ msgstr "Proračunavam veličinu Windows particije"
 #, 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 ""
 "Vaša Windows particija je previše fragmentirana, prvo pokrenite ``defrag''"
@@ -6116,19 +6116,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 "
@@ -6150,7 +6150,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"
@@ -6158,14 +6158,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"
@@ -6175,7 +6175,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"
@@ -6195,10 +6195,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"
@@ -6209,11 +6209,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"
@@ -6229,23 +6229,23 @@ 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 ""
 "Upoznavanje\n"
 "\n"
-"Operativni sistem i druge komponente dostupne u Mandrakelinux distribuciji \n"
+"Operativni sistem i druge komponente dostupne u Mandrivalinux distribuciji \n"
 "na dalje će biti zvane \"Softverski Proizvodi\" . Softverski proizvodi "
 "uključuju, ali nisu i \n"
 "ograničeni na, skup programa, metoda, pravila i dokumentaciju koja je "
 "vezanaza operativni \n"
-"sistem i druge komponente Mandrakelinux distribucije.\n"
+"sistem i druge komponente Mandrivalinux distribucije.\n"
 "\n"
 "\n"
 "1. Licencni ugovor\n"
 "\n"
 "Pažljivo pročitajte ovaj dokument. Ovaj dokument je licencni ugovor "
 "izmeđuizmeđu vas i   \n"
-"Mandrakesoft S.A. koji polaže pravo na Softverske Proizvode.\n"
+"Mandriva S.A. koji polaže pravo na Softverske Proizvode.\n"
 "Instaliranjem, kopiranjem ili upotrebom Softverskih Proizvoda u bilo kom "
 "vidu, vi eksplicitno \n"
 "prihvatate i potpuno se slažete sa prihvatanjem postavki i uslova i stanja u "
@@ -6265,7 +6265,7 @@ msgstr ""
 "Softverski Proizvodi i prateća dokumentracija su omogućene \"kao takve\", i "
 "bez garancije, do granica \n"
 "koje su dozvoljene zakonom.\n"
-"Mandrakesoft S.A. neće, u svim uslovima i u granicama zakona, biti ogovoran "
+"Mandriva S.A. neće, u svim uslovima i u granicama zakona, biti ogovoran "
 "za bilo koje specijalne,\n"
 "slučajne, direktne ili indirektne štete (uključujući neograničeneštete ili "
 "gubitke \n"
@@ -6273,14 +6273,14 @@ msgstr ""
 "kazne koje su rezultat sudske \n"
 "odluke, ili za bilo koji drugi gubitak) koje proizilaze iz upotrebe ili "
 "nemogućnosti korišćenja Softverskih \n"
-"Proizvoda, čak iako je Mandrakesoft S.A. savetovao i ukazivao na mogućnost "
+"Proizvoda, čak iako je Mandriva S.A. savetovao i ukazivao na mogućnost "
 "pojave takve \n"
 "štete.\n"
 "\n"
 "Ograničena odgovornosti vezane za posedovanje ili upotrebu zabranjenog "
 "softvera u nekim zemljama\n"
 "\n"
-"Do granica koje su uslovljene zakonom, Mandrakesoft S.A. ili njegovi "
+"Do granica koje su uslovljene zakonom, Mandriva S.A. ili njegovi "
 "distributeri neće, ni pod kojim uslovima, biti \n"
 "odgovorni za specijalne, namerne direktne ili indirektne štete(uključujući "
 "neograničene \n"
@@ -6290,7 +6290,7 @@ msgstr ""
 "proizilaze \n"
 "iz upotrebe ili nemogućnosti korišćenja Softverskih Komponenti ili koje "
 "proizilaze download-ovanih softverskih komponenti \n"
-"bilo kog Mandrakelinux sajta koji su zabranjeni ili ograničeni u nekim "
+"bilo kog Mandrivalinux sajta koji su zabranjeni ili ograničeni u nekim "
 "zemljama po lokalnim zakonima.\n"
 "Ova ograničena prava se primenjuju, ali nisu i ograničena na,kriptografske "
 "komponente \n"
@@ -6309,10 +6309,10 @@ msgstr ""
 "i uslove licencnog ugovora za svaku komponentu pre upotrebe bilo koje "
 "komponenete. Bilo koje pitanje \n"
 "vezano za licencu komponenti treba da bude adresirano na autora komponente a "
-"nena Mandrakesoft.\n"
-"Programi koje je razvio Mandrakesoft S.A. podležu pod GPL Licencu. "
+"nena Mandriva.\n"
+"Programi koje je razvio Mandriva S.A. podležu pod GPL Licencu. "
 "Dokumentacija pisana od \n"
-"strane Mandrakesoft S.A. podleže pod posebnu licencu. Molim da pogledate "
+"strane Mandriva S.A. podleže pod posebnu licencu. Molim da pogledate "
 "dokumentaciju  \n"
 "za detalje.\n"
 "\n"
@@ -6323,10 +6323,10 @@ msgstr ""
 "ona \n"
 "su zaštićena zakonima o intelektualnoj svojini i pravima koji se primenjuju "
 "na softverske programe.\n"
-"Mandrakesoft S.A. je rezervisao svoja prava na modifikovanje ili adaptaciju "
+"Mandriva S.A. je rezervisao svoja prava na modifikovanje ili adaptaciju "
 "SoftverskihProizvoda, kako za celinu tako i za \n"
 "delove, za sve sve svrhe i sve upotrebe.\n"
-"\"Mandrake\", \"Mandrakelinux\" i pridruženi logotipi i oznake Mandrakesoft "
+"\"Mandriva\", \"Mandrivalinux\" i pridruženi logotipi i oznake Mandriva "
 "S.A.  \n"
 "\n"
 "\n"
@@ -6342,7 +6342,7 @@ msgstr ""
 "sredstvo, nesporazumi će biti upućeni na odgovarajuće Sudske ustanove u "
 "Parizu - Francuska.\n"
 "Za bilo koje pitanje koje je vezano za ovaj dokument, kontaktirajte  "
-"Mandrakesoft S.A.  \n"
+"Mandriva S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6431,7 +6431,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"
@@ -6439,21 +6439,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 ""
 "Čestitamo, instalacija je završena.\n"
 "Izvadite disketu iz drajva i pritisnite <Enter> da se računar resetuje.\n"
 "\n"
 "\n"
 "Za informacije o popravkama koje su na raspolaganju za ovo izdanje\n"
-"Mandrakelinux Linux-a, pročitajte deo 'Errata' koji možete naći na\n"
+"Mandrivalinux Linux-a, pročitajte deo 'Errata' koji možete naći na\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Informacije o konfigurisanju vašeg sistema možete naći u post-instalacionom\n"
-"poglavlju zvaničnog Mandrakelinux 'Vodiča za korisnike'."
+"poglavlju zvaničnog Mandrivalinux 'Vodiča za korisnike'."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6488,13 +6488,13 @@ msgstr "Pokrećem korak `%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 ""
 "Vaš sistem ima manjak snage. Usled toga možete imati problema pri "
 "instalaciji\n"
-"Mandrakelinux. Ukoliko se oni pojave, možete probati tekstualnu instalaciju. "
+"Mandrivalinux. Ukoliko se oni pojave, možete probati tekstualnu instalaciju. "
 "Da bi to postigli,\n"
 "pritisnite `F1' pri startanju sa CDROM-a, a onda ukucajte  `text'."
 
@@ -7026,9 +7026,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 ""
-"KOntaktirajte Mandrakelinux web sajt da bi dobili listu dostupnih mirror-a"
+"KOntaktirajte Mandrivalinux web sajt da bi dobili listu dostupnih mirror-a"
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7248,8 +7248,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrakelinux Installation %s"
-msgstr "Mandrakelinux Instalacija %s"
+msgid "Mandrivalinux Installation %s"
+msgstr "Mandrivalinux Instalacija %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9831,13 +9831,13 @@ msgstr ""
 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 ""
 "drakfirewall konfigurator\n"
 "\n"
-"On konfiguriše lični firewall za ovu Mandrakelinux mašinu.\n"
+"On konfiguriše lični firewall za ovu Mandrivalinux mašinu.\n"
 "Za moćno firewall rešenje, pogledajte\n"
 "specijalizovanu MandrakeSecurity Firewall distribuciju."
 
@@ -13776,7 +13776,7 @@ 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 ""
@@ -15781,18 +15781,18 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>What is Mandrivalinux?</b>"
 msgstr ""
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrakelinux</b>!"
-msgstr "Dobrodošli u <b>Mandrakelinux</b>!"
+msgid "Welcome to <b>Mandrivalinux</b>!"
+msgstr "Dobrodošli u <b>Mandrivalinux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -15801,7 +15801,7 @@ 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 ""
 
@@ -15818,9 +15818,9 @@ msgstr "Dobrodošli u Svet Open Source-a"
 #: 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 ""
 
@@ -15840,7 +15840,7 @@ msgstr ""
 #, 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 ""
 
 #: share/advertising/03.pl:17
@@ -15866,10 +15866,10 @@ msgstr ""
 #: 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 ""
 
 #: share/advertising/04.pl:17
@@ -15888,8 +15888,8 @@ msgstr ""
 #: 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 ""
 
 #: share/advertising/05.pl:19
@@ -15916,7 +15916,7 @@ 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 ""
 
 #: share/advertising/06.pl:13
@@ -15926,7 +15926,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgid "You are now installing <b>Mandrivalinux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15945,13 +15945,13 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
 msgstr ""
 
 #: 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 ""
@@ -15963,7 +15963,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15977,19 +15977,19 @@ msgstr ""
 
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrakesoft Products</b>"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgid "<b>Mandriva Products</b>"
+msgstr "Mandrivalinux Kontrolni Centar"
 
 #: 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 ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrakelinux products are:"
+msgid "The Mandrivalinux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -16010,61 +16010,61 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrakelinux for x86-64</b>, The Mandrakelinux solution for making "
+"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
 #: share/advertising/10.pl:15
 #, c-format
-msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgid "<b>Mandriva Products (Nomad Products)</b>"
 msgstr ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: share/advertising/11.pl:13
 #, c-format
-msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgid "<b>Mandriva Products (Professional Solutions)</b>"
 msgstr ""
 
 #: 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 ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -16102,7 +16102,7 @@ msgstr "Izaberite ključ za enkripciju fajl sistema"
 #, 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 ""
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -16123,7 +16123,7 @@ 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 ""
 
 #: share/advertising/14.pl:15
@@ -16240,7 +16240,7 @@ msgstr ""
 #: 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 ""
 
@@ -16475,14 +16475,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrakelinux Control Center</b>"
-msgstr "<b>Mandrakelinux Kontrolni Centar</b>"
+msgid "<b>Mandrivalinux Control Center</b>"
+msgstr "<b>Mandrivalinux Kontrolni Centar</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 ""
 
@@ -16504,21 +16504,21 @@ msgstr ""
 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 ""
 
 #: share/advertising/27.pl:13
 #, fuzzy, c-format
 msgid "<b>Online Store</b>"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgstr "Mandrivalinux Kontrolni Centar"
 
 #: 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 ""
 
@@ -16541,20 +16541,20 @@ msgstr ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: share/advertising/28.pl:20
@@ -16573,33 +16573,33 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
 msgstr ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: share/advertising/29.pl:18
@@ -16622,32 +16622,32 @@ msgstr ""
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
@@ -16947,8 +16947,8 @@ msgstr ""
 
 #: share/compssUsers.pl:196
 #, fuzzy, c-format
-msgid "Mandrakesoft Wizards"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgid "Mandriva Wizards"
+msgstr "Mandrivalinux Kontrolni Centar"
 
 #: share/compssUsers.pl:197
 #, fuzzy, c-format
@@ -17087,7 +17087,7 @@ msgstr ""
 #, fuzzy, 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"
@@ -17161,14 +17161,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 ""
 "[OPTION]...\n"
-"  --no-confirmation      ne postavlja pitanje o potvrdi u MandrakeUpdate "
+"  --no-confirmation      ne postavlja pitanje o potvrdi u Mandriva Update "
 "modu\n"
 "  --no-verify-rpm        ne proverava signature paketa\n"
 "  --changelog-first      prikadzuje zapis o izmenama pre liste fajlova u "
@@ -19777,13 +19777,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrakelinux Bug Report Tool"
+msgid "Mandrivalinux Bug Report Tool"
 msgstr "Mandrake Program za Prijavljivanje Grešaka"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrakelinux Control Center"
-msgstr "Mandrakelinux Kontrolni Centar"
+msgid "Mandrivalinux Control Center"
+msgstr "Mandrivalinux Kontrolni Centar"
 
 #: standalone/drakbug:48
 #, c-format
@@ -19803,8 +19803,8 @@ msgstr "HardDrake"
 
 #: standalone/drakbug:51
 #, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
+msgid "Mandriva Online"
+msgstr "Mandriva Online"
 
 #: standalone/drakbug:52
 #, c-format
@@ -19848,7 +19848,7 @@ msgstr "Čarobnjaci za konfiguraciju"
 
 #: standalone/drakbug:81
 #, c-format
-msgid "Select Mandrakesoft Tool:"
+msgid "Select Mandriva Tool:"
 msgstr ""
 
 #: standalone/drakbug:82
@@ -20265,7 +20265,7 @@ msgstr "Pokrenuto pri startanju"
 #, fuzzy, 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 ""
 "Ovaj interfejs još uvek nije podešen.\n"
 "Pokrenite konfiguracionog čarobnjaka u glavnom prozoru"
@@ -20274,7 +20274,7 @@ msgstr ""
 #, fuzzy, 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 ""
 "Ovaj interfejs još uvek nije podešen.\n"
 "Pokrenite konfiguracionog čarobnjaka u glavnom prozoru"
@@ -20327,7 +20327,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgid "MdkKDM (Mandrivalinux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -20626,7 +20626,7 @@ msgstr "Uvezi"
 #: 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"
@@ -21154,7 +21154,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"
@@ -21181,7 +21181,7 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrakelinux Help Center"
+msgid "Mandrivalinux Help Center"
 msgstr "Mandrake Kontrolni Centar"
 
 #: standalone/drakhelp:36
@@ -24144,7 +24144,7 @@ msgid ""
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
-"Ovo je HardDrake, Mandrakelinux-ov alat za podešavanje hardvera.\n"
+"Ovo je HardDrake, Mandrivalinux-ov alat za podešavanje hardvera.\n"
 "<span foreground=\"royalblue3\">Verzija:</span> %s\n"
 "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
@@ -24255,7 +24255,7 @@ msgstr "Izmene su završene, ali da bi ih primenili morate se izlogovati"
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrakelinux Tools Logs"
+msgid "Mandrivalinux Tools Logs"
 msgstr "Mandrake Alati za objašnjenja"
 
 #: standalone/logdrake:51
@@ -24762,7 +24762,7 @@ msgstr "Povezivanje završeno."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrakelinux Control Center."
+"Verify your configuration in the Mandrivalinux Control Center."
 msgstr ""
 "povezivanje neuspelo.\n"
 "Proverite vašu konfiguraciju u Mandrake Kontrolnom Centru."
@@ -25000,7 +25000,7 @@ msgstr "Osvežavanje liste podešenih skenera ..."
 #: standalone/scannerdrake:101
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "%s nije podržan u ovoj verziji Mandrakelinux-a."
+msgstr "%s nije podržan u ovoj verziji Mandrivalinux-a."
 
 #: standalone/scannerdrake:104
 #, c-format
@@ -25042,7 +25042,7 @@ msgstr ""
 #: standalone/scannerdrake:144
 #, fuzzy, c-format
 msgid "The %s is not supported under Linux."
-msgstr "%s nije podržan u ovoj verziji Mandrakelinux-a."
+msgstr "%s nije podržan u ovoj verziji Mandrivalinux-a."
 
 #: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
@@ -25621,8 +25621,8 @@ msgstr "Instalacija nije uspela"
 #~ msgstr "ne mogu da pronađen nijedan font.\n"
 
 #, fuzzy
-#~ msgid "MandrakeSoft Wizards"
-#~ msgstr "Mandrakelinux Kontrolni Centar"
+#~ msgid "Mandriva Wizards"
+#~ msgstr "Mandrivalinux Kontrolni Centar"
 
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Nema dostupnog pretraživača! Molim Vas da instalirate barem jednog"
@@ -26158,8 +26158,8 @@ msgstr "Instalacija nije uspela"
 #~ "  --report          - program treba da bude jedan od mandrake alata\n"
 #~ "  --incident        - program treba da bude jedan od mandrake alata"
 
-#~ msgid "Mandrake Online"
-#~ msgstr "Mandrake Online"
+#~ msgid "Mandriva Online"
+#~ msgstr "Mandriva Online"
 
 #~ msgid ""
 #~ "Connection failed.\n"