various Mandrake -> Mandriva changes

1 files changed, 324 insertions, 315 deletions

diff --git a/perl-install/share/po/tl.po b/perl-install/share/po/tl.po
index 8d4b594b1..b072a6da8 100644
--- a/perl-install/share/po/tl.po
+++ b/perl-install/share/po/tl.po
@@ -99,7 +99,7 @@ msgstr ""
 "\n"
 "\n"
 "Maaari rin kayong magpatuloy na walang USB key - magagamit ninyo\n"
-"pa rin ang Mandriva Move bilang isang normal na \"live\" Mandrake\n"
+"pa rin ang Mandriva Move bilang isang normal na \"live\" Mandriva\n"
 "Operating System."
 
 #: ../move/move.pm:483
@@ -128,7 +128,7 @@ msgstr ""
 "\n"
 "Maaari rin kayong magpatuloy na walang USB key - magagamit \n"
 "ninyo pa rin ang Mandriva Move bilang isang normal na \"live\"\n"
-"Mandrake Operating System."
+"Mandriva Operating System."
 
 #: ../move/move.pm:494
 #, c-format
@@ -1310,11 +1310,11 @@ msgstr "Mano-manong pili"
 #: 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 ""
-"Kaya ng Mandrivalinux na sumuporta sa maraming wika. Piliin\n"
+"Kaya ng Mandriva Linux na sumuporta sa maraming wika. Piliin\n"
 "ang mga wika na nais ninyong i-install. Sila ay mapapakinabangan\n"
 "kung natapos na ang inyong installation at ni-restart ang inyong sistema."
 
@@ -3744,12 +3744,12 @@ msgstr "Paganahin ang suporta sa radyo"
 #, 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 ""
 "Bago magpatuloy, kailangang basahin ninyong mabuti ang mga nasasaad sa\n"
-"lisensiya. Tinutukoy nito ang kabuoang distribusyon ng Mandrivalinux. Kung\n"
+"lisensiya. Tinutukoy nito ang kabuoang distribusyon ng Mandriva Linux. Kung\n"
 "kayo ay sumasang-ayon sa lahat ng nasasaad, i-check ang \"%s\" na box.\n"
 "Kung hindi, i-click ang \"%s\" na button para i-reboot ang inyong computer."
 
@@ -3953,13 +3953,13 @@ msgstr ""
 #: help.pm:85
 #, fuzzy, c-format
 msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Ang installation ng Mandrivalinux ay nakahati sa ilang mga CD-ROM.\n"
+"Ang installation ng Mandriva Linux ay nakahati sa ilang mga CD-ROM.\n"
 "Kung ang napiling package ay nakalagay sa ibang CD-ROM, iluluwa ng DrakX\n"
 "ang kasalukuyang CD at ipapasuksok sa inyo ang tamang CD."
 
@@ -3967,11 +3967,12 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -4024,11 +4025,11 @@ msgid ""
 msgstr ""
 "Panahon na para piliin kung aling mga program ang nais ninyong i-install sa\n"
 "inyong sistema. Mayroong libo-libong mga package na available para sa\n"
-"Mandrivalinux, at upang mas madali itong pangasiwaan, ang mga package\n"
+"Mandriva Linux, at upang mas madali itong pangasiwaan, ang mga package\n"
 "ay inayos sa mga pangkat ng magkakatulad na mga application.\n"
 "\n"
 "Ang mga package ay inayos sa mga pangkat na batay sa paggamit ng\n"
-"inyong makina. Inaayos ng Mandrivalinux ang mga pangkat ng mga\n"
+"inyong makina. Inaayos ng Mandriva Linux ang mga pangkat ng mga\n"
 "package sa apat na kategoriya. Maaari ninyong paghaluhaluin at\n"
 "pagbagaybagayin ang mga application mula sa sari-saring kategoriya,\n"
 "para ang installation na ``Workstation'' ay maaari pa ring maka-install\n"
@@ -4137,10 +4138,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"
@@ -4173,11 +4174,11 @@ msgstr ""
 "!! Kung ang isang package ng server ay napili, dahil kayo ay pumili ng\n"
 "bukod na package o kaya iyon ay bahagi ng isang pangkat ng mga package,\n"
 "kayo ay tatanungin kung gusto ninyo talagang i-install ang mga server na\n"
-"iyon. Bilang default, sisimulan kaagad ng Mandrivalinux pag-boot ang kahit\n"
+"iyon. Bilang default, sisimulan kaagad ng Mandriva Linux pag-boot ang kahit\n"
 "anong na-install na mga service. Kahit na sila ay ligtas at walang kilalang "
 "mga\n"
 "issue nang mailabas ang distribusyon, maaring matuklasan na may butas sa\n"
-"seguridad pagkatapos matapos ang version ng Mandrivalinux na ito. Kung\n"
+"seguridad pagkatapos matapos ang version ng Mandriva Linux na ito. Kung\n"
 "hindi ninyo nalalaman ang ginagawa ng isang service o bakit ito ini-"
 "install,\n"
 "i-click ang \"%s\". Ang pagki-click sa \"%s\" ay mag-i-install ng mga "
@@ -4346,7 +4347,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"
@@ -4402,7 +4403,7 @@ msgid ""
 msgstr ""
 "X (para sa \"X Window System\") ay ang puso ng \"graphical interface\"\n"
 "ng GNU/Linux na kung saan lahat ng mga \"graphical environment\" (KDE,\n"
-"GNOME, AfterStep, WindowMaker, atbp.) na kasama sa Mandrivalinux ay\n"
+"GNOME, AfterStep, WindowMaker, atbp.) na kasama sa Mandriva Linux ay\n"
 "nakaasa.\n"
 "\n"
 "Ihaharap sa inyo ang isang talaan ng iba-ibang mga parameter na babaguhin\n"
@@ -4529,12 +4530,12 @@ msgstr ""
 #: help.pm:316
 #, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4561,7 +4562,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"
@@ -4570,7 +4571,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"
@@ -4591,13 +4593,13 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Sa puntong ito, kailangan ninyong magpasya kung saan ninyo nais i-install\n"
-"ang Mandrivalinux na \"operating system\" (OS) sa inyong \"hard drive\".\n"
+"ang Mandriva Linux na \"operating system\" (OS) sa inyong \"hard drive\".\n"
 "Kung ang inyong \"hard drive\" ay walang laman o kung may namamalaging\n"
 "\"operating system\" na gumagamit sa lahat ng available na puwang,\n"
 "kakailanganin ninyong ipartisyon ang drive. Ang pagpapartisyon ng isang\n"
 "\"hard drive\" ay ginagawa sa pamamagitan ng paghahati-hati nito sa\n"
 "kaisipan (\"logical\") upang makagawa ng puwang na kinakailangan para\n"
-"ma-install ang inyong bagong sistema ng Mandrivalinux.\n"
+"ma-install ang inyong bagong sistema ng Mandriva Linux.\n"
 "\n"
 "Dahil kadalasan na hindi na mababawi ang paraan ng pagpapartisyon ng\n"
 "hard drive at maaaring magdulot ng pagkawala ng data  kung mayroon\n"
@@ -4633,7 +4635,7 @@ msgstr ""
 "walang mawawalang data, kung dati na ninyong na-defragment ang partisyon\n"
 "ng Windows. Matinding itinatagubilin na i-backup ang inyong data. Ang\n"
 "paggamit sa option na ito ay ipinapayo kung nais ninyong gamitin pareho ang\n"
-"Mandrivalinux at Microsoft Windows sa iisang computer.\n"
+"Mandriva Linux at Microsoft Windows sa iisang computer.\n"
 "\n"
 "   Bago piliin ang option na ito, pakiunawa na pagkatapos ng paraang ito,\n"
 "ang laki ng partisyon ng inyong Microsoft Windows ay magiging mas\n"
@@ -4643,7 +4645,7 @@ msgstr ""
 "\n"
 " * \"%s\": kung gusto ninyong tanggalin lahat ng data at mga partisyon\n"
 "na mayroon sa inyong hard drive at palitan sila ng inyong bagong sistema\n"
-"ng Mandrivalinux, piliin ang option na ito. Maging maingat, dahil hindi na\n"
+"ng Mandriva Linux, piliin ang option na ito. Maging maingat, dahil hindi na\n"
 "ninyo maaaring bawiin ang inyong pili matapos ninyong patotohanan ito.\n"
 "\n"
 "   !! kung pipiliin ninyo ang option na ito, lahat ng data sa inyong disk "
@@ -4809,7 +4811,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."
@@ -4835,7 +4837,7 @@ msgstr ""
 "I-click ang \"%s\" kung handa na kayong i-format ang mga partisyon.\n"
 "\n"
 "I-click ang \"%s\" kung gusto ninyong pumili ng ibang partisyon para sa\n"
-"inyong pag-i-install ng bagong Mandrivalinux na \"operating system\".\n"
+"inyong pag-i-install ng bagong Mandriva Linux na \"operating system\".\n"
 "\n"
 "I-click ang \"%s\" kung nais ninyong piliin ang mga partisyon na susuriin\n"
 "para sa mga \"bad blocks\" (mga sirang bloke) sa disk."
@@ -4852,7 +4854,7 @@ msgstr "Nakaraan"
 #: help.pm:434
 #, fuzzy, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4864,7 +4866,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Pagdating ng panahon na kayo ay nag-i-install ng Mandrivalinux, mas\n"
