From 33c1a2b120ec3053e64f648abcf64fd7476849b1 Mon Sep 17 00:00:00 2001
From: Mageia SVN-Git Migration <svn-git-migration@mageia.org>
Date: Mon, 14 Feb 2011 00:37:56 +0000
Subject: 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
------------------------------------------------------------------------
---
 MageiaUpdate                    | 288 ++++++++++++++++++++++++++++++++++++++++
 Makefile                        |   8 +-
 MandrivaUpdate                  | 288 ----------------------------------------
 Rpmdrake/edit_urpm_sources.pm   |  14 +-
 Rpmdrake/formatting.pm          |   2 +-
 Rpmdrake/gurpm.pm               |   2 +-
 Rpmdrake/icon.pm                |   4 +-
 Rpmdrake/init.pm                |   4 +-
 Rpmdrake/open_db.pm             |   2 +-
 Rpmdrake/pkg.pm                 |  10 +-
 Rpmdrake/rpmnew.pm              |   2 +-
 Rpmdrake/widgets.pm             |   2 +-
 edit-urpm-sources.pl            |   2 +-
 grpmi/curl_download/Makefile.PL |   0
 gui.lst                         |  12 +-
 gurpmi.addmedia                 |   2 +-
 icons/title-install.png         | Bin 3073 -> 4436 bytes
 icons/title-media.png           | Bin 3166 -> 3837 bytes
 icons/title-tile.png            | Bin 163 -> 174 bytes
 icons/title-update.png          | Bin 2900 -> 4414 bytes
 pixmaps/edit-urpm-sources16.png | Bin 1017 -> 1032 bytes
 pixmaps/edit-urpm-sources32.png | Bin 2644 -> 2577 bytes
 pixmaps/edit-urpm-sources48.png | Bin 4372 -> 4370 bytes
 pixmaps/mandrivaupdate16.png    | Bin 1002 -> 1055 bytes
 pixmaps/mandrivaupdate32.png    | Bin 2690 -> 2592 bytes
 pixmaps/mandrivaupdate48.png    | Bin 4972 -> 4414 bytes
 pixmaps/rpmdrake-remove16.png   | Bin 997 -> 1004 bytes
 pixmaps/rpmdrake-remove32.png   | Bin 2616 -> 2446 bytes
 pixmaps/rpmdrake-remove48.png   | Bin 4665 -> 4035 bytes
 pixmaps/rpmdrake16.png          | Bin 1003 -> 945 bytes
 pixmaps/rpmdrake32.png          | Bin 2672 -> 2312 bytes
 pixmaps/rpmdrake48.png          | Bin 4937 -> 3837 bytes
 po/da.po                        |   6 +-
 po/ro.po                        |   8 +-
 po/uk.po                        |   2 +-
 rpmdrake                        |   8 +-
 rpmdrake.pm                     |  14 +-
 37 files changed, 335 insertions(+), 345 deletions(-)
 create mode 100755 MageiaUpdate
 delete mode 100755 MandrivaUpdate
 mode change 100644 => 100755 grpmi/curl_download/Makefile.PL

