From be4ff1644a3dfeea87b1df54fc2e54fa14961b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <remi@verschelde.fr>
Date: Mon, 16 Feb 2015 22:47:56 +0100
Subject: Some Mandriva -> Mageia leftovers and Mageia copyright years update

---
 mgaapplet                | 2 +-
 mgaapplet-upgrade-helper | 4 ++--
 mgaonline.pm             | 2 +-
 mgaupdate                | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mgaapplet b/mgaapplet
index 5c0b772a..4c800559 100755
--- a/mgaapplet
+++ b/mgaapplet
@@ -633,7 +633,7 @@ sub about_dialog() {
     $url =~ s/^https:/http:/;
     my $w = gtknew('AboutDialog', name => N("Mageia Online %s", $ver),
                    copyright => N("Copyright (C) %s by %s", 'Mandriva', '2001-2010') . "\n" .
-                     N("Copyright (C) %s by %s", 'Mageia', '2010-2011'),
+                     N("Copyright (C) %s by %s", 'Mageia', '2010-2015'),
                    license => join('', cat_('/usr/share/common-licenses/GPL')),
                    icon => '/usr/share/icons/mini/mgaonline.png',
                    comments => N("Mageia Online gives access to Mageia web services."),
diff --git a/mgaapplet-upgrade-helper b/mgaapplet-upgrade-helper
index 7798e10d..fb2a1ec0 100755
--- a/mgaapplet-upgrade-helper
+++ b/mgaapplet-upgrade-helper
@@ -316,8 +316,8 @@ packages as well?)."))
         log::explanations("logging gurpmi message in '$log_file'");
     }
 
-    # we cannot use installUpdates() as MandrivaUpdate needs the media
-    # flaged as update (or else, we need to add a new option to MandrivaUpdate):
+    # we cannot use installUpdates() as MageiaUpdate needs the media
+    # flaged as update (or else, we need to add a new option to MageiaUpdate):
     run_gurpmi();
 }
 
diff --git a/mgaonline.pm b/mgaonline.pm
index 22e4038f..fb6dd250 100644
--- a/mgaonline.pm
+++ b/mgaonline.pm
@@ -129,7 +129,7 @@ sub get_distro_list() {
 
 
 sub clean_confdir() {
-    my $confdir = '/root/.MdkOnline';
+    my $confdir = '/root/.MgaOnline';
     system "/bin/rm", "-f", "$confdir/*log.bz2", "$confdir/*log.bz2.uue", "$confdir/*.dif $confdir/rpm_qa_installed_before", "$confdir/rpm_qa_installed_after";
 }
 
diff --git a/mgaupdate b/mgaupdate
index 4678bf0b..60a5d847 100755
--- a/mgaupdate
+++ b/mgaupdate
@@ -41,7 +41,7 @@ BEGIN { unshift @::textdomains, 'mgaupdate' }
 
 require_root_capability();
 
-my $confdir = '/root/.MdkOnline';
+my $confdir = '/root/.MgaOnline';
 my $conffile = "$confdir/mgaupdate";
 
 my $logfile = '/var/tmp/mgaupdate.log';
@@ -49,7 +49,7 @@ my $logfile = '/var/tmp/mgaupdate.log';
 
 my $CLIENT_VERSION = "4";
 my $YEARS = "2002-2006";
-my $MGA_YEARS = "2010-2012";
+my $MGA_YEARS = "2010-2015";
 
 #for compatibilities with former versions
 mkdir_p($confdir) if !-d $confdir;
@@ -67,7 +67,7 @@ N("Copyright (C) %s %s", $YEARS, 'Mandriva') . N("Copyright (C) %s %s", $MGA_YEA
 ") . N("  --auto		- Mageia Update launched automatically.
 ") . N("  --mnf			- launch mnf specific scripts.
 ") . N("  --noX			- text mode version of Mageia Update.
-") . N("  --debug			- log what is done
+") . N("  --debug		- log what is done.
 ");
     exit(0);
 }
-- 
cgit v1.2.1