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@cyrillic.po b/perl-install/share/po/uz@cyrillic.po
index 121c271e6..cdc7dc2c6 100644
--- a/perl-install/share/po/uz@cyrillic.po
+++ b/perl-install/share/po/uz@cyrillic.po
@@ -551,11 +551,11 @@ msgstr "Илтимос фойдаланиш учун тилни танланг"
 #: 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 бир неча тилларни қўллайди. Ўрнатилиши керак\n"
+"Mageia Linux бир неча тилларни қўллайди. Ўрнатилиши керак\n"
 "бўлган тилни танланг. Ушбу тилдан тизим ўрнатилгандан кейин\n"
 "фойдаланишингиз мумкин."
 
@@ -2610,11 +2610,11 @@ msgstr "Дискнинг қайси қисми ҳажмини ўзгартири
 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® диск қисми дефрагментация қилиниши керак. Илтимос "
 "Microsoft Windows® тизимини юкланг ва ``defrag'' воситасини ишга туширинг ва "
-"яна қайтадан Mandriva Linux тизимини ўрнатиб кўринг."
+"яна қайтадан Mageia Linux тизимини ўрнатиб кўринг."
 
 #: fs/partitioning_wizard.pm:180
 #, fuzzy, c-format
@@ -2705,7 +2705,7 @@ msgstr "Бутун дискни ўчириб ташлаб фойдаланиш"
 #, c-format
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr ""
-"Сизда биттадан кўп қаттиқ диск мавжуд. Уларни қайсига Mandriva Linux ОТни "
+"Сизда биттадан кўп қаттиқ диск мавжуд. Уларни қайсига Mageia Linux ОТни "
 "ўрнатишни истайсиз?"
 
 #: fs/partitioning_wizard.pm:243 fsedit.pm:610
@@ -4748,15 +4748,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"
@@ -4764,7 +4764,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 "
@@ -4786,7 +4786,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"
@@ -4795,14 +4795,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"
@@ -4812,7 +4812,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 "
@@ -4834,10 +4834,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"
@@ -4848,11 +4848,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"
@@ -4868,14 +4868,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 ""
 "Кириш\n"
 "\n"
-"Mandriva Linux дистрибутивида мавжуд бўлган операцион тизим ва унинг турли "
+"Mageia Linux дистрибутивида мавжуд бўлган операцион тизим ва унинг турли "
 "қисмлари \n"
 "бундан буён \"Дастурий Маҳсулотлар\" деб юритилади. Дастурий маҳсулотлар \n"
-"Mandriva Linux дистрибутивнинг қисмлари ва операцион тизим билан боғлиқ "
+"Mageia Linux дистрибутивнинг қисмлари ва операцион тизим билан боғлиқ "
 "бўлган\n"
 "дастурлар тўплами, усуллар, қоидалар ва қўлланмаларни ўз ичига олади, аммо "
 "бу билан чекланмайди.\n"
@@ -4884,7 +4884,7 @@ msgstr ""
 "1. Лицензия келишуви\n"
 "\n"
 "Илтимос, ушбу ҳужжатни диққат билан ўқиб чиқинг. Бу ҳужжат Сиз билан "
-"Mandriva S.A. \n"
+"Mageia \n"
 "ўртасида Дастурий Маҳсулотлари бўйича имзоланадиган лицензия келишувидир.\n"
 "Дастурий Маҳсулотларни ҳар қандай мақсад билан ўрнатиб, кўпайтириб ёки \n"
 "улардан фойдаланиб Сиз мазкур Лицензиянинг шартлари ва қоидаларини тўлиқ "
@@ -4906,7 +4906,7 @@ msgstr ""
 "\n"
 "Дастурий Маҳсулотлар ва уларга илова қилинган қўлланмалар \"ўз ҳолича\", "
 "қонунда йўл қўйилган\n"
-"даражада ҳеч қандай кафолатларсиз тақдим қилинади. Mandriva S.A. қонунда йўл "
+"даражада ҳеч қандай кафолатларсиз тақдим қилинади. Mageia қонунда йўл "
 "қўйилган\n"
 "даражада ҳеч қандай ҳолатда Дастурий Маҳсулотлардан фойдаланиш ёки "
 "фойдаланмаслик оқибатида\n"
@@ -4915,18 +4915,18 @@ msgstr ""
 "касод бўлиши, тижорат фаолиятидаги узилишлар, молиявий зарарлар, суд "
 "маҳкамалари натижасидаги\n"
 "суд харажатлари ёки жарималар ёки бошқа ҳар қандай билвосита йўқотишлар) "
