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
------------------------------------------------------------------------

1 files changed, 7 insertions, 7 deletions

diff --git a/rpmdrake.pm b/rpmdrake.pm
index 6dcc1edc..c5d9a792 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -20,7 +20,7 @@
 # 
 #*****************************************************************************
 #
-# $Id$
+# $Id: rpmdrake.pm 267936 2010-04-26 16:40:21Z jvictor $
 
 package rpmdrake;
 
@@ -118,7 +118,7 @@ our ($mdk_version) = $mandrake_release =~ /(\d+\.\d+)/;
 our ($branded, %distrib);
 $branded = -f '/etc/sysconfig/oem'
     and %distrib = MDK::Common::System::distrib();
-our $myname_update = $branded ? N("Software Update") : N("Mandriva Linux Update");
+our $myname_update = $branded ? N("Software Update") : N("Mageia Update");
 
 @rpmdrake::prompt::ISA = 'urpm::prompt';
 
@@ -577,7 +577,7 @@ sub mirrors {
             $::statusbar and $id = statusbar_msg(
                 $branded
                   ? N("Please wait, downloading mirror addresses.")
-                    : N("Please wait, downloading mirror addresses from the Mandriva website."),
+                    : N("Please wait, downloading mirror addresses from the Mageia website."),
                 0);
             my $_clean_guard = before_leaving {
                 undef $gurpm;
@@ -624,7 +624,7 @@ $branded
 Please check that your network is currently running.
 
 Is it ok to continue?")
-: N("I need to contact the Mandriva website to get the mirror list.
+: 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?");
@@ -650,7 +650,7 @@ Please try again later.", $error)
 : N("There was an error downloading the mirror list:
 
 %s
-The network, or the Mandriva website, may be unavailable.
+The network, or the Mageia website, may be unavailable.
 Please try again later.", $error)), %options
 
 	);
@@ -664,7 +664,7 @@ Please try again later.", $error)), %options
 
 There can be many reasons for this problem; the most frequent is
 the case when the architecture of your processor is not supported
-by Mandriva Linux Official Updates.")), %options
+by Mageia Official Updates.")), %options
     ), return '';
 
     my $w = ugtk2->new(N("Mirror choice"), grab => 1, @transient_options);
@@ -944,7 +944,7 @@ sub check_update_media_version {
 		? N("Your medium `%s', used for updates, does not match the version of %s you're running (%s).
 It will be disabled.",
 		    $_->{name}, $distrib{system}, $distrib{product})
-		: N("Your medium `%s', used for updates, does not match the version of Mandriva Linux you're running (%s).
+		: N("Your medium `%s', used for updates, does not match the version of Mageia you're running (%s).
 It will be disabled.",
 		    $_->{name}, $mdk_version)
 	    );