+"Pagdating ng panahon na kayo ay nag-i-install ng Mandriva Linux, mas\n"
 "malamang na ilang mga package ay nabago na simula nang naunang\n"
 "paglabas. Maaaring inayos ang mga sira (\"bug\"), naresolba ang mga tanong\n"
 "sa sequridad. Para pakinabangan ang mga update (pagbabago) na ito ,\n"
@@ -4895,7 +4897,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"
@@ -4909,7 +4911,7 @@ msgstr ""
 "\n"
 "Kung hindi ninyo alam ang pipiliin, manatili sa default na option. Maaari\n"
 "ninyong baguhin ang level ng seguridad mamaya gamit ang draksec\n"
-"na kasangkapan mula sa Mandrake Control Center.\n"
+"na kasangkapan mula sa Mandriva Control Center.\n"
 "\n"
 "Ang \"%s\" na field ay magbibigay kaalaman sa sistema kung sinong \"user\"\n"
 "o gumagamit ng computer na ito ang siyang mananagot para sa seguridad.\n"
@@ -4924,7 +4926,7 @@ msgstr "Tagapamala ng Seguridad"
 #, 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"
@@ -4995,7 +4997,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Sa puntong ito, kailangan ninyong piliin kung aling mga partisyon ang\n"
-"gagamitin para sa pag-i-install ng sistema na Mandrivalinux. Kung ang\n"
+"gagamitin para sa pag-i-install ng sistema na Mandriva Linux. Kung ang\n"
 "mga partisyon ay nai-define na, mula sa dating pag-i-install ng GNU/Linux\n"
 "o ng ibang kasangkapang pangpartisyon, maaari ninyong gamiting ang\n"
 "mga mayroon nang partisyon. Kung hindi, dapat mag-define ng mga\n"
@@ -5094,7 +5096,7 @@ msgstr "Lipat sa normal o bihasang mode"
 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"
@@ -5125,7 +5127,7 @@ msgstr ""
 "Mahigit sa isang partisyon ng Microsoft ang natiktikan sa inyong hard "
 "drive.\n"
 "Pakipili kung alin ang gusto ninyong i-resize para ma-install ang inyong\n"
-"bagong \"operating sytem\" na Mandrivalinux.\n"
+"bagong \"operating sytem\" na Mandriva Linux.\n"
 "\n"
 "Bawat partition ay nakalista ng ganito: \"Pangalan ng Linux\",\n"
 "\"Pangalan ng Windows\", \"Capacity\".\n"
@@ -5180,7 +5182,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"
@@ -5189,19 +5191,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 ""
 "Ang hakbang na ito pagaganahin lamang kung mayroong nakitang\n"
 "partisyon ng GNU/Linux sa inyong makina.\n"
 "\n"
 "Kailangang malaman ngayon ng DrakX kung gusto ninyong magsagawa\n"
-"ng bagong install o upgrade ng namamalaging Mandrivalinux na sistema:\n"
+"ng bagong install o upgrade ng namamalaging Mandriva Linux na sistema:\n"
 "\n"
 " * \"%s\": Para sa karamihang bahagi, ganap na binubura nito ang lumang\n"
 "sistema. Kung nais ninyong baguhin kung paano ang pagpartisyon sa inyong\n"
@@ -5212,13 +5215,13 @@ msgstr ""
 " * \"%s\": ang klase ng pag-i-install na ito ay pahihintulutan kayong i-"
 "update\n"
 "ang mga package na kasalukuyang naka-install sa inyong sistema ng\n"
-"Mandrivalinux. Ang inyong kasalukuyang pakana ng pagpapartisyon at\n"
+"Mandriva Linux. Ang inyong kasalukuyang pakana ng pagpapartisyon at\n"
 "data ng gumagamit ay hindi nabago. Karamihan ng ibang mga hakbang sa\n"
 "pagko-configure ay mayroon pa rin, katulad ng standard na pag-i-install.\n"
 "\n"
 "Ang paggamit sa ``Upgrade'' na option ay gagana ng mabuti sa mga sistema\n"
-"ng Mandrivalinux na nagpapatakbo ng version \"8.1\" o pataas. Ang\n"
-"pagsasagawa ng upgrade sa mga version bago ng Mandrivalinux \"8.1\" ay\n"
+"ng Mandriva Linux na nagpapatakbo ng version \"8.1\" o pataas. Ang\n"
+"pagsasagawa ng upgrade sa mga version bago ng Mandriva Linux \"8.1\" ay\n"
 "hindi ipinapayo."
 
 #: help.pm:591
@@ -5279,7 +5282,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"
@@ -5321,7 +5325,7 @@ msgstr ""
 "Tungkol sa suporta sa UTF-8 (unicode): Ang Unicode ay isang bagong\n"
 "\"character encoding\" na nagnanais masakop ang lahat ng namamalaging\n"
 "wika. Ang buong suporta dita ng GNU/Linux ay ginagawa pa rin. Sa dahilang\n"
-"ito, gagamitin ito o hindi ng Mandrivalinux depende sa mga pili ng mga\n"
+"ito, gagamitin ito o hindi ng Mandriva Linux depende sa mga pili ng mga\n"
 "gumagamit:\n"
 "\n"
 " * Kung kayo ay pipili ng wika na may malakas na \"legacy encoding"
@@ -5585,7 +5589,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5606,12 +5610,12 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Panahon na upang pumili ng sistema ng pagpi-print para sa inyong computer.\n"
 "Ang ibang mga \"operating system\" (OS) ay mag-aalok lamang ng isa, pero\n"
-"ang Mandrivalinux ay nag-aalok ng dalawa. Bawat isa sa dalawang sistema\n"
+"ang Mandriva Linux ay nag-aalok ng dalawa. Bawat isa sa dalawang sistema\n"
 "ng pagpi-print na ito ay nababagay sa natatanging uri ng configuration.\n"
 "\n"
 " * \"%s\" -- na acronym para sa ``print, do not queue'', ang piliin kung "
@@ -5641,7 +5645,7 @@ msgstr ""
 "Kung kayo ay pipili na ngayon, at mamaya ay makita ninyo na hindi ninyo "
 "gusto\n"
 "ang inyong sistema ng pagpi-print maaari ninyo itong baguhin sa pamamagitan\n"
-"ng pagpapatakbo ng PrinterDrake mula sa Mandrake Control Center at\n"
+"ng pagpapatakbo ng PrinterDrake mula sa Mandriva Control Center at\n"
 "pagki-click sa bihasa (\"expert\") na pindutan."
 
 #: help.pm:765
@@ -5763,7 +5767,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"
@@ -5780,7 +5785,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"
@@ -5918,11 +5923,11 @@ msgstr "Mga serbisyo"
 #, 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 ""
 "Piliin ang hard drive na inyong gustong burahin upang ma-install ang\n"
-"inyong bagong Mandrivalinux na partisyon. Mag-ingat, lahat ng data\n"
+"inyong bagong Mandriva Linux na partisyon. Mag-ingat, lahat ng data\n"
 "sa drive na ito ay mawawala at hindi na ito mababawi!"
 
 #: help.pm:863
@@ -6275,12 +6280,12 @@ msgstr "Kino-compute ang laki ng partisyon ng 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 ""
 "Ang inyong partisyon ng Windows ay sobrang fragmented. Paki-reboot ang "
 "inyong computer sa Windows, patakbuhin ang ``defrag'', at simulan ulit ang "
-"pag-i-install ng Mandrivalinux."
+"pag-i-install ng Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6397,13 +6402,13 @@ msgstr "Ginagawang \"down\" ang network"
 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"
@@ -6432,8 +6437,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 "
@@ -6447,8 +6452,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 "
@@ -6457,7 +6462,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"
@@ -6491,10 +6496,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"
@@ -6516,22 +6521,22 @@ msgstr ""
 "Pagpapakilala\n"
 "\n"
 "Ang \"operating system\" (OS) at ang mga iba't-ibang bahagi na available sa "
-"distribusyon ng Mandrivalinux\n"
+"distribusyon ng Mandriva Linux\n"
 "ay tatawaging \"Software Products\" magmula ngayon. Ang mga Software "
 "Products ay\n"
 "nagsasama ng, pero hindi limitado dito, mga kumpol ng mga program, paraan, "
 "pamamalakad\n"
 "at dokumentasyon na may kaugnayan sa \"operating system\" at iba't-ibang mga "
 "bahagi ng\n"
-"distribusyon ng Mandrivalinux.\n"
+"distribusyon ng Mandriva Linux.\n"
 "\n"
 "\n"
 "1. Kasunduang Lisensiya\n"
 "\n"
 "Pakibasa ng mabuti ang dokumentong ito. Ang dokumentong ito ay kasunduan na "
 "lisensiya\n"
-"sa pagitan ninyo at ng Mandriva S.A. na sumasakod sa \"Software Products"
-"\". Sa\n"
+"sa pagitan ninyo at ng Mandriva S.A. na sumasakod sa \"Software Products\". "
+"Sa\n"
 "pag-i-install, pagkokopya o paggagamit ng Software Products sa ano mang "
 "paraan, kayo\n"
 "ay malinaw na tumatanggap at sumasang-ayon na sumunod sa mga nasasaad at "
