various Mandrake -> Mandriva changes

1 files changed, 199 insertions, 191 deletions

diff --git a/perl-install/share/po/id.po b/perl-install/share/po/id.po
index b8343fd27..ec0a7c364 100644
--- a/perl-install/share/po/id.po
+++ b/perl-install/share/po/id.po
@@ -1316,11 +1316,11 @@ msgstr "Pilihan bahasa"
 #: 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 mendukung beberapa bahasa. Pilihlah\n"
+"Mandriva Linux mendukung beberapa bahasa. Pilihlah\n"
 "bahasa yang akan diinstall. Bahasa pilihan akan ditampilkan\n"
 "setelah proses installasi selesai dan Anda merestart sistem Anda."
 
@@ -3732,12 +3732,12 @@ msgstr "aktifkan dukungan radio"
 #, 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 ""
 "Bacalah lisensi sebelum melanjutkan. Lisensi mencakup seluruh distribusi\n"
-"Mandrivalinux. Jika Anda setuju dengan semua pasal di dalamnya, klik\n"
+"Mandriva Linux. Jika Anda setuju dengan semua pasal di dalamnya, klik\n"
 "kotak \"%s\". Jika tidak, klik pada tombol \"%s\" akan mereboot komputer "
 "Anda."
 
@@ -3918,13 +3918,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 ""
-"Installasi Mandrivalinux didistribusikan pada beberapa CDROM. DrakX tahu "
+"Installasi Mandriva Linux didistribusikan pada beberapa CDROM. DrakX tahu "
 "jika paket\n"
 "terpilih berada di CDROM lain dan akan mengeluarkan CD yang ada untuk "
 "kemudian\n"
@@ -3936,11 +3936,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"
@@ -3993,11 +3994,11 @@ msgid ""
 msgstr ""
 "Sekarang waktunya untuk menentukan program yang akan diinstal. Terdapat "
 "ribuan \n"
-"pada Mandrivalinux, dan untuk mempermudah, mereka telah diletakkan pada "
+"pada Mandriva Linux, dan untuk mempermudah, mereka telah diletakkan pada "
 "grup \n"
 "aplikasi yang sejenis.\n"
 "\n"
-"Mandrivalinux mengurutkan paket dalam empat kategori. Anda bisa "
+"Mandriva Linux mengurutkan paket dalam empat kategori. Anda bisa "
 "menggabungkan \n"
 "menyesuaikan aplikasi dari berbagai kategori, sehingga installasi "
 "``Workstation''\n"
@@ -4106,10 +4107,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"
@@ -4141,9 +4142,10 @@ msgstr ""
 "!! Jika paket server terpilih dengan sengaja atau karena merupakan bagian "
 "suatu\n"
 "grup besar, akan ada pertanyaan konfirmasi installasi paket tersebut. Pada\n"
-"Mandrivalinux, secara default semua server terinstal dijalankan saat boot.\n"
+"Mandriva Linux, secara default semua server terinstal dijalankan saat boot.\n"
 "Meski aman saat distribusi diluncurkan, ada kemungkinan lubang keamanan\n"
-"ditemukan setelah versi Mandrivalinux ini selesai. Jika Anda tidak tahu apa\n"
+"ditemukan setelah versi Mandriva Linux ini selesai. Jika Anda tidak tahu "
+"apa\n"
 "yang dilakukan oleh suatu layanan atau mengapa ia diinstal, klik \"%s\".\n"
 "Jika Anda menekan \"%s\" layanan terdaftar akan diinstal dan akan "
 "dijalankan\n"
@@ -4308,7 +4310,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"
@@ -4364,7 +4366,7 @@ msgid ""
 msgstr ""
 "X (untuk X Window System) adalah jantung dari interface grafis GNU/Linux\n"
 "yang diperlukan oleh semua lingkungan grafis (KDE, GNOME, AfterStep,\n"
-"WindowMaker, dll.) yang dibundel pada Mandrivalinux.\n"
+"WindowMaker, dll.) yang dibundel pada Mandriva Linux.\n"
 "\n"
 "Anda akan melihat daftar parameter yang berbeda untuk merubah untuk "
 "mendapatkan\n"
