various Mandrake -> Mandriva changes

1 files changed, 229 insertions, 222 deletions

diff --git a/perl-install/share/po/sl.po b/perl-install/share/po/sl.po
index a039e4090..e01f0b56d 100644
--- a/perl-install/share/po/sl.po
+++ b/perl-install/share/po/sl.po
@@ -108,7 +108,7 @@ msgstr ""
 "\n"
 "Nadaljujete lahko tudi brez USB ključa. Še vedno boste lahko\n"
 "Mandriva Move uporabljali kot normalno živo distribucijo\n"
-"operacijskega sistema Mandrivalinux."
+"operacijskega sistema Mandriva Linux."
 
 #: ../move/move.pm:483
 #, c-format
@@ -135,7 +135,7 @@ msgstr ""
 "\n"
 "Nadaljujete lahko tudi brez USB ključa. Še vedno boste lahko\n"
 "Mandriva Move uporabljali kot normalno živo distribucijo\n"
-"operacijskega sistema Mandrivalinux."
+"operacijskega sistema Mandriva Linux."
 
 #: ../move/move.pm:494
 #, c-format
@@ -1309,11 +1309,11 @@ msgstr "Izbira jezika"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
 msgstr ""
-"Mandrivalinux omogoča večjezično podporo. Izberite\n"
+"Mandriva Linux omogoča večjezično podporo. Izberite\n"
 "jezike, ki jih želite namestiti. Nameščeni jeziki bodo dosegljivi,\n"
 "ko boste dokončali namestitev in znova zagnali računalnik."
 
@@ -3731,12 +3731,13 @@ msgstr "omogoči radio podporo"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Preden nadaljujete, pozorno preberite pogoje licenčne pogodbe,\n"
-"ki se nanaša na celotno distribucijo Mandrivalinux. Če se strinjate z vsemi\n"
+"ki se nanaša na celotno distribucijo Mandriva Linux. Če se strinjate z "
+"vsemi\n"
 "pogoji licenčne pogodbe, označite okence \"%s\". Če se s pogoji pogodbe\n"
 "ne strinjate, pa označite okence \"%s\" in vaš računalnik se bo ponovno "
 "zagnal."
@@ -3918,13 +3919,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Namestitev za Mandrivalinux je shranjena na več zgoščenkah.\n"
+"Namestitev za Mandriva Linux je shranjena na več zgoščenkah.\n"
 "Če je izbrani paket shranjen na drugi zgoščeniki, bo DrakX izvrgel\n"
 "trenutno in vas pozval, da v pogon vstavite pravo zgoščenko.\n"
 "če prave zgoščenke nimate, kliknite \"%s\" in željeni paketi ne\n"
@@ -3934,11 +3935,12 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3989,7 +3991,7 @@ msgid ""
 "command-line interface. The total size of this installation is about 65\n"
 "megabytes."
 msgstr ""
-"Za Mandrivalinux je dostopnih na tisoče različnih programskih paketov.\n"
+"Za Mandriva Linux je dostopnih na tisoče različnih programskih paketov.\n"
 "Da bi bilo upravljanje s paketi bolj preprosto, so razvrščeni v skupine\n"
 "vsebinsko povezanih paketov.\n"
 "\n"
@@ -4104,10 +4106,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4138,9 +4140,9 @@ msgstr ""
 "\n"
 "!! Če izberete paket ali skupino paketov, ki vsebuje strežnik,\n"
 "boste morali namestitev takšnega paketa na izrecno vprašanje\n"
-"potrditi. Mandrivalinux namreč kot privzeto vključi vse\n"
+"potrditi. Mandriva Linux namreč kot privzeto vključi vse\n"
 " nameščene storitve ob zagonu sistema. Čeprav ob izdaji\n"
-"te različice Mandrivalinuxa ni bilo znanih težav v zvezi z varnostjo,\n"
+"te različice Mandriva Linuxa ni bilo znanih težav v zvezi z varnostjo,\n"
 "je mogoče, da so bile odkrite varnostne luknje kasneje. Če za \n"
 "določeno storitev ne veste, kaj je njena naloga, kliknite \"%s\" S klikom\n"
 "na \"%s\"bodo nameščene naštete storitve, sistem pa jih bo samodejno\n"
@@ -4299,7 +4301,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4354,7 +4356,7 @@ msgid ""
 "not successful in getting the display configured."
 msgstr ""
 "X (X okenski sistem) je srce grafičnega vmesnika za GNU/Linux\n"