@@ -6567,8 +6572,8 @@ msgstr ""
 "bunga ng hatol ng\n"
 "hukuman, o kahit ano pang ibang kakalabasang kawalan) na gawa ng paggamit ng "
 "o hindi magamit ang\n"
-"Software Products, kahit na napayuhan ang Mandriva S.A. ng ikapangyayari "
-"o pangyayari ng gayong\n"
+"Software Products, kahit na napayuhan ang Mandriva S.A. ng ikapangyayari o "
+"pangyayari ng gayong\n"
 "mga kapinsalaan.\n"
 "\n"
 "MAY HANGGAHANG PANANAGUTAN KAUGNAY SA PAGHAHAWAK O PAGGAGAMIT NG "
@@ -6587,7 +6592,7 @@ msgstr ""
 "at paggamit ng mga\n"
 "software component o gawa ng  pagda-download ng mga software component mula "
 "sa isa sa mga site ng\n"
-"Mandrivalinux  na ipinagbabawal ng batas sa mga ibang bansa ng mga local na "
+"Mandriva Linux  na ipinagbabawal ng batas sa mga ibang bansa ng mga local na "
 "batas. Itong may\n"
 "hanggahang pananagutan ay sumasakop, pero hindi lamang dito, sa mga strong "
 "cryptography component\n"
@@ -6624,11 +6629,11 @@ msgstr ""
 "kani-kanilang mga\n"
 "autor at protektado by mga batas ng intellectual property at copyright na "
 "nagagamit sa mga software\n"
-"program. Inilalaan ng Mandriva S.A. ang mga karapatan nito na baguhin o "
-"i-adapt ang mga Software\n"
+"program. Inilalaan ng Mandriva S.A. ang mga karapatan nito na baguhin o i-"
+"adapt ang mga Software\n"
 "Products, sa kabuuan o bahagi, sa lahat ng paraan at para sa lahat ng "
 "layunin.\n"
-"Ang \"Mandriva\", \"Mandrivalinux\" at mga kasamahang logo ay mga trademark "
+"Ang \"Mandriva\", \"Mandriva Linux\" at mga kasamahang logo ay mga trademark "
 "ng Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6645,8 +6650,8 @@ msgstr ""
 "sa labas ng hukuman. Bilang\n"
 "huling gagawin, ang pagtatalo ay isasangguni sa mga naaangkop na mga Hukuman "
 "ng Batas ng Paris - France.\n"
-"Para sa kahit anong katanungan sa dokumentong ito, makipag-alam sa "
-"Mandriva S.A.  \n"
+"Para sa kahit anong katanungan sa dokumentong ito, makipag-alam sa Mandriva "
+"S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6739,8 +6744,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"
@@ -6748,14 +6753,14 @@ 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 ""
 "Maligayang bati, tapos na ang pag-i-install.\n"
 "Tanggalin ang boot media at pindutin ang return para mag-boot ulit.\n"
 "\n"
 "\n"
-"Para sa inpormasyon sa mga fixes na available para sa labas ng "
-"Mandrivalinux\n"
+"Para sa inpormasyon sa mga fixes na available para sa labas ng Mandriva "
+"Linux\n"
 "na ito, konsultahin ang Errata na available mula sa:\n"
 "\n"
 "\n"
@@ -6763,15 +6768,15 @@ msgstr ""
 "\n"
 "\n"
 "Inpormasyon sa pagko-configure ng inyong sistema ay available sa kabanata\n"
-"tungkol sa \"post install\" (pagkatapos mag-install) sa \"Official Mandrake "
+"tungkol sa \"post install\" (pagkatapos mag-install) sa \"Official Mandriva "
 "Linux\n"
 "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
@@ -6800,12 +6805,12 @@ msgstr "Pumpasok sa hakbang na `%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 ""
 "Ang inyong sistema mababa sa kakayahan. Maaari kayong magkaproblema\n"
-"sa pag-install ng Mandrivalinux. Kung mangyari ito, maaari ninyong subukan\n"
+"sa pag-install ng Mandriva Linux. Kung mangyari ito, maaari ninyong subukan\n"
 "ang \"text install\". Para dito, pindutin ang `F1' kapag nagbo-boot sa "
 "CDROM,\n"
 "at ipasok ang `text'."
@@ -7347,9 +7352,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 ""
-"Nakikipag-alam sa web site ng Mandrivalinux para makuha ang talaan ng mga "
+"Nakikipag-alam sa web site ng Mandriva Linux para makuha ang talaan ng mga "
 "available na mirror..."
 
 #: install_steps_interactive.pm:840
@@ -7578,8 +7583,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Pag-install ng Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Pag-install ng Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10170,14 +10175,14 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall configurator\n"
 "\n"
 "Ito ay nagko-configure ng personal na firewall para sa makinang ito ng\n"
-"Mandrivalinux. Para sa mas makapangyarihan at dedicated na solusyon\n"
+"Mandriva Linux. Para sa mas makapangyarihan at dedicated na solusyon\n"
 "ng firewall, pakitingnan ang pinatanging distribusyon na MandrakeSecurity\n"
 "Firewall."
 
@@ -14232,8 +14237,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 ""
 
@@ -16185,18 +16190,18 @@ msgstr "Hinto"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Ano ang Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Ano ang Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Maligayang pagdating sa <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Maligayang pagdating sa <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."
@@ -16205,18 +16210,18 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, fuzzy, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Ang Mandrivalinux ay isang Open Source na distribusyon na binubuo ng libo-"
+"Ang Mandriva Linux ay isang Open Source na distribusyon na binubuo ng libo-"
 "libong mga piling-pili na application mula sa mundo ng Libreng Software "
-"(Free Software). Ang Mandrivalinux ay isa sa mga pinaka ginagamit na "
+"(Free Software). Ang Mandriva Linux ay isa sa mga pinaka ginagamit na "
 "distribusyon ng Linux sa buong mundo!"
 
 #: share/advertising/02.pl:13
 #, fuzzy, c-format
 msgid "<b>Open Source</b>"
-msgstr "<b>MandrakeStore</b>"
+msgstr "<b>Mandriva Store</b>"
 
 #: share/advertising/02.pl:15
 #, fuzzy, c-format
@@ -16226,15 +16231,15 @@ msgstr "Maligayang pagdating sa mundo ng Open Source!"
 #: share/advertising/02.pl:17
 #, fuzzy, 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 ""
-"Ang Mandrivalinux ay committed sa Open Source na Model at buo ang paggalang "
+"Ang Mandriva Linux ay committed sa Open Source na Model at buo ang paggalang "
 "sa General Public License. Itong bagong release ay bunga ng bayanihan ng mga "
-"pangkat ng developer ng Mandriva at ng buong mundong komunidad ng mga "
-"taga-ambag sa Mandrivalinux."
+"pangkat ng developer ng Mandriva at ng buong mundong komunidad ng mga taga-"
+"ambag sa Mandriva Linux."
 
 #: share/advertising/02.pl:19
 #, fuzzy, c-format
@@ -16253,8 +16258,8 @@ msgstr "<b>Tandaan</b>"
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -16275,34 +16280,34 @@ msgstr ""
 #: share/advertising/04.pl:13
 #, fuzzy, c-format
 msgid "<b>Join the Community</b>"
-msgstr "<b>Sumali na sa komunidad ng Mandrivalinux!</b>"
+msgstr "<b>Sumali na sa komunidad ng Mandriva Linux!</b>"
 
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrivalinux world."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 
 #: share/advertising/05.pl:15
 #, fuzzy, c-format
 msgid "<b>Download Version</b>"
-msgstr "Ito ang Mandrivalinux <b>Download version</b>."
+msgstr "Ito ang Mandriva Linux <b>Download version</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 ""
 
@@ -16340,7 +16345,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -16363,7 +16368,7 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
@@ -16373,10 +16378,10 @@ msgid ""
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"Ang PowerPack ay ang premier na produktong Linux desktop ng Mandriva. "
-"Bukod sa pagiging pinakamadali at pinaka user-friendly na distribusyon ng "
-"Linux, ang PowerPack ay nagsasama ng libo-libong mga application - lahat "
-"mula sa pinakatanyag sa pinakateknikal."
+"Ang PowerPack ay ang premier na produktong Linux desktop ng Mandriva. Bukod "
+"sa pagiging pinakamadali at pinaka user-friendly na distribusyon ng Linux, "
+"ang PowerPack ay nagsasama ng libo-libong mga application - lahat mula sa "
+"pinakatanyag sa pinakateknikal."
 
 #: share/advertising/08.pl:13
 #, c-format
@@ -16385,7 +16390,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -16409,14 +16414,13 @@ msgstr "<b>Mandriva Store</b>"
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
-"products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, fuzzy, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Mandrivalinux Updates Applet"
+msgid "The Mandriva Linux products are:"
+msgstr "Mandriva Linux Updates Applet"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16436,7 +16440,7 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
@@ -16448,21 +16452,21 @@ msgstr ""
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
@@ -16474,23 +16478,25 @@ msgstr "Alamin ang tungkol sa aming <b>Personal Solutions</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 ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -16669,11 +16675,11 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, fuzzy, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Sa Mandrivalinux menu makakakita kayo ng mga madaling gamitin na application "
-"para sa lahat ng inyong gawain:"
+"Sa Mandriva Linux menu makakakita kayo ng mga madaling gamitin na "
+"application para sa lahat ng inyong gawain:"
 
 #: share/advertising/18.pl:16
 #, c-format
