Synthesized commit during git-svn import combining previous Mandriva history with Mageia.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r431 | dmorgan | 2011-02-06 01:58:02 +0000 (Sun, 06 Feb 2011) | 1 line

Add drakx structure on the SVN
------------------------------------------------------------------------
r432 | dmorgan | 2011-02-06 01:59:38 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned advertising
------------------------------------------------------------------------
r446 | dmorgan | 2011-02-06 22:37:08 +0000 (Sun, 06 Feb 2011) | 1 line

Import Clean perl-install
------------------------------------------------------------------------
r448 | dmorgan | 2011-02-06 23:02:36 +0000 (Sun, 06 Feb 2011) | 1 line

Add cleaned files
------------------------------------------------------------------------
r449 | dmorgan | 2011-02-06 23:03:52 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned kernel
------------------------------------------------------------------------
r450 | dmorgan | 2011-02-06 23:23:30 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned tools
------------------------------------------------------------------------
r451 | dmorgan | 2011-02-07 00:01:56 +0000 (Mon, 07 Feb 2011) | 1 line

Import stage1
------------------------------------------------------------------------
r473 | dmorgan | 2011-02-07 11:20:50 +0000 (Mon, 07 Feb 2011) | 1 line

Import images
------------------------------------------------------------------------
r497 | ennael | 2011-02-09 21:02:06 +0000 (Wed, 09 Feb 2011) | 2 lines

readd missing file

------------------------------------------------------------------------
r502 | pterjan | 2011-02-09 23:30:32 +0000 (Wed, 09 Feb 2011) | 1 line

Import rescue
------------------------------------------------------------------------
r603 | ennael | 2011-02-24 13:32:54 +0000 (Thu, 24 Feb 2011) | 2 lines

import cleaned rescue for Mageia

------------------------------------------------------------------------
r2061 | tv | 2011-10-20 20:32:19 +0100 (Thu, 20 Oct 2011) | 1 line

import (cleaned) doc
------------------------------------------------------------------------

1 files changed, 65 insertions, 70 deletions

diff --git a/perl-install/install/help/po/id.po b/perl-install/install/help/po/id.po
index be1d4a1da..1b89c4031 100644
--- a/perl-install/install/help/po/id.po
+++ b/perl-install/install/help/po/id.po
@@ -1,4 +1,4 @@
-# Instalator Grafis Mandriva Linux
+# Instalator Grafis Mageia
 # Copyright (C) 1999 Mandriva
 # Budi Rachmanto <rac@mandrivalinux.org>, 2001-2003
 # Linux Indonesia <http://www.linux.or.id>, 1999-2001
@@ -27,15 +27,15 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../help.pm:14
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandriva Linux distribution. If you agree with all the\n"
+"covers the entire Mageia 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"
-"Mandriva Linux. Jika Anda setuju dengan semua pasal di dalamnya, klik\n"
+"Mageia. Jika Anda setuju dengan semua pasal di dalamnya, klik\n"
 "kotak \"%s\". Jika tidak, klik pada tombol \"%s\" akan mereboot komputer "
 "Anda."
 
@@ -202,15 +202,15 @@ msgstr ""
 "terkecil kedua\", dan seterusnya."
 
 #: ../help.pm:88
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
+"The Mageia 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 Mandriva Linux didistribusikan pada beberapa CDROM. DrakX tahu "
+"Installasi Mageia didistribusikan pada beberapa CDROM. DrakX tahu "
 "jika paket\n"
 "terpilih berada di CDROM lain dan akan mengeluarkan CD yang ada untuk "
 "kemudian\n"
@@ -222,12 +222,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandriva Linux, and to make "
-"it\n"
+"There are thousands of packages available for Mageia, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandriva Linux sorts package groups in four categories. You can mix and\n"
+"Mageia 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"
@@ -279,11 +278,11 @@ msgid ""
 msgstr ""
 "Sekarang waktunya untuk menentukan program yang akan diinstal. Terdapat "
 "ribuan \n"
-"pada Mandriva Linux, dan untuk mempermudah, mereka telah diletakkan pada "
+"pada Mageia, dan untuk mempermudah, mereka telah diletakkan pada "
 "grup \n"
 "aplikasi yang sejenis.\n"
 "\n"
-"Mandriva Linux mengurutkan paket dalam empat kategori. Anda bisa "
+"Mageia mengurutkan paket dalam empat kategori. Anda bisa "
 "menggabungkan \n"
 "menyesuaikan aplikasi dari berbagai kategori, sehingga installasi "
 "``Workstation''\n"
@@ -353,7 +352,7 @@ msgid "Truly minimal install"
 msgstr "Installasi paling minimal"
 
 #: ../help.pm:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "If you choose to install packages individually, the installer will present\n"
 "a tree containing all packages classified by groups and subgroups. While\n"
@@ -366,10 +365,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 Mandriva Linux will automatically start any installed\n"
+"installed. By default Mageia 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 Mandriva Linux was\n"
+"security holes were discovered after this version of Mageia 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"
@@ -401,9 +400,9 @@ msgstr ""
 "!! Jika paket server terpilih dengan sengaja atau karena merupakan bagian "
 "suatu\n"
 "grup besar, akan ada pertanyaan konfirmasi installasi paket tersebut. Pada\n"
