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, 60 insertions, 65 deletions

diff --git a/perl-install/install/help/po/tg.po b/perl-install/install/help/po/tg.po
index 735a34387..f21e7d367 100644
--- a/perl-install/install/help/po/tg.po
+++ b/perl-install/install/help/po/tg.po
@@ -26,15 +26,15 @@ msgstr ""
 "X-Generator: KBabel 1.10\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 ""
 "Пеш аз давомдиҳӣ шумо бояд шартҳои литсензияро бо диққат хонед. Он\n"
-"ба ҳамаи тақсимоти  Mandriva Linux паҳн гардидааст. Агар шумо ба\n"
+"ба ҳамаи тақсимоти  Mageia паҳн гардидааст. Агар шумо ба\n"
 "ҳамаи шартҳои литсензия розӣ бошед, пункти \"%s\"-ро қайд кунед. Агар розӣ\n"
 "набошед, танҳо \"%s\" компютери худро хомӯш созед."
 
@@ -210,15 +210,15 @@ msgstr ""
 "дорад, \"b\" маънои\"дуюмин аз поёни SCSI ID\"-ро дорад ва ғайра."
 
 #: ../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 ""
-"Коргузории Mandriva Linux дар CD-ROM-ҳои мухталиф тақсим шудааст. Агар\n"
+"Коргузории Mageia дар CD-ROM-ҳои мухталиф тақсим шудааст. Агар\n"
 "бастаи интихобшуда дар дигар CD-ROM ҷойгир бошад, DrakX диски фишурдаи\n"
 "ҷориро ба берун кашида аз шумо вогузории диски талабшударо пурсон мешавад.\n"
 "Агар шумо дар даст диски фишурдаи талабшударо надошта бошед, танҳо ба \"%s\" "
@@ -229,12 +229,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"
@@ -285,12 +284,12 @@ msgid ""
 "megabytes."
 msgstr ""
 "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 "
+"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"
@@ -357,7 +356,7 @@ msgid "Truly minimal install"
 msgstr "Коргузории аз ҳама пастарин"
 
 #: ../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"
@@ -370,10 +369,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"
@@ -405,11 +404,11 @@ msgstr ""
 "!! Агар бастаи хидматрасонро интихоб карда бошед, хоҳ барои интихоби муайяни "
 "бастаи алоҳида, хоҳ барои он ки вай як қисми гурӯҳӣ баста\n"
 "аст, шумо бояд тасдиқ кунед, ки дар ҳақиқат ин хидматрасонҳои\n"
-"коргузоришавандаро истифода бурдан мехоҳед. Дар Mandriva Linux\n"
+"коргузоришавандаро истифода бурдан мехоҳед. Дар Mageia\n"
 "ҳамаи хидматрасонҳои коргузоришуда ҳангоми оғозёбӣ ба таври худкор, бо "
 "нобаёнӣ сар дода мешаванд. Ҳарчанде, ки онҳо бехатаранд ва муаммоҳои\n"
 "маълумро ҳангоми даргиронидан дар тақсимот надоранд, мумкин аст, ки\n"
-"дар бехатарӣ баъди барориши нусхаи хотимавии Mandriva Linux\n"
+"дар бехатарӣ баъди барориши нусхаи хотимавии Mageia\n"
 "сӯрохиҳои муайян мешаванд. Агар шумо надонед, ки барои чӣ ин ё он\n"
 "хидматрасон лозим аст ё барои чӣ он коргузорӣ мегардад пас ба \"%s\"\n"
 "ангушт занед. Бо пахшкунии \"%s\" шумо хидматрасонҳои номбаршударо\n"
@@ -547,11 +546,11 @@ msgstr ""
 "хидматрасон пеш аз ҳама ба эҳтиёҷи шумо мувофиқат мекунад."
 
 #: ../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"
@@ -607,7 +606,7 @@ msgid ""
 msgstr ""
 "X (барои системи X Window) ин асоси интерфейси графикии GNU/Linux мебошад,\n"
 "ки дар он ҳамаи муҳитҳои графикӣ асос ёфтааст (KDE, GNOME, AfterStep,\n"
-"WindowMaker ва ғайра) ва ба ҳайати Mandriva Linux дохил аст.\n"
+"WindowMaker ва ғайра) ва ба ҳайати Mageia дохил аст.\n"
 "\n"
 "Ба шумо рӯйхати параметрҳои гуногуне ки ба тағироти гирифтани тасвири\n"
 "беҳтарини графикӣ пешбинӣ шудааст, дода мешавад: Корти графикӣ\n"