-"na katerem so zgrajeni vsa v Mandraklinux vključena grafična\n"
+"na katerem so zgrajeni vsa v Mandriva Linux vključena grafična\n"
 "okolja. (KDE,GNOME, AfterStep, WindowMaker. itd)\n"
 "\n"
 "Predočen vam bo seznam različnih vrednosti, ki jih lahko spreminjate,\n"
@@ -4466,12 +4468,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4498,7 +4500,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4507,7 +4509,8 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4528,11 +4531,11 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Določite, na katerem delu trdega diska naj bo nameščen operacijski\n"
-"sistem Mandrivalinux. Če je trdi disk prazen ali če na njem nameščeni\n"
+"sistem Mandriva Linux. Če je trdi disk prazen ali če na njem nameščeni\n"
 "operacijski sistem zaseda celoten prostor, boste morali disk razdeliti na\n"
 "posamezne razdelke. Razdeljevanje trdega diska izvede logično\n"
 "razdelitev, ki zagotovi potrebni prostor za namestitev operacijskega\n"
-"sistema Mandrivalinux.\n"
+"sistema Mandriva Linux.\n"
 "\n"
 "Trdega diska po izvršenem razdeljevanju običajno ni mogoče povrniti v "
 "prejšnje stanje.\n"
@@ -4564,8 +4567,8 @@ msgstr ""
 "FAT ali NTFS z nameščenimi Okni spremenite velikost. Pri tem podatkov na\n"
 "razdelku ne boste izgubili, če najprej v Oknih defragmentirate disk.\n"
 "Vsekakor pa priporočamo, da pred nadaljevanjem napravite varnostno\n"
-"kopijo podatkov. Če želite uporabljati oba operacijska sistema, "
-"Mandrivalinux\n"
+"kopijo podatkov. Če želite uporabljati oba operacijska sistema, Mandriva "
+"Linux\n"
 "in Okna (Windows™), vam priporočamo, da izberete to možnost.\n"
 "\n"
 "   Če se odločite za to možnost, morate vedeti, da bo po končanem postopku\n"
@@ -4575,7 +4578,7 @@ msgstr ""
 "\n"
 " * \"%s\": Če želite izbrisati vse obstoječe razdelke z vsemi podatki in "
 "jih \n"
-"nadomestiti s sistemom Mandrivalinux, izberite to možnost.\n"
+"nadomestiti s sistemom Mandriva Linux, izberite to možnost.\n"
 "Bodite previdni, ko boste potrdili to izbiro, prejšnjega stanja ne bo več "
 "mogoče vzpostaviti.\n"
 "\n"
@@ -4730,7 +4733,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4749,7 +4752,7 @@ msgstr ""
 "\n"
 "Kliknite na \"%s\",ko boste pripravljeni na razdeljevanje.\n"
 "\n"
-"Kliknite na \"%s\", če želite za namestitev sistema Mandrivalinux\n"
+"Kliknite na \"%s\", če želite za namestitev sistema Mandriva Linux\n"
 "izbrati drug razdelek.\n"
 "\n"
 "Kliknite na \"%s\", če želite določiti razdelke, na katerih naj sistem\n"
@@ -4767,7 +4770,7 @@ msgstr "Nazaj"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4780,7 +4783,7 @@ msgid ""
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
 "Verjetno so bili od njegove izdaje pa do časa, ko nameščate\n"
-"Mandrivalinux na svoj računalnik, nekateri paketi popravljeni\n"
+"Mandriva Linux na svoj računalnik, nekateri paketi popravljeni\n"
 "ali nadgrajeni z varnostnimi popravki ali z odstranitvijo hroščev.\n"
 "Te popravke lahko prenesete z interneta. Če imate vzpostavljeno\n"
 "internetno povezavo, označite \"%s\", če pa želite namestiti\n"
@@ -4807,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 Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4835,7 +4838,7 @@ msgstr "Upravitelj varnostnih nastavitev"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -4906,7 +4909,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Izbrati morate razdelke, na katere boste namestitli sistem\n"
-"Mandrivalinux. Če ste razdelke že izbrali ob kakšni predhodni\n"
+"Mandriva Linux. Če ste razdelke že izbrali ob kakšni predhodni\n"
 "namestitvi GNU/Linux sistema s kakim drugim orodjem za\n"
 "razdeljevanje, lahko uporabite obstoječe razdelke, sicer pa morate\n"
 "razdelke trdega diska za namestitev določiti sedaj.\n"
@@ -4969,7 +4972,7 @@ msgstr ""
 "Vse nadaljnje informacije o datotečnih sistemih boste našli v\n"
 "dokumentaciji.\n"
 "\n"