-"учун, ҳатто Mandriva S.A.'га\n"
+"учун, ҳатто Mageia'га\n"
 "шундай зарар кўриш имконияти ёки ҳолатлари маълум бўлган тақдирда ҳам,\n"
 "жавобгар бўлмайди.\n"
 "\n"
 "БАЪЗИ МАМЛАКАТЛАРДА МАН ҚИЛИНГАН ДАСТУРИЙ МАҲСУЛОТЛАРГА ЭГАЛИК ҚИЛИШ\n"
 "ЁКИ УЛАРДАН ФОЙДАЛАНИШ БИЛАН БОҒЛИҚ ЧЕКЛАНГАН МАСЪУЛИЯТ\n"
 "\n"
-"Mandriva S.A. ёки унинг тарқатувчилари қонунда йўл қўйилган даражада ҳеч "
+"Mageia ёки унинг тарқатувчилари қонунда йўл қўйилган даражада ҳеч "
 "қандай ҳолатда\n"
 "баъзи мамлакатларнинг маҳаллий қонунлари билан чекланган ёки ман қилинган "
 "дастурий\n"
-"маҳсулотларнинг қисмларига эгалик қилиш ва улардан фойдаланиш, ёки Mandriva "
+"маҳсулотларнинг қисмларига эгалик қилиш ва улардан фойдаланиш, ёки Mageia "
 "Linux\n"
 "сайтларининг биридан дастурий маҳсулотнинг қисмларини кўчириб олиш оқибатида "
 "тасодифий,\n"
@@ -4955,11 +4955,11 @@ msgstr ""
 "ҳар бири\n"
 "учун лицензия келишувининг шартлари ва қоидаларини диққат билан ўқиб чиқинг. "
 "Қисмнинг\n"
-"лицензиясига оид ҳар қандай саволлар Mandriva'га эмас, балки қисмнинг "
+"лицензиясига оид ҳар қандай саволлар Mageia'га эмас, балки қисмнинг "
 "муаллифига юборилиши\n"
-"лозим. Mandriva S.A. томонидан ишлаб чиқилган дастурлар GPL лицензияси "
+"лозим. Mageia томонидан ишлаб чиқилган дастурлар GPL лицензияси "
 "таъсири\n"
-"остидадир. Mandriva S.A. томонидан ёзилган қўлланмалар эса махсус лицензия "
+"остидадир. Mageia томонидан ёзилган қўлланмалар эса махсус лицензия "
 "таъсири\n"
 "остидадир. Илтимос, қўшимча маълумот учун қўлланмаларга мурожаат қилинг.\n"
 "\n"
@@ -4970,12 +4970,12 @@ msgstr ""
 "муаллифларига\n"
 "тегишли бўлиб, интеллектуал мулк ва дастурий маҳсулотларга оид муаллифлик "
 "ҳуқуқи\n"
-"тўғрисидаги қонунлар билан ҳимояланади. Mandriva S.A. Дастурий Маҳсулотларни "
+"тўғрисидаги қонунлар билан ҳимояланади. Mageia Дастурий Маҳсулотларни "
 "тўлиқ\n"
 "ёки қисман, ҳар қандай йўл билан ва исталган мақсадларда ўзгартириш ёки "
 "мослаштириш ҳуқуқини\n"
-"ўзида сақлаб қолади. \"Mandriva\", \"Mandriva Linux\" ва тегишли белгилар "
-"Mandriva S.A.'га\n"
+"ўзида сақлаб қолади. \"Mageia\", \"Mageia Linux\" ва тегишли белгилар "
+"Mageia'га\n"
 "тегишли савдо белгиларидир.\n"
 "\n"
 "\n"
@@ -4993,7 +4993,7 @@ msgstr ""
 "судда муҳокама қилинади.\n"
 "Сўнгги навбатда масаланинг кўрилиши тегишли Париж (Франция) Қонунчилик "
 "судига ҳавола қилинади.\n"
-"Илтимос, мазкур ҳужжатга оид ҳар қандай саволлар бўйича Mandriva S.A. билан "
+"Илтимос, мазкур ҳужжатга оид ҳар қандай саволлар бўйича Mageia билан "
 "боғланинг.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5114,7 +5114,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"
@@ -5123,21 +5123,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 ""
 "Табриклаймиз! Ўрнатиш тугади.\n"
 "Юкловчи манбани олиб ташланг ва компьютерни\n"
 "ўчириб-ёқиш учун ENTER тугмасини босинг.\n"
 "\n"
 "\n"
-"Mandriva Linux'ниниг бу версияси учун янгиланишлар ҳақида\n"
+"Mageia Linux'ниниг бу версияси учун янгиланишлар ҳақида\n"
 "маълумот қуйидаги Errata веб-саҳифасида мавжуд:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"Тизимни мослаш ҳақида маълумот Mandriva Linux\n"
+"Тизимни мослаш ҳақида маълумот Mageia Linux\n"
 "фойдаланувчилари учун расмий қўлланмасида мавжуд."
 
 #: modules/interactive.pm:19
@@ -6644,8 +6644,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
@@ -6681,7 +6681,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"
@@ -6723,7 +6723,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 "