diff --git a/MageiaUpdate b/MageiaUpdate
new file mode 100755
index 00000000..6db84c4e
--- /dev/null
+++ b/MageiaUpdate
@@ -0,0 +1,288 @@
+#!/usr/bin/perl
+#*****************************************************************************
+#
+#  Copyright (c) 2002 Guillaume Cottenceau
+#  Copyright (c) 2002-2007 Thierry Vignaud <tvignaud@mandriva.com>
+#  Copyright (c) 2003, 2004, 2005 MandrakeSoft SA
+#  Copyright (c) 2005-2007 Mandriva SA
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2, as
+#  published by the Free Software Foundation.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#*****************************************************************************
+#
+# $Id: MageiaUpdate 261845 2009-10-13 12:33:58Z tv $
+
+use strict;
+use MDK::Common::Func 'any';
+use lib qw(/usr/lib/libDrakX);
+use common;
+
+use Rpmdrake::init;
+use standalone;  #- standalone must be loaded very first, for 'explanations', but after rpmdrake::init
+use rpmdrake;
+use Rpmdrake::gui;
+use Rpmdrake::rpmnew;
+use Rpmdrake::formatting;
+use Rpmdrake::pkg;
+use Rpmdrake::widgets;
+
+use mygtk2 qw(gtknew);  #- do not import anything else, especially gtkadd() which conflicts with ugtk2 one
+use ugtk2 qw(:all);
+use Gtk2::SimpleList;
+
+# make Rpmdrake::gui aware MageiaUpdate do not use the same columns ids as rpmdrake:
+%pkg_columns = (
+    image => 0,
+    selected => 1,
+    text => 2,
+    short_name => 3,
+    version => 4,
+    release => 5,
+    'arch' => 6,
+    importance => 7,
+);
+
+$ugtk2::wm_icon = get_icon('MageiaUpdate', "title-$MODE");
+
+our $w;
+our $statusbar;
+
+warn_about_user_mode();
+
+my (%data, $initialized);
+
+my %update_icons = (
+    security => 'security-update',
+    bugfix => 'bugfix-update',
+    normal => 'general-update',
+);
+
+my %icons_cache;
+
+sub refresh_packages_list {
+    my ($list, $info, $button) = @_;
+    # select packages to update:
+    my @requested = sort @filtered_pkgs;
+
+    # don't select packages in skip list:
+    if (!$initialized) {
+        $pkgs->{$_}{selected} = 0 foreach @requested;
+        my @selectable = grep { !$pkgs->{$_}{pkg}->flag_skip } @requested;
+        toggle($list, @selectable) if @selectable;
+        $initialized = 1;
+    }
+
+    my $i;
+    @{$list->{data}} = map {
+        $data{$_} = $i++;
+        my $summary = get_summary($_);
+        my ($name, $version, $release, $arch) = split_fullname($_);
+        my $pkg = $pkgs->{$_};
+        my $raw_medium = pkg2medium($pkg->{pkg}, $urpm);
+        my $medium = !$raw_medium->{fake} ? $raw_medium->{name} : undef;
+        my $icon;
+        my $importance = $medium && $descriptions->{$medium}{$name}{importance};
+        if ($importance) {
+            $icon = $icons_cache{$importance} ||= gtknew('Pixbuf', file => $update_icons{$importance});
+        }
+        [ $icon, $pkgs->{$_}{selected}, $_, format_name_n_summary($name, $summary), $version, $release, $arch, $importance ];
+    } grep { $pkgs->{$_}{pkg} } @requested;
+    gtktext_insert($info,
+      formatAlaTeX(N("The list of updates is empty. This means that either there is
+no available update for the packages installed on your computer,
+or you already installed all of them."))) if !@{$list->{data}};
+    $button->set_sensitive(scalar(@{$list->{data}}));
+}
+
+sub toggle {
+    my ($list, @names) = @_;
+    my $name = $names[0];
+    my $val = $pkgs->{$name}{selected};
+    my $old_status = $val ? 'to_install' : 'to_update';
+    my $done;
+    $pkgs->{$name}{pkg}->set_flag_skip(0);
+    toggle_nodes($w->{real_window}->window, $list->get_model, sub {
+                     my ($leaf, $_state, $_model) = @_;
+                     $done = 1;
+                     $list->{data}[$data{$leaf}][$pkg_columns{selected}] = $pkgs->{$name}{selected};
+                 },
+                 $old_status, @names);
+    # handle canceling:
+    $list->{data}[$data{$name}][$pkg_columns{selected}] = !$list->{data}[$data{$name}][$pkg_columns{selected}] if !$done;
+}
+
+$w = ugtk2->new(N("Software Management"));
+$w->{rwindow}->show_all if $::isEmbedded;
+$::main_window = $w->{real_window};
+
+sub quit() {
+    ($mandrivaupdate_width->[0], $mandrivaupdate_height->[0]) = $::w->{real_window}->get_size;
+    real_quit();
+}
+
+sub run_treeview_dialog {
+    my ($callback_action) = @_;
+
+    my ($list, $info, $update_button);
+
+    my $rootwin_height = second(gtkroot()->get_size);
+    my $is_small_screen = $rootwin_height <= 480;
+
+    compute_main_window_size($w);
+
+    gtkadd(
+	$w->{window},
+	gtkpack_(
+	    gtknew('VBox', spacing => 3),
+	    if_(!$is_small_screen, 0, getbanner()),
+              0, gtknew('Title2', label => N("Here is the list of software package updates"), width => 600),
+         1, create_vpaned(
+                 gtknew('ScrolledWindow', width => $typical_width*0.9, height => $is_small_screen ? 150 : 200,
+                        child => $list = Gtk2::SimpleList->new(
+                            " " => 'pixbuf',
+                            " " . " " . " "    => 'bool', #N("Selected")
+                            '' => 'hidden',
+                            " " . N("Name") . " "        => 'markup', #N("Name")
+                            " " . N("Version") . " "        => 'text',
+                            " " . N("Release") . " "        => 'text',
+                            " " . N("Arch") . " "        => 'text',
+                            '' => 'hidden',
+                        ),
+                    ),
+                 
+             gtknew('ScrolledWindow', width => $typical_width*0.9,
+                    child => $info = Gtk2::Mdv::TextView->new, height => $is_small_screen ? 150 : 190,
+                ),
+             resize1 => 1,
+         ),
+              0, gtkset_size_request(Gtk2::HSeparator->new, -1, 5),
+		    0, gtkpack_(
+			gtknew('HBox', spacing => 20),
+			0, gtksignal_connect(
+			    Gtk2::Button->new(but_(N("Help"))),
+			    clicked => sub { rpmdrake::open_help($MODE) },
+			),
+			0, gtksignal_connect(
+			    Gtk2::Button->new(but_(N("Select all"))),
+			    clicked => sub {
+                       toggle_all({
+                           widgets => {
+                               detail_list => $list,
+                               detail_list_model => $list->get_model
+                           },
+                       }, 1);
+                       refresh_packages_list($list, $info, $update_button);
+                   },
+			),
+               1, gtknew('Label'),
+			0, my $action_button = gtksignal_connect(
+			    $update_button = Gtk2::Button->new(but_(N("Update"))),
+			    clicked => sub {
+                                my $res = do_action({ tree_mode => 'all_updates' }, $callback_action);
+                                $initialized = 0 if !$res;
+                                refresh_packages_list($list, $info, $update_button);
+                            },
+			),
+			0, gtksignal_connect(
+			    Gtk2::Button->new(but_(N("Quit"))),
+			    clicked => \&quit,
+			),
+		    ),
+	    #0, $statusbar = Gtk2::Statusbar->new,
+	),
+    );
+    $statusbar = Gtk2::Statusbar->new;
+
+    $list->get_model->set_sort_func($pkg_columns{image} + 1, sub {
+                                        my ($store, $treeiter1, $treeiter2) = @_;
+                                        $store->get_value($treeiter1, $pkg_columns{importance}) cmp
+                                          $store->get_value($treeiter2, $pkg_columns{importance});
+                                    });
+
+
+    $list->set_rules_hint(1);
+    my $pix_col = $list->get_column($pkg_columns{image});
+    $pix_col->set_fixed_width(32);
+    my $bool_col = $list->get_column($pkg_columns{selected});
+    $bool_col->set_fixed_width(24);
+    $bool_col->set_sizing('fixed');
+    $bool_col->set_sort_column_id($pkg_columns{selected});
+
+    # -1 because actual widget count differs from TreeModel one due to the hidden column:
+    foreach (@pkg_columns{qw(short_name version release arch)}) {
+        my $col = $list->get_column($_-1);
+        ($col->get_cell_renderers)[0]->set_property('xpad', '6');
+        $col->set_sizing('autosize');
+        $col->set_sort_column_id($_);
+    }
+
+    my $pretty_column = $list->get_column($pkg_columns{short_name}-1);
+    $pretty_column->set_resizable(1);
+    ($pretty_column->get_cell_renderers)[0]->set_property('ellipsize', 'end');
+    $pretty_column->set_property('expand', '1');
+
+    $list->get_selection->signal_connect(changed => sub {
+                                             my ($model, $iter) = $_[0]->get_selected;
+                                             $model && $iter or return;
+                                             gtktext_insert($info, get_info($model->get($iter, $pkg_columns{text}), $w->{real_window}->window));
+                                             $info->scroll_to_iter($info->get_buffer->get_start_iter, 0, 0, 0, 0);
+                                         });
+
+    $w->{rwindow}->set_default_size(-1, 500) if !$::isEmbedded;
+
+    if ($mandrivaupdate_width->[0] && $mandrivaupdate_height->[0]) {
+        # so that we can shrink back:
+        $w->{real_window}->set_default_size($mandrivaupdate_width->[0], $mandrivaupdate_height->[0]);
+    }
+    $w->{rwindow}->show_all;
+    $w->{rwindow}->set_sensitive(0);
+
+    # ensure treeview get realized so that ->get_selection returns something
+    $list->realize;
+    gtkflush();
+
+    $filter->[0] = 'all'; # default filter: availlable updates
+    $Rpmdrake::pkg::probe_only_for_updates = 1; # faster startup
+    pkgs_provider({}, 'all_updates', pure_updates => 1); # default mode
+
+    refresh_packages_list($list, $info, $update_button);
+
+    my $cell = ($bool_col->get_cell_renderers)[0];
+    $cell->signal_connect(toggled => sub {
+	my ($_cell, $text_path) = @_;
+	my $name = @{$list->{data}[$text_path]}[$pkg_columns{text}];
+	gtkset_mousecursor_wait($w->{real_window}->window);
+	my $_guard = before_leaving(sub { gtkset_mousecursor_normal($w->{real_window}->window) });
+	toggle($list, $name);
+    });
+    $action_button->set_sensitive(0) if $>;
+
+    $w->{rwindow}->set_sensitive(1);
+
+    $w->main;
+}
+
+
+# -=-=-=---=-=-=---=-=-=-- main -=-=-=---=-=-=---=-=-=-
+
+do_merge_if_needed();
+
+readconf();
+
+init();
+run_treeview_dialog(\&perform_installation);
+
+writeconf();
+
+myexit(0);
diff --git a/Makefile b/Makefile
index 9b98d51b..1113943d 100644
--- a/Makefile
+++ b/Makefile
@@ -21,16 +21,16 @@ dirs:
 install: $(ALL)
 	@for n in $(DIRS); do make -C $$n install; done
 	install -d $(SBINDIR)
-	install rpmdrake MandrivaUpdate edit-urpm-sources.pl gurpmi.addmedia $(SBINDIR)
+	install rpmdrake MageiaUpdate edit-urpm-sources.pl gurpmi.addmedia $(SBINDIR)
 	install -d $(BINDIR)
 	ln -sf $(RELATIVE_SBIN)/rpmdrake $(BINDIR)/rpmdrake
-	ln -sf $(RELATIVE_SBIN)/MandrivaUpdate $(BINDIR)/MandrivaUpdate
+	ln -sf $(RELATIVE_SBIN)/MageiaUpdate $(BINDIR)/MageiaUpdate
 	ln -sf $(RELATIVE_SBIN)/edit-urpm-sources.pl $(BINDIR)/edit-urpm-sources.pl
 	ln -sf edit-urpm-sources.pl $(SBINDIR)/drakrpm-edit-media
 	ln -sf $(RELATIVE_SBIN)/drakrpm-edit-media $(BINDIR)/drakrpm-edit-media
 	ln -sf $(RELATIVE_SBIN)/gurpmi.addmedia $(BINDIR)/gurpmi.addmedia
 	ln -sf $(RELATIVE_SBIN)/rpmdrake $(BINDIR)/drakrpm
-	ln -sf $(RELATIVE_SBIN)/MandrivaUpdate $(SBINDIR)/drakrpm-update
+	ln -sf $(RELATIVE_SBIN)/MageiaUpdate $(SBINDIR)/drakrpm-update
 	ln -sf $(RELATIVE_SBIN)/drakrpm-update $(BINDIR)/drakrpm-update
 	install -d $(DATADIR)/rpmdrake/icons
 	install -m644 icons/*.png $(DATADIR)/rpmdrake/icons
@@ -47,7 +47,7 @@ dis: clean
 	rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar*
 	svn export -q -rBASE . $(NAME)-$(VERSION)
 	find $(NAME)-$(VERSION) -name .svnignore |xargs rm -rf
-	find $(NAME)-$(VERSION) -name '*.pm' -o -name rpmdrake -o -name MandrivaUpdate | xargs ./simplify-drakx-modules
+	find $(NAME)-$(VERSION) -name '*.pm' -o -name rpmdrake -o -name MageiaUpdate | xargs ./simplify-drakx-modules
 	./simplify-drakx-modules $(NAME)-$(VERSION)/{gurpmi.addmedia,edit-urpm-sources.pl}
 	tar cfa ../$(NAME)-$(VERSION).tar.lzma $(NAME)-$(VERSION)
 	rm -rf $(NAME)-$(VERSION)
diff --git a/MandrivaUpdate b/MandrivaUpdate
deleted file mode 100755
index 7e670ec8..00000000
--- a/MandrivaUpdate
+++ /dev/null
@@ -1,288 +0,0 @@
-#!/usr/bin/perl
-#*****************************************************************************
-#
-#  Copyright (c) 2002 Guillaume Cottenceau
-#  Copyright (c) 2002-2007 Thierry Vignaud <tvignaud@mandriva.com>
-#  Copyright (c) 2003, 2004, 2005 MandrakeSoft SA
-#  Copyright (c) 2005-2007 Mandriva SA
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License version 2, as
-#  published by the Free Software Foundation.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#*****************************************************************************
-#
-# $Id$
-
-use strict;
-use MDK::Common::Func 'any';
-use lib qw(/usr/lib/libDrakX);
-use common;
-
-use Rpmdrake::init;
-use standalone;  #- standalone must be loaded very first, for 'explanations', but after rpmdrake::init
-use rpmdrake;
-use Rpmdrake::gui;
-use Rpmdrake::rpmnew;
-use Rpmdrake::formatting;
-use Rpmdrake::pkg;
-use Rpmdrake::widgets;
-
-use mygtk2 qw(gtknew);  #- do not import anything else, especially gtkadd() which conflicts with ugtk2 one
-use ugtk2 qw(:all);
-use Gtk2::SimpleList;
-
-# make Rpmdrake::gui aware MandrivaUpdate do not use the same columns ids as rpmdrake:
-%pkg_columns = (
-    image => 0,
-    selected => 1,
-    text => 2,
-    short_name => 3,
-    version => 4,
-    release => 5,
-    'arch' => 6,
-    importance => 7,
-);
-
-$ugtk2::wm_icon = get_icon('MandrivaUpdate', "title-$MODE");
-
-our $w;
-our $statusbar;
-
-warn_about_user_mode();
-
-my (%data, $initialized);
-
-my %update_icons = (
-    security => 'security-update',
-    bugfix => 'bugfix-update',
-    normal => 'general-update',
-);
-
-my %icons_cache;
-
-sub refresh_packages_list {
-    my ($list, $info, $button) = @_;
-    # select packages to update:
-    my @requested = sort @filtered_pkgs;
-
-    # don't select packages in skip list:
-    if (!$initialized) {
-        $pkgs->{$_}{selected} = 0 foreach @requested;
-        my @selectable = grep { !$pkgs->{$_}{pkg}->flag_skip } @requested;
-        toggle($list, @selectable) if @selectable;
-        $initialized = 1;
-    }
-
-    my $i;
-    @{$list->{data}} = map {
-        $data{$_} = $i++;
-        my $summary = get_summary($_);
-        my ($name, $version, $release, $arch) = split_fullname($_);
-        my $pkg = $pkgs->{$_};
-        my $raw_medium = pkg2medium($pkg->{pkg}, $urpm);
-        my $medium = !$raw_medium->{fake} ? $raw_medium->{name} : undef;
-        my $icon;
-        my $importance = $medium && $descriptions->{$medium}{$name}{importance};
-        if ($importance) {
-            $icon = $icons_cache{$importance} ||= gtknew('Pixbuf', file => $update_icons{$importance});
-        }
-        [ $icon, $pkgs->{$_}{selected}, $_, format_name_n_summary($name, $summary), $version, $release, $arch, $importance ];
-    } grep { $pkgs->{$_}{pkg} } @requested;
-    gtktext_insert($info,
-      formatAlaTeX(N("The list of updates is empty. This means that either there is
-no available update for the packages installed on your computer,
-or you already installed all of them."))) if !@{$list->{data}};
-    $button->set_sensitive(scalar(@{$list->{data}}));
-}
-
-sub toggle {
-    my ($list, @names) = @_;
-    my $name = $names[0];
-    my $val = $pkgs->{$name}{selected};
-    my $old_status = $val ? 'to_install' : 'to_update';
-    my $done;
-    $pkgs->{$name}{pkg}->set_flag_skip(0);
-    toggle_nodes($w->{real_window}->window, $list->get_model, sub {
-                     my ($leaf, $_state, $_model) = @_;
-                     $done = 1;
-                     $list->{data}[$data{$leaf}][$pkg_columns{selected}] = $pkgs->{$name}{selected};
-                 },
-                 $old_status, @names);
-    # handle canceling:
-    $list->{data}[$data{$name}][$pkg_columns{selected}] = !$list->{data}[$data{$name}][$pkg_columns{selected}] if !$done;
-}
-
-$w = ugtk2->new(N("Software Management"));
-$w->{rwindow}->show_all if $::isEmbedded;
-$::main_window = $w->{real_window};
-
-sub quit() {
-    ($mandrivaupdate_width->[0], $mandrivaupdate_height->[0]) = $::w->{real_window}->get_size;
-    real_quit();
-}
-
-sub run_treeview_dialog {
-    my ($callback_action) = @_;
-
-    my ($list, $info, $update_button);
-
-    my $rootwin_height = second(gtkroot()->get_size);
-    my $is_small_screen = $rootwin_height <= 480;
-
-    compute_main_window_size($w);
-
-    gtkadd(
-	$w->{window},
-	gtkpack_(
-	    gtknew('VBox', spacing => 3),
-	    if_(!$is_small_screen, 0, getbanner()),
-              0, gtknew('Title2', label => N("Here is the list of software package updates"), width => 600),
-         1, create_vpaned(
-                 gtknew('ScrolledWindow', width => $typical_width*0.9, height => $is_small_screen ? 150 : 200,
-                        child => $list = Gtk2::SimpleList->new(
-                            " " => 'pixbuf',
-                            " " . " " . " "    => 'bool', #N("Selected")
-                            '' => 'hidden',
-                            " " . N("Name") . " "        => 'markup', #N("Name")
-                            " " . N("Version") . " "        => 'text',
-                            " " . N("Release") . " "        => 'text',
-                            " " . N("Arch") . " "        => 'text',
-                            '' => 'hidden',
-                        ),
-                    ),
-                 
-             gtknew('ScrolledWindow', width => $typical_width*0.9,
-                    child => $info = Gtk2::Mdv::TextView->new, height => $is_small_screen ? 150 : 190,
-                ),
-             resize1 => 1,
-         ),
-              0, gtkset_size_request(Gtk2::HSeparator->new, -1, 5),
-		    0, gtkpack_(
-			gtknew('HBox', spacing => 20),
-			0, gtksignal_connect(
-			    Gtk2::Button->new(but_(N("Help"))),
-			    clicked => sub { rpmdrake::open_help($MODE) },
-			),
-			0, gtksignal_connect(
-			    Gtk2::Button->new(but_(N("Select all"))),
-			    clicked => sub {
-                       toggle_all({
-                           widgets => {
-                               detail_list => $list,
-                               detail_list_model => $list->get_model
-                           },
-                       }, 1);
-                       refresh_packages_list($list, $info, $update_button);
-                   },
-			),
-               1, gtknew('Label'),
-			0, my $action_button = gtksignal_connect(
-			    $update_button = Gtk2::Button->new(but_(N("Update"))),
-			    clicked => sub {
-                                my $res = do_action({ tree_mode => 'all_updates' }, $callback_action);
-                                $initialized = 0 if !$res;
-                                refresh_packages_list($list, $info, $update_button);
-                            },
-			),
-			0, gtksignal_connect(
-			    Gtk2::Button->new(but_(N("Quit"))),
-			    clicked => \&quit,
-			),
-		    ),
-	    #0, $statusbar = Gtk2::Statusbar->new,
-	),
-    );
-    $statusbar = Gtk2::Statusbar->new;
-
-    $list->get_model->set_sort_func($pkg_columns{image} + 1, sub {
-                                        my ($store, $treeiter1, $treeiter2) = @_;
-                                        $store->get_value($treeiter1, $pkg_columns{importance}) cmp
-                                          $store->get_value($treeiter2, $pkg_columns{importance});
-                                    });
-
-
-    $list->set_rules_hint(1);
-    my $pix_col = $list->get_column($pkg_columns{image});
-    $pix_col->set_fixed_width(32);
-    my $bool_col = $list->get_column($pkg_columns{selected});
-    $bool_col->set_fixed_width(24);
-    $bool_col->set_sizing('fixed');
-    $bool_col->set_sort_column_id($pkg_columns{selected});
-
-    # -1 because actual widget count differs from TreeModel one due to the hidden column:
-    foreach (@pkg_columns{qw(short_name version release arch)}) {
-        my $col = $list->get_column($_-1);
-        ($col->get_cell_renderers)[0]->set_property('xpad', '6');
-        $col->set_sizing('autosize');
-        $col->set_sort_column_id($_);
-    }
-
-    my $pretty_column = $list->get_column($pkg_columns{short_name}-1);
-    $pretty_column->set_resizable(1);
-    ($pretty_column->get_cell_renderers)[0]->set_property('ellipsize', 'end');
-    $pretty_column->set_property('expand', '1');
-
-    $list->get_selection->signal_connect(changed => sub {
-                                             my ($model, $iter) = $_[0]->get_selected;
-                                             $model && $iter or return;
-                                             gtktext_insert($info, get_info($model->get($iter, $pkg_columns{text}), $w->{real_window}->window));
-                                             $info->scroll_to_iter($info->get_buffer->get_start_iter, 0, 0, 0, 0);
-                                         });
-
-    $w->{rwindow}->set_default_size(-1, 500) if !$::isEmbedded;
-
-    if ($mandrivaupdate_width->[0] && $mandrivaupdate_height->[0]) {
-        # so that we can shrink back:
-        $w->{real_window}->set_default_size($mandrivaupdate_width->[0], $mandrivaupdate_height->[0]);
-    }
-    $w->{rwindow}->show_all;
-    $w->{rwindow}->set_sensitive(0);
-
-    # ensure treeview get realized so that ->get_selection returns something
-    $list->realize;
-    gtkflush();
-
-    $filter->[0] = 'all'; # default filter: availlable updates
-    $Rpmdrake::pkg::probe_only_for_updates = 1; # faster startup
-    pkgs_provider({}, 'all_updates', pure_updates => 1); # default mode
-
-    refresh_packages_list($list, $info, $update_button);
-
-    my $cell = ($bool_col->get_cell_renderers)[0];
-    $cell->signal_connect(toggled => sub {
-	my ($_cell, $text_path) = @_;
-	my $name = @{$list->{data}[$text_path]}[$pkg_columns{text}];
-	gtkset_mousecursor_wait($w->{real_window}->window);
-	my $_guard = before_leaving(sub { gtkset_mousecursor_normal($w->{real_window}->window) });
-	toggle($list, $name);
-    });
-    $action_button->set_sensitive(0) if $>;
-
-    $w->{rwindow}->set_sensitive(1);
-
-    $w->main;
-}
-
-
-# -=-=-=---=-=-=---=-=-=-- main -=-=-=---=-=-=---=-=-=-
-
-do_merge_if_needed();
-
-readconf();
-
-init();
-run_treeview_dialog(\&perform_installation);
-
-writeconf();
-
-myexit(0);
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';
diff --git a/edit-urpm-sources.pl b/edit-urpm-sources.pl
index 5ccc255f..6168d1d0 100755
--- a/edit-urpm-sources.pl
+++ b/edit-urpm-sources.pl
@@ -20,7 +20,7 @@
 # 
 #*****************************************************************************
 #
-# $Id$
+# $Id: edit-urpm-sources.pl 244763 2008-09-04 16:12:52Z tv $
 
 
 use strict;
diff --git a/grpmi/curl_download/Makefile.PL b/grpmi/curl_download/Makefile.PL
old mode 100644
new mode 100755
diff --git a/gui.lst b/gui.lst
index d1866806..e73f8e72 100644
--- a/gui.lst
+++ b/gui.lst
@@ -176,7 +176,6 @@ ccsm
 cd-mason
 cdrdao-gcdmaster
 cdvst
-cedega-mandriva
 celestia
 cellwriter
 celtx-ca
@@ -1074,16 +1073,7 @@ mahjongg3d
 mail-notification
 mailody
 mando
-mandriva-doc-Drakxtools-Guide-en
-mandriva-doc-Drakxtools-Guide-fr
-mandriva-doc-Drakxtools-Guide-pt_br
-mandriva-doc-Introducing-en
-mandriva-doc-Introducing-fr
-mandriva-doc-Introducing-pt_br
-mandriva-doc-Mastering-Manual-en
-mandriva-doc-Mastering-Manual-fr
-mandriva-kde4-config-common
-mandrivamenu
+mageia-kde4-config-common
 mandvd
 manedit
 maniadrive
diff --git a/gurpmi.addmedia b/gurpmi.addmedia
index a3beaab5..8c10aee9 100755
--- a/gurpmi.addmedia
+++ b/gurpmi.addmedia
@@ -20,7 +20,7 @@
 # 
 #*****************************************************************************
 #
-# $Id$
+# $Id: gurpmi.addmedia 261187 2009-10-01 14:44:34Z tv $
 
 use strict;
 
diff --git a/icons/title-install.png b/icons/title-install.png
index a6bbe178..d63e82cc 100644
Binary files a/icons/title-install.png and b/icons/title-install.png differ
diff --git a/icons/title-media.png b/icons/title-media.png
index e87a3329..93ef1aaf 100644
Binary files a/icons/title-media.png and b/icons/title-media.png differ
diff --git a/icons/title-tile.png b/icons/title-tile.png
index 022ef1f0..a2747af5 100644
Binary files a/icons/title-tile.png and b/icons/title-tile.png differ
diff --git a/icons/title-update.png b/icons/title-update.png
index c99b75da..85ec1ca3 100644
Binary files a/icons/title-update.png and b/icons/title-update.png differ
diff --git a/pixmaps/edit-urpm-sources16.png b/pixmaps/edit-urpm-sources16.png
index 60c55c41..aa13bbd1 100644
Binary files a/pixmaps/edit-urpm-sources16.png and b/pixmaps/edit-urpm-sources16.png differ
diff --git a/pixmaps/edit-urpm-sources32.png b/pixmaps/edit-urpm-sources32.png
index 4ff5eac0..181f054a 100644
Binary files a/pixmaps/edit-urpm-sources32.png and b/pixmaps/edit-urpm-sources32.png differ
diff --git a/pixmaps/edit-urpm-sources48.png b/pixmaps/edit-urpm-sources48.png
index 50ea924e..2f783718 100644
Binary files a/pixmaps/edit-urpm-sources48.png and b/pixmaps/edit-urpm-sources48.png differ
diff --git a/pixmaps/mandrivaupdate16.png b/pixmaps/mandrivaupdate16.png
index cf485cb7..a715b0d9 100644
Binary files a/pixmaps/mandrivaupdate16.png and b/pixmaps/mandrivaupdate16.png differ
diff --git a/pixmaps/mandrivaupdate32.png b/pixmaps/mandrivaupdate32.png
index 5ab663aa..32e10d99 100644
Binary files a/pixmaps/mandrivaupdate32.png and b/pixmaps/mandrivaupdate32.png differ
diff --git a/pixmaps/mandrivaupdate48.png b/pixmaps/mandrivaupdate48.png
index 9a805109..85ec1ca3 100644
Binary files a/pixmaps/mandrivaupdate48.png and b/pixmaps/mandrivaupdate48.png differ
diff --git a/pixmaps/rpmdrake-remove16.png b/pixmaps/rpmdrake-remove16.png
index 8c8ea87a..9126b68d 100644
Binary files a/pixmaps/rpmdrake-remove16.png and b/pixmaps/rpmdrake-remove16.png differ
diff --git a/pixmaps/rpmdrake-remove32.png b/pixmaps/rpmdrake-remove32.png
index 00a790b7..e8a521e6 100644
Binary files a/pixmaps/rpmdrake-remove32.png and b/pixmaps/rpmdrake-remove32.png differ
diff --git a/pixmaps/rpmdrake-remove48.png b/pixmaps/rpmdrake-remove48.png
index 8aa83433..69be5731 100644
Binary files a/pixmaps/rpmdrake-remove48.png and b/pixmaps/rpmdrake-remove48.png differ
diff --git a/pixmaps/rpmdrake16.png b/pixmaps/rpmdrake16.png
index 4a0e201c..0e66f0c4 100644
Binary files a/pixmaps/rpmdrake16.png and b/pixmaps/rpmdrake16.png differ
diff --git a/pixmaps/rpmdrake32.png b/pixmaps/rpmdrake32.png
index 0601ccbd..2226ef70 100644
Binary files a/pixmaps/rpmdrake32.png and b/pixmaps/rpmdrake32.png differ
diff --git a/pixmaps/rpmdrake48.png b/pixmaps/rpmdrake48.png
index 83b1a2a8..93ef1aaf 100644
Binary files a/pixmaps/rpmdrake48.png and b/pixmaps/rpmdrake48.png differ
diff --git a/po/da.po b/po/da.po
index e5338002..8ce1e8df 100644
--- a/po/da.po
+++ b/po/da.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-23 22:34-0300\n"
-"PO-Revision-Date: 2010-04-23 15:28+0200\n"
+"PO-Revision-Date: 2010-11-17 21:44+0100\n"
 "Last-Translator: Keld Simonsen <keld@keldix.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
@@ -929,9 +929,9 @@ msgid "This is an offical update which is supported by Mandriva."
 msgstr "Dette er en officiel opdatering som er understøttet af Mandriva."
 
 #: ../Rpmdrake/gui.pm:177
-#, fuzzy, c-format
+#, c-format
 msgid "This is an unoffical update."
-msgstr "Dette er en uofficiel opdatering som <b>ikke er understøttet</b>."
+msgstr "Dette er en uofficiel opdatering."
 
 #: ../Rpmdrake/gui.pm:181
 #, c-format
diff --git a/po/ro.po b/po/ro.po
index 6372d794..1fee57e7 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -50,8 +50,8 @@ msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: https://qa.mandriva.com\n"
 "POT-Creation-Date: 2010-08-23 22:34-0300\n"
-"PO-Revision-Date: 2010-06-01 15:08+0100\n"
-"Last-Translator: Cătălin Florin RUSSEN <cfrussen@yahoo.co.uk>\n"
+"PO-Revision-Date: 2010-09-29 19:26+0100\n"
+"Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
 "Language-Team: Romanian <cooker-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -983,9 +983,9 @@ msgid "This is an offical update which is supported by Mandriva."
 msgstr "Aceasta este o actualizare oficială ce este suportată de Mandriva."
 
 #: ../Rpmdrake/gui.pm:177
-#, fuzzy, c-format
+#, c-format
 msgid "This is an unoffical update."
-msgstr "Aceasta este o actualizare neoficială ce <b>nu este suportată</b>."
+msgstr "Aceasta este o actualizare neoficială."
 
 #: ../Rpmdrake/gui.pm:181
 #, c-format
diff --git a/po/uk.po b/po/uk.po
index 97163b24..9f65a725 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,5 +1,5 @@
 # translation of rpmdrake.po to ukrainian
-# $Id$
+# $Id: uk.po 270676 2010-08-24 01:42:19Z jvictor $
 # Latest versions of po files are at http://www.mandrivalinux.com/l10n/uk.php3
 #
 # Copyright (C) 1999,2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
diff --git a/rpmdrake b/rpmdrake
index 8f235e49..ea7fb2f4 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -22,7 +22,7 @@
 #
 #*****************************************************************************
 #
-# $Id$
+# $Id: rpmdrake 267936 2010-04-26 16:40:21Z jvictor $
 
 use strict;
 use MDK::Common::Func 'any';
@@ -620,9 +620,9 @@ sub run_treeview_dialog {
                         version => $Rpmdrake::init::version,
                         copyright => N("Copyright (C) %s by Mandriva", '2002-2009'),
                         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.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)
 	    );
-- 
cgit v1.2.1