@@ -738,14 +737,14 @@ msgstr ""
 "намоишгари худро танзим карда натавониста бошед."
 
 #: ../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"
@@ -772,7 +771,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"
@@ -781,8 +780,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"
@@ -803,12 +801,12 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Дар ин қадам шумо бояд дар куҷои гардонандаи сахт ҷойгир кардани\n"
-"системаи омили Mandriva Linux-ро ҳал кунед. Агар гардонандаи сахти\n"
+"системаи омили Mageia-ро ҳал кунед. Агар гардонандаи сахти\n"
 "шумо холӣ бошад ё системаи омили ҳозирбуда ҳамаи фазои имконпазирро\n"
 "ишғол кунад, ба шумо лозим меояд, ки гардонандаи сахти худро\n"
 "бахшбандӣ кунед. Бахшбандикунии гардонандаи сахт асосан аз тақсимоти "
 "мантиқии фазои ишғолшуда барои коргузории системаи омилии \n"
-"Mandriva Linux иборат аст.\n"
+"Mageia иборат аст.\n"
 "\n"
 "Азбаски ҷараёни бахшбандии гардонандаи сахт одатан барнагарданда\n"
 "аст ва ба гумшавии додаҳо оварда расониданаш мумкин аст, агар дар "
@@ -850,7 +848,7 @@ msgstr ""
 "\n"
 " * \"%s\": агар шумо хоҳед, ки ҳамаи додаҳоро дар ҳама қисматҳои\n"
 "дар гардонандаи сахти худ мавҷудбударо нобуд созед ва ҷои онҳоро бо системаи "
-"нави Mandriva Linux иваз кунед, ин хосиятро интихоб\n"
+"нави Mageia иваз кунед, ин хосиятро интихоб\n"
 "кунед. Эҳтиёт бошед, зеро баъди тасдиқот шумо интихоби худро\n"
 "баргардонида наметавонед.\n"
 "\n"
@@ -981,7 +979,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"
@@ -1000,7 +998,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."
@@ -1024,15 +1022,15 @@ msgstr ""
 "Агар шумо ба шаклбандии бахшҳо тайёр бошед ба \"%s\" ангушт занед.\n"
 "\n"
 "Агар шумо хоҳед, ки дигар бахшҳоро барои коргузории системаи\n"
-"омилии навъи Mandriva Linux интихоб кунед ба \"%s\" ангушт занед.\n"
+"омилии навъи Mageia интихоб кунед ба \"%s\" ангушт занед.\n"
 "\n"
 "Агар хоҳед бахшҳоеро, ки дар диск ба мавҷудияти қисмҳои бад\n"
 "тафтиш карда шаванд интихоб намоед, ба \"%s\" ангушт занед."
 
 #: ../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"
@@ -1044,7 +1042,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Ҳангоми коргузории Mandriva Linux хуб мешуд, ки баъзе бастаи\n"
+"Ҳангоми коргузории Mageia хуб мешуд, ки баъзе бастаи\n"
 "барномаҳо нав карда шаванд, аз рӯзи барориши ибтидоӣ. Эҳтимолан\n"
 "баъзе хатогиҳо ислоҳ шудаанд ва дархостҳо оиди бехтарӣ ҳал шудаанд.\n"
 "Барои гирифтани фоида аз ин навсозиҳо, ҳозир ба шумо боркунии онҳо аз "
@@ -1060,7 +1058,7 @@ msgstr ""
 "кардани коргузории бозсозӣ пахш кунед."
 
 #: ../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"
@@ -1096,10 +1094,10 @@ msgid "Security Administrator"
 msgstr "Идоракунандаи Бехатарӣ"
 
 #: ../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"
@@ -1170,7 +1168,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Дар ин пункт шумо бояд интихоб намоед, ки кадом бахш(ҳо) барои\n"
-"коргузории системавӣ Mandriva Linux-и шумо истифода бурда мешаванд.\n"
+"коргузории системавӣ Mageia-и шумо истифода бурда мешаванд.\n"
 "Агар бахшҳои алоқаи аз коргузории пешинаи GNU/Linux ё аз дигар\n"
 "асбоби бахшбандикунӣ муайян шуда бошад, шумо метавонед бахшҳои мавҷударо "
 "истифода баред. Дар дигар ҳолат бояд бахшҳои гардонандаи\n"
@@ -1285,11 +1283,11 @@ msgid "Toggle between normal/expert mode"
 msgstr "Зомин байни усули мӯътадил/мутахассисӣ"
 
 #: ../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"