@@ -4494,12 +4496,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"
@@ -4526,7 +4528,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"
@@ -4535,7 +4537,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"
@@ -4557,11 +4560,11 @@ msgid ""
 msgstr ""
 "Sekarang Anda harus menentukan dimana Anda hendak menginstall sistem "
 "operasi\n"
-"Mandrivalinux pada harddisk Anda. Jika harddisk Anda kosong atau jika "
+"Mandriva Linux pada harddisk Anda. Jika harddisk Anda kosong atau jika "
 "sebuah\n"
 "sistem operasi menggunakan semua tempat, Anda harus mempartisi drive.\n"
 "Pada dasarnya, mempartisi harddisk berarti membaginya secara logical\n"
-"untuk membuat ruang yang diperlukan sistem Mandrivalinux baru Anda.\n"
+"untuk membuat ruang yang diperlukan sistem Mandriva Linux baru Anda.\n"
 "\n"
 "Karena proses partisi harddisk biasanya tidak bisa dikembalikan dan bisa \n"
 "mengacu pada kehilangan data, partisi bisa menegangkan dan membuat stress\n"
@@ -4598,7 +4601,7 @@ msgstr ""
 "dengan sebelumnya Anda sudah mendefrag partisi Windows.\n"
 "Membackup data sangat disarankan. Penggunaan opsi ini sangat "
 "direkomendasikan jika Anda\n"
-"ingin menggunakan Mandrivalinux dan Microsoft Windows pada komputer yang "
+"ingin menggunakan Mandriva Linux dan Microsoft Windows pada komputer yang "
 "sama.\n"
 "\n"
 "   Sebelum memilih opsi ini, harap dipahami bahwa setelah prosedur ini, "
@@ -4611,8 +4614,8 @@ msgstr ""
 "\n"
 " * \"%s\". Jika Anda hendak menghapus seluruh data dan semua partisi yang "
 "ada pada harddisk\n"
-"Anda dan menggantinya dengan sistem Mandrivalinux yang baru, pilih opsi ini. "
-"Hati-hati, karena\n"
+"Anda dan menggantinya dengan sistem Mandriva Linux yang baru, pilih opsi "
+"ini. Hati-hati, karena\n"
 "Anda tidak bisa membatalkan opsi ini setelah Anda mengkonfirmasikan.\n"
 "\n"
 "   !! Jika Anda memilih opsi ini, semua data pada harddisk Anda akan "
@@ -4780,7 +4783,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."
@@ -4802,7 +4805,7 @@ msgstr ""
 "Klik pada \"%s\" ketika Anda siap memformat partisi.\n"
 "\n"
 "Klik pada \"%s\" jika Anda hendak memilih partisi lain untuk \n"
-"installasi sistem operasi Mandrivalinux baru Anda.\n"
+"installasi sistem operasi Mandriva Linux baru Anda.\n"
 "\n"
 "Klik pada \"%s\" jika Anda hendak memilih partisi yang hendak \n"
 "diperiksa untuk block rusak pada disk."
@@ -4819,7 +4822,7 @@ msgstr "Sebelumnya"
 #: 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"
@@ -4831,7 +4834,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Saat Mandrivalinux diinstal, mungkin beberapa paket telah diupdate sejak\n"
+"Saat Mandriva Linux diinstal, mungkin beberapa paket telah diupdate sejak\n"
 "rilis awal. Beberapa kesalahan mungkin telah diperbaiki / masalah keamanan\n"
 "dipecahkan. Untuk memanfaatkan update ini Anda dapat men-download-nya dari\n"
 "Internet. Pilih \"%s\" jika Anda memiliki koneksi Internet, atau \"%s\" "
@@ -4859,7 +4862,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"
@@ -4872,7 +4875,7 @@ msgstr ""
 "\n"
 "Jika Anda tidak tahu apa yang akan dipilih, gunakan opsi default. Anda\n"
 "mampu mengubahnya menggunakan perkakas draksec, yang merupakan bagian\n"
