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, 42 insertions, 42 deletions

diff --git a/perl-install/share/po/uz.po b/perl-install/share/po/uz.po
index 95699e281..de262d3d1 100644
--- a/perl-install/share/po/uz.po
+++ b/perl-install/share/po/uz.po
@@ -551,11 +551,11 @@ msgstr "Iltimos foydalanish uchun tilni tanlang"
 #: any.pm:1135
 #, c-format
 msgid ""
-"Mandriva Linux can support multiple languages. Select\n"
+"Mageia 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 ""
-"Mandriva Linux bir necha tillarni qoʻllaydi. Oʻrnatilishi kerak\n"
+"Mageia Linux bir necha tillarni qoʻllaydi. Oʻrnatilishi kerak\n"
 "boʻlgan tilni tanlang. Ushbu tildan tizim oʻrnatilgandan keyin\n"
 "foydalanishingiz mumkin."
 
@@ -2620,11 +2620,11 @@ msgstr "Diskning qaysi qismi hajmini oʻzgartirishni istaysiz?"
 msgid ""
 "Your Microsoft Windows® partition is too fragmented. Please reboot your "
 "computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
-"the Mandriva Linux installation."
+"the Mageia Linux installation."
 msgstr ""
 "Microsoft Windows® disk qismi defragmentatsiya qilinishi kerak. Iltimos "
 "Microsoft Windows® tizimini yuklang va ``defrag'' vositasini ishga tushiring "
-"va yana qaytadan Mandriva Linux tizimini oʻrnatib koʻring."
+"va yana qaytadan Mageia Linux tizimini oʻrnatib koʻring."
 
 #: fs/partitioning_wizard.pm:180
 #, fuzzy, c-format
@@ -2715,7 +2715,7 @@ msgstr "Butun diskni oʻchirib tashlab foydalanish"
 #, c-format
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr ""
-"Sizda bittadan koʻp qattiq disk mavjud. Ularni qaysiga Mandriva Linux OTni "
+"Sizda bittadan koʻp qattiq disk mavjud. Ularni qaysiga Mageia Linux OTni "
 "oʻrnatishni istaysiz?"
 
 #: fs/partitioning_wizard.pm:243 fsedit.pm:610
@@ -4761,15 +4761,15 @@ msgstr ""
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Mandriva "
+"The operating system and the different components available in the Mageia "
 "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 Mandriva Linux distribution, and "
+"system and the different components of the Mageia Linux distribution, and "
 "any applications \n"
-"distributed with these products provided by Mandriva's licensors or "
+"distributed with these products provided by Mageia's licensors or "
 "suppliers.\n"
 "\n"
 "\n"
@@ -4777,7 +4777,7 @@ msgid ""
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"Mandriva S.A. which applies to the Software Products.\n"
+"Mageia which applies to the Software Products.\n"
 "By installing, duplicating or using any of the Software Products in any "
 "manner, you explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -4799,7 +4799,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Neither Mandriva S.A. nor its licensors or suppliers will, in any "
+"Neither Mageia nor its licensors or suppliers will, in any "
 "circumstances and to the extent \n"
 "permitted by law, be liable for any special, incidental, direct or indirect "
 "damages whatsoever \n"
@@ -4808,14 +4808,14 @@ msgid ""
 "loss, legal fees and penalties resulting from a court judgment, or any other "
 "consequential loss) \n"
 "arising out of  the use or inability to use the Software Products, even if "
-"Mandriva S.A. or its \n"
+"Mageia or its \n"
 "licensors or suppliers have been advised of the possibility or occurrence of "
 "such damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, neither Mandriva S.A. nor its licensors, "
+"To the extent permitted by law, neither Mageia nor its licensors, "
 "suppliers or\n"
 "distributors will, in any circumstances, be liable for any special, "
 "incidental, direct or indirect \n"
@@ -4825,7 +4825,7 @@ msgid ""
 "judgment, or any \n"
 "other consequential loss) arising out of the possession and use of software "
 "components or \n"
-"arising out of  downloading software components from one of Mandriva Linux "
+"arising out of  downloading software components from one of Mageia Linux "
 "sites which are \n"
 "prohibited or restricted in some countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
@@ -4847,10 +4847,10 @@ msgid ""
 "agreement for each component \n"
 "before using any component. Any question on a component license should be "
 "addressed to the component \n"