@@ -16923,18 +16929,18 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux Control Center</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux Control Center</b>"
 
 #: share/advertising/25.pl:15
 #, fuzzy, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"Ang Mandrivalinux Control Center ay kinakailangang koleksyon ng mga "
-"kagamitang pang Mandrake lamang para maging simple ang pagco-configure ng "
+"Ang Mandriva Linux Control Center ay kinakailangang koleksyon ng mga "
+"kagamitang pang Mandriva lamang para maging simple ang pagco-configure ng "
 "inyong computer."
 
 #: share/advertising/25.pl:17
@@ -16961,24 +16967,24 @@ 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 ""
 
 #: share/advertising/27.pl:13
 #, fuzzy, c-format
 msgid "<b>Online Store</b>"
-msgstr "<b>MandrakeStore</b>"
+msgstr "<b>Mandriva Store</b>"
 
 #: share/advertising/27.pl:15
 #, fuzzy, 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 ""
-"Hanapin ang lahat ng produkto at serbisyo ng Mandriva sa "
-"<b>Mandriva Store</b> -- ang aming buong serbisyong plataporma ng e-commerce."
+"Hanapin ang lahat ng produkto at serbisyo ng Mandriva sa <b>Mandriva Store</"
+"b> -- ang aming buong serbisyong plataporma ng e-commerce."
 
 #: share/advertising/27.pl:17
 #, c-format
@@ -16994,8 +17000,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Dumaan kayo ngayon sa <b>store.mandrakesoft.com</b>"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Dumaan kayo ngayon sa <b>store.mandriva.com</b>"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -17005,7 +17011,7 @@ msgstr "<b>Mandriva Club</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
 
@@ -17021,7 +17027,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 "\t* Espesyal na mga tawad para sa mga produkto at serbisyo sa Mandriva Store"
 
@@ -17034,15 +17040,15 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, fuzzy, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
 msgstr ""
 "\t* Makilahok sa \"online chat\" (usapan sa internet) gamit ang <b>Kopete</b>"
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
@@ -17061,7 +17067,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -17084,7 +17090,7 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
@@ -17096,21 +17102,21 @@ msgstr "<b>Mandriva Expert</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/compssUsers.pl:25
@@ -17500,15 +17506,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 ""
 "[MGA_OPTION] [PANGALAN_NG_PROGRAM]\n"
 "\n"
 "MGA OPTION:\n"
 "  --help            - i-print ang mensaheng tulong na ito.\n"
-"  --report          - ang program ay dapat isa sa mga mandrake tool\n"
-"  --incident        - ang program ay dapat isa sa mga mandrake tool"
+"  --report          - ang program ay dapat isa sa mga Mandriva tool\n"
+"  --incident        - ang program ay dapat isa sa mga Mandriva tool"
 
 #: standalone.pm:63
 #, c-format
@@ -17564,7 +17570,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -17635,8 +17641,8 @@ 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"
@@ -20441,13 +20447,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, fuzzy, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrake Bug Report Tool"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Bug Report Tool"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux Control Center"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux Control Center"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20939,20 +20945,20 @@ msgstr "Sinimulan sa boot"
 #, 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 ""
 "Ang interface na ito ay hindi pa na-configure.\n"
-"Patakbuhin ang \"Magdagdag ng interface\" na assistant mula sa Mandrake "
+"Patakbuhin ang \"Magdagdag ng interface\" na assistant mula sa Mandriva "
 "Control Center"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Ang interface na ito ay hindi pa na-configure.\n"
-"Patakbuhin ang \"%s\" na assistant mula sa Mandrake Control Center"
+"Patakbuhin ang \"%s\" na assistant mula sa Mandriva Control Center"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21002,7 +21008,7 @@ msgstr ""
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
 msgstr ""
 
 #: standalone/drakedm:37
@@ -21306,18 +21312,18 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 "Copyright (C) 2001-2002 ng Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original na version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 
 #: standalone/drakfont:520
 #, c-format
@@ -21896,8 +21902,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrake Control Center"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva Control Center"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22569,7 +22575,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 ""
 "Walang Sound Card na natiktikan sa inyong makina. Paki-verify na may "
 "nakapasak ng tama na Sound Card na suportado ng Linux.\n"
@@ -22578,7 +22584,7 @@ msgstr ""
 "Maaari kayong dumalaw sa aming database ng hardware sa:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24601,7 +24607,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 ""
 "Walang natiktikang TV Card sa inyong makina. Paki-verify na may nakapasak ng "
 "tama na Video/TV Card na suportado ng Linux.\n"
@@ -24610,7 +24616,7 @@ msgstr ""
 "Maaari kayong dumalaw sa aming database ng hardware sa:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25318,19 +25324,19 @@ msgstr "Tungkol sa Harddrake"
 
 #. -PO: Do not alter the <span ..> and </span> tags
 #: standalone/harddrake2:226
-#, fuzzy, c-format
+#, c-format
 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 ""
-"Ito ay HardDrake, isang kagamitang gawa ng Mandrake na pang-configure ng "
+"Ito ay HardDrake, isang kagamitang gawa ng %s na pang-configure ng "
 "hardware.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25441,8 +25447,8 @@ msgstr "Tapos na ang pagbabago, pero para magkabisa dapat kayong mag-logout."
 
 #: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrake Tools Logs"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva Tools Logs"
 
 #: standalone/logdrake:51
 #, c-format
@@ -25958,10 +25964,10 @@ msgstr "Kompleta na ang koneksyon."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Koneksyon ay nabigo.\n"
-"I-verify ang inyong configuration sa Mandrivalinux Control Center."
+"I-verify ang inyong configuration sa Mandriva Linux Control Center."
 
 #: standalone/net_monitor:341
 #, c-format
@@ -26837,7 +26843,6 @@ msgstr "Pag-i-install nabigo"
 #~ msgid "You've not selected any font"
 #~ msgstr "Hindi kayo nakapili ng font"
 
-
 #~ msgid "No browser available! Please install one"
 #~ msgstr "Walang available na browser! Mag-install ng isa"
 
@@ -26971,17 +26976,17 @@ msgstr "Pag-i-install nabigo"
 #~ msgstr "Error sa pagbubukas ng %s para sa pagsusulat: %s"
 
 #~ msgid ""
-#~ "This is HardDrake, a Mandrivalinux hardware configuration tool.\n"
+#~ "This is HardDrake, a Mandriva Linux hardware configuration tool.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Ito ay HardDrake, isang kagamitang gawa ng Mandrivalinux na pang-"
+#~ "Ito ay HardDrake, isang kagamitang gawa ng Mandriva Linux na pang-"
 #~ "configure ng hardware.\n"
 #~ "<span foreground=\"royalblue3\">Version:</span> %s\n"
 #~ "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
-#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "tvignaud@mandriva.com&gt;\n"
 #~ "\n"
 
 #~ msgid "OK"
@@ -27404,18 +27409,18 @@ msgstr "Pag-i-install nabigo"
 #~ "Nabigong tanggalin ang printer na \"%s\" mula sa Star Office/OpenOffice."
 #~ "org/GIMP."
 
-#~ msgid "<b>Congratulations for choosing Mandrivalinux!</b>"
-#~ msgstr "<b>Maligayang bati sa pagpili ng Mandrivalinux!</b>"
+#~ msgid "<b>Congratulations for choosing Mandriva Linux!</b>"
+#~ msgstr "<b>Maligayang bati sa pagpili ng Mandriva Linux!</b>"
 
 #~ msgid ""
-#~ "Your new Mandrivalinux operating system and its many applications is the "
-#~ "result of collaborative efforts between Mandriva developers and "
-#~ "Mandrivalinux contributors throughout the world."
+#~ "Your new Mandriva Linux operating system and its many applications is the "
+#~ "result of collaborative efforts between Mandriva developers and Mandriva "
+#~ "Linux contributors throughout the world."
 #~ msgstr ""
-#~ "Ang iyong bagong Mandrivalinux na operating system (OS) at marami nitong "
+#~ "Ang iyong bagong Mandriva Linux na operating system (OS) at marami nitong "
 #~ "mga application ay bunga ng mala-bayanihang pagsisikap sa pagitan ng mga "
-#~ "developer ng Mandriva at mga nag-aambag (mula sa iba't-ibang bahagi "
-#~ "ng mundo) sa Mandrivalinux."
+#~ "developer ng Mandriva at mga nag-aambag (mula sa iba't-ibang bahagi ng "
+#~ "mundo) sa Mandriva Linux."
 
 #~ msgid ""
 #~ "We would like to thank everyone who participated in the development of "
@@ -27540,15 +27545,15 @@ msgstr "Pag-i-install nabigo"
 #~ "\t* Espesyal na talaan ng mga download mirror para lamang sa mga Kasapi "
 #~ "ng Mandriva Club"
 
-#~ msgid "\t* Voting for software to put in Mandrivalinux"
-#~ msgstr "\t* Pagboto para sa mga software na ilalagay sa Mandrivalinux"
+#~ msgid "\t* Voting for software to put in Mandriva Linux"
+#~ msgstr "\t* Pagboto para sa mga software na ilalagay sa Mandriva Linux"
 
 #~ msgid "\t* Plus much more"
 #~ msgstr "\t* At higit na marami pa"
 
 #~ msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
 #~ msgstr ""