-"dari dari Pusat Kontrol Mandrivalinux.\n"
+"dari dari Pusat Kontrol Mandriva Linux.\n"
 "\n"
 "Isi bagian \"%s\" dengan alamat email dari orang yang bertanggung jawab\n"
 "atas keaman. Pesan keamanan akan dikirimkan pada alamat tersebut."
@@ -4886,7 +4889,7 @@ msgstr "Administrator Keamanan"
 #, 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"
@@ -4957,7 +4960,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Saat ini, Anda harus memilih partisi yang akan digunakan untuk installasi\n"
-"sistem Mandrivalinux Anda. Jika partisi telah didefinisikan, baik dari\n"
+"sistem Mandriva Linux Anda. Jika partisi telah didefinisikan, baik dari\n"
 "installasi GNU/Linux sebelumnya atau melalui perkakas partisi lainnya,\n"
 "Anda bisa menggunakan partisi yang ada. Jika tidak, partisi harddisk \n"
 "harus didefinisikan.\n"
@@ -5041,7 +5044,7 @@ msgstr "Ubah ke modus normal/ahli"
 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"
@@ -5118,7 +5121,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"
@@ -5127,18 +5130,19 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your 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 ""
 "Tahap ini hanya aktif jika partisi GNU/Linux lama ditemukan.\n"
 "\n"
 "DrakX perlu tahu Anda ingin melakukan installasi baru atau upgrade sistem\n"
-"Mandrivalinux yang sudah ada:\n"
+"Mandriva Linux yang sudah ada:\n"
 "\n"
 "* \"%s\": Untuk sebagian besar bagian, opsi ini menghapus sistem lama.\n"
 "Namun, bergantung pada skema partisi Anda, Anda bisa mencegah data Anda\n"
@@ -5147,11 +5151,11 @@ msgstr ""
 "harus menggunakan opsi ini.\n"
 "\n"
 "* \"%s\": Kelas installasi ini akan mengupdate paket yang terinstall\n"
-"pada sistem Mandrivalinux Anda. Skema partisi dan data pengguna Anda\n"
+"pada sistem Mandriva Linux Anda. Skema partisi dan data pengguna Anda\n"
 "tidak akan diubah. Sebagian besar langkah konfigurasi yang tersisa\n"
 "serupa pada installasi standar.\n"
 "\n"
-"Menggunakan opsi ``Upgrade'' seharusnya berjalan pada Mandrivalinux\n"
+"Menggunakan opsi ``Upgrade'' seharusnya berjalan pada Mandriva Linux\n"
 "versi \"8.1\" keatas. Melakukan upgrade pada versi sebelum \"8.1\"\n"
 "tidak dianjurkan."
 
@@ -5210,7 +5214,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"
@@ -5251,7 +5256,7 @@ msgstr ""
 "Tentang dukungan UTF-8 (unicode): Unicode adalah enkoding karakter yang\n"
 "baru yang ditujukan untuk mencakup seluruh bahasa yang ada. Namun \n"
 "dukungan penuh pada GNU/Linux sedang dalam pengembangan. Untuk alasan\n"
-"tersebut, penggunaan UTF-8 pada Mandrivalinux bergantung pada pilihan\n"
+"tersebut, penggunaan UTF-8 pada Mandriva Linux bergantung pada pilihan\n"
 "pengguna:\n"
 "\n"
 " * Jika Anda memilih menggunakan bahasa dengan enkoding yang kuat (bahasa\n"
@@ -5485,7 +5490,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"
@@ -5506,11 +5511,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 ""
 "Sekarang, waktunya memilih sistem pencetakan untuk komputer Anda. Sistem\n"
-"operasi lain mungkin menawarkan satu, tetapi Mandrivalinux menawarkan dua.\n"
+"operasi lain mungkin menawarkan satu, tetapi Mandriva Linux menawarkan dua.\n"
 "Setiap sistem pencetakan sesuai untuk jenis konfigurasi tertentu.\n"
 "\n"
 " * \"%s\" - yang merupakan akronim untuk ``print, tidak ada antrian'',\n"
