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

diff --git a/perl-install/share/po/libDrakX.pot b/perl-install/share/po/libDrakX.pot
index 9f486b3b3..50b84362a 100644
--- a/perl-install/share/po/libDrakX.pot
+++ b/perl-install/share/po/libDrakX.pot
@@ -515,7 +515,7 @@ 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 ""
@@ -2437,7 +2437,7 @@ msgstr ""
 
 #: fs/partitioning_wizard.pm:172
 #, c-format
-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."
+msgid "Your Microsoft Windows® partition is too fragmented. Please reboot your computer under Microsoft Windows®, run the ``defrag'' utility, then restart the Mageia Linux installation."
 msgstr ""
 
 #: fs/partitioning_wizard.pm:180
@@ -4498,17 +4498,17 @@ msgstr ""
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Mandriva Linux distribution \n"
+"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 any applications \n"
-"distributed with these products provided by Mandriva's licensors or suppliers.\n"
+"system and the different components of the Mageia Linux distribution, and any applications \n"
+"distributed with these products provided by Mageia's licensors or suppliers.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\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 License. \n"
 "If you disagree with any portion of the License, you are not allowed to install, duplicate or use \n"
@@ -4523,21 +4523,21 @@ msgid ""
 "\n"
 "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 circumstances and to the extent \n"
+"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"
 "(including without limitation damages for loss of business, interruption of business, financial \n"
 "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"
+"arising out of  the use or inability to use the Software Products, even if 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, suppliers or\n"
+"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"
 "damages whatsoever (including without limitation damages for loss of business, interruption of \n"
 "business, financial loss, legal fees and penalties resulting from a court 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 sites which are \n"
+"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 cryptography components \n"
 "included in the Software Products.\n"
@@ -4551,9 +4551,9 @@ msgid ""
 "Most of these licenses allow you to use, duplicate, adapt or redistribute the components which \n"
 "they cover. Please read carefully the terms and conditions of the license 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. Documentation written \n"
-"by Mandriva S.A. is governed by a specific license. Please refer to the documentation for \n"
+"licensor or supplier and not to Mageia.\n"
+"The programs developed by Mageia are governed by the GPL License. Documentation written \n"
+"by Mageia is governed by a specific license. Please refer to the documentation for \n"
 "further details.\n"
 "\n"
 "\n"
@@ -4561,9 +4561,9 @@ msgid ""
 "\n"
 "All rights to the components of the Software Products belong to their 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 modify or adapt the Software \n"
+"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"
@@ -4574,7 +4574,7 @@ msgid ""
 "The terms and conditions of this License are governed by the Laws of France.\n"
 "All disputes on the terms of this license will preferably be settled out of 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 ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -4661,7 +4661,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 Linux,\n"
+"For information on fixes which are available for this release of Mageia Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -4669,7 +4669,7 @@ 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 ""
 
 #: modules/interactive.pm:19
@@ -6102,8 +6102,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
@@ -6139,7 +6139,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"
@@ -6178,7 +6178,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      do not ask first confirmation question in Mandriva Update mode\n"
+"  --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 description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"