-#~ "Para sa karagdagang inpormasyon, pakidalaw ang <b>www.mandrakeclub.com</b>"
+#~ "Para sa karagdagang inpormasyon, pakidalaw ang <b>www.mandrivaclub.com</b>"
 
 #~ msgid "Do you require assistance?"
 #~ msgstr "Nangangailangan ba kayo ng tulong?"
@@ -27559,45 +27564,46 @@ msgstr "Pag-i-install nabigo"
 
 #~ msgid ""
 #~ "If you have Linux questions, subscribe to Mandriva Expert at <b>www."
-#~ "mandrakeexpert.com</b>"
+#~ "mandrivaexpert.com</b>"
 #~ msgstr ""
 #~ "Kung mayroon kayong tanong sa Linux, mag-subscribe sa <b>www."
-#~ "mandrakeexpert.com</b>"
+#~ "mandrivaexpert.com</b>"
 
 #~ msgid ""
 #~ "If you would like to get involved, please subscribe to the \"Cooker\" "
 #~ "mailing list by visiting <b>mandrake-linux.com/cooker</b>"
 #~ msgstr ""
 #~ "Kung gusto ninyong makisangkot, mag-subscribe sa \"Cooker\" na mailing "
-#~ "list sa pamamagitan ng pagdalaw sa <b>mandrake-linux.com/cooker</b>"
+#~ "list sa pamamagitan ng pagdalaw sa <b>mandrivalinux.com/cooker</b>"
 
 #~ msgid ""
 #~ "To learn more about our dynamic community, please visit <b>www.mandrake-"
 #~ "linux.com</b>!"
 #~ msgstr ""
 #~ "Para mas dumami ang kaalaman tungkol sa aming dynamic na komunidad, "
-#~ "dumalaw sa <b>www.mandrake-linux.com</b>!"
+#~ "dumalaw sa <b>www.mandrivalinux.com</b>!"
 
 #~ msgid ""
-#~ "Mandrivalinux includes the famous graphical desktops KDE and GNOME, plus "
+#~ "Mandriva Linux includes the famous graphical desktops KDE and GNOME, plus "
 #~ "the latest versions of the most popular Open Source applications."
 #~ msgstr ""
-#~ "Ang Mandrivalinux ay naglalaman ng mga tanyag na graphical desktop na KDE "
-#~ "at GNOME, at ang pinakahuling version ng pinakatanyag na mga Open Source "
-#~ "application."
+#~ "Ang Mandriva Linux ay naglalaman ng mga tanyag na graphical desktop na "
+#~ "KDE at GNOME, at ang pinakahuling version ng pinakatanyag na mga Open "
+#~ "Source application."
 
 #~ msgid ""
-#~ "Mandrivalinux is widely known as the most user-friendly and the easiest "
+#~ "Mandriva Linux is widely known as the most user-friendly and the easiest "
 #~ "to install and easy to use Linux distribution."
 #~ msgstr ""
-#~ "Ang Mandrivalinux ay kilalang-kilala bilang (1) pinaka \"user friendly"
+#~ "Ang Mandriva Linux ay kilalang-kilala bilang (1) pinaka \"user friendly"
 #~ "\" (mabait sa gumagamit); (2) pinaka madaling i-install; at (3) pinaka "
 #~ "madaling gamitin; na distribusyon ng Linux."
 
-#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandrakemove</b>"
+#~ msgid ""
+#~ "\t* Find out Mandriva Linux on a bootable CD with <b>Mandrakemove</b>"
 #~ msgstr ""
-#~ "\t* Alamin ang Mandrivalinux sa bootable na CD gamit ang <b>Mandrakemove</"
-#~ "b>"
+#~ "\t* Alamin ang Mandriva Linux sa bootable na CD gamit ang "
+#~ "<b>Mandrakemove</b>"
 
 #~ msgid ""
 #~ "\t* If you use Linux mostly for Office, Internet and Multimedia tasks, "
@@ -27646,13 +27652,12 @@ msgstr "Pag-i-install nabigo"
 
 #~ msgid ""
 #~ "<b>MandrakeClustering</b>: the power and speed of a Linux cluster "
-#~ "combined with the stability and easy-of-use of the world-famous "
-#~ "Mandrivalinux distribution. A unique blend for incomparable HPC "
-#~ "performance."
+#~ "combined with the stability and easy-of-use of the world-famous Mandriva "
+#~ "Linux distribution. A unique blend for incomparable HPC performance."
 #~ msgstr ""
 #~ "<b>MandrakeClustering</b>: ang kapangyarihan at bilis ng Linux cluster na "
 #~ "sinamahan ng stability (kapanatagan) at ease-of-use (madaling gamitin) ng "
-#~ "tanyag sa mundo na distribusyon ng Mandrivalinux. Isang kakaibang halo "
+#~ "tanyag sa mundo na distribusyon ng Mandriva Linux. Isang kakaibang halo "
 #~ "para sa walang katulad na HPC performance."
 
 #~ msgid ""
@@ -27670,8 +27675,8 @@ msgstr "Pag-i-install nabigo"
 #~ msgid "<b>Do you require assistance?</b>"
 #~ msgstr "<b>Nangangailangan ba kayo ng tulong?</b>"
 
-#~ msgid "This is the Mandrivalinux <b>Download version</b>."
-#~ msgstr "Ito ang Mandrivalinux <b>Download version</b>."
+#~ msgid "This is the Mandriva Linux <b>Download version</b>."
+#~ msgstr "Ito ang Mandriva Linux <b>Download version</b>."
 
 #~ msgid ""
 #~ "The free download version does not include commercial software, and "
@@ -27683,14 +27688,14 @@ msgstr "Pag-i-install nabigo"
 #~ "at RTC) at video card (gaya ng ATI® at NVIDIA®)."
 
 #~ msgid ""
-#~ "Your new Mandrivalinux distribution and its many applications are the "
-#~ "result of collaborative efforts between Mandriva developers and "
-#~ "Mandrivalinux contributors throughout the world."
+#~ "Your new Mandriva Linux distribution and its many applications are the "
+#~ "result of collaborative efforts between Mandriva developers and Mandriva "
+#~ "Linux contributors throughout the world."
 #~ msgstr ""
-#~ "Ang inyong bagong distribusyon ng Mandrivalinux at marami nitong mga "
+#~ "Ang inyong bagong distribusyon ng Mandriva Linux at marami nitong mga "
 #~ "application ay bunga ng mala-bayanihang pagsisikap sa pagitan ng mga "
-#~ "developer ng Mandriva at mga nag-aambag (mula sa iba't-ibang bahagi "
-#~ "ng mundo) sa Mandrivalinux."
+#~ "developer ng Mandriva at mga nag-aambag (mula sa iba't-ibang bahagi ng "
+#~ "mundo) sa Mandriva Linux."
 
 #~ msgid "<b>PowerPack+</b>"
 #~ msgstr "<b>PowerPack+</b>"
@@ -27706,25 +27711,26 @@ msgstr "Pag-i-install nabigo"
 #~ "komprehensibong pagpili ng mga world-class server application."
 
 #~ msgid ""
-#~ "It is the only Mandrivalinux product that includes the groupware solution."
-#~ msgstr ""
-#~ "Ito lang ang tanging produkto ng Mandrivalinux na isinasama ang groupware "
+#~ "It is the only Mandriva Linux product that includes the groupware "
 #~ "solution."
+#~ msgstr ""
+#~ "Ito lang ang tanging produkto ng Mandriva Linux na isinasama ang "
+#~ "groupware solution."
 
 #~ msgid ""
-#~ "When you log into your Mandrivalinux system for the first time, you can "
+#~ "When you log into your Mandriva Linux system for the first time, you can "
 #~ "choose between several popular graphical desktops environments, "
 #~ "including: KDE, GNOME, WindowMaker, IceWM, and others."
 #~ msgstr ""
-#~ "Kung kayo ay magla-login sa Mandrivalinux na sistema sa kauna-unahang "
+#~ "Kung kayo ay magla-login sa Mandriva Linux na sistema sa kauna-unahang "
 #~ "pagkakataon, maaari kayong pumili sa ilang mga tanyag na graphical "
 #~ "desktop environment, gaya ng: KDE, GNOME, WindowMaker, IceWM, at iba pa."
 
 #~ msgid ""
-#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
+#~ "In the Mandriva Linux menu you will find easy-to-use applications for all "
 #~ "of your tasks:"
 #~ msgstr ""
-#~ "Sa Mandrivalinux menu makakakita kayo ng mga madaling gamitin na "
+#~ "Sa Mandriva Linux menu makakakita kayo ng mga madaling gamitin na "
 #~ "application para sa lahat ng inyong gawain:"
 
 #~ msgid ""
@@ -27771,13 +27777,13 @@ msgstr "Pag-i-install nabigo"
 #~ msgstr "\t* Address Book (server at client)"
 
 #~ msgid ""
-#~ "Your new Mandrivalinux distribution is the result of collaborative "
-#~ "efforts between Mandriva developers and Mandrivalinux contributors "
+#~ "Your new Mandriva Linux distribution is the result of collaborative "
+#~ "efforts between Mandriva developers and Mandriva Linux contributors "
 #~ "throughout the world."
 #~ msgstr ""