-"Če Mandrivalinux nameščate na PPC računalnik, morate ustvariti\n"
+"Če Mandriva Linux nameščate na PPC računalnik, morate ustvariti\n"
 "zagonski \"bootstrap'\" razdelek z velikostjo najmanj 1MB, ki ga\n"
 "uporablja zagonski nalagalnik yaboot. Če ta razdelek nekoliko\n"
 "povečate in mu namenite vsaj 50MB, boste nanj lahko shranjevali\n"
@@ -4990,7 +4993,7 @@ msgstr "Preklapljanje med normalnim in izvedenskim načinom"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -5020,7 +5023,7 @@ msgid ""
 msgstr ""
 "Na vašem trdem disku je več kot en razdelek za Okna (Windows™).\n"
 "Izberite razdelek, ki ga želite zmanjšati, da bi pridobili prostor za\n"
-"namestitev sistema Mandrivalinux.\n"
+"namestitev sistema Mandriva Linux.\n"
 "\n"
 "Na seznamu so razdelki s podatki: \"Ime v Linuxu\", \"Ime v Oknih\"\n"
 "\"Velikost\" \n"
@@ -5067,7 +5070,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -5076,19 +5079,20 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux system. Your current "
+"partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
 msgstr ""
 "Ta korak se zažene samo v primeru, da na vašem računalniku že obstaja\n"
 "razdelek  zaGNU/Linux.\n"
 "\n"
 "Lahko izbirate med novo namestitvijo in med posodobitvijo obstoječega\n"
-"sistema Mandrivalinux.\n"
+"sistema Mandriva Linux.\n"
 "\n"
 " * \"%s\": S tem boste obstoječi sistem povsem odstranili. Če želite\n"
 "spremeniti razdelitev trdega diska ali datotečni sistem, izberite to\n"
@@ -5101,7 +5105,7 @@ msgstr ""
 "podobno kot pri običajni novi namestitvi.\n"
 "\n"
 "Možnost \"Posodobitev\" deluje, če imate nameščeno različico\n"
-"sistema Mandrivalinux  \"8.1\" ali novejšo. Posodobitve starejših\n"
+"sistema Mandriva Linux  \"8.1\" ali novejšo. Posodobitve starejših\n"
 "različic od \"8.1\" ne priporočamo."
 
 #: help.pm:591
@@ -5157,7 +5161,8 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -5436,7 +5441,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5457,11 +5462,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Izberite sistem za tiskanje. Drugi operacijski sistemi navadno nudijo\n"
-"en sistem, Mandrivalinux pa vam daje na izbiro dva.\n"
+"en sistem, Mandriva Linux pa vam daje na izbiro dva.\n"
 "Od obeh sistemov je vsak primeren za svojo vrsto namestitve.\n"
 "\n"
 " * \"%s\"--je kratica za ``print, do not queue\" (tiskaj, ne vnesi v čakalno "
@@ -5604,7 +5609,8 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5621,7 +5627,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5744,12 +5750,12 @@ msgstr "Storitve"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Izberite trdi disk, ki ga želite izbrisati, da bi dobili prostor za "
 "razdelek\n"
-"za Mandrivalinux.\n"
+"za Mandriva Linux.\n"
 "Vsi podatki na izbranem disku bodo izbrisani in jih ne bo mogoče\n"
 "obnoviti!"
 
@@ -6102,7 +6108,7 @@ msgstr "Preračunavam velikost razdelka za Okna (Windows)."
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "Vaš razdelek za Okna (Windows) je preveč razdrobljen. Poženite ``defrag'' v "
@@ -6219,13 +6225,13 @@ msgstr "Izklapljanje omrežja"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -6254,8 +6260,8 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by "
-"law, be liable for any special,\n"
+"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"
 "business, interruption of business, financial loss, legal fees and penalties "
@@ -6269,8 +6275,8 @@ msgid ""
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, "
-"in no circumstances, be \n"
+"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"
 "limitation damages for loss of business, interruption of business, financial "
@@ -6279,7 +6285,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6313,10 +6319,10 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software "
-"Products, as a whole or in \n"
+"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
+"as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6337,11 +6343,11 @@ msgid ""
 msgstr ""
 "PREDSTAVITEV\n"
 "\n"
-"Operacijski sistem in druge sestavine distribucije Mandrivalinux \n"
+"Operacijski sistem in druge sestavine distribucije Mandriva Linux \n"
 "bomo v nadaljnjem besedilu imenovali \"Programje\".  Programje vsebuje "
 "programe, metode, pravila in dokumentacijo, \n"
 "ki se nanašajo na operacijski sistem in na različne sestavine distribucije "