@@ -1319,7 +1317,7 @@ msgid ""
 msgstr ""
 "Дар гардонандаи сахти шумо зиёда аз як бахши Microsoft муайян гардид.\n"
 "Марҳамат карда бахшеро, ки барои коргузории системаи нави омили\n"
-"Mandriva Linux андозаи онро тағир додан мехоҳед, интихоб намоед.\n"
+"Mageia андозаи онро тағир додан мехоҳед, интихоб намоед.\n"
 "\n"
 "Ҳар бахш ба таври зерин ба рӯйхат гирифта мешавад: \"ном дар Linux\",\n"
 "\"ном дар Windows\" \"Ғунҷоиш\".\n"
@@ -1364,13 +1362,13 @@ msgstr ""
 "дагмаи \"%s\"ангушт зада рӯйхати пураро бинед."
 
 #: ../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"
@@ -1379,20 +1377,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 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 ""
 "Ин қадам танҳо дар он ҳолате фаъол мегардад, ки дар мошинаи шумо\n"
 "бахши кӯҳнаи GNU/Linux пайдо гардад.\n"
 "\n"
 "DrakX бояд донад, ки оё шумо мехоҳед, ки коргузории навро гузаронед\n"
-"ё системаи Mandriva Linux-и мавҷударо афзоиш диҳед:\n"
+"ё системаи Mageia-и мавҷударо афзоиш диҳед:\n"
 "\n"
 " * \"%s\": Дар бисёр ҳолатҳо ин вариант ба нобудшавии системаи кӯҳна\n"
 "оварда мерасонад. Агар хоҳед, ки бахшҳои гардонандаи сахти худро иваз\n"
@@ -1401,14 +1398,14 @@ msgstr ""
 "додаҳои мавҷудаи худро аз бознависӣ захира карда метавонанд.\n"
 "\n"
 " * \"%s\": ин синфи коргузорӣ ба шумо имконияти авкунии бастаи\n"
-"барномаҳои дар системаи Mandriva Linux-и коргузоришударо медиҳад.\n"
+"барномаҳои дар системаи Mageia-и коргузоришударо медиҳад.\n"
 "Нақшаи бахшбандии ҷорӣ ва додаҳои корванд, ивазнашавандаанд.\n"
 "Бештари дигар қадамҳо низ дастрас мегарданд, ба монанди коргузории "
 "низоммеъёр.\n"
 "\n"
-"Интихоби хосияти ``Густариш'' дар системаҳои Mandriva Linux аз нусхаи\n"
+"Интихоби хосияти ``Густариш'' дар системаҳои Mageia аз нусхаи\n"
 "\"8.1\" сар карда то охирон хеле хуб хоҳад кор кард. Гузаронидани Густариш\n"
-"дар системаҳои Mandriva Linux болотар аз \"8.1\" маслиҳат дода мешавад."
+"дар системаҳои Mageia болотар аз \"8.1\" маслиҳат дода мешавад."
 
 #: ../help.pm:594
 #, c-format
@@ -1449,7 +1446,7 @@ msgstr ""
 "ғайри лотинӣ медиҳад."
 
 #: ../help.pm:612
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -1465,8 +1462,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"
@@ -1651,10 +1647,10 @@ msgstr ""
 "корандози \"%s\" худборшавро ҷойгир намуд."
 
 #: ../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"
@@ -1675,11 +1671,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 ""
 "Ҳоло вақте расидааст барои интихоби системаи чопкунӣ барои компютери\n"
-"шумо. Дигар СО ба шумо як намудро пешкаш карда метавонад, Mandriva Linux\n"
+"шумо. Дигар СО ба шумо як намудро пешкаш карда метавонад, Mageia\n"
 "бошад, ду намудро. Ҳар яке аз системаҳо барои батанзимдарории\n"
 "муайяни беҳтарин мебошад.\n"
 "\n"
@@ -1816,8 +1812,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"
@@ -1834,7 +1829,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"
@@ -1920,14 +1915,14 @@ msgid "Graphical Interface"
 msgstr "Интерфейси Графикӣ"
 
 #: ../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 ""
 "Диски сахтеро, интихоб намоед, ки шумо онро барои офаридани қисми\n"
-"Mandriva Linux дур намудан мехоҳед. Эҳтиёт шавед, ки дар он ҳамаи\n"
+"Mageia дур намудан мехоҳед. Эҳтиёт шавед, ки дар он ҳамаи\n"
 "додаҳои мавҷуд буда гум хоҳад шуд ва он барқарор намегардад!"
 
 #: ../help.pm:866