-"licensor or supplier and not to Mandriva.\n"
-"The programs developed by Mandriva S.A. are governed by the GPL License. "
+"licensor or supplier and not to Mageia.\n"
+"The programs developed by Mageia are governed by the GPL License. "
 "Documentation written \n"
-"by Mandriva S.A. is governed by a specific license. Please refer to the "
+"by Mageia is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -4861,11 +4861,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. and its suppliers and licensors reserves their rights to "
+"Mageia and its suppliers and licensors reserves their rights to "
 "modify or adapt the Software \n"
 "Products, as a whole or in parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
-"Mandriva S.A.  \n"
+"\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of "
+"Mageia  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -4881,14 +4881,14 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact Mandriva S.A."
+"For any question on this document, please contact Mageia"
 msgstr ""
 "Kirish\n"
 "\n"
-"Mandriva Linux distributivida mavjud boʻlgan operatsion tizim va uning turli "
+"Mageia Linux distributivida mavjud boʻlgan operatsion tizim va uning turli "
 "qismlari \n"
 "bundan buyon \"Dasturiy Mahsulotlar\" deb yuritiladi. Dasturiy mahsulotlar \n"
-"Mandriva Linux distributivning qismlari va operatsion tizim bilan bogʻliq "
+"Mageia Linux distributivning qismlari va operatsion tizim bilan bogʻliq "
 "boʻlgan\n"
 "dasturlar toʻplami, usullar, qoidalar va qoʻllanmalarni oʻz ichiga oladi, "
 "ammo bu bilan cheklanmaydi.\n"
@@ -4897,7 +4897,7 @@ msgstr ""
 "1. Litsenziya kelishuvi\n"
 "\n"
 "Iltimos, ushbu hujjatni diqqat bilan oʻqib chiqing. Bu hujjat Siz bilan "
-"Mandriva S.A. \n"
+"Mageia \n"
 "oʻrtasida Dasturiy Mahsulotlari boʻyicha imzolanadigan litsenziya "
 "kelishuvidir.\n"
 "Dasturiy Mahsulotlarni har qanday maqsad bilan oʻrnatib, koʻpaytirib yoki \n"
@@ -4921,7 +4921,7 @@ msgstr ""
 "\n"
 "Dasturiy Mahsulotlar va ularga ilova qilingan qoʻllanmalar \"oʻz holicha\", "
 "qonunda yoʻl qoʻyilgan\n"
-"darajada hech qanday kafolatlarsiz taqdim qilinadi. Mandriva S.A. qonunda "
+"darajada hech qanday kafolatlarsiz taqdim qilinadi. Mageia qonunda "
 "yoʻl qoʻyilgan\n"
 "darajada hech qanday holatda Dasturiy Mahsulotlardan foydalanish yoki "
 "foydalanmaslik oqibatida\n"
@@ -4930,7 +4930,7 @@ msgstr ""
 "kasod boʻlishi, tijorat faoliyatidagi uzilishlar, moliyaviy zararlar, sud "
 "mahkamalari natijasidagi\n"
 "sud xarajatlari yoki jarimalar yoki boshqa har qanday bilvosita "
-"yoʻqotishlar) uchun, hatto Mandriva S.A.'ga\n"
+"yoʻqotishlar) uchun, hatto Mageia'ga\n"
 "shunday zarar koʻrish imkoniyati yoki holatlari maʼlum boʻlgan taqdirda "
 "ham,\n"
 "javobgar boʻlmaydi.\n"
@@ -4938,12 +4938,12 @@ msgstr ""
 "BAʼZI MAMLAKATLARDA MAN QILINGAN DASTURIY MAHSULOTLARGA EGALIK QILISH\n"
 "YOKI ULARDAN FOYDALANISH BILAN BOGʻLIQ CHEKLANGAN MASʼULIYAT\n"
 "\n"
-"Mandriva S.A. yoki uning tarqatuvchilari qonunda yoʻl qoʻyilgan darajada "
+"Mageia yoki uning tarqatuvchilari qonunda yoʻl qoʻyilgan darajada "
 "hech qanday holatda\n"
 "baʼzi mamlakatlarning mahalliy qonunlari bilan cheklangan yoki man qilingan "
 "dasturiy\n"
 "mahsulotlarning qismlariga egalik qilish va ulardan foydalanish, yoki "
-"Mandriva Linux\n"
+"Mageia Linux\n"
 "saytlarining biridan dasturiy mahsulotning qismlarini koʻchirib olish "
 "oqibatida tasodifiy,\n"
 "toʻgʻridan-toʻgʻri, bevosita yoki bilvosita yetkazilgan zararlar (shu "