-"Mandrivalinux.\n"
+"Mandriva Linux.\n"
 "\n"
 "\n"
 "1. LICENČNA POGODBA\n"
@@ -6365,30 +6371,28 @@ msgstr ""
 "Programje in priložena dokumentacija sta na voljo v obliki, v kakršni sta, "
 "brez jamstva,\n"
 "ki presega z zakonom določeno odgovornost.\n"
-"Mandriva d.d. v nobenem primeru, razen kadar to izrecno določa pravni "
-"red,\n"
+"Mandriva d.d. v nobenem primeru, razen kadar to izrecno določa pravni red,\n"
 "ne prevzema odgovornosti za kakršnokoli naključno, posredno ali neposredno "
 "škodo,\n"
 "vključno s škodo zaradi izgube zaslužka, motenj v poslovanju, finančnih "
 "izgub, sodnih taks\n"
 "in izrečenih kazni ali drugih oblik posredne škode, ki bi nastala zaradi "
 "uporabe ali\n"
-"nezmožnosti uporabe programja, tudi če je bila Mandriva d.d. opozorjena "
-"na možnost nastanka takšne škode.\n"
+"nezmožnosti uporabe programja, tudi če je bila Mandriva d.d. opozorjena na "
+"možnost nastanka takšne škode.\n"
 "\n"
 "\n"
 "OMEJENA ODGOVORNOST ZA POSEDOVANJE ALI UPORABO PROGRAMJA, KI JE V NEKATERIH "
 "DRŽAVAH PREPOVEDANO\n"
 "\n"
-"Mandriva d.d. v nobenem primeru, razen kadar to izrecno določa pravni "
-"red,\n"
+"Mandriva d.d. v nobenem primeru, razen kadar to izrecno določa pravni red,\n"
 "ne prevzema odgovornosti za kakršnokoli naključno, posredno ali neposredno "
 "škodo,\n"
 "vključno s škodo zaradi izgube zaslužka, motenj v poslovanju, finančnih "
 "izgub, sodnih taks\n"
 "in izrečenih kazni ali drugih oblik posredne škode, ki bi nastala zaradi "
 "posedovanja\n"
-"ali uporabe programja oziroma zardi pridobivanja programja z Mandrivalinux "
+"ali uporabe programja oziroma zardi pridobivanja programja z Mandriva Linux "
 "spletnih strani,\n"
 "če je to v nasprotju z veljavnim pravnim redom države, v kateri bivate.\n"
 "Navedena omejitev odgovornosti se nanaša tudi, vendar ne izključno, na "
@@ -6425,10 +6429,10 @@ msgstr ""
 "Avtorske in druge pravice intelektualne lastnine, ki se nanašajo na "
 "programje, pripadaj avtorjem\n"
 " programja in so zaščitene z zakonom.\n"
-"Mandriva d.d. si pridržuje pravico do spreminjanja programja v celoti "
-"ali deloma\n"
+"Mandriva d.d. si pridržuje pravico do spreminjanja programja v celoti ali "
+"deloma\n"
 "v kakršnem koli smislu in za kakršen koli namen.\n"
-"\"Mandriva\", \"Mandrivalinux\" in pripadajoči logotipi so blagovne znamke "
+"\"Mandriva\", \"Mandriva Linux\" in pripadajoči logotipi so blagovne znamke "
 "Mandriva d.d.\n"
 "\n"
 "\n"
@@ -6536,8 +6540,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6545,7 +6549,7 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "Čestitamo!\n"
 "Uspešno ste dokončali namestitev.\n"
@@ -6557,14 +6561,14 @@ msgstr ""
 "\n"
 "\n"
 "Navodila za nastavljanje sistema po namestitvi boste našli v poglavju\n"
-"\"post install\" uradnih navodil za uporabnike. (Official Mandrivalinux "
+"\"post install\" uradnih navodil za uporabnike. (Official Mandriva Linux "
 "User's Guide)"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -6593,12 +6597,12 @@ msgstr "Pričenjam s korakom `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Vaš sistem ni dovolj zmogljiv. Lahko, da boste imeli pri namestitvi\n"
-"Mandrivalinux težave. V tem primeru lahko poskusite z namestitvijo v "
+"Mandriva Linux težave. V tem primeru lahko poskusite z namestitvijo v "
 "besedilnem načinu. \n"
 "Po zagonu z zgoščenke pritisnite `F1' in vpišite `text'."
 
