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

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r535 | dmorgan | 2011-02-14 00:37:56 +0000 (Mon, 14 Feb 2011) | 1 line

Import cleaned rpmdrake
------------------------------------------------------------------------

9 files changed, 21 insertions, 21 deletions

diff --git a/Rpmdrake/edit_urpm_sources.pm b/Rpmdrake/edit_urpm_sources.pm
index 82f52547..f8c1fa02 100644
--- a/Rpmdrake/edit_urpm_sources.pm
+++ b/Rpmdrake/edit_urpm_sources.pm
@@ -20,7 +20,7 @@ package Rpmdrake::edit_urpm_sources;
 # 
 #*****************************************************************************
 #
-# $Id$
+# $Id: edit_urpm_sources.pm 266598 2010-03-03 12:00:58Z tv $
 
 
 use strict;
@@ -114,8 +114,8 @@ sub _want_base_distro() {
 	N("Choose media type"),
 N("In order to keep your system secure and stable, you must at a minimum set up
 sources for official security and stability updates. You can also choose to set
-up a fuller set of sources which includes the complete official Mandriva
-repositories, giving you access to more software than can fit on the Mandriva
+up a fuller set of sources which includes the complete official Mageia
+repositories, giving you access to more software than can fit on the Mageia
 discs. Please choose whether to configure update sources only, or the full set
 of sources."),
 	 transient => $::main_window,
@@ -135,7 +135,7 @@ sub easy_add_callback_with_mirror() {
 N("This will attempt to install all official sources corresponding to your
 distribution (%s).
 
-I need to contact the Mandriva website to get the mirror list.
+I need to contact the Mageia website to get the mirror list.
 Please check that your network is currently running.
 
 Is it ok to continue?", $distro),
@@ -980,9 +980,9 @@ sub mainwindow() {
                               version => $rpmdrake::mdk_version,
                               copyright => N("Copyright (C) %s by Mandriva", '2002-2008'),
                               license => $license, wrap_license => 1,
-                              comments => N("Rpmdrake is Mandriva Linux package management tool."),
-                              website => 'http://mandrivalinux.com',
-                              website_label => N("Mandriva Linux"),
+                              comments => N("Rpmdrake is Mageia package management tool."),
+                              website => 'http://www.mageia.org/',
+                              website_label => N("Mageia"),
                               authors => 'Thierry Vignaud <vignaud@mandriva.com>',
                               artists => 'Hélène Durosini <ln@mandriva.com>',
                               translator_credits =>
diff --git a/Rpmdrake/formatting.pm b/Rpmdrake/formatting.pm
index 6e4e0dc7..12e0228a 100644
--- a/Rpmdrake/formatting.pm
+++ b/Rpmdrake/formatting.pm
@@ -21,7 +21,7 @@ package Rpmdrake::formatting;
 #
 #*****************************************************************************
 #
-# $Id$
+# $Id: formatting.pm 261189 2009-10-01 14:44:39Z tv $
 
 use strict;
 use utf8;
diff --git a/Rpmdrake/gurpm.pm b/Rpmdrake/gurpm.pm
index a148d7c1..3a9017c9 100644
--- a/Rpmdrake/gurpm.pm
+++ b/Rpmdrake/gurpm.pm
@@ -21,7 +21,7 @@ package Rpmdrake::gurpm;
 #
 #*****************************************************************************
 #
-# $Id$
+# $Id: gurpm.pm 255450 2009-04-03 16:00:16Z tv $
 
 use strict;
 use lib qw(/usr/lib/libDrakX);
diff --git a/Rpmdrake/icon.pm b/Rpmdrake/icon.pm
index feffe9c0..a2bcedf7 100644
--- a/Rpmdrake/icon.pm
+++ b/Rpmdrake/icon.pm
@@ -21,7 +21,7 @@ package Rpmdrake::icon;
 #
 #*****************************************************************************
 #
-# $Id$
+# $Id: icon.pm 237459 2008-02-26 14:20:47Z tv $
 
 use strict;
 our @ISA = qw(Exporter);
@@ -153,7 +153,7 @@ my %group_icons = (
 	N("Toys") => 'toys_section',
 	N("Video") => 'video_section',
 
-     # for Mandriva Choice:
+     # for Mageia Choice:
 	N("Workstation") => 'office_section',
 	join('|', N("Workstation"), N("Configuration")) => 'configuration_section',
 	join('|', N("Workstation"), N("Console Tools")) => 'interpreters_section',
diff --git a/Rpmdrake/init.pm b/Rpmdrake/init.pm
index 5a0ea01a..b901292e 100644
--- a/Rpmdrake/init.pm
+++ b/Rpmdrake/init.pm
@@ -21,7 +21,7 @@ package Rpmdrake::init;
 #
 #*****************************************************************************
 #
-# $Id$
+# $Id: init.pm 263915 2009-12-03 17:41:04Z tv $
 
 use strict;
 use MDK::Common::Func 'any';
@@ -56,7 +56,7 @@ N("  --justdb               update the database, but do not modify the filesyste
 N("  --no-confirmation      don't ask first confirmation question in update mode"),
 N("  --no-media-update      don't update media at startup"),
 N("  --no-verify-rpm        don't verify packages signatures"),
-if_($0 !~ /MandrivaUpdate/, N("  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host\" machine to show needed deps")),
+if_($0 !~ /MageiaUpdate/, N("  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host\" machine to show needed deps")),
 N("  --rpm-root=path        use another root for rpm installation"),
 N("  --urpmi-root           use another root for urpmi db & rpm installation"),
 N("  --run-as-root          force to run as root"),
diff --git a/Rpmdrake/open_db.pm b/Rpmdrake/open_db.pm
index e996dbfd..86b95be1 100644
--- a/Rpmdrake/open_db.pm
+++ b/Rpmdrake/open_db.pm
@@ -21,7 +21,7 @@ package Rpmdrake::open_db;
 #
 #*****************************************************************************
 #
-# $Id$
+# $Id: open_db.pm 268344 2010-05-06 13:06:08Z jvictor $
 
 use strict;
 use common;
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index a2f3e4d6..dbfb4e1c 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -21,7 +21,7 @@ package Rpmdrake::pkg;
 #
 #*****************************************************************************
 #
-# $Id$
+# $Id: pkg.pm 270160 2010-06-22 19:55:40Z jvictor $
 
 use strict;
 use MDK::Common::Func 'any';
@@ -255,8 +255,8 @@ Then, restart \"%s\".", N("Enabled"), $rpmdrake::myname_update));
 		}
 		my ($mirror) = choose_mirror($urpm, transient => $w->{real_window} || $::main_window,
                                        message => join("\n\n",
-                                                       N("You have no configured update media. MandrivaUpdate cannot operate without any update media."),
-                                                       N("I need to contact the Mandriva website to get the mirror list.
+                                                       N("You have no configured update media. MageiaUpdate cannot operate without any update media."),
+                                                       N("I need to contact the Mageia website to get the mirror list.
 Please check that your network is currently running.
 
 Is it ok to continue?"),
@@ -405,7 +405,7 @@ sub get_updates_list {
         @$requested_list = ();
     }
 
-    # list updates including skiped ones + their deps in MandrivaUpdate:
+    # list updates including skiped ones + their deps in MageiaUpdate:
     @$requested_list = uniq(@$requested_list, @$requested_strict);
 
     # do not pre select updates in rpmdrake:
@@ -529,7 +529,7 @@ sub get_pkgs {
       }
     }
     @updates = @requested;
-    # selecting updates by default but skipped ones (MandrivaUpdate only):
+    # selecting updates by default but skipped ones (MageiaUpdate only):
     foreach (@requested_strict) {
 	$all_pkgs{$_}{selected} = 1;
     }
diff --git a/Rpmdrake/rpmnew.pm b/Rpmdrake/rpmnew.pm
index 0fb447c1..fc6377d6 100644
--- a/Rpmdrake/rpmnew.pm
+++ b/Rpmdrake/rpmnew.pm
@@ -21,7 +21,7 @@ package Rpmdrake::rpmnew;
 #
 #*****************************************************************************
 #
-# $Id$
+# $Id: rpmnew.pm 263914 2009-12-03 17:41:02Z tv $
 
 use strict;
 use lib qw(/usr/lib/libDrakX);
diff --git a/Rpmdrake/widgets.pm b/Rpmdrake/widgets.pm
index a1f689a3..78e9ec7e 100644
--- a/Rpmdrake/widgets.pm
+++ b/Rpmdrake/widgets.pm
@@ -21,7 +21,7 @@ package Gtk2::Mdv::TextView;
 #
 #*****************************************************************************
 #
-# $Id$
+# $Id: widgets.pm 233986 2008-02-06 14:14:06Z tv $
 
 use strict;
 use MDK::Common::Func 'any';