@@ -5648,7 +5653,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"
@@ -5665,7 +5671,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"
@@ -5716,7 +5722,7 @@ msgstr ""
 "\n"
 " * \"%s\": jika Anda hendak mengkonfigurasi akses jaringan Internet\n"
 "atau lokal Anda, Anda bisa melakukannya sekarang. Lihat dokumentasi\n"
-"cetak atau gunakan Pusat Kontrol Mandrivalinux setelah installasi\n"
+"cetak atau gunakan Pusat Kontrol Mandriva Linux setelah installasi\n"
 "selesai untuk mengambil keuntungan dari bantuannya.\n"
 "\n"
 " * \"%s\": mengijinkan Anda mengkonfigurasi alamat proxy HTTP dan\n"
@@ -5733,7 +5739,7 @@ msgstr ""
 " * \"%s\": jika Anda hendak merubah konfigurasi bootloader Anda, klik\n"
 "tombol ini. Opsi ini ditujukan untuk pengguna tingkat lanjut. Lihat\n"
 "dokumentasi cetak atau bantuan tentang konfigurasi bootloader pada \n"
-"Pusat Kontrol Mandrivalinux.\n"
+"Pusat Kontrol Mandriva Linux.\n"
 "\n"
 " * \"%s\": melalui daftar ini Anda bisa menentukan layanan apa yang\n"
 "akan dijalankan pada komputer Anda. Jika Anda berencana untuk memakai\n"
@@ -5795,10 +5801,10 @@ msgstr "Layanan"
 #, 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 ""
-"Pilih harddrive yang akan dihapus untuk menginstall partisi Mandrivalinux\n"
+"Pilih harddrive yang akan dihapus untuk menginstall partisi Mandriva Linux\n"
 "baru Anda. Hati-hati, semua data pada drive ini akan hilang dan\n"
 "tidak dapat dikembalikan seperti semula!"
 
@@ -6150,11 +6156,11 @@ msgstr "Menghitung ukuran partisi 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 ""
 "Partisi Windows Anda terlalu terfragmen. Harap reboot komputer Anda pada "
-"Windows, jalankan utilitas ``defrag'', lalu ulangi installasi Mandrivalinux."
+"Windows, jalankan utilitas ``defrag'', lalu ulangi installasi Mandriva Linux."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -6271,13 +6277,13 @@ msgstr "Menonaktifkan jaringan"
 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"
@@ -6331,7 +6337,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"
@@ -6368,7 +6374,7 @@ msgid ""
 "Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
 "as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -6592,8 +6598,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"
@@ -6601,13 +6607,13 @@ 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 ""
 "Selamat, installasi selesai.\n"
 "Ambil media boot dan tekan Return/Enter untuk reboot.\n"
 "\n"
 "\n"
-"Untuk informasi perbaikan yang tersedia untuk rilis Mandrivalinux\n"
+"Untuk informasi perbaikan yang tersedia untuk rilis Mandriva Linux\n"
 "ini, silakan lihat Errata yang tersedia pada:\n"
 "\n"
 "\n"
@@ -6615,13 +6621,13 @@ msgstr ""
 "\n"
 "\n"
 "Informasi tentang konfigurasi sistem tersedia pada bab Pasca\n"
-"Installasi di Panduan Pengguna Resmi Linux Mandrivalinux."
+"Installasi di Panduan Pengguna Resmi Linux Mandriva Linux."
 
 #. -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
@@ -6650,12 +6656,12 @@ msgstr "Memasuki langkah `%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 ""
 "Sumber daya sistem Anda rendah. Anda akan mengalami kesulitan\n"
-"menginstall Mandrivalinux. Jika terjadi, Anda bisa mencoba\n"
+"menginstall Mandriva Linux. Jika terjadi, Anda bisa mencoba\n"
 "installasi berbasis teks. Untuk melakukannya, tekan `F1' saat\n"
 "booting pada CDROM, lalu ketikkan `text'."
 
@@ -7192,8 +7198,8 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
-msgstr "Menghubungi situs Mandrivalinux untuk mengambil daftar mirror..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr "Menghubungi situs Mandriva Linux untuk mengambil daftar mirror..."
 
 #: install_steps_interactive.pm:840
 #, c-format
@@ -7416,8 +7422,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Installasi Mandrivalinux %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Installasi Mandriva Linux %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -10225,13 +10231,13 @@ 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 ""
 "konfigurator drakfirewall\n"
 "\n"
-"Program ini mengkonfigurasi firewall pribadi untuk Mandrivalinux.\n"
+"Program ini mengkonfigurasi firewall pribadi untuk Mandriva Linux.\n"
 "Untuk membuat solusi firewall yang lebih baik, cobalah\n"
 "distribusi khusus MandrakeSecurity Firewall"
 
@@ -14272,12 +14278,12 @@ 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 ""
-"Jalankan Scannerdrake (Perangkat Lunak/Scanner pada Pusat Kontrol "
-"Mandrivalinux) untuk berbagi scanner pada jaringan.\n"
+"Jalankan Scannerdrake (Perangkat Lunak/Scanner pada Pusat Kontrol Mandriva "
+"Linux) untuk berbagi scanner pada jaringan.\n"
 
 #: printer/printerdrake.pm:3933
 #, c-format
@@ -16190,33 +16196,33 @@ msgstr "Stop"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Apa itu Mandrivalinux?</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Apa itu Mandriva Linux?</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "Selamat Datang di <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "Selamat Datang di <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 adalah sebuah <b>distribusi Linux</b> yang menggabungkan inti "
+"Mandriva Linux adalah sebuah <b>distribusi Linux</b> yang menggabungkan inti "
 "sistem, yang disebut <b>sistem operasi</b> (berbasiskan kernel Linux) dengan "
 "<b>banyak aplikasi</b> yang sesuai kebutuhan Anda."
 
 #: 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 juga merupakan distribusi Linux paling <b>ramah pengguna</b>. "
+"Mandriva Linux juga merupakan distribusi Linux paling <b>ramah pengguna</b>. "
 "Ia juga merupakan distribusi Linux yang <b>paling banyak digunakan</b>!"
 
 #: share/advertising/02.pl:13
@@ -16232,14 +16238,14 @@ msgstr "Selamat datang di <b>dunia open source</b>!"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
+"Mandriva Linux is committed to the open source model. This means that this "
 "new release is the result of <b>collaboration</b> between <b>Mandriva's team "
-"of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
-"Mandrivalinux berkomitmen dengan model open source. Hal ini berarti rilis "
+"Mandriva Linux berkomitmen dengan model open source. Hal ini berarti rilis "
 "baru adalah hasil <b>kolaborasi</b> antara <b>tim pengembang Mandriva</b> "
-"dengan <b>komunitas</b> kontributor Mandrivalinux."
+"dengan <b>komunitas</b> kontributor Mandriva Linux."
 
 #: share/advertising/02.pl:19
 #, c-format
@@ -16258,11 +16264,11 @@ 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 ""
 "Sebagian besar perangkat lunak yang disertakan pada distribusi ini dan semua "
-"perkakas Mandrivalinux berada dibawah lisensi <b>General Public License</b>."
+"perkakas Mandriva Linux berada dibawah lisensi <b>General Public License</b>."
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -16292,25 +16298,25 @@ msgstr "<b>Bergabung dengan Komunitas</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 memiliki salah satu <b>komunitas terbesar</b> dari pengguna "
+"Mandriva Linux memiliki salah satu <b>komunitas terbesar</b> dari pengguna "
 "dan pengembang. Fungsi dari komunitas sangatlah luas, mulai dari pelaporan "
 "kesalahan hingga pengembangan aplikasi baru. Komunitas memainkan <b>peran</"
-"b> dalam dunia Mandrivalinux."
+"b> dalam dunia Mandriva Linux."
 
 #: 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 ""
 "Untuk <b>mempelajari lebih lanjut</b> tentang komunitas dinamis kami, "
-"silahkan kunjungi <b>www.mandrakelinux.com</b> atau <b>www.mandrakelinux.com/"
+"silahkan kunjungi <b>www.mandrivalinux.com</b> atau <b>www.mandrivalinux.com/"
 "en/cookerdevel.php3</b> jika Anda ingin <b>terlibat</b> pada pengembangan."
 
 #: share/advertising/05.pl:15
@@ -16321,10 +16327,10 @@ msgstr "<b>Versi 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 ""
-"Saat ini Anda akan menginstall <b>Mandrivalinux Versi Download</b>. Ini "
+"Saat ini Anda akan menginstall <b>Mandriva Linux Versi Download</b>. Ini "
 "merupakan versi gratis yang <b>tersedia untuk semua</b>."
 
 #: share/advertising/05.pl:19
@@ -16368,8 +16374,8 @@ msgstr "<b>Discovery, Desktop Linux Pertama Anda</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
-msgstr "Anda sekarang akan menginstall <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
+msgstr "Anda sekarang akan menginstall <b>Mandriva Linux Discovery</b>."
 
 #: share/advertising/06.pl:17
 #, c-format
@@ -16391,8 +16397,8 @@ msgstr "<b>PowerPack, Desktop Linux Handal</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
-msgstr "Anda akan menginstall <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
+msgstr "Anda akan menginstall <b>Mandriva Linux PowerPack</b>."
 
 #: share/advertising/07.pl:17
 #, c-format
@@ -16412,8 +16418,8 @@ msgstr "<b>PowerPack+, Solusi Linux untuk Desktop dan Server</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
-msgstr "Anda akan menginstall <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
+msgstr "Anda akan menginstall <b>Mandriva Linux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
 #, c-format
@@ -16435,14 +16441,14 @@ msgstr "<b>Produk Mandriva</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> telah mengembangkan produk <b>Mandrivalinux</b> yang luas."
+"<b>Mandriva</b> telah mengembangkan produk <b>Mandriva Linux</b> yang luas."
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
-msgstr "Produk Mandrivalinux adalah:"
+msgid "The Mandriva Linux products are:"
+msgstr "Produk Mandriva Linux adalah:"
 
 #: share/advertising/09.pl:18
 #, c-format
@@ -16462,10 +16468,10 @@ msgstr "\t* <b>PowerPack+</b>, Solusi Linux untuk Desktop dan Server."
 #: 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 untuk x86-64</b>, Solusi Mandrivalinux untuk "
+"\t* <b>Mandriva Linux untuk x86-64</b>, Solusi Mandriva Linux untuk "
 "memaksimalkan prosesor 64-bit Anda."
 
 #: share/advertising/10.pl:15
@@ -16476,29 +16482,29 @@ msgstr "<b>Produk Mandriva (Produk Nomad)</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 telah mengembangan dua produk yang mengijinkan Anda menggunakan "
-"Mandrivalinux <b>pada sembarang komputer</b> dan tanpa harus menginstallnya:"
+"Mandriva Linux <b>pada sembarang komputer</b> dan tanpa harus menginstallnya:"
 
 #: 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>, distribusi Mandrivalinux yang berjalan sepenuhnya melalui "
+"\t* <b>Move</b>, distribusi Mandriva Linux yang berjalan sepenuhnya melalui "
 "CD-ROM bootable."
 
 #: 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>, distribusi Mandrivalinux yang terinstall pada ultra-"
-"compact “LaCie Mobile Hard Drive”."
+"\t* <b>GlobeTrotter</b>, distribusi Mandriva Linux yang terinstall pada "
+"ultra-compact “LaCie Mobile Hard Drive”."
 
 #: share/advertising/11.pl:13
 #, c-format
@@ -16516,18 +16522,20 @@ msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
-msgstr "\t* <b>Corporate Desktop</b>, Desktop Mandrivalinux untuk Bisnis."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Desktop Mandriva Linux untuk Bisnis."
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
-msgstr "\t* <b>Corporate Server</b>, Solusi Server Mandrivalinux."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Solusi Server Mandriva Linux."
 
 #: 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>, Solusi Keamanan Mandrivalinux."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, Solusi Keamanan Mandriva Linux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -16726,10 +16734,10 @@ msgstr "<b>Menikmati Aplikasi yang Luas</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 ""