@@ -7139,9 +7143,9 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
-"Vzpostavljam povezavo s spletno stranjo Mandrivalinux, in pridobivanje "
+"Vzpostavljam povezavo s spletno stranjo Mandriva Linux, in pridobivanje "
 "seznama dosegljivih strežnikov...."
 
 #: install_steps_interactive.pm:840
@@ -7369,8 +7373,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Namestitev Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Namestitev Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9959,7 +9963,7 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -11303,7 +11307,7 @@ msgid ""
 "work, you might want to relaunch the configuration."
 msgstr ""
 "Med nastavljanjem se je pojavila napaka.\n"
-"Preizkusite povezavo v Mandrivalinux nadzornem središču. Če povezava ne "
+"Preizkusite povezavo v Mandriva Linux nadzornem središču. Če povezava ne "
 "deluje, ponovno zaženite nastavitve."
 
 #: network/netconnect.pm:1537
@@ -14002,8 +14006,8 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
 "Zaženite Scannerdrake (Nastavite svoj računalnik/Stronja oprema/Nastavite "
@@ -15928,33 +15932,33 @@ msgstr "Ustavi"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Kaj je Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Kaj je Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Dobrodošli v <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Dobrodošli v <b>Mandriva Linux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
-"Mandrivalinux je <b>distribucija Linuxa</b>, ki združuje jedro, imenovano "
+"Mandriva Linux je <b>distribucija Linuxa</b>, ki združuje jedro, imenovano "
 "<b>operacijski sistem</b>, skupaj z <b>mnogimi programi</b>, ki vam služijo "
 "pri vsakodnevnih opravilih."
 
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mandrivalinux je trenutno <b>uporabniku najprijaznejša</b>distribucija "
+"Mandriva Linux je trenutno <b>uporabniku najprijaznejša</b>distribucija "
 "Linuxa.  Obenem je ena od <b>najbolj razširjenih</b> distribucij."
 
 #: share/advertising/02.pl:13
@@ -15970,14 +15974,14 @@ msgstr "Pozdravljeni v <b>svetu odprte kode</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"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 "
+"Mandriva Linux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's team "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
-"Mandrivalinux temelji na odprtokodnem modelu, kar pomeni, da je nova "
-"različica plod <b>sodelovanja</b> med <b>razvojnim oddelkom Mandrivaa</"
-"b> in <b>skupnostjo razvijalcev</b> z vsega sveta."
+"Mandriva Linux temelji na odprtokodnem modelu, kar pomeni, da je nova "
+"različica plod <b>sodelovanja</b> med <b>razvojnim oddelkom Mandrivaa</b> in "
+"<b>skupnostjo razvijalcev</b> z vsega sveta."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -15996,10 +16000,10 @@ msgstr "<b>GPL</b>"
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Večina programov, ki so del distribucije, in vsa orodja Mandrivalinuxa so "
+"Večina programov, ki so del distribucije, in vsa orodja Mandriva Linuxa so "
 "zajeta v <b>licenci GPL</b>"
 
 #: share/advertising/03.pl:17
@@ -16029,25 +16033,25 @@ msgstr "<b>Pridruži se skupnosti</b>"
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrivalinux world."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
-"Mandrivalinux ima eno <b>največjih skupnosti</b> uporabnikov in razvijalcev. "
-"Vloga te skupnosti je izjemno velika, saj sega od prijavljanja napak do "
-"razvoja novih programov. Skupnost igra <b>ključno vlogo</b> v svetu "
-"Mandrivalinuxa. "
+"Mandriva Linux ima eno <b>največjih skupnosti</b> uporabnikov in "
+"razvijalcev. Vloga te skupnosti je izjemno velika, saj sega od prijavljanja "
+"napak do razvoja novih programov. Skupnost igra <b>ključno vlogo</b> v svetu "
+"Mandriva Linuxa. "
 
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 "<b>Če bi radi izvedeli kaj več</<b> o naši skupnosti, obiščite <b>www."
-"mandrakelinux.com</b> ali neposredno <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> ali neposredno <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b>, če želite <b>sodelovati</b> pri razvoju. "
 
 #: share/advertising/05.pl:15
@@ -16058,10 +16062,10 @@ msgstr "<b>Različica Download</b>"
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
-"Trenutno se namešča <b>Mandrivalinux Download</b>. To je brezplačna "
+"Trenutno se namešča <b>Mandriva Linux Download</b>. To je brezplačna "
 "različica, ki jo želi Mandriva obdržati <b>prosto dostopno</b> vsakomur."
 
 #: share/advertising/05.pl:19