-"Mandriva Linux, secara default semua server terinstal dijalankan saat boot.\n"
+"Mageia, secara default semua server terinstal dijalankan saat boot.\n"
 "Meski aman saat distribusi diluncurkan, ada kemungkinan lubang keamanan\n"
-"ditemukan setelah versi Mandriva Linux ini selesai. Jika Anda tidak tahu "
+"ditemukan setelah versi Mageia 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 "
@@ -543,11 +542,11 @@ msgstr ""
 "Anda."
 
 #: ../help.pm:234
-#, c-format
+#, fuzzy, c-format
 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 Mandriva Linux rely upon.\n"
+"WindowMaker, etc.) bundled with Mageia rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -603,7 +602,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 Mandriva Linux.\n"
+"WindowMaker, dll.) yang dibundel pada Mageia.\n"
 "\n"
 "Anda akan melihat daftar parameter yang berbeda untuk merubah untuk "
 "mendapatkan\n"
@@ -731,14 +730,14 @@ msgstr ""
 "tidak berhasil mendapatkan konfigurasi tampilan."
 
 #: ../help.pm:319
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandriva Linux\n"
+"You now need to decide where you want to install the Mageia\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"
-"Mandriva Linux system.\n"
+"Mageia 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"
@@ -765,7 +764,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 Mandriva Linux and Microsoft Windows on\n"
+"recommended if you want to use both Mageia and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -774,8 +773,7 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandriva Linux system, "
-"choose\n"
+"your hard drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -797,11 +795,11 @@ msgid ""
 msgstr ""
 "Sekarang Anda harus menentukan dimana Anda hendak menginstall sistem "
 "operasi\n"
-"Mandriva Linux pada harddisk Anda. Jika harddisk Anda kosong atau jika "
+"Mageia 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 Mandriva Linux baru Anda.\n"
+"untuk membuat ruang yang diperlukan sistem Mageia 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"
@@ -838,7 +836,7 @@ msgstr ""
 "dengan sebelumnya Anda sudah mendefrag partisi Windows.\n"
 "Membackup data sangat disarankan. Penggunaan opsi ini sangat "
 "direkomendasikan jika Anda\n"
-"ingin menggunakan Mandriva Linux dan Microsoft Windows pada komputer yang "
+"ingin menggunakan Mageia dan Microsoft Windows pada komputer yang "
 "sama.\n"
 "\n"
 "   Sebelum memilih opsi ini, harap dipahami bahwa setelah prosedur ini, "
@@ -851,7 +849,7 @@ msgstr ""
 "\n"
 " * \"%s\". Jika Anda hendak menghapus seluruh data dan semua partisi yang "
 "ada pada harddisk\n"
-"Anda dan menggantinya dengan sistem Mandriva Linux yang baru, pilih opsi "
+"Anda dan menggantinya dengan sistem Mageia yang baru, pilih opsi "
 "ini. Hati-hati, karena\n"
 "Anda tidak bisa membatalkan opsi ini setelah Anda mengkonfirmasikan.\n"
 "\n"
@@ -986,7 +984,7 @@ msgid "Save packages selection"
 msgstr ""
 
 #: ../help.pm:408
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
 "reformat some of them and erase any data they contain. To do so, please\n"
@@ -1005,7 +1003,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"
-"Mandriva Linux operating system installation.\n"
+"Mageia 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."
@@ -1027,15 +1025,15 @@ 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 Mandriva Linux baru Anda.\n"
+"installasi sistem operasi Mageia baru Anda.\n"
 "\n"
 "Klik pada \"%s\" jika Anda hendak memilih partisi yang hendak \n"
 "diperiksa untuk block rusak pada disk."
 
 #: ../help.pm:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"By the time you install Mandriva Linux, it's likely that some packages will\n"
+"By the time you install Mageia, 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"
@@ -1047,7 +1045,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 Mandriva Linux diinstal, mungkin beberapa paket telah diupdate sejak\n"
+"Saat Mageia 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\" "
@@ -1060,7 +1058,7 @@ msgstr ""
 "tekan \"%s\" untuk mengambil/menginstall paket atau \"%s\" untuk membatalkan."
 
 #: ../help.pm:450
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "At this point, DrakX will allow you to choose the security level you desire\n"
 "for your machine. As a rule of thumb, the security level should be set\n"
@@ -1069,7 +1067,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 Mandriva Linux\n"
+"to change it later with the draksec tool, which is part of Mageia\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -1082,7 +1080,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 Mandriva Linux.\n"
+"dari dari Pusat Kontrol Mageia.\n"
 "\n"
 "Isi bagian \"%s\" dengan alamat email dari orang yang bertanggung jawab\n"
 "atas keaman. Pesan keamanan akan dikirimkan pada alamat tersebut."