-#~ "Ang inyong bagong distribusyon ng Mandrivalinux ay bunga ng mala-"
-#~ "bayanihang pagsisikap sa pagitan ng mga developer ng Mandriva at mga "
-#~ "nag-aambag (mula sa iba't-ibang bahagi ng mundo) sa Mandrivalinux."
+#~ "Ang inyong bagong distribusyon ng Mandriva Linux ay bunga ng mala-"
+#~ "bayanihang pagsisikap sa pagitan ng mga developer ng Mandriva at mga nag-"
+#~ "aambag (mula sa iba't-ibang bahagi ng mundo) sa Mandriva Linux."
 
 #~ msgid ""
 #~ "We would like to thank everyone who participated in the development of "
@@ -27847,13 +27853,13 @@ msgstr "Pag-i-install nabigo"
 #~ msgid ""
 #~ "Before continuing, you should carefully read the terms of the license. "
 #~ "It\n"
-#~ "covers the entire Mandrivalinux distribution. If you do agree with all "
+#~ "covers the entire Mandriva Linux distribution. If you do agree with all "
 #~ "the\n"
 #~ "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
 #~ "will reboot your computer."
 #~ msgstr ""
 #~ "Bago magpatuloy, kailangang basahin ninyong mabuti ang mga nasasaad sa\n"
-#~ "lisensiya. Tinutukoy nito ang kabuoang distribusyon ng Mandrivalinux. "
+#~ "lisensiya. Tinutukoy nito ang kabuoang distribusyon ng Mandriva Linux. "
 #~ "Kung\n"
 #~ "kayo ay sumasang-ayon sa lahat ng nasasaad, i-check ang \"%s\" na box.\n"
 #~ "Kung hindi, i-click ang \"%s\" na button para i-reboot ang inyong "
@@ -27979,25 +27985,27 @@ msgstr "Pag-i-install nabigo"
 #~ "ang check sa \"%s\" na box."
 
 #~ msgid ""
-#~ "The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+#~ "The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
 #~ "selected package is located on another CD-ROM, DrakX will eject the "
 #~ "current\n"
 #~ "CD and ask you to insert the correct CD as required."
 #~ msgstr ""
-#~ "Ang installation ng Mandrivalinux ay nakahati sa ilang mga CD-ROM.\n"
+#~ "Ang installation ng Mandriva Linux ay nakahati sa ilang mga CD-ROM.\n"
 #~ "Kung ang napiling package ay nakalagay sa ibang CD-ROM, iluluwa ng DrakX\n"
 #~ "ang kasalukuyang CD at ipapasuksok sa inyo ang tamang CD."
 
 #~ msgid ""
 #~ "It is now time to specify which programs you wish to install on your\n"
-#~ "system. There are thousands of packages available for Mandrivalinux, and\n"
+#~ "system. There are thousands of packages available for Mandriva Linux, "
+#~ "and\n"
 #~ "to make it simpler to manage the packages have been placed into groups "
 #~ "of\n"
 #~ "similar applications.\n"
 #~ "\n"
 #~ "Packages are sorted into groups corresponding to a particular use of "
 #~ "your\n"
-#~ "machine. Mandrivalinux sorts packages groups in four categories. You can\n"
+#~ "machine. Mandriva Linux sorts packages groups in four categories. You "
+#~ "can\n"
 #~ "mix and match applications from the various categories, so a\n"
 #~ "``Workstation'' installation can still have applications from the\n"
 #~ "``Development'' category installed.\n"
@@ -28052,11 +28060,11 @@ msgstr "Pag-i-install nabigo"
 #~ "Panahon na para piliin kung aling mga program ang nais ninyong i-install "
 #~ "sa\n"
 #~ "inyong sistema. Mayroong libo-libong mga package na available para sa\n"
-#~ "Mandrivalinux, at upang mas madali itong pangasiwaan, ang mga package\n"
+#~ "Mandriva Linux, at upang mas madali itong pangasiwaan, ang mga package\n"
 #~ "ay inayos sa mga pangkat ng magkakatulad na mga application.\n"
 #~ "\n"
 #~ "Ang mga package ay inayos sa mga pangkat na batay sa paggamit ng\n"
-#~ "inyong makina. Inaayos ng Mandrivalinux ang mga pangkat ng mga\n"
+#~ "inyong makina. Inaayos ng Mandriva Linux ang mga pangkat ng mga\n"
 #~ "package sa apat na kategoriya. Maaari ninyong paghaluhaluin at\n"
 #~ "pagbagaybagayin ang mga application mula sa sari-saring kategoriya,\n"
 #~ "para ang installation na ``Workstation'' ay maaari pa ring maka-install\n"
@@ -28132,11 +28140,11 @@ msgstr "Pag-i-install nabigo"
 #~ "chose the individual package or because it was part of a group of "
 #~ "packages,\n"
 #~ "you will be asked to confirm that you really want those servers to be\n"
-#~ "installed. By default Mandrivalinux will automatically start any "
+#~ "installed. By default Mandriva Linux will automatically start any "
 #~ "installed\n"
 #~ "services at boot time. Even if they are safe and have no known issues at\n"
 #~ "the time the distribution was shipped, it is entirely possible that that\n"
-#~ "security holes were discovered after this version of Mandrivalinux was\n"
+#~ "security holes were discovered after this version of Mandriva Linux was\n"
 #~ "finalized. If you do not know what a particular service is supposed to "
 #~ "do\n"
 #~ "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
@@ -28177,12 +28185,12 @@ msgstr "Pag-i-install nabigo"
 #~ "!! Kung ang isang package ng server ay napili, dahil kayo ay pumili ng\n"
 #~ "bukod na package o kaya iyon ay bahagi ng isang pangkat ng mga package,\n"
 #~ "kayo ay tatanungin kung gusto ninyo talagang i-install ang mga server na\n"
-#~ "iyon. Bilang default, sisimulan kaagad ng Mandrivalinux pag-boot ang "
+#~ "iyon. Bilang default, sisimulan kaagad ng Mandriva Linux pag-boot ang "
 #~ "kahit\n"
 #~ "anong na-install na mga service. Kahit na sila ay ligtas at walang "
 #~ "kilalang mga\n"
 #~ "issue nang mailabas ang distribusyon, maaring matuklasan na may butas sa\n"
-#~ "seguridad pagkatapos matapos ang version ng Mandrivalinux na ito. Kung\n"
+#~ "seguridad pagkatapos matapos ang version ng Mandriva Linux na ito. Kung\n"
 #~ "hindi ninyo nalalaman ang ginagawa ng isang service o bakit ito ini-"
 #~ "install,\n"
 #~ "i-click ang \"%s\". Ang pagki-click sa \"%s\" ay mag-i-install ng mga "
@@ -28216,7 +28224,8 @@ msgstr "Pag-i-install nabigo"
 #~ "You will now set up your Internet/network connection. If you wish to\n"
 #~ "connect your computer to the Internet or to a local network, click \"%s"
 #~ "\".\n"
-#~ "Mandrivalinux will attempt to auto-detect network devices and modems. If\n"
+#~ "Mandriva Linux will attempt to auto-detect network devices and modems. "
+#~ "If\n"
 #~ "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
 #~ "configure the network, or to do it later, in which case clicking the \"%s"
 #~ "\"\n"
@@ -28237,7 +28246,7 @@ msgstr "Pag-i-install nabigo"
 #~ "modems\n"
 #~ "that require additional software to work compared to Normal modems. Some "
 #~ "of\n"
-#~ "those modems actually work under Mandrivalinux, some others do not. You\n"
+#~ "those modems actually work under Mandriva Linux, some others do not. You\n"
 #~ "can consult the list of supported modems at LinModems.\n"
 #~ "\n"
 #~ "You can consult the ``Starter Guide'' chapter about Internet connections\n"
@@ -28247,7 +28256,7 @@ msgstr "Pag-i-install nabigo"
 #~ msgstr ""
 #~ "Ngayon ay ise-setup ninyo ang inyong koneksyon sa Internet/network.\n"
 #~ "Kung nais ninyong i-connect ang inyong computer sa Internet o sa isang\n"
-#~ "\"local network\", i-click ang \"%s\". Susubukin ng Mandrivalinux na\n"
+#~ "\"local network\", i-click ang \"%s\". Susubukin ng Mandriva Linux na\n"
 #~ "automatic na tiktikan ang mga network device at mga modem. Kung nabigo\n"
 #~ "itong pagtitiktik, tanggalin ang check sa \"%s\" na box. Maaarin rin "
 #~ "ninyong piliin\n"
@@ -28270,7 +28279,7 @@ msgstr "Pag-i-install nabigo"
 #~ "Tungkol sa Winmodem Connection. Ang mga Winmodem ay mga espesyal na\n"
 #~ "\"integrated low-end modem\" na nangangailangan ng karagdagang software\n"
 #~ "para gumana, kung ikukumpara sa mga Normal modem. Ilan sa mga gayong\n"
-#~ "modem ay talagang gagana sa ilalim ng Mandrivalinux, ilang iba pa ay "
+#~ "modem ay talagang gagana sa ilalim ng Mandriva Linux, ilang iba pa ay "
 #~ "hindi.\n"
 #~ "Maaari ninyong konsultahin ang listahan ng mga suportadong modem sa\n"
 #~ "\"LinModems\".\n"
@@ -28411,7 +28420,7 @@ msgstr "Pag-i-install nabigo"
 #~ "X (for X Window System) is the heart of the GNU/Linux graphical "
 #~ "interface\n"
 #~ "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-#~ "WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+#~ "WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 #~ "\n"
 #~ "You will be presented with a list of different parameters to change to "
 #~ "get\n"