@@ -16105,8 +16109,8 @@ msgstr "<b>Discovery, vaše prvo Linux namizje</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Trenutno se namešča <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Trenutno se namešča <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16128,8 +16132,8 @@ msgstr "<b>PowerPack, najpopolnejše Linux namizje</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Trenutno se namešča <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Trenutno se namešča <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16149,8 +16153,8 @@ msgstr "<b>PowerPack+, Linux rešitve za namizja in strežnike</b> "
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Trenutno se namešča <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Trenutno se namešča <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16172,15 +16176,14 @@ msgstr "<b>Mandrivaovi izdelki</b>"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
-"products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
-"<b>Mandriva</b> je razvil široko paleto <b>Mandrivalinux</b> izdelkov."
+"<b>Mandriva</b> je razvil široko paleto <b>Mandriva Linux</b> izdelkov."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Izdelki Mandrivalinux:"
+msgid "The Mandriva Linux products are:"
+msgstr "Izdelki Mandriva Linux:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16200,10 +16203,10 @@ msgstr "\t* <b>PowerPack+</b>, Linux rešitev za namizja in strežnike."
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
-"\t* <b>Mandrivalinux za x86-64</b>, Mandrivalinuxova rešitev za 64-bitne "
+"\t* <b>Mandriva Linux za x86-64</b>, Mandriva Linuxova rešitev za 64-bitne "
 "procesorje."
 
 #: share/advertising/10.pl:15
@@ -16214,27 +16217,27 @@ msgstr "<b>Mandrivaovi izdelki</b>"
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Mandriva je razvil dva izdelka, ki omogočata uporabo Mandrivalinuxa "
-"<b>na kateremkoli računalniku</b> brez potrebe po namestitvi:"
+"Mandriva je razvil dva izdelka, ki omogočata uporabo Mandriva Linuxa <b>na "
+"kateremkoli računalniku</b> brez potrebe po namestitvi:"
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
-"\t* <b>Move</b>, distribucija Mandrivalinuxa, ki jo poženete s CD-ROM-a."
+"\t* <b>Move</b>, distribucija Mandriva Linuxa, ki jo poženete s CD-ROM-a."
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
-"\t* <b>GlobeTrotter</b>, distribucija Mandrivalinuxa, prednameščena na "
+"\t* <b>GlobeTrotter</b>, distribucija Mandriva Linuxa, prednameščena na "
 "zunanjem disku “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
@@ -16245,25 +16248,27 @@ msgstr "<b>Mandrivaovi izdelki (Profesionalne rešitve)</b>"
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandriva products designed to meet the <b>professional "
-"needs</b>:"
+"Below are the Mandriva products designed to meet the <b>professional needs</"
+"b>:"
 msgstr "Mandrivaovi izdelki, ki zadoščajo <b>profesionalnim potrebam</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
-"\t* <b>Corporate Desktop</b>, Mandrivalinux namizje, namenjeno podjetjem."
+"\t* <b>Corporate Desktop</b>, Mandriva Linux namizje, namenjeno podjetjem."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Mandrivalinux strežniške rešitve."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Mandriva Linux strežniške rešitve."
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
-msgstr "\t* <b>Multi-Network Firewall</b>, Mandrivalinux varnostne rešitve."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, Mandriva Linux varnostne rešitve."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16335,8 +16340,8 @@ msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
 "environment</b>. Mandriva has chosen <b>KDE</b> as the default one."
 msgstr ""
-"PowerPack+ omogoča izbiro <b>namizja</b>. Mandriva je kot privzeto "
-"izbral <b>KDE</b>. "
+"PowerPack+ omogoča izbiro <b>namizja</b>. Mandriva je kot privzeto izbral "
+"<b>KDE</b>. "
 
 #: share/advertising/14.pl:15
 #, c-format
@@ -16461,10 +16466,10 @@ msgstr "<b>Uživajte v široki paleti programov</b>"
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"V meniju Mandrivalinuxa boste našli programe <b>za vsa vaše potrebe</b>:"
+"V meniju Mandriva Linuxa boste našli programe <b>za vsa vaše potrebe</b>:"
 
 #: share/advertising/18.pl:16
 #, c-format
@@ -16716,17 +16721,17 @@ msgstr "\t* <b>Postfix</b> in <b>Sendmail</b>: zmogljiva mail strežnika."
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinuxov nadzorni center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linuxov nadzorni center</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"<b>Mandrivalinuxov nadzorni center</b> je zbirko nepogrešljivih programov, "
+"<b>Mandriva Linuxov nadzorni center</b> je zbirko nepogrešljivih programov, "
 "ki omogočajo upravljanje s sistemom."
 
 #: share/advertising/25.pl:17