-"Pada menu Mandrivalinux Anda akan menemukan aplikasi <b>mudah digunakan</b> "
+"Pada menu Mandriva Linux Anda akan menemukan aplikasi <b>mudah digunakan</b> "
 "untuk <b>semua tugas Anda</b>:"
 
 #: share/advertising/18.pl:16
@@ -16995,18 +17003,18 @@ msgstr "\t* <b>Postfix</b> dan <b>Sendmail</b>: server mail paling populer."
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Pusat Kontrol Mandrivalinux</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Pusat Kontrol Mandriva Linux</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>Pusat Kontrol Mandrivalinux</b> adalah kumpulan koleksi penting dari "
-"utilitas khusus Mandrivalinux yang didesain untuk mempermudah konfigurasi "
+"<b>Pusat Kontrol Mandriva Linux</b> adalah kumpulan koleksi penting dari "
+"utilitas khusus Mandriva Linux yang didesain untuk mempermudah konfigurasi "
 "komputer Anda."
 
 #: share/advertising/25.pl:17
@@ -17031,15 +17039,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 ""
 "Seperti semua pemrograman komputer, perangkat lunak open source "
 "<b>membutuhkan waktu dan orang</b> untuk pengembangan. Untuk menghargai "
 "filosofi open source, Mandriva menjual produk dan layanan yang bernilai "
-"lebih untuk <b>meningkatkan Mandrivalinux</b>. Jika Anda ingin <b>mendukung "
-"filosofi open source</b> dan pengembangan dari Mandrivalinux, <b>silahkan</"
+"lebih untuk <b>meningkatkan Mandriva Linux</b>. Jika Anda ingin <b>mendukung "
+"filosofi open source</b> dan pengembangan dari Mandriva Linux, <b>silahkan</"
 "b> mempertimbangkan untuk membeli salah satu produk atau layanan kami!"
 
 #: share/advertising/27.pl:13
@@ -17074,8 +17082,8 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Berkunjunglah sekarang pada <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
+msgstr "Berkunjunglah sekarang pada <b>store.mandriva.com</b>!"
 
 #: share/advertising/28.pl:15
 #, c-format
@@ -17085,11 +17093,11 @@ 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> adalah <b>pelengkap sempurna</b> untuk produk "
-"Mandrivalinux Anda..."
+"<b>Mandriva Club</b> adalah <b>pelengkap sempurna</b> untuk produk Mandriva "
+"Linux Anda..."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -17103,10 +17111,10 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 "\t* <b>Potongan khusus</b> untuk produk dan layanan pada toko online "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -17118,17 +17126,17 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
-msgstr "\t* Partisipasi pada <b>forum pengguna</b> Mandrivalinux."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
+msgstr "\t* Partisipasi pada <b>forum pengguna</b> Mandriva Linux."
 
 #: 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>Akses cepat dan khusus</b>, sebelum rilis publik, untuk <b>citra ISO</"
-"b> Mandrivalinux."
+"b> Mandriva Linux."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -17148,10 +17156,10 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 "Mandriva Online menawarkan layanan yang luas untuk <b>kemudahan update</b> "
-"dari sistem Mandrivalinux Anda:"
+"dari sistem Mandriva Linux Anda:"
 
 #: share/advertising/29.pl:18
 #, c-format
@@ -17175,9 +17183,9 @@ msgstr "\t* Update <b>terjadwal</b> yang fleksibel."
 #: 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* Pengelolaan <b>semua sistem Mandrivalinux Anda</b> dengan satu account."
+"\t* Pengelolaan <b>semua sistem Mandriva Linux Anda</b> dengan satu account."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -17188,27 +17196,27 @@ 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 ""
 "Apakah Anda membutuhkan <b>asisten?</b> Temukan teknisi ahli Mandriva pada "
