1 files changed, 16 insertions, 14 deletions

diff --git a/control-center b/control-center
index 1f3cd64d..573f887d 100755
--- a/control-center
+++ b/control-center
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id$
+# $Id: control-center 269021 2010-05-19 16:37:57Z eugeni $
 
 # Copyright (C) 1999-2008 Mandriva
 #                         Daouda Lo
@@ -87,7 +87,7 @@ mygtk2::import_style_ressources();
 my $rc = find { -r $_ } ("$themes_dir/$theme/gtkrc", if_($theme ne 'default', "$themes_dir/default/gtkrc"));
 Gtk2::Rc->parse($rc) if -r $rc;
 
-my $branding = N("Mandriva Linux");
+my $branding = N("Mageia");
 my $product_id = common::parse_LDAP_namespace_structure(cat_('/etc/product.id'));
 # allow OEM branding:
 $branding = translate($product_id->{distribution});
@@ -155,8 +155,8 @@ my @tree = (
                         title => N("Software Management"),
                         list => [
                             "Install Software",
-                            "Mandriva Update",
-                            if_(0, "Mandriva Online"),
+                            "Mageia Update",
+                            if_(0, "Mageia Online"),
                             "Updates Configuration",
                             "Software Media Manager",
                             "Extended Maintenance",
@@ -517,7 +517,7 @@ my @tree = (
                     "Security Level",
                     "Tomoyo Policy",
                     "Firewall",
-                    "Mandriva Tools Authentication",
+                    "Mageia Tools Authentication",
                     "Invictus Firewall",
                     "Parental Controls",
                 ]
@@ -616,7 +616,7 @@ my %options = (
     'wiz_expert' => [ N("/_Options"), N("/Expert mode in _wizards") ],
 );
 
-my $mdk_rel = common::mandrake_release();
+my $mga_rel = common::mandrake_release();
 
 my ($steps, $view);
 
@@ -681,7 +681,9 @@ sub run_help() {
 
 sub run_browser {
     my ($url) = @_;
-    $url = "http://wiki.mandriva.com/en/$release->{version}_$url" if $url !~ m!^http://!;
+    # Enable back $url when we will have our first release and our first release wiki page
+    #$url = "http://wiki.mageia.org/en/$release->{version}_$url" if $url !~ m!^http://!;
+    $url = "http://www.mageia.org/" if $url !~ m!^http://!;
     run_program::raw({ detach => 1, as_user => 1 }, '/usr/bin/www-browser', $url);
 }
 
@@ -818,7 +820,7 @@ sub clean_list {
             $programs{$stuff}{icon} = $programs{$stuff}{real_icon};
         }
         # do not complain about missing entries in move:
-        warn qq("$exec" is not executable [$stuff]) if $mdk_rel !~ /Move/ && !$is_present && !$programs{$stuff}{disabled};
+        warn qq("$exec" is not executable [$stuff]) if $mga_rel !~ /Move/ && !$is_present && !$programs{$stuff}{disabled};
         !$programs{$stuff}{hidden} && $is_present && !$programs{$stuff}{disabled};
     } @$subtree;
 }
@@ -1437,8 +1439,8 @@ sub about_mdk_cc() {
     my ($previous_type, $not_first_title, $not_first_block);
     my $locale = lang::read;
     require Gtk2::Pango;
-    foreach my $line (grep { $_ ne "\n" && !/^#/ } cat_(top(glob("/usr/share/doc/mandriva-release-*/CREDITS"), glob("/usr/share/doc/mandriva-release-*/CREDITS.$locale->{lang}")))) {
-        $line =~ s/ Limited Edition 2005 \|//;
+   foreach my $line (grep { $_ ne "\n" && !/^#/ } cat_(top(glob("/usr/share/doc/mageia-release-*/CREDITS.$locale->{lang}")))) {
+        $l
         if (my ($type, $comment, $contributor) = split(/\|/, $line, 3)) {
             last if !$type;
             $comment =~ s/^ //; # fix initial space of first section (CREDITS format should be enhanced to specify lines that really are sections)
@@ -1478,21 +1480,21 @@ sub about_mdk_cc() {
 
     gtkpack_($window_about->vbox,
              (0, Gtk2::Banner->new('/usr/share/icons/large/drakconf.png',
-                                   #-PO: Here, first %s will be replaced by 'Mandriva Linux'
-                                   #-PO: second %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
+                                   #-PO: Here, first %s will be replaced by 'Mageia'
+                                   #-PO: second %s will be replaced by the version (eg: "Mageia 1 (Free) Control Center")
                                                        N("%s %s (%s) Control Center",
                                                          $branding, @$release{qw(version product)}))),
              0, Gtk2::Label->new(""),
              0, Gtk2::Label->new(
                  #-PO: here %s is eg: "1999-2008"
-                 N("Copyright (C) %s Mandriva SA", '1999-2008') . "\n"),
+                 N("Copyright (C) %s Mandriva SA", '1999-2008') . "\n" . N("Copyright (C) %s Mageia", '2011') . "\n" ),
              0, Gtk2::HSeparator->new,
              0, Gtk2::Label->new(""),
              1, my $n = Gtk2::Notebook->new,
              );
 
     add2notebook($n, N("Authors"), $list);
-    add2notebook($n, N("Mandriva Linux Contributors"), gtkset_size_request(create_scrolled_window($credits), 650, 50));
+    add2notebook($n, N("Mageia Contributors"), gtkset_size_request(create_scrolled_window($credits), 650, 50));
     $n->set_current_page(0);
 
     $window_about->show_all;