@@ -16751,15 +16756,15 @@ msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
 "Mandriva sells added value products and services to <b>keep improving "
-"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrivalinux, <b>please</b> consider buying one of "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 "Kot vsako programiranje tudi odprta koda <b>zahteva čas in ljudi</b> za "
-"razvoj. S spoštovanjem do te filozofije Mandriva trži dodatno "
-"izpopolnjene izdelke in nenehno <b>izboljšuje Mandrivalinux.</b> Če "
-"<b>podpirate</b> filozofijo odprte kode in razvoj Mandrivalinuxa, premislite "
-"o nakupu naših izdelkov in storitev."
+"razvoj. S spoštovanjem do te filozofije Mandriva trži dodatno izpopolnjene "
+"izdelke in nenehno <b>izboljšuje Mandriva Linux.</b> Če <b>podpirate</b> "
+"filozofijo odprte kode in razvoj Mandriva Linuxa, premislite o nakupu naših "
+"izdelkov in storitev."
 
 #: share/advertising/27.pl:13
 #, c-format
@@ -16769,8 +16774,8 @@ msgstr "<b>Spletna prodajalna</b>"
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandriva products and services, you can visit our "
-"<b>e-commerce platform</b>."
+"To learn more about Mandriva products and services, you can visit our <b>e-"
+"commerce platform</b>."
 msgstr ""
 "Če želite izvedeti več o Mandrivaovih izdelkih obiščite našo <b>spletno "
 "prodajalno</b>."
@@ -16791,8 +16796,8 @@ msgstr "Nadgradnja spletne prodajalne je povečala učinkovitost in uporabnost."
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Še danes obiščite <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Še danes obiščite <b>store.mandriva.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -16802,9 +16807,9 @@ msgstr "<b>Mandriva Club</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
-msgstr "<b>Mandriva Club</b> je <b>dopolnitev</b> vašega Mandrivalinuxa."
+msgstr "<b>Mandriva Club</b> je <b>dopolnitev</b> vašega Mandriva Linuxa."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -16816,10 +16821,10 @@ msgstr "Izkoristite <b>prednosti</b>, ki vam jih nudi Mandriva Club:"
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 "\t* <b>Popusti</b> na izdelke in storitve v spletni prodajalni <b>store."
-"mandrakesoft.com</b>."
+"mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -16831,16 +16836,16 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Sodelovanje v Mandrivalinuxovih <b>uporabniških forumih</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Sodelovanje v Mandriva Linuxovih <b>uporabniških forumih</b>."
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
-"\t* <b>Predčasen dostop</b> do Mandrivalinuxovih ISO datotek, še pred "
+"\t* <b>Predčasen dostop</b> do Mandriva Linuxovih ISO datotek, še pred "
 "uradnim izidom."
 
 #: share/advertising/29.pl:13
@@ -16853,16 +16858,17 @@ msgstr "<b>Mandriva Online</b>"
 msgid ""
 "<b>Mandriva Online</b> is a new premium service that Mandriva is proud to "
 "offer its customers!"
-msgstr "<b>Mandriva Online</b> je nova storitev, ki jo ponujamo našim strankam."
+msgstr ""
+"<b>Mandriva Online</b> je nova storitev, ki jo ponujamo našim strankam."
 
 #: share/advertising/29.pl:17
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 "Mandriva Online nudi vrsto storitev za <b>preprosto nadgradnjo</b> vašega "
-"Mandrivalinux sistema"
+"Mandriva Linux sistema"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -16886,10 +16892,10 @@ msgstr "\t* <b>Hitri</b> popravki."
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
-"\t* Upravljanje <b>vseh vaših Mandrivalinux sistemov</b> z enim uporabniškim "
-"imenom."
+"\t* Upravljanje <b>vseh vaših Mandriva Linux sistemov</b> z enim "
+"uporabniškim imenom."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -16900,28 +16906,28 @@ msgstr "<b>Mandriva Expert</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 "Potrebujete <b>pomoč</b>? Obrnite se na naše strokovnjake na www."
-"mandrakeexpert.com."
+"mandrivaexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"S pomočjo strokovnjakov v <b>Mandrivalinux experts</b> boste prihranili "
+"S pomočjo strokovnjakov v <b>Mandriva Linux experts</b> boste prihranili "
 "veliko časa."
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
-"Za vsa vprašanja o Mandrivalinuxu vam je na voljo plačljiva podpore na "
-"<b>store.mandrakesoft.com</b>."
+"Za vsa vprašanja o Mandriva Linuxu vam je na voljo plačljiva podpore na "
+"<b>store.mandriva.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -17306,15 +17312,15 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 "[MOŽNOSTI] [IME_PROGRAMA]\n"
 "\n"
 "MOŽNOSTI:\n"
 "  --help            - izpiši to sporočilo za pomoč.\n"