@@ -4971,11 +4971,11 @@ msgstr ""
 "qismlarning har biri\n"
 "uchun litsenziya kelishuvining shartlari va qoidalarini diqqat bilan oʻqib "
 "chiqing. Qismning\n"
-"litsenziyasiga oid har qanday savollar Mandriva'ga emas, balki qismning "
+"litsenziyasiga oid har qanday savollar Mageia'ga emas, balki qismning "
 "muallifiga yuborilishi\n"
-"lozim. Mandriva S.A. tomonidan ishlab chiqilgan dasturlar GPL litsenziyasi "
+"lozim. Mageia tomonidan ishlab chiqilgan dasturlar GPL litsenziyasi "
 "taʼsiri\n"
-"ostidadir. Mandriva S.A. tomonidan yozilgan qoʻllanmalar esa maxsus "
+"ostidadir. Mageia tomonidan yozilgan qoʻllanmalar esa maxsus "
 "litsenziya taʼsiri\n"
 "ostidadir. Iltimos, qoʻshimcha maʼlumot uchun qoʻllanmalarga murojaat "
 "qiling.\n"
@@ -4987,12 +4987,12 @@ msgstr ""
 "mualliflariga\n"
 "tegishli boʻlib, intellektual mulk va dasturiy mahsulotlarga oid mualliflik "
 "huquqi\n"
-"toʻgʻrisidagi qonunlar bilan himoyalanadi. Mandriva S.A. Dasturiy "
+"toʻgʻrisidagi qonunlar bilan himoyalanadi. Mageia Dasturiy "
 "Mahsulotlarni toʻliq\n"
 "yoki qisman, har qanday yoʻl bilan va istalgan maqsadlarda oʻzgartirish yoki "
 "moslashtirish huquqini\n"
-"oʻzida saqlab qoladi. \"Mandriva\", \"Mandriva Linux\" va tegishli belgilar "
-"Mandriva S.A.'ga\n"
+"oʻzida saqlab qoladi. \"Mageia\", \"Mageia Linux\" va tegishli belgilar "
+"Mageia'ga\n"
 "tegishli savdo belgilaridir.\n"
 "\n"
 "\n"
@@ -5010,7 +5010,7 @@ msgstr ""
 "sudda muhokama qilinadi.\n"
 "Soʻnggi navbatda masalaning koʻrilishi tegishli Parij (Fransiya) Qonunchilik "
 "sudiga havola qilinadi.\n"
-"Iltimos, mazkur hujjatga oid har qanday savollar boʻyicha Mandriva S.A. "
+"Iltimos, mazkur hujjatga oid har qanday savollar boʻyicha Mageia "
 "bilan bogʻlaning.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5131,7 +5131,7 @@ msgid ""
 "Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of Mandriva "
+"For information on fixes which are available for this release of Mageia "
 "Linux,\n"
 "consult the Errata available from:\n"
 "\n"
@@ -5140,21 +5140,21 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandriva Linux User's Guide."
+"install chapter of the Official Mageia Linux User's Guide."
 msgstr ""
 "Tabriklaymiz! Oʻrnatish tugadi.\n"
 "Yuklovchi manbani olib tashlang va kompyuterni\n"
 "oʻchirib-yoqish uchun ENTER tugmasini bosing.\n"
 "\n"
 "\n"
-"Mandriva Linux'ninig bu versiyasi uchun yangilanishlar haqida\n"
+"Mageia Linux'ninig bu versiyasi uchun yangilanishlar haqida\n"
 "maʼlumot quyidagi Errata veb-sahifasida mavjud:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"Tizimni moslash haqida maʼlumot Mandriva Linux\n"
+"Tizimni moslash haqida maʼlumot Mageia Linux\n"
 "foydalanuvchilari uchun rasmiy qoʻllanmasida mavjud."
 
 #: modules/interactive.pm:19
@@ -6670,8 +6670,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of Mandriva Linux tools\n"
-"  --incident        - program should be one of Mandriva Linux tools"
+"  --report          - program should be one of Mageia Linux tools\n"
+"  --incident        - program should be one of Mageia Linux tools"
 msgstr ""
 
 #: standalone.pm:66
@@ -6707,7 +6707,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandriva Linux Terminal Server Configurator\n"
+"Mageia Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -6749,7 +6749,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      do not ask first confirmation question in Mandriva "
+"  --no-confirmation      do not ask first confirmation question in Mageia "
 "Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "