Synthesized commit during git-svn import combining previous Mandriva history with Magiea.

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, 18 insertions, 51 deletions

diff --git a/perl-install/messages.pm b/perl-install/messages.pm
index 4be398be7..6b3f61592 100644
--- a/perl-install/messages.pm
+++ b/perl-install/messages.pm
@@ -1,4 +1,4 @@
-package messages; # $Id$
+package messages; # $Id: messages.pm 245997 2008-09-19 12:59:39Z pixel $
 
 use diagnostics;
 use strict;
@@ -6,21 +6,20 @@ use strict;
 use common;
 
 sub main_license {
-    my ($us, $google) = @_;
 #-PO: keep the double empty lines between sections, this is formatted a la LaTeX
 N("Introduction
 
-The operating system and the different components available in the Mandriva Linux distribution 
+The operating system and the different components available in the Mageia Linux distribution 
 shall be called the \"Software Products\" hereafter. The Software Products include, but are not 
 restricted to, the set of programs, methods, rules and documentation related to the operating 
-system and the different components of the Mandriva Linux distribution, and any applications 
-distributed with these products provided by Mandriva's licensors or suppliers.
+system and the different components of the Mageia Linux distribution, and any applications 
+distributed with these products provided by Mageia's licensors or suppliers.
 
 
 1. License Agreement
 
 Please read this document carefully. This document is a license agreement between you and  
-Mandriva S.A. which applies to the Software Products.
+Mageia which applies to the Software Products.
 By installing, duplicating or using any of the Software Products in any manner, you explicitly 
 accept and fully agree to conform to the terms and conditions of this License. 
 If you disagree with any portion of the License, you are not allowed to install, duplicate or use 
@@ -35,21 +34,21 @@ Software Products.
 
 The Software Products and attached documentation are provided \"as is\", with no warranty, to the 
 extent permitted by law.
-Neither Mandriva S.A. nor its licensors or suppliers will, in any circumstances and to the extent 
+Neither Mageia nor its licensors or suppliers will, in any circumstances and to the extent 
 permitted by law, be liable for any special, incidental, direct or indirect damages whatsoever 
 (including without limitation damages for loss of business, interruption of business, financial 
 loss, legal fees and penalties resulting from a court judgment, or any other consequential loss) 
-arising out of  the use or inability to use the Software Products, even if Mandriva S.A. or its 
+arising out of  the use or inability to use the Software Products, even if Mageia or its 
 licensors or suppliers have been advised of the possibility or occurrence of such damages.
 
 LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES
 
-To the extent permitted by law, neither Mandriva S.A. nor its licensors, suppliers or
+To the extent permitted by law, neither Mageia nor its licensors, suppliers or
 distributors will, in any circumstances, be liable for any special, incidental, direct or indirect 
 damages whatsoever (including without limitation damages for loss of business, interruption of 
 business, financial loss, legal fees and penalties resulting from a court judgment, or any 
 other consequential loss) arising out of the possession and use of software components or 
-arising out of  downloading software components from one of Mandriva Linux sites which are 
+arising out of  downloading software components from one of Mageia Linux sites which are 
 prohibited or restricted in some countries by local laws.
 This limited liability applies to, but is not restricted to, the strong cryptography components 
 included in the Software Products.
@@ -63,9 +62,9 @@ The Software Products consist of components created by different persons or enti
 Most of these licenses allow you to use, duplicate, adapt or redistribute the components which 
 they cover. Please read carefully the terms and conditions of the license agreement for each component 
 before using any component. Any question on a component license should be addressed to the component 
-licensor or supplier and not to Mandriva.
-The programs developed by Mandriva S.A. are governed by the GPL License. Documentation written 
-by Mandriva S.A. is governed by a specific license. Please refer to the documentation for 
+licensor or supplier and not to Mageia.
+The programs developed by Mageia are governed by the GPL License. Documentation written 
+by Mageia is governed by a specific license. Please refer to the documentation for 
 further details.
 
 
@@ -73,9 +72,9 @@ further details.
 
 All rights to the components of the Software Products belong to their respective authors and are 
 protected by intellectual property and copyright laws applicable to software programs.
-Mandriva S.A. and its suppliers and licensors reserves their rights to modify or adapt the Software 
+Mageia and its suppliers and licensors reserves their rights to modify or adapt the Software 
 Products, as a whole or in parts, by all means and for all purposes.
-\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of Mandriva S.A.  
+\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of Mageia  
 
 
 5. Governing Laws 
@@ -86,7 +85,7 @@ agreement.
 The terms and conditions of this License are governed by the Laws of France.
 All disputes on the terms of this license will preferably be settled out of court. As a last 
 resort, the dispute will be referred to the appropriate Courts of Law of Paris - France.
-For any question on this document, please contact Mandriva S.A.",
+For any question on this document, please contact Mageia",
 $us ? "\n\n" . N("You agree not to (i) sell, export, re-export, transfer, divert, disclose technical data, or 
 dispose of, any Software to any person, entity, or destination prohibited by US export laws 
 or regulations including, without limitation, Cuba, Iran, North Korea, Sudan and Syria; or 
@@ -101,9 +100,6 @@ release, performance, display or disclosure of the Software and any accompanying
 by the United States Government shall be governed solely by the terms of this Agreement and any 
 other applicable licence agreements and shall be prohibited except to the extent expressly permitted 
 by the terms of this Agreement.") . "\n" : '',
-$google ? N("Most of these components, but excluding the applications and software provided by Google Inc. or 
-its subsidiaries (\"Google Software\"), are governed under the terms and conditions of the GNU 
-General Public Licence, hereafter called \"GPL\", or of similar licenses.")
  : N("Most of these components are governed under the terms and conditions of the GNU 
 General Public Licence, hereafter called \"GPL\", or of similar licenses."));
 }
@@ -116,42 +112,13 @@ http://www.mp3licensing.com for more details). If you are unsure if a patent
 may be applicable to you, check your local laws.");
 }
 
-sub google_provisions() {
-N("6. Additional provisions applicable to those Software Products provided by Google Inc. (\"Google Software\")
-
-(a)  You acknowledge that Google or third parties own all rights, title and interest in and to the Google 
-Software, portions thereof, or software provided through or in conjunction with the Google Software, including
-without limitation all Intellectual Property Rights. \"Intellectual Property Rights\" means any and all rights 
-existing from time to time under patent law, copyright law, trade secret law, trademark law, unfair competition 
-law, database rights and any and all other proprietary rights, and any and all applications, renewals, extensions 
-and restorations thereof, now or hereafter in force and effect worldwide. You agree not to modify, adapt, 
-translate, prepare derivative works from, decompile, reverse engineer, disassemble or otherwise attempt to derive 
-source code from Google Software. You also agree to not remove, obscure, or alter Google's or any third party's 
-copyright notice, trademarks, or other proprietary rights notices affixed to or contained within or accessed in 
-conjunction with or through the Google Software.  
-
-(b)  The Google Software is made available to you for your personal, non-commercial use only.
-You may not use the Google Software in any manner that could damage, disable, overburden, or impair Google's 
-search services (e.g., you may not use the Google Software in an automated manner), nor may you use Google 
-Software in any manner that could interfere with any other party's use and enjoyment of Google's search services
-or the services and products of the third party licensors of the Google Software.
-
-(c)  Some of the Google Software is designed to be used in conjunction with Google's search and other services.
-Accordingly, your use of such Google Software is also defined by Google's Terms of Service located at 
-http://www.google.com/terms_of_service.html and Google's Toolbar Privacy Policy located at 
-http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.
-
-(d)  Google Inc. and each of its subsidiaries and affiliates are third party beneficiaries of this contract 
-and may enforce its terms.");
-}
-
 sub install_completed() {
 #-PO: keep the double empty lines between sections, this is formatted a la LaTeX
 N("Congratulations, installation is complete.
 Remove the boot media and press Enter to reboot.
 
 
-For information on fixes which are available for this release of Mandriva Linux,
+For information on fixes which are available for this release of Mageia Linux,
 consult the Errata available from:
 
 
@@ -159,8 +126,8 @@ consult the Errata available from:
 
 
 Information on configuring your system is available in the post
-install chapter of the Official Mandriva Linux User's Guide.",
-'http://www.mandriva.com/en/security/advisories');
+install chapter of the Official Mageia Linux User's Guide.",
+'http://www.mageia.org/');
 }
 
 1;