@@ -28474,7 +28483,7 @@ msgstr "Pag-i-install nabigo"
 #~ msgstr ""
 #~ "X (para sa \"X Window System\") ay ang puso ng \"graphical interface\"\n"
 #~ "ng GNU/Linux na kung saan lahat ng mga \"graphical environment\" (KDE,\n"
-#~ "GNOME, AfterStep, WindowMaker, atbp.) na kasama sa Mandrivalinux ay\n"
+#~ "GNOME, AfterStep, WindowMaker, atbp.) na kasama sa Mandriva Linux ay\n"
 #~ "nakaasa.\n"
 #~ "\n"
 #~ "Ihaharap sa inyo ang isang talaan ng iba-ibang mga parameter na "
@@ -28609,7 +28618,7 @@ msgstr "Pag-i-install nabigo"
 #~ "have to partition the drive. Basically, partitioning a hard drive "
 #~ "consists\n"
 #~ "of logically dividing it to create the space needed to install your new\n"
-#~ "Mandrivalinux system.\n"
+#~ "Mandriva Linux system.\n"
 #~ "\n"
 #~ "Because the process of partitioning a hard drive is usually irreversible\n"
 #~ "and can lead to lost data if there is an existing operating system "
@@ -28648,7 +28657,7 @@ msgstr "Pag-i-install nabigo"
 #~ "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 #~ "data, provided you have previously defragmented the Windows partition.\n"
 #~ "Backing up your data is strongly recommended.. Using this option is\n"
-#~ "recommended if you want to use both Mandrivalinux and Microsoft Windows "
+#~ "recommended if you want to use both Mandriva Linux and Microsoft Windows "
 #~ "on\n"
 #~ "the same computer.\n"
 #~ "\n"
@@ -28658,7 +28667,7 @@ msgstr "Pag-i-install nabigo"
 #~ "Windows to store your data or to install new software.\n"
 #~ "\n"
 #~ " * \"%s\": if you want to delete all data and all partitions present on\n"
-#~ "your hard drive and replace them with your new Mandrivalinux system,\n"
+#~ "your hard drive and replace them with your new Mandriva Linux system,\n"
 #~ "choose this option. Be careful, because you will not be able to undo "
 #~ "your\n"
 #~ "choice after you confirm.\n"
@@ -28685,13 +28694,14 @@ msgstr "Pag-i-install nabigo"
 #~ msgstr ""
 #~ "Sa puntong ito, kailangan ninyong magpasya kung saan ninyo nais i-"
 #~ "install\n"
-#~ "ang Mandrivalinux na \"operating system\" (OS) sa inyong \"hard drive\".\n"
+#~ "ang Mandriva Linux na \"operating system\" (OS) sa inyong \"hard drive"
+#~ "\".\n"
 #~ "Kung ang inyong \"hard drive\" ay walang laman o kung may namamalaging\n"
 #~ "\"operating system\" na gumagamit sa lahat ng available na puwang,\n"
 #~ "kakailanganin ninyong ipartisyon ang drive. Ang pagpapartisyon ng isang\n"
 #~ "\"hard drive\" ay ginagawa sa pamamagitan ng paghahati-hati nito sa\n"
 #~ "kaisipan (\"logical\") upang makagawa ng puwang na kinakailangan para\n"
-#~ "ma-install ang inyong bagong sistema ng Mandrivalinux.\n"
+#~ "ma-install ang inyong bagong sistema ng Mandriva Linux.\n"
 #~ "\n"
 #~ "Dahil kadalasan na hindi na mababawi ang paraan ng pagpapartisyon ng\n"
 #~ "hard drive at maaaring magdulot ng pagkawala ng data  kung mayroon\n"
@@ -28737,7 +28747,7 @@ msgstr "Pag-i-install nabigo"
 #~ "ng Windows. Matinding itinatagubilin na i-backup ang inyong data. Ang\n"
 #~ "paggamit sa option na ito ay ipinapayo kung nais ninyong gamitin pareho "
 #~ "ang\n"
-#~ "Mandrivalinux at Microsoft Windows sa iisang computer.\n"
+#~ "Mandriva Linux at Microsoft Windows sa iisang computer.\n"
 #~ "\n"
 #~ "   Bago piliin ang option na ito, pakiunawa na pagkatapos ng paraang "
 #~ "ito,\n"
@@ -28748,7 +28758,7 @@ msgstr "Pag-i-install nabigo"
 #~ "\n"
 #~ " * \"%s\": kung gusto ninyong tanggalin lahat ng data at mga partisyon\n"
 #~ "na mayroon sa inyong hard drive at palitan sila ng inyong bagong sistema\n"
-#~ "ng Mandrivalinux, piliin ang option na ito. Maging maingat, dahil hindi "
+#~ "ng Mandriva Linux, piliin ang option na ito. Maging maingat, dahil hindi "
 #~ "na\n"
 #~ "ninyo maaaring bawiin ang inyong pili matapos ninyong patotohanan ito.\n"
 #~ "\n"
@@ -28873,7 +28883,7 @@ msgstr "Pag-i-install nabigo"
 #~ "Click on \"%s\" when you are ready to format the partitions.\n"
 #~ "\n"
 #~ "Click on \"%s\" if you want to choose another partition for your new\n"
-#~ "Mandrivalinux operating system installation.\n"
+#~ "Mandriva Linux operating system installation.\n"
 #~ "\n"
 #~ "Click on \"%s\" if you wish to select partitions that will be checked "
 #~ "for\n"
@@ -28902,14 +28912,14 @@ msgstr "Pag-i-install nabigo"
 #~ "I-click ang \"%s\" kung handa na kayong i-format ang mga partisyon.\n"
 #~ "\n"
 #~ "I-click ang \"%s\" kung gusto ninyong pumili ng ibang partisyon para sa\n"
-#~ "inyong pag-i-install ng bagong Mandrivalinux na \"operating system\".\n"
+#~ "inyong pag-i-install ng bagong Mandriva Linux na \"operating system\".\n"
 #~ "\n"
 #~ "I-click ang \"%s\" kung nais ninyong piliin ang mga partisyon na "
 #~ "susuriin\n"
 #~ "para sa mga \"bad blocks\" (mga sirang bloke) sa disk."
 
 #~ msgid ""
-#~ "At the time you are installing Mandrivalinux, it is likely that some\n"
+#~ "At the time you are installing Mandriva Linux, it is likely that some\n"
 #~ "packages will have been updated since the initial release. Bugs may have\n"
 #~ "been fixed, security issues resolved. To allow you to benefit from these\n"
 #~ "updates, you are now able to download them from the Internet. Check \"%s"
@@ -28924,7 +28934,7 @@ msgstr "Pag-i-install nabigo"
 #~ "the\n"
 #~ "selected package(s), or \"%s\" to abort."
 #~ msgstr ""
-#~ "Pagdating ng panahon na kayo ay nag-i-install ng Mandrivalinux, mas\n"
+#~ "Pagdating ng panahon na kayo ay nag-i-install ng Mandriva Linux, mas\n"
 #~ "malamang na ilang mga package ay nabago na simula nang naunang\n"
 #~ "paglabas. Maaaring inayos ang mga sira (\"bug\"), naresolba ang mga "
 #~ "tanong\n"
@@ -28995,7 +29005,7 @@ msgstr "Pag-i-install nabigo"
 #~ "\n"
 #~ "DrakX now needs to know if you want to perform a new install or an "
 #~ "upgrade\n"
-#~ "of an existing Mandrivalinux system:\n"
+#~ "of an existing Mandriva Linux system:\n"
 #~ "\n"
 #~ " * \"%s\": For the most part, this completely wipes out the old system. "
 #~ "If\n"
@@ -29007,21 +29017,21 @@ msgstr "Pag-i-install nabigo"
 #~ "written.\n"
 #~ "\n"
 #~ " * \"%s\": this installation class allows you to update the packages\n"
-#~ "currently installed on your Mandrivalinux system. Your current\n"
+#~ "currently installed on your Mandriva Linux system. Your current\n"
 #~ "partitioning scheme and user data is not altered. Most of other\n"
 #~ "configuration steps remain available, similar to a standard "
 #~ "installation.\n"
 #~ "\n"
-#~ "Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
+#~ "Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 #~ "running version \"8.1\" or later. Performing an Upgrade on versions "
 #~ "prior\n"
-#~ "to Mandrivalinux version \"8.1\" is not recommended."
+#~ "to Mandriva Linux version \"8.1\" is not recommended."
 #~ msgstr ""
 #~ "Ang hakbang na ito pagaganahin lamang kung mayroong nakitang\n"
 #~ "partisyon ng GNU/Linux sa inyong makina.\n"
 #~ "\n"
 #~ "Kailangang malaman ngayon ng DrakX kung gusto ninyong magsagawa\n"
-#~ "ng bagong install o upgrade ng namamalaging Mandrivalinux na sistema:\n"
+#~ "ng bagong install o upgrade ng namamalaging Mandriva Linux na sistema:\n"
 #~ "\n"
 #~ " * \"%s\": Para sa karamihang bahagi, ganap na binubura nito ang lumang\n"
 #~ "sistema. Kung nais ninyong baguhin kung paano ang pagpartisyon sa inyong\n"