-"<b>platform dukungan teknis kami</b> www.mandrakeexpert.com."
+"<b>platform dukungan teknis kami</b> www.mandrivaexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
-"Terima kasih kepada bantuan dari <b>ahli berkualitas Mandrivalinux</b>, Anda "
-"akan menghemat banyak waktu."
+"Terima kasih kepada bantuan dari <b>ahli berkualitas Mandriva Linux</b>, "
+"Anda akan menghemat banyak waktu."
 
 #: 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 ""
-"Untuk sembarang pertanyaan yang berhubungan dengan Mandrivalinux, Anda "
+"Untuk sembarang pertanyaan yang berhubungan dengan Mandriva Linux, Anda "
 "memiliki kesempatan untuk membeli dukungan insiden pada <b>store."
 "mandrakesoft.com</b>."
 
@@ -17596,8 +17604,8 @@ 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 ""
 "[OPSI] [NAMA_PROGRAM]\n"
 "\n"
@@ -17658,7 +17666,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"
@@ -20500,13 +20508,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Perkakas Pelapor Kesalahan Mandrivalinux"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Perkakas Pelapor Kesalahan Mandriva Linux"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Pusat Kontrol Mandrivalinux"
+msgid "Mandriva Linux Control Center"
+msgstr "Pusat Kontrol Mandriva Linux"
 
 #: standalone/drakbug:48
 #, c-format
@@ -20997,19 +21005,19 @@ msgstr "Dijalankan saat 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 ""
 "Antarmuka ini belum terkonfigurasi.\n"
-"Jalankan asisten \"Tambahkan antarmuka\" dari Pusat Kontrol Mandrivalinux"
+"Jalankan asisten \"Tambahkan antarmuka\" dari Pusat Kontrol Mandriva Linux"
 
 #: 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 ""
 "Anda tidak memiliki koneksi Internet yang terkonfigurasi.\n"
-"Jalankan asisten \"%s\" dari Pusat Kontrol Mandrivalinux"
+"Jalankan asisten \"%s\" dari Pusat Kontrol Mandriva Linux"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -21059,8 +21067,8 @@ msgstr "KDM (KDE Display Manager)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Mandrivalinux Display Manager)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Mandriva Linux Display Manager)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -21363,18 +21371,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 ""
 "Hak Cipta (C) 2001-2002 oleh Mandriva \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versi orisinal)\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
@@ -21948,8 +21956,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Pusat Bantuan Mandrivalinux"
+msgid "Mandriva Linux Help Center"
+msgstr "Pusat Bantuan Mandriva Linux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -22615,7 +22623,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 ""
 "Tidak ada Kartu Suara yang terdeteksi. Pastikan Kartu Suara yang didukung "
 "Linux terhubung dengan benar.\n"
@@ -22624,7 +22632,7 @@ msgstr ""
 "Anda bisa mengunjungi database perangkat keras kami pada:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, c-format
@@ -24648,7 +24656,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 ""
 "Tidak ada Kartu TV yang terdeteksi. Pastikan Kartu Video/TV yang didukung "
 "Linux terhubung dengan benar.\n"
@@ -24657,7 +24665,7 @@ msgstr ""
 "Kunjungi database perangkat keras kami di:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -25366,13 +25374,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 ""
 "Ini adalah HardDrake, perkakas konfigurasi perangkat keras %s.\n"
 "<span foreground=\"royalblue3\">Versi:</span> %s\n"
 "<span foreground=\"royalblue3\">Penulis:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -25480,8 +25488,8 @@ msgstr "Perubahan selesai, tetapi agar efektif, Anda harus logout"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Log Perkakas Mandrivalinux"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Log Perkakas Mandriva Linux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -26004,10 +26012,10 @@ msgstr "Koneksi selesai."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "Koneksi gagal.\n"
-"Periksa konfigurasi Anda pada Pusat Kontrol Mandrivalinux."
+"Periksa konfigurasi Anda pada Pusat Kontrol Mandriva Linux."
 
 #: standalone/net_monitor:341
 #, c-format