-"  --report          - program mora biti eno izmed mandrakelinuxovih orodij\n"
-"  --incident        - program mora biti eno izmed mandrakelinuxovih orodij"
+"  --report          - program mora biti eno izmed Mandriva Linuxovih orodij\n"
+"  --incident        - program mora biti eno izmed Mandriva Linuxovih orodij"
 
 #: standalone.pm:63
 #, c-format
@@ -17368,7 +17374,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17382,7 +17388,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[MOŽNOSTI]...\n"
-"Nastavitev terminalskega strežnika Mandrivalinux\n"
+"Nastavitev terminalskega strežnika Mandriva Linux\n"
 "--enable         : omogoči MTS\n"
 "--disable        : onemogoči MTS\n"
 "--start          : poženi MTS\n"
@@ -17442,15 +17448,16 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 #, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      do not ask first confirmation question in "
-"Mandriva Update mode\n"
+"  --no-confirmation      do not ask first confirmation question in 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 ""
 "[MOŽNOST]...\n"
-"  --no-confirmation      v Mandriva Update načinu ne zahtevaj prve potrditve\n"
+"  --no-confirmation      v Mandriva Update načinu ne zahtevaj prve "
+"potrditve\n"
 "  --no-verify-rpm        brez preverjanja podpisov paketov\n"
 "  --changelog-first      v oknu z opisom najprej prikaži dnevnik sprememb\n"
 "  --merge-all-rpmnew     predlog za združitev vseh najdenih datotek ."
@@ -20221,13 +20228,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinuxovo orodje za poročanje o hroščih"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linuxovo orodje za poročanje o hroščih"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Nadzorno središče Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Nadzorno središče Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20718,19 +20725,19 @@ msgstr "Vključeno ob zagonu"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Ta omrežna naprava še ni nastavljena.\n"
-"Zaženite \"Dodaj omrežno napravo\" v Mandrivalinux nadzornem središču"
+"Zaženite \"Dodaj omrežno napravo\" v Mandriva Linux nadzornem središču"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Nobena internetna povezava ni nastavljena.\n"
-"Zaženite \"%s\" v Mandrivalinux nadzornem središču"
+"Zaženite \"%s\" v Mandriva Linux nadzornem središču"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -20780,8 +20787,8 @@ msgstr "KDM (Upravitelj prikazovalnika KDE)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Upravitelj prikazovalnika Mandrivalinux)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Upravitelj prikazovalnika Mandriva Linux)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21085,18 +21092,18 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 "Avtorske pravice (C) 2001-2002 Mandriva. \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (originalna različica)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 
 #: standalone/drakfont:520
 #, c-format
@@ -21671,8 +21678,8 @@ msgstr " --doc <link>          - povezava na drugo spletno stran\n"
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrivalinuxovo središče za pomoč"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Linuxovo središče za pomoč"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22333,7 +22340,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "Ne zaznam zvočne kartice. Preverite, če imate zvočno kartico, ki jo Linux "
 "podpira in če je pravilno priključena.\n"
@@ -22342,7 +22349,7 @@ msgstr ""
 "Seznam podprte strojne opreme je dosegljiv na:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24357,7 +24364,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "Na vašem računalniku ni bila zaznana TV kartica. Prosimo preverite da je v "
 "Linuxu podprta TV kartica pravilno vstavljena.\n"
@@ -24366,7 +24373,7 @@ msgstr ""
 "Lahko obiščete bazo podprte strojne opreme na:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25080,13 +25087,13 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
 "To je HardDrake, %s orodje za nastavljanje strojne opreme.\n"
 "<span foreground=\"royalblue3\">Različica:</span> %s\n"
 "<span foreground=\"royalblue3\">Avtor:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25195,8 +25202,8 @@ msgstr "Da bi uveljavili spremembe, se morate odjaviti."
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Logi mandrakelinuxovih orodij"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Logi Mandriva Linuxovih orodij"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25710,10 +25717,10 @@ msgstr "Povezovanje je opravljeno."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Povezavanje je spodletelo.\n"
-"Preverite nastavitve v Nadzornem središču Mandrivalinux "
+"Preverite nastavitve v Nadzornem središču Mandriva Linux "
 
 #: standalone/net_monitor:341
 #, c-format