@@ -29033,13 +29043,13 @@ msgstr "Pag-i-install nabigo"
 #~ " * \"%s\": ang klase ng pag-i-install na ito ay pahihintulutan kayong i-"
 #~ "update\n"
 #~ "ang mga package na kasalukuyang naka-install sa inyong sistema ng\n"
-#~ "Mandrivalinux. Ang inyong kasalukuyang pakana ng pagpapartisyon at\n"
+#~ "Mandriva Linux. Ang inyong kasalukuyang pakana ng pagpapartisyon at\n"
 #~ "data ng gumagamit ay hindi nabago. Karamihan ng ibang mga hakbang sa\n"
 #~ "pagko-configure ay mayroon pa rin, katulad ng standard na pag-i-install.\n"
 #~ "\n"
 #~ "Ang paggamit sa ``Upgrade'' na option ay gagana ng mabuti sa mga sistema\n"
-#~ "ng Mandrivalinux na nagpapatakbo ng version \"8.1\" o pataas. Ang\n"
-#~ "pagsasagawa ng upgrade sa mga version bago ng Mandrivalinux \"8.1\" ay\n"
+#~ "ng Mandriva Linux na nagpapatakbo ng version \"8.1\" o pataas. Ang\n"
+#~ "pagsasagawa ng upgrade sa mga version bago ng Mandriva Linux \"8.1\" ay\n"
 #~ "hindi ipinapayo."
 
 #~ msgid ""
@@ -29106,7 +29116,8 @@ msgstr "Pag-i-install nabigo"
 #~ "About UTF-8 (unicode) support: Unicode is a new character encoding meant "
 #~ "to\n"
 #~ "cover all existing languages. Though full support for it in GNU/Linux is\n"
-#~ "still under development. For that reason, Mandrivalinux will be using it\n"
+#~ "still under development. For that reason, Mandriva Linux will be using "
+#~ "it\n"
 #~ "or not depending on the user choices:\n"
 #~ "\n"
 #~ " * If you choose a languages with a strong legacy encoding (latin1\n"
@@ -29155,7 +29166,7 @@ msgstr "Pag-i-install nabigo"
 #~ "\"character encoding\" na nagnanais masakop ang lahat ng namamalaging\n"
 #~ "wika. Ang buong suporta dita ng GNU/Linux ay ginagawa pa rin. Sa "
 #~ "dahilang\n"
-#~ "ito, gagamitin ito o hindi ng Mandrivalinux depende sa mga pili ng mga\n"
+#~ "ito, gagamitin ito o hindi ng Mandriva Linux depende sa mga pili ng mga\n"
 #~ "gumagamit:\n"
 #~ "\n"
 #~ " * Kung kayo ay pipili ng wika na may malakas na \"legacy encoding"
@@ -29413,7 +29424,7 @@ msgstr "Pag-i-install nabigo"
 #~ "checking this box.\n"
 #~ "\n"
 #~ "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-#~ "\"%s\"), you must ensure that you have a way to boot your Mandrivalinux\n"
+#~ "\"%s\"), you must ensure that you have a way to boot your Mandriva Linux\n"
 #~ "system! Be sure you know what you are doing before changing any of the\n"
 #~ "options. !!\n"
 #~ "\n"
@@ -29456,7 +29467,7 @@ msgstr "Pag-i-install nabigo"
 #~ "bootloader\n"
 #~ "(sa pagpili ng \"%s\"), dapat ninyong tiyaking na kayo ay may paraan "
 #~ "para\n"
-#~ "i-boot ang inyong sistema ng Mandrivalinux! Tiyakin na alam ninyo ang\n"
+#~ "i-boot ang inyong sistema ng Mandriva Linux! Tiyakin na alam ninyo ang\n"
 #~ "inyong ginagawa bego baguhin ang kahit na anong mga option. !!\n"
 #~ "\n"
 #~ "Ang pagki-click sa \"%s\" na pindutan sa dialog na ito ay mag-aalok ng "
@@ -29558,7 +29569,7 @@ msgstr "Pag-i-install nabigo"
 #~ msgid ""
 #~ "Now, it's time to select a printing system for your computer. Other OSs "
 #~ "may\n"
-#~ "offer you one, but Mandrivalinux offers two. Each of the printing "
+#~ "offer you one, but Mandriva Linux offers two. Each of the printing "
 #~ "systems\n"
 #~ "is best suited to particular types of configuration.\n"
 #~ "\n"
@@ -29596,7 +29607,7 @@ msgstr "Pag-i-install nabigo"
 #~ "Panahon na upang pumili ng sistema ng pagpi-print para sa inyong "
 #~ "computer.\n"
 #~ "Ang ibang mga \"operating system\" (OS) ay mag-aalok lamang ng isa, pero\n"
-#~ "ang Mandrivalinux ay nag-aalok ng dalawa. Bawat isa sa dalawang sistema\n"
+#~ "ang Mandriva Linux ay nag-aalok ng dalawa. Bawat isa sa dalawang sistema\n"
 #~ "ng pagpi-print na ito ay nababagay sa natatanging uri ng configuration.\n"
 #~ "\n"
 #~ " * \"%s\" -- na acronym para sa ``print, do not queue'', ang piliin kung "
@@ -30163,8 +30174,8 @@ msgstr "Pag-i-install nabigo"
 #~ "computer."
 
 #~ msgid ""
-#~ "Find all Mandriva products and services at <b>MandrakeStore</b> -- "
-#~ "our full service e-commerce platform."
+#~ "Find all Mandriva products and services at <b>MandrakeStore</b> -- our "
+#~ "full service e-commerce platform."
 #~ msgstr ""
 #~ "Hanapin ang lahat ng produkto at serbisyo ng Mandriva sa "
 #~ "<b>MandrakeStore</b> -- ang aming buong serbisyong plataporma ng e-"
@@ -30191,26 +30202,27 @@ msgstr "Pag-i-install nabigo"
 #~ "\t* Espesyal na mga tawad para sa mga produkto at serbisyo sa "
 #~ "MandrakeStore"
 
-#~ msgid "\t* Find out Mandrivalinux on a bootable CD with <b>Mandriva Move</b>"
+#~ msgid ""
+#~ "\t* Find out Mandriva Linux on a bootable CD with <b>Mandriva Move</b>"
 #~ msgstr ""
-#~ "\t* Alamin ang Mandrivalinux sa bootable na CD gamit ang <b>Mandriva Move</"
-#~ "b>"
+#~ "\t* Alamin ang Mandriva Linux sa bootable na CD gamit ang <b>Mandriva "
+#~ "Move</b>"
 
 #~ msgid ""
-#~ "Find all Mandriva products at <b>MandrakeStore</b> -- our full "
-#~ "service e-commerce platform."
+#~ "Find all Mandriva products at <b>MandrakeStore</b> -- our full service e-"
+#~ "commerce platform."
 #~ msgstr ""
-#~ "Hanapin lahat ng mga produkto ng Mandriva sa <b>MandrakeStore</b> -- "
-#~ "ang aming buong serbisyong plataporma ng e-commerce."
+#~ "Hanapin lahat ng mga produkto ng Mandriva sa <b>MandrakeStore</b> -- ang "
+#~ "aming buong serbisyong plataporma ng e-commerce."
 
 #~ msgid "<b>Become a MandrakeClub member!</b>"
 #~ msgstr "<b>Maging Kasapi ng MandrakeClub!</b>"
 
 #~ msgid ""
-#~ "In the Mandrivalinux menu you will find easy-to-use applications for all "
+#~ "In the Mandriva Linux menu you will find easy-to-use applications for all "
 #~ "tasks:"
 #~ msgstr ""
-#~ "Sa Mandrivalinux menu makakakita kayo ng mga madaling gamitin na "
+#~ "Sa Mandriva Linux menu makakakita kayo ng mga madaling gamitin na "
 #~ "application para sa lahat ng gawain:"
 
 #~ msgid ""
@@ -30248,15 +30260,12 @@ msgstr "Pag-i-install nabigo"
 #~ "  --report          - ang program ay dapat isa sa mga mandrake tool\n"
 #~ "  --incident        - ang program ay dapat isa sa mga mandrake tool"
 
-#~ msgid "Mandriva Online"
-#~ msgstr "Mandriva Online"
-
 #~ msgid ""
 #~ "This interface has not been configured yet.\n"
 #~ "Run the \"Add an interface\" assistant from the Mandrake Control Center"
 #~ msgstr ""
 #~ "Ang interface na ito ay hindi pa na-configure.\n"
-#~ "Patakbuhin ang \"Magdagdag ng interface\" na assistant mula sa Mandrake "
+#~ "Patakbuhin ang \"Magdagdag ng interface\" na assistant mula sa Mandriva "
 #~ "Control Center"
 
 #~ msgid "The alert wizard had unexpectly failled:"
@@ -30267,7 +30276,7 @@ msgstr "Pag-i-install nabigo"
 #~ "Verify your configuration in the Mandrake Control Center."
 #~ msgstr ""
 #~ "Koneksyon ay nabigo.\n"
-#~ "I-verify ang inyong configuration sa Mandrake Control Center."
+#~ "I-verify ang inyong configuration sa Mandriva Control Center."
 
 #~ msgid "The package %s is needed. Install it?"
 #~ msgstr "Ang package na %s ay kailangan. I-Install ba ito?"