@@ -1093,10 +1091,10 @@ msgid "Security Administrator"
 msgstr "Administrator Keamanan"
 
 #: ../help.pm:464
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandriva Linux system. If partitions have already been\n"
+"installation of your Mageia 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"
@@ -1167,7 +1165,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Saat ini, Anda harus memilih partisi yang akan digunakan untuk installasi\n"
-"sistem Mandriva Linux Anda. Jika partisi telah didefinisikan, baik dari\n"
+"sistem Mageia 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"
@@ -1272,11 +1270,11 @@ msgid "Toggle between normal/expert mode"
 msgstr "Ubah ke modus normal/ahli"
 
 #: ../help.pm:536
-#, c-format
+#, fuzzy, c-format
 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"
-"Mandriva Linux operating system.\n"
+"Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -1306,7 +1304,7 @@ msgid ""
 msgstr ""
 "Terdapat lebih dari satu partisi Microsoft yang terdeteksi pada harddisk\n"
 "Anda. Pilih partisi yang hendak Anda ubah ukurannya untuk installasi sistem\n"
-"operasi Mandriva Linux.\n"
+"operasi Mageia.\n"
 "\n"
 "Tiap partisi terdaftar sebagai: \"Nama Linux\",\"Nama windows\",\"Kapasitas"
 "\".\n"
@@ -1347,13 +1345,13 @@ msgstr ""
 "klik tombol \"%s\" untuk mendapatkan daftar lengkap."
 
 #: ../help.pm:572
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "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 Mandriva Linux system:\n"
+"upgrade of an existing Mageia 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"
@@ -1362,19 +1360,18 @@ 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 Mandriva Linux system. Your current "
-"partitioning\n"
+"currently installed on your Mageia 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 Mandriva Linux systems\n"
+"Using the ``Upgrade'' option should work fine on Mageia systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandriva Linux version \"8.1\" is not recommended."
+"to Mageia 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"
-"Mandriva Linux yang sudah ada:\n"
+"Mageia 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"
@@ -1383,11 +1380,11 @@ msgstr ""
 "harus menggunakan opsi ini.\n"
 "\n"
 "* \"%s\": Kelas installasi ini akan mengupdate paket yang terinstall\n"
-"pada sistem Mandriva Linux Anda. Skema partisi dan data pengguna Anda\n"
+"pada sistem Mageia 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 Mandriva Linux\n"
+"Menggunakan opsi ``Upgrade'' seharusnya berjalan pada Mageia\n"
 "versi \"8.1\" keatas. Melakukan upgrade pada versi sebelum \"8.1\"\n"
 "tidak dianjurkan."
 
@@ -1430,7 +1427,7 @@ msgstr ""
 "antara layout Latin dan non-Latin."
 
 #: ../help.pm:612
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -1446,8 +1443,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandriva Linux's use of UTF-8 "
-"will\n"
+"still under development. For that reason, Mageia'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"
@@ -1488,7 +1484,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 Mandriva Linux bergantung pada pilihan\n"
+"tersebut, penggunaan UTF-8 pada Mageia bergantung pada pilihan\n"
 "pengguna:\n"
 "\n"
 " * Jika Anda memilih menggunakan bahasa dengan enkoding yang kuat (bahasa\n"
@@ -1646,10 +1642,10 @@ msgstr ""
 "jika Anda tahu apa yang Anda lakukan."
 
 #: ../help.pm:745
-#, c-format
+#, 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 Mandriva Linux offers two. Each of\n"
+"operating systems may offer you one, but Mageia 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"
@@ -1670,11 +1666,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 Mandriva Linux\n"
+"system you may change it by running PrinterDrake from the Mageia\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 Mandriva Linux menawarkan dua.\n"
+"operasi lain mungkin menawarkan satu, tetapi Mageia menawarkan dua.\n"
 "Setiap sistem pencetakan sesuai untuk jenis konfigurasi tertentu.\n"
 "\n"
 " * \"%s\" - yang merupakan akronim untuk ``print, tidak ada antrian'',\n"
@@ -1801,8 +1797,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandriva Linux Control Center after the installation has finished to "
-"benefit\n"
+"Mageia 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"
@@ -1819,7 +1814,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"
-"Mandriva Linux Control Center.\n"
+"Mageia 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"
@@ -1870,7 +1865,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 Mandriva Linux setelah installasi\n"
+"cetak atau gunakan Pusat Kontrol Mageia setelah installasi\n"
 "selesai untuk mengambil keuntungan dari bantuannya.\n"
 "\n"
 " * \"%s\": mengijinkan Anda mengkonfigurasi alamat proxy HTTP dan\n"
@@ -1887,7 +1882,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 Mandriva Linux.\n"
+"Pusat Kontrol Mageia.\n"
 "\n"
 " * \"%s\": melalui daftar ini Anda bisa menentukan layanan apa yang\n"
 "akan dijalankan pada komputer Anda. Jika Anda berencana untuk memakai\n"
@@ -1910,13 +1905,13 @@ msgid "Graphical Interface"
 msgstr "Antarmuka Grafis"
 
 #: ../help.pm:861
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
+"Mageia 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 Mandriva Linux\n"
+"Pilih harddrive yang akan dihapus untuk menginstall partisi Mageia\n"
 "baru Anda. Hati-hati, semua data pada drive ini akan hilang dan\n"
 "tidak dapat dikembalikan seperti semula!"