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

diff --git a/perl-install/share/po/nn.po b/perl-install/share/po/nn.po
index a88a94235..ee01874c7 100644
--- a/perl-install/share/po/nn.po
+++ b/perl-install/share/po/nn.po
@@ -542,11 +542,11 @@ msgstr "Vel språk"
 #: 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 støttar fleire språk. Her\n"
+"Mageia Linux støttar fleire språk. Her\n"
 "kan du velja kva språk du vil ha tilgjengeleg."
 
 #: any.pm:1138
@@ -2612,11 +2612,11 @@ msgstr "Kva partisjon vil du endra storleik på?"
 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®-partisjonen for fragmentert. Start maskina på nytt under "
 "Microsoft Windows®, og køyr defragmenteringsverktøyet. Prøv så å installera "
-"Mandriva Linux på nytt."
+"Mageia Linux på nytt."
 
 #: fs/partitioning_wizard.pm:180
 #, c-format
@@ -4791,15 +4791,15 @@ msgstr "Oppstartslastaren kan ikkje handtera «/boot» på fleire fysiske volum.
 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"
@@ -4807,7 +4807,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 "
@@ -4829,7 +4829,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"
@@ -4838,14 +4838,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"
@@ -4855,7 +4855,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 "
@@ -4877,10 +4877,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"
@@ -4891,11 +4891,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"
@@ -4911,19 +4911,19 @@ 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 ""
 "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"
@@ -4931,7 +4931,7 @@ msgstr ""
 "\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 "
@@ -4953,7 +4953,7 @@ msgstr ""
 "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"
@@ -4962,14 +4962,14 @@ msgstr ""
 "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"
@@ -4979,7 +4979,7 @@ msgstr ""
 "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 "
@@ -5001,10 +5001,10 @@ msgstr ""
 "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"
@@ -5015,10 +5015,10 @@ msgstr ""
 "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 "
+"“Mageia”, “Mageia Linux” and associated logos are trademarks of Mandriva "
 "S.A.  \n"
 "\n"
 "\n"
@@ -5035,7 +5035,7 @@ msgstr ""
 "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"
 
 # skip-rule: klammeform
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5242,7 +5242,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"
@@ -5251,21 +5251,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 ""
 "Gratulerer! Installeringa er fullført.\n"
 "Fjern oppstartsmediet, og trykk «Enter» for å starta maskina på nytt.\n"
 "\n"
 "\n"
 "Du finn meir informasjon om nye rettingar for denne\n"
-"utgåva av Mandriva Linux på:\n"
+"utgåva av Mageia Linux på:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Meir informasjon om korleis du set opp systemet ditt finn du\n"
-"i den offisielle Mandriva Linux-bruksrettleiinga."
+"i den offisielle Mageia Linux-bruksrettleiinga."
 
 #: modules/interactive.pm:19
 #, c-format
@@ -6949,15 +6949,15 @@ 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 ""
 "[VAL] [PROGRAMNAMN]\n"
 "\n"
 "VAL:\n"
 "  --help            – Vis denne hjelpeteksten.\n"
-"  --report          – Programmet må vera eitt av verktøya i Mandriva Linux.\n"
-"  --incident        – Programmet må vera eitt av verktøya i Mandriva Linux."
+"  --report          – Programmet må vera eitt av verktøya i Mageia Linux.\n"
+"  --incident        – Programmet må vera eitt av verktøya i Mageia Linux."
 
 #: standalone.pm:66
 #, c-format
@@ -7011,7 +7011,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"
@@ -7025,7 +7025,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[VAL] …\n"
-"Oppsett av terminaltenar for Mandriva Linux.\n"
+"Oppsett av terminaltenar for Mageia Linux.\n"
 "--enable         – Bruk MTS.\n"
 "--disable        – Ikkje bruk MTS.\n"
 "--start          – Start MTS.\n"
@@ -7074,7 +7074,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 "
@@ -7082,7 +7082,7 @@ msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[VAL] …\n"
-"  --no-confirmation      Ikkje spør første stadfestingsspørsmål i Mandriva "
+"  --no-confirmation      Ikkje spør første stadfestingsspørsmål i Mageia "
 "Update-modus.\n"
 "  --no-verify-rpm        Ikkje stadfest pakkesignaturar.\n"
 "  --changelog-first      Vis endringslogg før filliste i pakkeskildringa.\n"